summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty57
1 files changed, 36 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index b5dafa63d0d..07a28b02ccd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -20,21 +20,11 @@
\LWR@ProvidesPackagePass{xcolor}
\begin{warpHTML}
-\LetLtxMacro\LWRprint@textcolor\textcolor
-\LetLtxMacro\LWRprint@pagecolor\pagecolor
-\LetLtxMacro\LWRprint@nopagecolor\nopagecolor
-\LetLtxMacro\LWRprint@colorbox\colorbox
-\LetLtxMacro\LWRprint@colorboxBlock\colorbox
-\LetLtxMacro\LWRorigprint@fcolorbox\fcolorbox
-\LetLtxMacro\LWRorigprint@fcolorboxBlock\fcolorbox
-\LetLtxMacro\LWRorigprint@boxframe\boxframe
+\LetLtxMacro\LWR@print@pagecolor\pagecolor
+\LetLtxMacro\LWR@print@nopagecolor\nopagecolor
\appto\LWR@restoreorigformatting{%
-\LetLtxMacro\textcolor\LWRprint@textcolor%
-\LetLtxMacro\pagecolor\LWRprint@pagecolor%
-\LetLtxMacro\nopagecolor\LWRprint@nopagecolor%
-\LetLtxMacro\colorbox\LWRprint@colorbox%
-\LetLtxMacro\fcolorbox\LWRprint@fcolorbox%
-\LetLtxMacro\boxframe\LWRorigprint@boxframe%
+\LetLtxMacro\pagecolor\LWR@print@pagecolor%
+\LetLtxMacro\nopagecolor\LWR@print@nopagecolor%
}
\renewcommand*{\LWR@findcurrenttextcolor}{%
\protect\colorlet{LWR@current@color}{.}%
@@ -76,7 +66,7 @@
border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; %
padding:\LWR@printlength{\fboxsep}%
}
-\RenewDocumentCommand{\textcolor}{o m m}{%
+\NewDocumentCommand{\LWR@HTML@textcolor}{o m m}{%
\begingroup%
\IfValueTF{#1}{%
\color[#1]{#2}%
@@ -98,11 +88,13 @@ padding:\LWR@printlength{\fboxsep}%
\endgroup%
}
+\LWR@formatted{textcolor}
+
\renewcommand*{\pagecolor}[2][named]{}
\renewcommand*{\nopagecolor}{}
-\RenewDocumentCommand{\colorbox}{O{named} m +m}{%
+\NewDocumentCommand{\LWR@HTML@colorbox}{O{named} m +m}{%
\begingroup%
\LWR@FBcancel%
\InlineClass[%
@@ -112,7 +104,11 @@ padding:\LWR@printlength{\fboxsep}%
\endgroup%
}
-\NewDocumentCommand{\colorboxBlock}{O{named} m +m}{%
+\AtBeginDocument{
+\LWR@formatted{colorbox}
+}
+
+\NewDocumentCommand{\LWR@HTML@colorboxBlock}{O{named} m +m}{%
\begingroup%
\LWR@FBcancel%
\begin{BlockClass}[%
@@ -124,7 +120,11 @@ padding:\LWR@printlength{\fboxsep}%
\endgroup%
}
-\RenewDocumentCommand{\fcolorbox}{O{named} m O{named} m +m}{%
+\AtBeginDocument{
+\LWR@formatted{colorboxBlock}
+}
+
+\NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{named} m +m}{%
\LWR@traceinfo{HTML fcolorbox #2 #4}%
\begingroup%
\LWR@FBcancel%
@@ -144,7 +144,11 @@ padding:\LWR@printlength{\fboxsep}%
\endgroup%
}
-\NewDocumentCommand{\fcolorboxBlock}{O{named} m O{named} m +m}{%
+\AtBeginDocument{
+\LWR@formatted{fcolorbox}
+}
+
+\NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{named} m +m}{%
\LWR@traceinfo{HTML fcolorboxBlock #2 #4}%
\begingroup%
\LWR@FBcancel%
@@ -170,6 +174,10 @@ padding:\LWR@printlength{\fboxsep}%
\LWR@traceinfo{HTML fcolorboxBlock done}%
}
+\AtBeginDocument{
+\LWR@formatted{fcolorboxBlock}
+}
+
\NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{%
\begin{BlockClass}[%
#3%
@@ -178,7 +186,7 @@ padding:\LWR@printlength{\fboxsep}%
width:\LWR@printlength{\LWR@tempwidth}%
]{fcolorminipage}%
}
-\NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m}
+\NewDocumentEnvironment{LWR@HTML@fcolorminipage}{O{named} m O{named} m O{c} o o m}
{%
\LWR@FBcancel%
\setlength{\LWR@tempwidth}{#8}%
@@ -193,12 +201,17 @@ width:\LWR@printlength{\LWR@tempwidth}%
}%
}
{\end{BlockClass}}
-\renewcommand*{\boxframe}[3]{%
+
+\AtBeginDocument{
+\LWR@formattedenv{fcolorminipage}
+}
+\newcommand*{\LWR@HTML@boxframe}[3]{%
{%
\setlength{\LWR@tempwidth}{#1}%
\setlength{\LWR@tempheight}{#2}%
\addtolength{\LWR@tempheight}{#3}%
\LWR@forceminwidth{\fboxrule}%
+\LWR@findcurrenttextcolor%
\InlineClass[%
display:inline-block ; %
border:\LWR@printlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; %
@@ -207,6 +220,8 @@ height:\LWR@printlength{\LWR@tempheight}%
]{boxframe}{}%
}%
}
+
+\LWR@formatted{boxframe}
\newcommand*{\LWR@xcolortempcolor}{}
\def\rowc@l@rs[#1]#2#3#4%