projects
/
latex-mlastyle.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed \lineskip and \lineskiplimit (and this time I mean it)
[latex-mlastyle.git]
/
mlastyle.dtx
diff --git
a/mlastyle.dtx
b/mlastyle.dtx
index 3b84a1c3f3c331a8ec436a977d8081bb12b61479..06f8a6b82e45f028da8df2b363f48b2405c5eeb2 100644
(file)
--- a/
mlastyle.dtx
+++ b/
mlastyle.dtx
@@
-175,7
+175,7
@@
Schlegl",
% \DoNotIndex{\belowdisplayshortskip,\belowdisplayskip}
% \DoNotIndex{\addtolength}
% \DoNotIndex{\advance}
% \DoNotIndex{\belowdisplayshortskip,\belowdisplayskip}
% \DoNotIndex{\addtolength}
% \DoNotIndex{\advance}
-% \DoNotIndex{\baselineskip}
+% \DoNotIndex{\baselineskip
,\lineskip,\lineskiplimit
}
% \DoNotIndex{\bibpreamble,\bibpunct,\bibsep}
% \DoNotIndex{\begin}
% \DoNotIndex{\bfseries}
% \DoNotIndex{\bibpreamble,\bibpunct,\bibsep}
% \DoNotIndex{\begin}
% \DoNotIndex{\bfseries}
@@
-947,7
+947,9
@@
Schlegl",
% \begin{macro}{\and}
% |\maketitle| generates a heading in MLA format.
% \begin{macrocode}
% \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
\@author\par
\@ifundefined{mlastyle@instructor}{}{\mlastyle@instructor}\par
\@ifundefined{mlastyle@course}{}{\mlastyle@course}\par
@@
-976,6
+978,12
@@
Schlegl",
% ^^A \def\mlastyle@slashx{\ifx\mlastyle@slashnext/\else
% ^^A \penalty\exhyphenpenalty\fi}
% \end{macro}
% ^^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}
% \begin{macro}{\section}
% \begin{macro}{\subsection}
% \begin{macro}{\subsubsection}
@@
-987,7
+995,7
@@
Schlegl",
\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@
}{0pt}{1sp}{\centering}}
\renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@
\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}
% \end{macrocode}
% ^^A\let\mlastyle@vfont\verbatim@font
% ^^A\def\verbatim@font{\mlastyle@qspread\mlastyle@vfont}
@@
-1084,6
+1092,12
@@
Schlegl",
\let\@listi\@listI}\normalsize
\fi
\linespread{2}
\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}
\leftmargini\parindent
\def\@listi{\leftmargin\leftmargini
\parsep\z@\itemsep\z@\topsep -3\p@\relax}