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

diff --git a/mlastyle.dtx b/mlastyle.dtx
index b6236d3..50847e0 100644
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -262,10 +262,10 @@ Schlegl",
 % \DoNotIndex{\parindent}
 % \DoNotIndex{\parsep}
 % \DoNotIndex{\penalty}
+% \DoNotIndex{\protected@xdef}
 % \DoNotIndex{\relax}
 % \DoNotIndex{\renewcommand}
 % \DoNotIndex{\renewenvironment}
-% \DoNotIndex{\reset@font}
 % \DoNotIndex{\rhead}
 % \DoNotIndex{\selectfont}
 % \DoNotIndex{\setlength}
@@ -636,6 +636,7 @@ Schlegl",
 % \end{macro}
 % \subsubsection{Macros}
 % \begin{macro}{\maketitle}
+% \begin{macro}{\and}
 % |\maketitle| generates a heading in MLA format.
 %    \begin{macrocode}
   \renewcommand{\maketitle}{\begin{flushleft}
@@ -645,8 +646,10 @@ Schlegl",
     \@date\end{flushleft}
     \begin{center}\@title\end{center}\par
   }
+  \let\and\par
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 % \begin{macro}{\today}
 % |\today| is redefined to DD~Mon.~YYYY format.
 %    \begin{macrocode}
@@ -879,10 +882,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 +905,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}
@@ -937,6 +940,7 @@ Schlegl",
 % executed.
 %    \begin{macrocode}
 \ifmlastyle@style
+%    \end{macrocode}
 % If the \Lopt{bibstyle} option is set, specify the bibliography style.
 %    \begin{macrocode}
   \ifmlastyle@bibstyle
@@ -946,6 +950,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}}