More work on switch to natbib

diff --git a/mlastyle.bst b/mlastyle.bst
index 15e90d09fa889752d02adc566cd8eedd151b3330..d0c322d49057ad05f1f59b2a7928f5e9e8f6785e 100644 (file)
--- a/mlastyle.bst
+++ b/mlastyle.bst
@@ -776,7 +776,7 @@ FUNCTION {cite.label}
          if$
        }
       if$
-      author.duplicate { ", " * cite.title * }{} if$
+      author.duplicate { "(" * cite.title * ")" }{ "( )" * } if$
     }
   if$
       %}

diff --git a/mlastyle.dtx b/mlastyle.dtx
index 46412055357c7ea7375d11b82db39337e27bd07c..7033be8b0ee6686b7709c27bb15416c90055c73d 100644 (file)
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -875,7 +875,9 @@ Schlegl",
 % This first block is the beginnings of an implementation for
 % \package{natbib}.
 %    \begin{macrocode}
-\newcommand{\bibstyle@mlastyle}{\bibpunct[ ]{(}{)}{;}{a}{,}{;}
+\newcommand{\bibstyle@mlastyle}%
+{\bibpunct[ ]{(}{)}{;}{a}{\mlastyle@comma}{,}
+\gdef\mlastyle@comma{\ifx\NAT@date\space\def\NAT@date{\unskip}\else,\fi}
 \@ifundefined{chapter}
 {\gdef\refname{Works Cited}}
 {\gdef\bibname{Works Cited}}}
@@ -984,7 +986,7 @@ Schlegl",
   {\renewcommand\bibname{Works Cited}}
 \else
   \let\cite\citep
-  \newcommand\citepage[2][]{\citetext{#2}}
+  \newcommand\citepage[2][]{\citeyearpar[\unskip #1]{#2}}
   \newcommand\citepageM[2][]{ \citetext{#2}}
   \newcommand\citeindirect[2][]{\citep[#1][qtd. in]{#2}}
   \newcommand\citeindirectM[2][]{ \citep[#1][qtd. in]{#2}}