summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/ulem
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-13 23:33:41 +0000
committerKarl Berry <karl@freefriends.org>2010-10-13 23:33:41 +0000
commitbf72bf0cdcc3c68bdeac6cdeb248d24ad27a4678 (patch)
tree3d7c633f8f4b4561122711518776c71576a8ead1 /Master/texmf-dist/tex/generic/ulem
parenteecd79924876319c8f3985ffb4f10b657c72c9be (diff)
ulem (13oct10)
git-svn-id: svn://tug.org/texlive/trunk@20083 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/ulem')
-rw-r--r--Master/texmf-dist/tex/generic/ulem/ulem.sty13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/generic/ulem/ulem.sty b/Master/texmf-dist/tex/generic/ulem/ulem.sty
index f0daae070c7..66f8386fbea 100644
--- a/Master/texmf-dist/tex/generic/ulem/ulem.sty
+++ b/Master/texmf-dist/tex/generic/ulem/ulem.sty
@@ -1,5 +1,5 @@
%
-% U L E M . S T Y [2010-01-21]
+% U L E M . S T Y [2010-10-03]
%
% The ulem package provides various types of underlining that can stretch
% between words and be broken across lines in LaTeX or plain TeX.
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Defend against multiple loading.
\expandafter \ifx \csname UL@box\endcsname \relax \else
- \typeout{ulem.sty refuses to load twice. }\endinput \fi
+ \immediate\write16{ulem.sty refuses to load twice. }\endinput \fi
% Set catcode of @ in case it isn't a "letter" already
\chardef\ULthickness\catcode\string`\@ % hold catcode temporarily
@@ -269,12 +269,12 @@
\expandafter\ifx \csname @ifundefined\endcsname \relax
-% Allow plain TeX to use this style:
+% Allow plain TeX to use ulem.sty:
\def\@height{height}
\def\@depth{depth}
\def\@width{width}
\def\@empty{}
- \def\@gobble#1{}
+ \long\def\@gobble#1{}
\def\MakeRobust#1{}
% Do non-outer \newif with no visible \if's or \fi's when skipping
\csname newif\expandafter\endcsname \csname if@ignore\endcsname
@@ -306,13 +306,14 @@
% Process LaTeX \package options; plain TeX skips this section
\expandafter\ifx\csname ProvidesPackage\endcsname \relax \else
- \ProvidesPackage{ulem}[2010/01/21]
+ \ProvidesPackage{ulem}[2010/10/03]
\DeclareOption{normalem}{\normalem}
\DeclareOption{ULforem}{\ULforem}
\DeclareOption{normalbf}{}
\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}}
\ProcessOptions
- \let\UL@marginpar\marginpar
+%
+ \AtBeginDocument{\let\UL@marginpar\marginpar}%
\newcommand\UL@marpar[2][\gDefault@pt]{\gdef\gDefault@pt{#2}%
\ifx\ \LA@space \@latexerr{Marginpar lost}%
\else \UL@stop \UL@marginpar[#1]{#2}\UL@start \fi}