Changed copyright, margins, and surname recognition algorithm

[latex-mlastyle.git] / mlastyle.dtx

diff --git a/mlastyle.dtx b/mlastyle.dtx
index fbb8c272d41397790bb5d95ca736fd7f2253d7aa..dc05e324d2a0b97466aead4ea55f67682a2cdd48 100644 (file)
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2003 by Scott Pakin <pakin@uiuc.edu>
-% --------------------------------------------------
+% Copyright (C) 2003 by Tim Pope <latex@rebelongto.us>
+% ----------------------------------------------------
 % 
 % This file may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.2
@@ -278,6 +278,7 @@
 % Define the surname, along with an obsolete synonym.
 %    \begin{macrocode}
 \def\surname#1{\gdef\mlastyle@surname{#1}}
+\def\mlastyle@surname{\def\sw@llow##1 {}\expandafter\sw@llow\@author}
 \let\lastname\surname
 %    \end{macrocode}
 % \end{macro}
@@ -369,12 +370,13 @@
 % right margin at .5 inches from the top of the page.
 % ^^A%\settoheight{\headheight}{\llap{\parbox[b]{\textwidth}{\large\raggedleft Pope}}}
 %    \begin{macrocode}
-  \setlength{\voffset}{-0.5in}
+  \addtolength{\voffset}{-0.5in}
   \setlength{\textheight}{\paperheight}
   \addtolength{\textheight}{-2in}
   \setlength{\topmargin}{0in}
-  \addtolength{\headheight}{-1pt}
-  \setlength{\headheight}{1.4\headheight}% kludge
+  %\addtolength{\headheight}{-1pt}
+  %\setlength{\headheight}{1.4\headheight}% kludge
+  \setlength\headheight\f@baselineskip
   \setlength{\headsep}{0.5in}
   \addtolength{\headsep}{-\headheight}
   \setlength{\footskip}{0.25in}
@@ -382,7 +384,7 @@
 %    \end{macrocode}
 % Left and right margins in MLA format are each 1 inch wide.
 %    \begin{macrocode}
-  \setlength{\hoffset}{-0.5in}
+  \addtolength{\hoffset}{-0.5in}
   \setlength{\textwidth}{\paperwidth}
   \addtolength{\textwidth}{-2in}
   \setlength{\oddsidemargin}{0.5in}
@@ -430,9 +432,7 @@
   \fancypagestyle{plain}{\fancyhf{}}
   \fancypagestyle{mlastyle}{
     \fancyhf{}
-    \def\sw@llow##1 {}
-    \rhead{\@ifundefined{mlastyle@surname}%
-      {\expandafter\sw@llow\@author}{\mlastyle@surname} \thepage}
+    \rhead{\mlastyle@surname{} \thepage}
     \renewcommand{\headrulewidth}{0pt}
     \renewcommand{\footrulewidth}{0pt}
   }
@@ -466,8 +466,8 @@
 % \subsubsection{Miscellaneous}
 % With all packages loaded, we can now redefine |/|.
 %    \begin{macrocode}
-  \catcode`/=13
-  \let/=\mlastyle@slash
+  %\catcode`/=13
+  %\let/=\mlastyle@slash
 %    \end{macrocode}
 % The definition of |\thebibliography| varies depending on the document
 % class.