X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=blobdiff_plain;f=mlastyle.dtx;h=35188b349d89fece0f42e0ca802b6eaff605ea14;hp=5ce986d15d17cf695f2251fae1bb1f6530700d56;hb=c2fc5c3464aa846d0950cb95eb9a13a8ce5c2d57;hpb=94e66ed8027650d5105bb5435537564567d032d2

diff --git a/mlastyle.dtx b/mlastyle.dtx
index 5ce986d..35188b3 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}
@@ -196,6 +196,7 @@ Schlegl",
 % \DoNotIndex{\edef}
 % \DoNotIndex{\else}
 % \DoNotIndex{\end}
+% \DoNotIndex{\endnote,\footnote}
 % \DoNotIndex{\endcsname}
 % \DoNotIndex{\endlist}
 % \DoNotIndex{\exhyphenpenalty}
@@ -591,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
@@ -673,7 +675,7 @@ Schlegl",
 \newcommand{\bibstyle@mlastyle}{%
   \bibpunct[ ]{(}{)}{;}{a}{,}{,}
   \@ifundefined{chapter}
-  {\gdef\refname{Works Cited}}
+  {\gdef\refname{\newpage Works Cited}}
   {\gdef\bibname{Works Cited}}}
 %    \end{macrocode}
 % \end{macro}
@@ -946,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
@@ -975,18 +979,24 @@ 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}
 % Sections are formatted by centering the section name and beginning a new
 % page.  Subsections simply center the section name.
 %    \begin{macrocode}
-  \renewcommand{\section}{\clearpage\@startsection{section}{1}{\z@
+  \renewcommand{\section}{\@startsection{section}{1}{\z@
     }{0pt}{1sp}{\centering}}
   \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@
-    }{0pt}{1sp}{\centering}}
+    }{0pt}{1sp}{\noindent}}
   \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}
@@ -1034,8 +1044,6 @@ Schlegl",
 % \subsubsection{Margins}
 % Top and bottom margins are 1 inch each.  The header is flush with the
 % right margin, .5 inches from the top of the page.
-% ^^A\addtolength{\headheight}{-1pt}
-% ^^A\setlength{\headheight}{1.4\headheight}% kludge
 %    \begin{macrocode}
   \addtolength{\voffset}{-.5in}
   \setlength{\textheight}{\paperheight}
@@ -1085,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}
@@ -1130,14 +1144,11 @@ Schlegl",
 % welcome.
 %    \begin{macrocode}
   \def\footnoterule{
-    \global\skip\footins=\f@baselineskip\relax
-    \ifnum\mlastyle@prevsplit=\z@
-      \global\skip\footins=3.15\skip\footins\else
-      \global\skip\footins=2.15\skip\footins
+    \ifnum\mlastyle@prevsplit=\z@\else
       \vbox to \z@{\linespread{1}\normalsize\vss\vbox{\noindent
       \leaders\hrule\@height 3\p@\@depth-2.6\p@
       %\leaders\hbox{-}
-      \hfill\strut}\kern1.1\baselineskip}%
+      \hfill\strut}\kern\z@}%
     \fi
     \xdef\mlastyle@prevsplit{\the\insertpenalties}}
   \def\mlastyle@prevsplit{0}
@@ -1145,7 +1156,7 @@ Schlegl",
   \skip\footins=2.15\skip\footins
   \long\def\@footnotetext#1{\insert\footins{%
     \linespread{1}\normalsize
-    \splittopskip\footnotesep
+    \splittopskip1.7\baselineskip
     \color@begingroup
     \parindent\mlastyle@i
     \rule\z@{1.7\baselineskip}
@@ -1161,10 +1172,12 @@ Schlegl",
 % Endnotes are supported, but only if the \package{endnotes} package is
 % loaded {\em before\/} this package.
 %    \begin{macrocode}
-  \ifx\@undefined\endnote\else
+  \ifx\@undefined\endnote
+  \let\note\footnote\else
     \def\enoteheading{\newpage\section*{\notesname}}
     \def\enoteformat{\leavevmode\makeenmark{} }
     \def\enotesize{\normalsize}
+    \let\note\endnote
   \fi
 %    \end{macrocode}
 % \end{macro}