X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=blobdiff_plain;f=mlastyle.dtx;h=dacd9d7b0e5fc9482018ba3c0cfc4adc6f99c118;hp=3b84a1c3f3c331a8ec436a977d8081bb12b61479;hb=77725df66cfb9a50347bf204074d25219f24e565;hpb=2ad77387b5fe38fa970037a791995fad800cb848

diff --git a/mlastyle.dtx b/mlastyle.dtx
index 3b84a1c..dacd9d7 100644
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -175,7 +175,7 @@ Schlegl",
 % \DoNotIndex{\belowdisplayshortskip,\belowdisplayskip}
 % \DoNotIndex{\addtolength}
 % \DoNotIndex{\advance}
-% \DoNotIndex{\baselineskip}
+% \DoNotIndex{\baselineskip,\lineskip,\lineskiplimit}
 % \DoNotIndex{\bibpreamble,\bibpunct,\bibsep}
 % \DoNotIndex{\begin}
 % \DoNotIndex{\bfseries}
@@ -592,7 +592,8 @@ Schlegl",
 	\mlastyle@formatfalse
 	\mlastyle@underlinefalse}
 \DeclareOption{singlespacequotes}{
-  \def\mlastyle@qspread{\linespread{1}\selectfont\vskip\baselineskip}}
+  \def\mlastyle@qspread{\lineskip=.1\baselineskip%
+  \lineskiplimit=\lineskip\linespread{1}\selectfont\vskip\baselineskip}}
 \DeclareOption{doublespacequotes}{\let\mlastyle@qspread\relax}
 \ExecuteOptions{nobibstyle,nopapersize,mla,cm,doublespacequotes}
 \ProcessOptions
@@ -947,7 +948,9 @@ Schlegl",
 % \begin{macro}{\and}
 % |\maketitle| generates a heading in MLA format.
 %    \begin{macrocode}
-  \renewcommand{\maketitle}{\begin{flushleft}
+  \renewcommand{\maketitle}{%
+    \global\@topnum\z@
+    \begin{flushleft}%
     \@author\par
     \@ifundefined{mlastyle@instructor}{}{\mlastyle@instructor}\par
     \@ifundefined{mlastyle@course}{}{\mlastyle@course}\par
@@ -976,6 +979,12 @@ Schlegl",
 % ^^A \def\mlastyle@slashx{\ifx\mlastyle@slashnext/\else
 % ^^A  \penalty\exhyphenpenalty\fi}
 % \end{macro}
+% \begin{macro}{\@makecaption}
+% |\@makecaption| should left align its contents.
+%    \begin{macrocode}
+\long\def\@makecaption#1#2{\noindent #1\par\noindent #2\strut\par}
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\section}
 % \begin{macro}{\subsection}
 % \begin{macro}{\subsubsection}
@@ -987,7 +996,7 @@ Schlegl",
   \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@
     }{0pt}{1sp}{\centering}}
   \renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@
-    }{0pt}{1sp}{\centering}}
+    }{0pt}{1sp}{\noindent}}
 %    \end{macrocode}
 % ^^A\let\mlastyle@vfont\verbatim@font
 % ^^A\def\verbatim@font{\mlastyle@qspread\mlastyle@vfont}
@@ -1084,6 +1093,12 @@ Schlegl",
    \let\@listi\@listI}\normalsize
   \fi
   \linespread{2}
+  \ifx\relax\mlastyle@qspread
+    \lineskiplimit=.5\baselineskip
+  \else
+    \lineskiplimit=.2\baselineskip
+  \fi
+  \lineskip=\lineskiplimit
   \leftmargini\parindent
   \def\@listi{\leftmargin\leftmargini
   \parsep\z@\itemsep\z@\topsep -3\p@\relax}