Footnote bug fixes

diff --git a/mlastyle.dtx b/mlastyle.dtx
index 5ce986d15d17cf695f2251fae1bb1f6530700d56..3b84a1c3f3c331a8ec436a977d8081bb12b61479 100644 (file)
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -196,6 +196,7 @@ Schlegl",
 % \DoNotIndex{\edef}
 % \DoNotIndex{\else}
 % \DoNotIndex{\end}
+% \DoNotIndex{\endnote,\footnote}
 % \DoNotIndex{\endcsname}
 % \DoNotIndex{\endlist}
 % \DoNotIndex{\exhyphenpenalty}
@@ -1034,8 +1035,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}
@@ -1130,14 +1129,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 +1141,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 +1157,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}