X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=blobdiff_plain;f=mlastyle.dtx;h=35b9aa5faff2fbc8f2535eef605bc67e448fc477;hp=b6236d33267bbb4f681899d152c791a2e1a2a3be;hb=e5e3605a1cca35da2cbf370caee48c0c50942935;hpb=2af0d6226ae01027a67f6535d7786b880553312d

diff --git a/mlastyle.dtx b/mlastyle.dtx
index b6236d3..35b9aa5 100644
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -638,6 +638,7 @@ Schlegl",
 % \begin{macro}{\maketitle}
 % |\maketitle| generates a heading in MLA format.
 %    \begin{macrocode}
+  \let\and\\
   \renewcommand{\maketitle}{\begin{flushleft}
     \@author\par
     \@ifundefined{mlastyle@instructor}{}{\mlastyle@instructor}\par
@@ -879,10 +880,6 @@ Schlegl",
 % This first block is the beginnings of an implementation for
 % \package{natbib}.  Surely there is a better way.
 %    \begin{macrocode}
-\newif\ifmlastyle@pages
-\renewcommand\NAT@citetp
-{\@ifnextchar[{\mlastyle@pagestrue\NAT@@citetp}%
-  {\mlastyle@pagesfalse\NAT@@citetp[]}}
 \newcommand{\bibstyle@mlastyle}{%
   \bibpunct[\mlastyle@space]{\mlastyle@brack(}{\mlastyle@brack)}%
     {;}{a}{\mlastyle@comma}{,}
@@ -906,6 +903,10 @@ Schlegl",
 \def\mlastyle@notitle
   { \ \ \ \ \unskip\unskip\unskip\unskip\unskip\unskip}
 \RequirePackage{natbib}
+\newif\ifmlastyle@pages
+\renewcommand\NAT@citetp
+{\@ifnextchar[{\mlastyle@pagestrue\NAT@@citetp}%
+  {\mlastyle@pagesfalse\NAT@@citetp[]}}
 %    \end{macrocode}
 %\end{macro}
 % \begin{macro}{\cite}
@@ -946,6 +947,14 @@ Schlegl",
 % \end{macro}
 %    \begin{macrocode}
   \let\cite\citep
+  \let\mlastyle@citequeue\empty
+  %\newcommand\citeflush{\ifx\mlastyle@citequeue\@empty\unskip
+    %\else\citetext{\mlastyle@citequeue}\global
+    %\let\mlastyle@citequeue\@empty\fi}
+  %\newcommand\citeadd[2][]{\ifx\mlastyle@citequeue\@empty
+    %\protected@xdef\mlastyle@citequeue{\citealp[#1]{#2}}\else
+    %\protected@xdef\mlastyle@citequeue{\mlastyle@citequeue\NAT@sep
+    %\ {\citealp[#1]{#2}}\fi}
   \newcommand\citepage[2][]{\citeyearpar[#1]{#2}}
   \newcommand\citepageM[2][]{\unskip{} \citeyearpar[#1]{#2}}
   \newcommand\citeindirect[2][]{\citep[qtd.\ in][#1]{#2}}