lwarp (19nov18)

git-svn-id: svn://tug.org/texlive/trunk@49196 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 53 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
index 4d15fdcac7c..7cb8365957e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
@@ -15,83 +15,73 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-\ProvidesPackage{lwarp-ulem}
-\LetLtxMacro\LWR@ulemorigemph\emph
-\LetLtxMacro\LWR@ulemorigtextbf\textbf
-\NewDocumentCommand{\uline}{+m}{%
-\LWR@HTMLtextstyle%
-    {text-decoration:underline; text-decoration-skip: auto}%
-    {uline}{#1}%
+\LWR@ProvidesPackagePass{ulem}[2012/05/18]
+\NewDocumentCommand{\LWR@HTML@uline}{+m}{%
+    \InlineClass%
+        (text-decoration:underline; text-decoration-skip: auto)%
+        {uline}{\LWR@isolate{#1}}%
 }
+\LWR@formatted{uline}
 
-\NewDocumentCommand{\uuline}{+m}{%
-\LWR@HTMLtextstyle%
-    {%
-        text-decoration:underline; text-decoration-skip: auto;%
-        text-decoration-style:double%
-    }%
-    {uuline}{#1}%
+\NewDocumentCommand{\LWR@HTML@uuline}{+m}{%
+    \InlineClass%
+        (%
+            text-decoration:underline; text-decoration-skip: auto;%
+            text-decoration-style:double%
+        )%
+        {uuline}{\LWR@isolate{#1}}%
 }
+\LWR@formatted{uuline}
 
-\NewDocumentCommand{\uwave}{+m}{%
-\LWR@HTMLtextstyle%
-    {%
-        text-decoration:underline; text-decoration-skip: auto;%
-        text-decoration-style:wavy%
-    }%
-    {uwave}{#1}%
+\NewDocumentCommand{\LWR@HTML@uwave}{+m}{%
+    \InlineClass%
+        (%
+            text-decoration:underline; text-decoration-skip: auto;%
+            text-decoration-style:wavy%
+        )%
+        {uwave}{\LWR@isolate{#1}}%
 }
+\LWR@formatted{uwave}
 
-\NewDocumentCommand{\sout}{+m}{%
-\LWR@HTMLtextstyle%
-    {text-decoration:line-through}%
-    {sout}{#1}%
+\NewDocumentCommand{\LWR@HTML@sout}{+m}{%
+    \InlineClass%
+        (text-decoration:line-through)%
+        {sout}{\LWR@isolate{#1}}%
 }
+\LWR@formatted{sout}
 
-\NewDocumentCommand{\xout}{+m}{%
-\LWR@HTMLtextstyle%
-    {text-decoration:line-through}%
-    {xout}{#1}%
+\NewDocumentCommand{\LWR@HTML@xout}{+m}{%
+    \InlineClass%
+        (text-decoration:line-through)%
+        {xout}{\LWR@isolate{#1}}%
 }
 
-\NewDocumentCommand{\dashuline}{+m}{%
-\LWR@HTMLtextstyle%
-    {%
-        text-decoration:underline;%
-        text-decoration-skip: auto;%
-        text-decoration-style:dashed%
-    }%
-    {dashuline}{#1}%
+\NewDocumentCommand{\LWR@HTML@dashuline}{+m}{%
+    \InlineClass%
+        (%
+            text-decoration:underline;%
+            text-decoration-skip: auto;%
+            text-decoration-style:dashed%
+        )%
+        {dashuline}{\LWR@isolate{#1}}%
 }
+\LWR@formatted{xout}
 
-\NewDocumentCommand{\dotuline}{+m}{%
-\LWR@HTMLtextstyle%
-    {%
-        text-decoration:underline;%
-        text-decoration-skip: auto;%
-        text-decoration-style: dotted%
-    }%
-    {dotuline}{#1}%
+\NewDocumentCommand{\LWR@HTML@dotuline}{+m}{%
+    \InlineClass%
+        (%
+            text-decoration:underline;%
+            text-decoration-skip: auto;%
+            text-decoration-style: dotted%
+        )%
+        {dotuline}{\LWR@isolate{#1}}%
 }
-\NewDocumentCommand{\ULthickness}{}{}
-\newlength{\ULdepth}
-\NewDocumentCommand{\markoverwith}{m}{}
-\NewDocumentCommand{\ULon}{+m}{\uline{#1}\egroup}
-\NewDocumentCommand{\useunder}{m m m}{%
-\relax%
-\ifx\relax#3\relax\else % argumentative command
-    \def#3{#1}\MakeRobust{#3}\fi
-}
-\newcommand*{\normalem}{\LetLtxMacro\emph\LWR@ulemorigemph}
-\newcommand*{\ULforem}{\LetLtxMacro\emph\uline}
-\ULforem% default
-\DeclareOption{normalem}{\normalem}
-\DeclareOption{ULforem}{\ULforem}
-\DeclareOption{normalbf}{}
-\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}}
+\LWR@formatted{dotuline}
+\NewDocumentCommand{\LWR@HTML@markoverwith}{m}{}
+\LWR@formatted{markoverwith}
 
-\DeclareOption*{}
-\ProcessOptions\relax% original LaTeX code
+\NewDocumentCommand{\LWR@HTML@ULon}{+m}{\uline{#1}\egroup}
+\LWR@formatted{ULon}
 \endinput
 %%
 %% End of file `lwarp-ulem.sty'.