From: Tim Pope <code@tpope.net>
Date: Tue, 18 Nov 2003 20:44:27 +0000 (+0000)
Subject: More work on switch to natbib
X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=commitdiff_plain;h=4bc6748190e5ece5a05f969febf7f3ec2468c337

More work on switch to natbib
---

diff --git a/mlastyle.bst b/mlastyle.bst
index 15e90d0..d0c322d 100644
--- 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 4641205..7033be8 100644
--- 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}}