X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=blobdiff_plain;f=mlastyle.dtx;h=d70be821ebcb279f81b6b69bb529b8e8f60ecb3c;hp=537c8477616b5d7dec63b3d8f73bbc36e0633aad;hb=8b116f969b8cd1d1365f7c6551a1ee17ccee970c;hpb=6ffb74f07ac58138a97cfc5a3f952e5a814c9c94

diff --git a/mlastyle.dtx b/mlastyle.dtx
index 537c847..d70be82 100644
--- a/mlastyle.dtx
+++ b/mlastyle.dtx
@@ -24,10 +24,10 @@
 \documentclass[draft]{ltxdoc}
 \iftrue
   \usepackage[compat]{mlastyle}
-  \addtolength{\headsep}{-25pt}
-  \addtolength{\headheight}{-12pt}
+  \addtolength{\headsep}{-5pt}
+  %\addtolength{\headheight}{-12pt}
   \addtolength{\topmargin}{-17pt}
-  \addtolength{\textheight}{58pt}
+  \addtolength{\textheight}{22pt}
   \IfFileExists{ulem.sty}{\usepackage[normalem]{ulem}}{\let\uline\emph}
 \else
   \usepackage[mla]{mlastyle}
@@ -514,12 +514,18 @@
   \fi
 \fi % \ifmlastyle@bibstyle
 %    \end{macrocode}
+% \begin{macro}{\UL@onin}
 % Load the \package{ulem} package if the \Lopt{underline} option is set.
+% By default, \package{ulem} does multiple underlining for nested
+% emphasis.  This is changed to MLA-style behavior with the redefinition
+% of |\UL@onin|.
 %    \begin{macrocode}
 \ifmlastyle@underline
   \RequirePackage{ulem}
+  \def\UL@onin#1{\egroup\UL@stop#1\UL@start}
 \fi % \ifmlastyle@underline
 %    \end{macrocode}
+% \end{macro}
 % Load the \package{times} package if the \Lopt{times} option is set.
 %    \begin{macrocode}
 \ifmlastyle@times