summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty499
1 files changed, 333 insertions, 166 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index ddb31bd5e15..92c34938bbb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2021/02/18 v0.895 Allows LaTeX to directly produce HTML5 output.]
+ [2021/04/08 v0.896 Allows LaTeX to directly produce HTML5 output.]
@@ -244,6 +244,7 @@
\LWR@loadafter{bussproofs}
\LWR@loadafter{bxpapersize}
\LWR@loadafter{bytefield}
+\LWR@loadafter{ccicons}
\LWR@loadafter{cancel}
\LWR@loadafter{canoniclayout}
\LWR@loadafter{caption}
@@ -265,6 +266,7 @@
\LWR@notmemoirloadafter{chngpage}
\LWR@loadafter{cite}
\LWR@loadafter{citeref}
+\LWR@loadafter{classicthesis}
\LWR@loadafter{cleveref}
\LWR@loadafter{cmdtrack}
\LWR@loadafter{colonequals}
@@ -300,6 +302,7 @@
\LWR@loadafter{endheads}
\LWR@loadafter{endnotes}
\LWR@loadafter{engtlc}
+\LWR@loadafter{enotez}
\LWR@notmemoirloadafter{enumerate}
\LWR@loadafter{enumitem}
\LWR@notmemoirloadafter{epigraph}
@@ -492,6 +495,7 @@
\LWR@loadafter{nowidow}
\LWR@loadafter{ntheorem}
\LWR@loadafter{octave}
+\LWR@loadafter{orcidlink}
\LWR@loadafter{overpic}
\LWR@loadafter{pagegrid}
\LWR@notmemoirloadafter{pagenote}
@@ -847,10 +851,11 @@
\LWR@origrule{0pt}{1\baselineskip}%
\LWR@orignewline%
}
-\long\def\LWR@firstoffour#1#2#3#4{#1}
-\long\def\LWR@secondoffour#1#2#3#4{#2}
-\long\def\LWR@thirdoffour#1#2#3#4{#3}
-\long\def\LWR@fourthoffour#1#2#3#4{#4}
+\long\def\LWR@firstoffive#1#2#3#4#5{#1}
+\long\def\LWR@secondoffive#1#2#3#4#5{#2}
+\long\def\LWR@thirdoffive#1#2#3#4#5{#3}
+\long\def\LWR@fourthoffive#1#2#3#4#5{#4}
+\long\def\LWR@fifthoffive#1#2#3#4#5{#5}
\newcounter{LWR@texboxdepth}
\setcounter{LWR@texboxdepth}{0}
\newcommand*{\LWR@maybe@orignewpage}{%
@@ -1538,6 +1543,24 @@
\LWR@lookforpackagename{18}%
\LWR@lookforpackagename{19}%
\LWR@lookforpackagename{20}%
+\IfSubStr{\detokenize\expandafter{#1}}{\LWRleftbrace}%
+ {%
+ \PackageError{lwarp}{%
+ You used:\MessageBreak
+ \protect\requirepackage[#1]{#2}\MessageBreak
+ Braces in the package options will fail with Lwarp.\MessageBreak
+ Instead, use:\MessageBreak
+ \protect\PassOptionsToPackage{#1}{#2}\MessageBreak
+ \protect\requirepackage{#2}\MessageBreak
+ near the line number given below.\MessageBreak
+ Enter 'h' for more info%
+ }%
+ {%
+ See the Lwarp manual troubleshooting index entry for\MessageBreak
+ ``package, options with braces''%
+ }%
+ }%
+ {}% no brace
\IfValueTF{#1}%
{% options given
\IfValueTF{#3}% version given?
@@ -2744,12 +2767,12 @@ div.marginblock br ,
div.marginparblock br
{ margin-bottom: 2ex ; }
-div.bodycontainer {
+main.bodycontainer {
float: left ;
width: 80% ;
}
-div.bodywithoutsidetoc div.bodycontainer {
+div.bodywithoutsidetoc main.bodycontainer {
float: none ;
width: 100% ;
}
@@ -3549,15 +3572,12 @@ img.lateximage{
border: none ;
}
-/* The -1px right margin compensates for the 1px right border. */
-/* Without this -1px margin, the body container appears below instead */
-/* of floating to the side. */
div.sidetoccontainer {
font-family: "DejaVu Serif", "Bitstream Vera Serif",
"Lucida Bright", Georgia, serif;
float: left ;
- width: 20%;
- margin: 0pt -1px 3ex 0pt ;
+ width: 19%; /* room for border-right next to 80% main */
+ margin: 0pt 0em 3ex 0pt ;
border-right: 1px solid silver;
border-bottom: 1px solid silver;
background: #FAF7F4 ;
@@ -3889,7 +3909,7 @@ span.sidetocthetitle { display: none }
span.sidetocthetitle { display: inline }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
- div.bodycontainer { width: 100% }
+ main.bodycontainer { width: 100% }
.marginpar {
max-width: 100%;
float: none;
@@ -3908,21 +3928,21 @@ span.sidetocthetitle { display: none }
div.sidetoccontainer { display:none; }
nav.topnavigation { display: none; }
nav.botnavigation { display: none; }
- div.bodycontainer { width: 100% }
+ main.bodycontainer { width: 100% }
}
@media handheld {
div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
- div.bodycontainer { width: 100% }
+ main.bodycontainer { width: 100% }
}
@media projection {
div.sidetoccontainer { display:none; }
nav.topnavigation { display:block }
nav.botnavigation { display:block }
- div.bodycontainer { width: 100% }
+ main.bodycontainer { width: 100% }
}
\end{filecontents*}
\end{LWRwriteconf}
@@ -4657,7 +4677,7 @@ MathJax = {
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.895"
+printversion = "v0.896"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -5574,7 +5594,6 @@ end -- not --version
\begin{warpHTML}
-
\newcommand*{\LWR@depthnone}{-5}
\newcommand*{\LWR@depthfinished}{-4}
\newcommand*{\LWR@depthbook}{-2}
@@ -5602,7 +5621,13 @@ end -- not --version
\newcommand*{\LWR@closeten}{}
\newcommand*{\LWR@closeeleven}{}
\newcommand*{\LWR@closetwelve}{}
-
+\newcommand*{\LWR@closethirteen}{}
+\newcommand*{\LWR@closefourteen}{}
+\newcommand*{\LWR@closefifteen}{}
+\newcommand*{\LWR@closesixteen}{}
+\newcommand*{\LWR@closeseventeen}{}
+\newcommand*{\LWR@closeeighteen}{}
+\newcommand*{\LWR@closenineteen}{}
\newcommand*{\LWR@closedepthone}{\LWR@depthnone}% top of the stack
@@ -5617,11 +5642,25 @@ end -- not --version
\newcommand*{\LWR@closedepthten}{\LWR@depthnone}
\newcommand*{\LWR@closedeptheleven}{\LWR@depthnone}
\newcommand*{\LWR@closedepthtwelve}{\LWR@depthnone}
+\newcommand*{\LWR@closedepththirteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthfourteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthfifteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthsixteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthseventeen}{\LWR@depthnone}
+\newcommand*{\LWR@closedeptheighteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthnineteen}{\LWR@depthnone}
\NewDocumentCommand{\LWR@pushclose}{m}
{%
+\global\let\LWR@closenineteen\LWR@closeeighteen%
+\global\let\LWR@closeeighteen\LWR@closeseventeen%
+\global\let\LWR@closeseventeen\LWR@closesixteen%
+\global\let\LWR@closesixteen\LWR@closefifteen%
+\global\let\LWR@closefifteen\LWR@closefourteen%
+\global\let\LWR@closefourteen\LWR@closethirteen%
+\global\let\LWR@closethirteen\LWR@closetwelve%
\global\let\LWR@closetwelve\LWR@closeeleven%
\global\let\LWR@closeeleven\LWR@closeten%
\global\let\LWR@closeten\LWR@closenine%
@@ -5634,6 +5673,13 @@ end -- not --version
\global\let\LWR@closethree\LWR@closetwo%
\global\let\LWR@closetwo\LWR@closeone%
\global\csletcs{LWR@closeone}{LWR@printclose#1}%
+\global\let\LWR@closedepthnineteen\LWR@closedeptheighteen%
+\global\let\LWR@closedeptheighteen\LWR@closedepthseventeen%
+\global\let\LWR@closedepthseventeen\LWR@closedepthsixteen%
+\global\let\LWR@closedepthsixteen\LWR@closedepthfifteen%
+\global\let\LWR@closedepthfifteen\LWR@closedepthfourteen%
+\global\let\LWR@closedepthfourteen\LWR@closedepththirteen%
+\global\let\LWR@closedepththirteen\LWR@closedepthtwelve%
\global\let\LWR@closedepthtwelve\LWR@closedeptheleven%
\global\let\LWR@closedeptheleven\LWR@closedepthten%
\global\let\LWR@closedepthten\LWR@closedepthnine%
@@ -5646,6 +5692,13 @@ end -- not --version
\global\let\LWR@closedepththree\LWR@closedepthtwo%
\global\let\LWR@closedepthtwo\LWR@closedepthone%
\global\csletcs{LWR@closedepthone}{LWR@depth#1}%
+\ifdefstring{\LWR@closedepthnineteen}{\LWR@depthnone}%
+ {}%
+ {%
+ \PackageError{lwarp}%
+ {The document is nested too deeply for Lwarp}%
+ {PLEASE inform the Lwarp maintainer!}%
+ }%
}
@@ -5662,6 +5715,13 @@ end -- not --version
\global\let\LWR@closenine\LWR@closeten%
\global\let\LWR@closeten\LWR@closeeleven%
\global\let\LWR@closeeleven\LWR@closetwelve%
+\global\let\LWR@closetwelve\LWR@closethirteen%
+\global\let\LWR@closethirteen\LWR@closefourteen%
+\global\let\LWR@closefourteen\LWR@closefifteen%
+\global\let\LWR@closefifteen\LWR@closesixteen%
+\global\let\LWR@closesixteen\LWR@closeseventeen%
+\global\let\LWR@closeseventeen\LWR@closeeighteen%
+\global\let\LWR@closeeighteen\LWR@closenineteen%
\global\let\LWR@closedepthone\LWR@closedepthtwo%
\global\let\LWR@closedepthtwo\LWR@closedepththree%
\global\let\LWR@closedepththree\LWR@closedepthfour%
@@ -5673,6 +5733,13 @@ end -- not --version
\global\let\LWR@closedepthnine\LWR@closedepthten%
\global\let\LWR@closedepthten\LWR@closedeptheleven%
\global\let\LWR@closedeptheleven\LWR@closedepthtwelve%
+\global\let\LWR@closedepthtwelve\LWR@closedepththirteen%
+\global\let\LWR@closedepththirteen\LWR@closedepthfourteen%
+\global\let\LWR@closedepthfourteen\LWR@closedepthfifteen%
+\global\let\LWR@closedepthfifteen\LWR@closedepthsixteen%
+\global\let\LWR@closedepthsixteen\LWR@closedepthseventeen%
+\global\let\LWR@closedepthseventeen\LWR@closedeptheighteen%
+\global\let\LWR@closedeptheighteen\LWR@closedepthnineteen%
}
\end{warpHTML}
@@ -5940,6 +6007,9 @@ end -- not --version
\LWR@closedepthfour\ \LWR@closedepthfive\ \LWR@closedepthsix\
\LWR@closedepthseven\ \LWR@closedeptheight\ \LWR@closedepthnine\
\LWR@closedepthten\ \LWR@closedeptheleven\ \LWR@closedepthtwelve\
+\LWR@closedepththirteen\ \LWR@closedepthfourteen\ \LWR@closedepthfifteen\
+\LWR@closedepthsixteen\ \LWR@closedepthseventeen\ \LWR@closedeptheighteen\
+\LWR@closedepthnineteen\
}
\newcommand*{\LWRPrintStack}{
@@ -6152,6 +6222,9 @@ end -- not --version
\RenewDocumentEnvironment{BlockClass}{o m}%
{\LWR@spanwarnformat{multi-paragraph object}}%
{}%
+ \RenewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}%
+ {\LWR@spanwarnformat{multi-paragraph object}}%
+ {}%
\renewcommand{\BlockClassSingle}[2]{%
{\LWR@spanwarnformat{multi-paragraph object}}%
##2%
@@ -6185,15 +6258,17 @@ end -- not --version
\end{LWR@nestspan}%
}
-\NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{%
-\LWR@traceinfo{LWR@htmlspanclass |#1|#2|}%
-\LWR@ensuredoingapar%
-\LWR@subhtmlelementclass{span}[#1]{#2}%
-\begin{LWR@nestspan}%
-#3%
-\LWR@htmltagc{/span}%
-\LWR@traceinfo{LWR@htmlspanclass done}%
-\end{LWR@nestspan}%
+\NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{%
+ \LWR@traceinfo{LWR@htmlspanclass |#1|#2|#3|}%
+ \LWR@ensuredoingapar%
+ \ifblank{#2}%
+ {\LWR@subhtmlelementclass{span}[#1]{#3}}%
+ {\LWR@subhtmlelementclass{span}[#1](#2){#3}}%
+ \begin{LWR@nestspan}%
+ #4%
+ \LWR@htmltagc{/span}%
+ \LWR@traceinfo{LWR@htmlspanclass done}%
+ \end{LWR@nestspan}%
}
@@ -6244,47 +6319,53 @@ end -- not --version
}
-\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{%
-\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}%
+\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{%
+\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}%
\ifblank{#2}%
{% empty style
\LWR@htmltag{%
#1%
- \ifblank{#3}{}{ class=\textquotedbl#3\textquotedbl\ }% spaces
+ \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% spaces
+ \ifblank{#4}{}{ class=\textquotedbl#4\textquotedbl}% spaces
}%
}%
{% non-empty style
\LWR@htmltag{%
#1\LWR@indentHTML%
- \ifblank{#3}{}{class=\textquotedbl#3\textquotedbl\LWR@indentHTML}%
+ \ifblank{#3}{}{role=\textquotedbl#3\textquotedbl\LWR@indentHTML}%
+ \ifblank{#4}{}{class=\textquotedbl#4\textquotedbl\LWR@indentHTML}%
style=\textquotedbl#2\textquotedbl\LWR@orignewline%
}%
}%
\LWR@traceinfo{LWR@subhtmlelementclass done}%
}
-\NewDocumentCommand{\LWR@htmlelementclass}{m o m}{%
-\LWR@stoppars%
-\LWR@forceemptyline%
-\LWR@subhtmlelementclass{#1}[#2]{#3}%
-\LWR@startpars%
+\NewDocumentCommand{\LWR@htmlelementclass}{m o D(){} m}{%
+ \LWR@stoppars%
+ \LWR@forceemptyline%
+ \ifblank{#3}%
+ {\LWR@subhtmlelementclass{#1}[#2]{#4}}%
+ {\LWR@subhtmlelementclass{#1}[#2](#3){#4}}%
+ \LWR@startpars%
}
\newcommand*{\LWR@htmlelementclassend}[2]{%
-\LWR@stoppars%
-\LWR@htmltag{/#1}%
-\ifbool{HTMLDebugComments}{%
- \LWR@htmlcomment{End of #1 ``#2''}%
-}{}%
-\LWR@startpars%
+ \LWR@stoppars%
+ \LWR@htmltag{/#1}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR@htmlcomment{End of #1 ``#2''}%
+ }{}%
+ \LWR@startpars%
}
-\NewDocumentCommand{\LWR@htmldivclass}{o m}{%
-\LWR@htmlelementclass{div}[#1]{#2}%
+\NewDocumentCommand{\LWR@htmldivclass}{o D(){} m}{%
+ \ifblank{#2}
+ {\LWR@htmlelementclass{div}[#1]{#3}}%
+ {\LWR@htmlelementclass{div}[#1](#2){#3}}%
}
\newcommand*{\LWR@htmldivclassend}[1]{%
-\LWR@htmlelementclassend{div}{#1}%
+ \LWR@htmlelementclassend{div}{#1}%
}
@@ -6313,15 +6394,15 @@ end -- not --version
\begin{warpprint}
-\NewDocumentEnvironment{BlockClass}{o m}{}{}%
+\NewDocumentEnvironment{BlockClass}{o D(){} m}{}{}
\end{warpprint}
\begin{warpHTML}
-\NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}%
+\NewDocumentEnvironment{LWR@print@BlockClass}{o D(){} m}{}{}%
-\NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}%
- {\LWR@htmldivclass[#1]{#2}}
- {\LWR@htmldivclassend{#2}}
+\NewDocumentEnvironment{LWR@HTML@BlockClass}{o D(){} m}%
+ {\LWR@htmldivclass[#1](#2){#3}}%
+ {\LWR@htmldivclassend{#3}}
\LWR@formattedenv{BlockClass}
\end{warpHTML}
@@ -6343,44 +6424,51 @@ end -- not --version
\NewDocumentCommand{\LWR@print@InlineClass}{D{(}{)}{} o m +m}{#4}%
\NewDocumentCommand{\LWR@HTML@InlineClass}{D{(}{)}{} o m +m}{%
+\LWR@traceinfo{LWR@HTML@InlineClass #3}%
\ifbool{FormatWP}{%
+ \LWR@traceinfo{LWR@HTML@InlineClass: FormatWP}%
\LWR@htmlspanclass[#1]{#3}{#4}%
}{%
+ \LWR@traceinfo{LWR@HTML@InlineClass: not FormatWP}%
\LWR@htmlspanclass[#2]{#3}{#4}%
}%
+\LWR@traceinfo{LWR@HTML@InlineClass: done}%
}
\LWR@formatted{InlineClass}
\end{warpHTML}
\begin{warpprint}
-\NewDocumentEnvironment{LWR@BlockClassWP}{m m m}{}{}%
+\NewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}{}{}
\end{warpprint}
\begin{warpHTML}
-\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m m}{}{}%
-\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m m}%
+\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m D(){} m}{}{}%
+
+\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m D(){} m}%
{%
\LWR@stoppars%
\ifbool{FormatWP}%
{%
\addtocounter{LWR@thisautoidWP}{1}%
\LWR@htmltag{%
- div class=\textquotedbl#3\textquotedbl\ % space
+ div class=\textquotedbl#4\textquotedbl\ % space
id=\textquotedbl%
\LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}%
\textquotedbl%
+ \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}%
\ifblank{#1}{}{ style=\textquotedbl#1\textquotedbl}%
}%
}% FormatWP
{% not FormatWP
\LWR@htmltag{%
- div class=\textquotedbl#3\textquotedbl%
+ div class=\textquotedbl#4\textquotedbl%
+ \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}%
\ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}%
}%
}% not FormatWP
\LWR@startpars%
}
-{\LWR@htmldivclassend{#3}}
+{\LWR@htmldivclassend{#4}}
\LWR@formattedenv{LWR@BlockClassWP}
\end{warpHTML}
@@ -6672,6 +6760,9 @@ end -- not --version
}
\long\def\LWR@@footnotetext#1#2{%
\LWR@traceinfo{LWR@footnotetext}%
+\LWR@newautopagelabel{page}%
+\begingroup%
+\let\LWR@newautopagelabel\LWR@null@newautopagelabel%
\global\setbox\csname #2\endcsname=\vbox{%
\unvbox\csname #2\endcsname%
\protected@edef\@currentlabel{%
@@ -6698,10 +6789,11 @@ end -- not --version
}%
\color@endgroup%
}% vbox
+\endgroup%
\LWR@ensuredoingapar%
}%
-\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}
+\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}%
\LetLtxMacro\@footnotetext\LWR@footnotetext
\newbox\LWR@mpfootnotes
\long\def\@mpfootnotetext#1{%
@@ -6741,7 +6833,8 @@ end -- not --version
\newcommand*{\LWR@@printpendingfootnotes}[1]{%
\expandafter\ifvoid\csname LWR@#1box\endcsname\else
\LWR@forcenewpage
- \begin{BlockClass}{footnotes}
+ \begin{BlockClass}(note){footnotes}%
+ \LWR@newautopagelabel{page}%
\null
\unvbox\csuse{LWR@#1box}
\setbox\csuse{LWR@#1box}=\vbox{}
@@ -6770,7 +6863,7 @@ end -- not --version
\newcommand*{\LWR@printpendingmpfootnotes}{%
\ifvoid\LWR@mpfootnotes\else
\LWR@forcenewpage
- \begin{BlockClass}{footnotes}
+ \begin{BlockClass}(note){footnotes}%
\null
\unvbox\LWR@mpfootnotes
\setbox\LWR@mpfootnotes=\vbox{}
@@ -6785,23 +6878,23 @@ end -- not --version
\renewcommand{\marginpar}[2][]{%
\ifbool{FormatWP}%
{%
-\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}%
#2
-\end{LWR@BlockClassWP}
+\end{LWR@BlockClassWP}%
}%
{%
- \LWR@htmlspanclass{marginpar}{#2}%
+ \LWR@htmlspanclass(note){marginpar}{#2}%
}%
}
\newcommand{\marginparBlock}[2][]{%
\LWR@stoppars%
\ifbool{FormatWP}%
{%
- \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+ \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}%
#2
\end{LWR@BlockClassWP}
}{%
- \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+ \begin{BlockClass}[width:2in; float:right; margin:10pt](note){marginparblock}%
#2
\end{BlockClass}
}%
@@ -6815,6 +6908,26 @@ end -- not --version
\LetLtxMacro\marginparBlock\marginpar
\end{warpprint}
+\newcounter{LWR@currentautosecpage}
+\setcounter{LWR@currentautosecpage}{1}
+\newcounter{LWR@currentautosecfloatpage}
+\setcounter{LWR@currentautosecfloatpage}{1}
+\newcounter{LWR@previousautopagelabel}
+\setcounter{LWR@previousautopagelabel}{-1}
+\newcommand*{\LWR@newautopagelabel}[1]{%
+\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}%
+ {}%
+ {%
+ \label{\BaseJobname-autopage-\csuse{the#1}}%
+ \ifnumequal{\value{#1}}{\value{page}}%
+ {}%
+ {\label{\BaseJobname-autopage-\csuse{thepage}}}%
+ \setcounter{LWR@previousautopagelabel}{\value{page}}%
+ }%
+}
+
+\newcommand*{\LWR@null@newautopagelabel}[1]{}
+
\begin{warpall}
@@ -6992,18 +7105,6 @@ end -- not --version
\LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}%
}
-\newcounter{LWR@previousautopagelabel}
-\setcounter{LWR@previousautopagelabel}{-1}
-
-\newcommand*{\LWR@newautopagelabel}[1]{%
-\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}%
-{}% no action if this autopage label has already been defined
-{%
- \label{\BaseJobname-autopage-\arabic{#1}}%
- \setcounter{LWR@previousautopagelabel}{\value{page}}
-}%
-}
-
\bgroup
\catcode`!=3 \catcode`?=3
@@ -7235,7 +7336,7 @@ end -- not --version
\newcommand*{\LWR@newhtmlfile}[1]{
\LWR@traceinfo{LWR@newhtmlfile}
\LWR@htmlelementclassend{section}{textbody}
-\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{main}{bodycontainer}
\LWR@htmlelementclassend{div}{bodyandsidetoc}
\LWR@printpendingfootnotes
@@ -7291,8 +7392,8 @@ end -- not --version
\LWR@filestart[#1]
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@latestautopage}%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecfloatpage}%
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
{}
{\LWR@topnavigation}
@@ -7314,7 +7415,7 @@ end -- not --version
{}
{\LWR@sidetoc}
-\LWR@htmlelementclass{div}{bodycontainer}
+\LWR@htmlelementclass{main}{bodycontainer}
\LWR@htmlelementclass{section}{textbody}
\boolfalse{LWR@setseqfilelabel}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}%
@@ -7394,8 +7495,6 @@ end -- not --version
\newcommand*{\LWR@printchaptername}{%
\ifdefvoid{\chaptername}{}{\chaptername~}%
}
-\newcounter{LWR@currentautosec}
-\setcounter{LWR@currentautosec}{1}
\DeclareDocumentCommand{\LWR@section}{m m m m}{%
\IfValueTF{#2}%
{\LWR@traceinfo{LWR@section: starting #4 #2}}%
@@ -7462,7 +7561,7 @@ end -- not --version
{}%
\LWR@traceinfo{LWR@section: about to LWR@createautosec}%
\LWR@createautosec{\@nameuse{LWR@tag#4}}%
-\setcounter{LWR@currentautosec}{\value{page}}%
+\setcounter{LWR@currentautosecpage}{\value{page}}%
\IfBooleanTF{#1}%
{%
\LWR@traceinfo{LWR@section: starred}%
@@ -7546,8 +7645,8 @@ end -- not --version
\LWR@htmltag{\@nameuse{LWR@tag#4end}}%
\LWR@orignewline%
\LWR@traceinfo{LWR@section: about to create the LaTeX label}%
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecpage}\LWR@orignewline%
\ifbool{LWR@setseqfilelabel}{}{%
\label{\BaseJobname-autofile-\arabic{LWR@htmlseqfilenumber}}%
\booltrue{LWR@setseqfilelabel}%
@@ -7834,7 +7933,7 @@ end -- not --version
\LWR@htmltag{/header}\LWR@orignewline
}%
\LWR@htmlelementclass{div}{bodywithoutsidetoc}
-\LWR@htmlelementclass{div}{bodycontainer}
+\LWR@htmlelementclass{main}{bodycontainer}
\LWR@traceinfo{LWR@lwarpStart: Generating textbody.}
\LWR@htmlelementclass{section}{textbody}
\booltrue{LWR@setseqfilelabel}%
@@ -7858,8 +7957,8 @@ end -- not --version
\typeout{Done.}
\typeout{---}
}{}
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@currentautosec}%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecpage}%
\LWR@traceinfo{LWR@lwarpStart: done}
}
\catcode`\$=3% math shift until lwarp starts
@@ -7882,12 +7981,11 @@ end -- not --version
{
\LWR@stoppars
\LWR@closeprevious{finished}
-
+\LWR@printpendingfootnotes
\label{\BaseJobname-autofile-last}
\LWR@htmlelementclassend{section}{textbody}
-\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{main}{bodycontainer}
\LWR@htmlelementclassend{div}{bodyandsidetoc}
-\LWR@printpendingfootnotes
\ifbool{FormatEPUB}{}{\LWR@createfooter}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}
@@ -8072,7 +8170,9 @@ end -- not --version
}% not memoir
\newcommand*{\LWR@maketitlesetup}{%
\LWR@setfootnoteseries%
-\def\@makefnmark{\textsuperscript{\thefootnote}}
+\def\@makefnmark{%
+ \textsuperscript{\thefootnote}%
+}
\long\def\@makefntext##1{%
\textsuperscript{\@thefnmark}~%
##1%
@@ -8373,6 +8473,7 @@ end -- not --version
\begin{warpHTML}
\renewcommand{\@begintheorem}[2]{%
\LWR@forcenewpage
+ \LWR@printpendingfootnotes% lwarp
\BlockClass{theoremcontents}
\trivlist
\item[\InlineClass{theoremlabel}{#1\ #2\ }]\itshape
@@ -8387,6 +8488,7 @@ end -- not --version
}
\renewcommand*{\@endtheorem}{%
\endtrivlist
+ \LWR@printpendingfootnotes% lwarp
\endBlockClass% theoremcontents
}
@@ -8410,7 +8512,7 @@ end -- not --version
\@noparitemfalse
}
\def\LWR@HTML@item[#1]{%
-\LWR@traceinfo{@item}
+\LWR@traceinfo{@item}%
\if@noparitem
\@donoparitem
\else
@@ -8534,10 +8636,41 @@ end -- not --version
}
\newcommand*{\LWR@descriptionstart}{%
-\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
-\renewcommand*{\LWR@printopenlist}{dl}
-\let\item\LWR@descitem%
-\LWR@nulllistfills%
+ \renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
+ \renewcommand*{\LWR@printopenlist}{dl}
+ \let\item\LWR@descitem%
+ \LWR@nulllistfills%
+ \renewcommand{\footnote}[2][]{%
+ \ifblank{##1}%
+ {%
+ \stepcounter\@mpfn
+ \protected@xdef\@thefnmark{\thempfn}%
+ \@footnotemark%\@footnotetext
+ }%
+ {%
+ \begingroup
+ \csname c@\@mpfn\endcsname ##1\relax
+ \unrestored@protected@xdef\@thefnmark{\thempfn}%
+ \endgroup
+ \@footnotemark%\@footnotetext
+ }%
+ }%
+ %
+ \renewcommand{\footnotemark}[1][]{%
+ \ifblank{##1}%
+ {%
+ \stepcounter{footnote}%
+ \protected@xdef\@thefnmark{\thefootnote}%
+ \@footnotemark%
+ }%
+ {%
+ \begingroup%
+ \c@footnote ##1\relax%
+ \unrestored@protected@xdef\@thefnmark{\thefootnote}%
+ \endgroup%
+ \@footnotemark%
+ }%
+ }%
}
@@ -8887,7 +9020,8 @@ end -- not --version
\LWR@setexparray{LWR@colatspec}%
{\arabic{LWR@tabletotalLaTeXcols}}%
{\expandafter\@firstofone\LWR@colparameter}%
- \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}: %
+ \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}%
+ : % space
\LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalLaTeXcols}}}%
}%
\let\LWR@colparameter\relax%
@@ -10373,16 +10507,19 @@ end -- not --version
\expandafter#2#1%
\fi}
\newcommand*{\LWR@nameref}[1]{%
- \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffour{#1}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}%
+}
+\newcommand*{\LWR@currentautosecpageref}[1]{%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffive{#1}%
}
\newcommand*{\LWR@htmlfileref}[1]{%
- \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffour{#1}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffive{#1}%
}
\newcommand*{\LWR@lateximagedepthref}[1]{%
- \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffour{#1}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffive{#1}%
}
\newcommand*{\LWR@lateximagenumberref}[1]{%
- \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fifthoffive{#1}%
}
\newcommand*{\LWR@write@lwarplabel}[1]{%
\LWR@traceinfo{LWR@write@lwarplabel !#1!}%
@@ -10392,6 +10529,7 @@ end -- not --version
{%
\string\newlabel{#1@lwarp}{%
{\@currentlabelname}%
+ {\theLWR@currentautosecpage}%
{%
\ifbool{FileSectionNames}%
{\LWR@thisfilename}%
@@ -10454,7 +10592,7 @@ end -- not --version
}% not inside HTML math comment
}% not lateximage
}
-\NewDocumentCommand{\LWR@new@label}{m}{%
+\newcommand*{\LWR@new@label}[1]{%
\LWR@traceinfo{LWR@new@label: starting}%
\LWR@traceinfo{LWR@new@label: !#1!}%
\LWR@orig@label{#1}%
@@ -10530,6 +10668,16 @@ end -- not --version
}
\LWR@formatted{ref}
+\NewDocumentCommand{\LWR@refwithsection}{s m}{%
+ \LWR@traceinfo{LWR@refwithsection !#2!}%
+ \IfBooleanTF{#1}%
+ {\LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}}%
+ {%
+ \LWR@startref{#2}%
+ \LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}%
+ \LWR@htmltag{/a}%
+ }%
+}
\CustomizeMathJax{\let\LWRref\ref}
\CustomizeMathJax{\renewcommand{\ref}{\ifstar\LWRref\LWRref}}
\newcommand*{\pagerefPageFor}{see }
@@ -10555,7 +10703,7 @@ end -- not --version
\AtBeginDocument{
- \def\@currentHref{\BaseJobname-autopage-\theLWR@currentautosec}
+ \def\@currentHref{\BaseJobname-autopage-\theLWR@previousautopagelabel}%
}
\newcommand*{\LWR@linkcatcodes}{%
@@ -10644,12 +10792,16 @@ end -- not --version
\LWR@urlb%
}
-\newcommand*{\LWR@subinlineimage}[5]{%
+\newcommand*{\LWR@subinlineimage}[6]{%
+ \ifblank{#6}%
+ {\renewcommand*{\LWR@tempone}{}}
+ {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}}
\ifblank{#1}%
{%
\LWR@htmltag{img \LWR@indentHTML
src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML
alt=\textquotedbl#3\textquotedbl \LWR@indentHTML
+ \LWR@tempone
style=\textquotedbl#5\textquotedbl \LWR@indentHTML
class=\textquotedbl#2\textquotedbl \LWR@orignewline
}%
@@ -10658,6 +10810,7 @@ end -- not --version
\LWR@htmltag{img \LWR@indentHTML
src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML
alt=\textquotedbl#1\textquotedbl \LWR@indentHTML
+ \LWR@tempone
style=\textquotedbl#5\textquotedbl \LWR@indentHTML
class=\textquotedbl#2\textquotedbl \LWR@orignewline
}%
@@ -10831,9 +10984,6 @@ end -- not --version
\setcounter{LWR@nextautoid}{#2}%
}
-\newcounter{LWR@latestautopage}
-\setcounter{LWR@latestautopage}{1}
-
\newenvironment*{LWR@figcaption}
{%
\ifbool{FormatWP}{%
@@ -10909,7 +11059,7 @@ end -- not --version
\ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}%
\addtocontents{\@nameuse{ext@#2}}{%
\protect\LWRsetnextfloat%
- {\arabic{LWR@latestautopage}}%
+ {\arabic{LWR@currentautosecfloatpage}}%
{\arabic{LWR@thisautoid}}%
}%
}% not TOC
@@ -11637,8 +11787,8 @@ end -- not --version
\renewcommand{\textsubscript}[1]{##1}%
\renewcommand{\underline}[1]{##1}%
\RenewDocumentCommand{\hspace}{s m}{}%
- \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}%
- \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}%
+ \RenewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{{##4}}%
+ \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{{##4}}%
\def\(##1\){}%
\def\[##1\]{}%
\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}%
@@ -11780,7 +11930,7 @@ end -- not --version
\newcommand*{\LWR@singledollarmeasure}[1]{%
\begingroup%
\LWR@restoreorigformatting%
- \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% inside group
+ \RenewDocumentEnvironment{lateximage}{s o s o o d()}{}{}% inside group
\LWR@print@normalsize%
\LWR@setcurrentfont%
\global\advance\c@LWR@lateximagedepth 1\relax%
@@ -11869,6 +12019,7 @@ end -- not --version
[\MathImageAltText]% alt tag
[]% no add'l hashing
[\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+ (math)% ARIA
}{% not dynamic math
\LWR@traceinfo{subsingledollar: static}%
\IfValueTF{#1}{% #1 True
@@ -11889,11 +12040,13 @@ end -- not --version
FB\LWR@tempone% xfakebold
]%
[\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+ (math)% ARIA
}{% #1 False
\begin{lateximage}% no hashing
[#2]% alt
[]% no add'l hashing
[\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+ (math)% ARIA
}%
}% not dynamic math
\LWR@addbaselinemarker%
@@ -11961,7 +12114,6 @@ end -- not --version
\LetLtxMacro\LWR@origcloseparen\)
\LetLtxMacro\LWR@origopenbracket\[
\LetLtxMacro\LWR@origclosebracket\]
-
\begingroup
\catcode`\$=\active%
\protected\gdef${\@ifnextchar$\LWR@doubledollar\LWR@singledollar}%
@@ -11972,9 +12124,18 @@ end -- not --version
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{
- \textbackslash[%
- {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
- \textbackslash]
+ \IfSubStr{\detokenize\expandafter{#1}}{\detokenize{note}}{%
+ \LWR@hidelatexequation{math}{#1}%
+ \InlineClass{hidden}{\LWR@syncnotenumbers}%
+ \textbackslash[%
+ {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
+ \textbackslash]
+ \InlineClass{hidden}{\LWR@syncnotenames}%
+ }{%
+ \textbackslash[%
+ {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
+ \textbackslash]
+ }%
}% mathjax
{% not mathjax
@@ -11988,6 +12149,7 @@ end -- not --version
\textbackslash{]}%
]%
*% do not add open/closing braces
+ (math)% ARIA
\LWR@applyxfakebold%
\LWR@origdollar\LWR@origdollar#1\LWR@origdollar\LWR@origdollar%
\end{lateximage}%
@@ -12060,11 +12222,13 @@ end -- not --version
\let\LWR@orig@math\math
\let\LWR@orig@endmath\endmath
+
\let\LWR@orig@displaymath\displaymath
\let\LWR@orig@enddisplaymath\enddisplaymath
\let\math\relax
\let\endmath\relax
+
\let\displaymath\relax
\let\enddisplaymath\relax
@@ -12078,8 +12242,7 @@ end -- not --version
\begin{BlockClass}{displaymath}%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}%
- [\MathImageAltText]%
+ \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA)
\LWR@origdollar\LWR@origdollar%
}
{%
@@ -12092,11 +12255,11 @@ end -- not --version
\begin{BlockClass}{displaymathnumbered}%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[\MathImageAltText]%
- \LWR@origequation%
+ \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA)
+ \LWR@orig@equation%
}
{%
- \LWR@origendequation%
+ \LWR@orig@endequation%
\end{lateximage}%
\end{BlockClass}%
}
@@ -12155,11 +12318,11 @@ end -- not --version
\LWR@htmlopencomment
\begingroup
- \@nameuse{LWR@orig#1}
+ \@nameuse{LWR@orig@#1}
\LWR@restoreorigformatting
\booltrue{LWR@insidemathcomment}
#2
- \@nameuse{LWR@origend#1}
+ \@nameuse{LWR@orig@end#1}
\endgroup
\LWR@htmlclosecomment
@@ -12181,10 +12344,10 @@ end -- not --version
}
\AtBeginDocument{
- \let\LWR@origequation\equation
- \let\LWR@origendequation\endequation
- \csletcs{LWR@origequation*}{equation*}
- \csletcs{LWR@origendequation*}{endequation*}
+ \let\LWR@orig@equation\equation
+ \let\LWR@orig@endequation\endequation
+ \csletcs{LWR@orig@equation*}{equation*}
+ \csletcs{LWR@orig@endequation*}{endequation*}
}
\newcommand*{\LWR@doequation}[2]{%
@@ -12214,11 +12377,11 @@ end -- not --version
\textbackslash{begin\{#2\}} % extra space
\LWR@HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
\textbackslash{end\{#2\}}%
- ]*% alt tag
+ ]*(math)% alt tag, ARIA
\LWR@applyxfakebold%
- \@nameuse{LWR@orig#2}%
+ \@nameuse{LWR@orig@#2}%
#1% contents collected by \collect@body
- \@nameuse{LWR@origend#2}%
+ \@nameuse{LWR@orig@end#2}%
\end{lateximage}%
\end{BlockClass}%
}% not mathjax
@@ -12249,7 +12412,7 @@ end -- not --version
\newcommand*{\LWR@synconenotename}[2]{%
\textbackslash(
- \textbackslash{}def\textbackslash{}#1\{#2\}
+ \textbackslash{}def\textbackslash{}#1name\{#2\}
\textbackslash)
}
@@ -12374,7 +12537,7 @@ end -- not --version
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
\begin{lateximage}[(\LWR@startingequationtag\textendash\LWR@equationtag)%
- \LWR@addmathjax{eqnarray}{\BODY}]*%
+ \LWR@addmathjax{eqnarray}{\BODY}]*(math)%
\LWR@applyxfakebold%
\LWR@origeqnarray%
\BODY%
@@ -12386,7 +12549,7 @@ end -- not --version
\begin{BlockClass}{displaymath}%
\LWR@newautoidanchor%
\booltrue{LWR@indisplaymathimage}%
- \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*%
+ \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*(math)%
\LWR@applyxfakebold%
\def\@eqncr{\nonumber\@seqncr}
\csuse{LWR@origeqnarray}%
@@ -12484,35 +12647,35 @@ end -- not --version
}
-\newcommand{\LWR@lateximage@oneimageb}[3]{%
+\newcommand{\LWR@lateximage@oneimageb}[4]{%
\LWR@subinlineimage{#1}{lateximage}%
{%
\LWR@print@mbox{%
\LWR@ImagesDirectory\OSPathSymbol%
#2%
}%
- }{svg}{#3}%
+ }{svg}{#3}{#4}%
}
-\newcommand{\LWR@lateximage@oneimage}[4]{%
+\newcommand{\LWR@lateximage@oneimage}[5]{%
\ifdefvoid{\LWR@ThisAltText}{%
\IfBooleanTF{#4}{%
- \LWR@lateximage@oneimageb{#1}{#2}{#3}%
+ \LWR@lateximage@oneimageb{#1}{#2}{#3}{#5}%
}{%
\LWR@lateximage@oneimageb%
{\AltTextOpen#1\AltTextClose}%
- {#2}{#3}%
+ {#2}{#3}{#5}%
}%
}{%
\LWR@lateximage@oneimageb%
{\AltTextOpen\LWR@ThisAltText\AltTextClose}%
- {#2}{#3}%
+ {#2}{#3}{#5}%
}%
}
\catcode`\$=\active%
-\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{}}
+\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{} D(){}}%
{%
\LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}%
\LWR@traceinfo{lateximage: entering depth is \arabic{LWR@lateximagedepth}}%
@@ -12602,10 +12765,10 @@ end -- not --version
\ifbool{LWR@indisplaymathimage}{}{% not in display math
\LetLtxMacro\[\LWR@origopenbracket%
\LetLtxMacro\]\LWR@origclosebracket%
- \let\equation\LWR@origequation%
- \let\endequation\LWR@origendequation%
- \csletcs{equation*}{LWR@origequation*}%
- \csletcs{endequation*}{LWR@origendequation*}%
+ \let\equation\LWR@orig@equation%
+ \let\endequation\LWR@orig@endequation%
+ \csletcs{equation*}{LWR@orig@equation*}%
+ \csletcs{endequation*}{LWR@orig@endequation*}%
}% not in display math
\LetLtxMacro\LWR@newsingledollar$%
\LetLtxMacro\LWR@newsingledollar$% syntax highlighting
@@ -12629,10 +12792,10 @@ end -- not --version
\LWR@traceinfo{lateximage: The page after the image is \arabic{page}}%
\IfBooleanTF{#1}% starred
{% hash
- \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}%
+ \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}{#6}%
}% hash
{% no hash
- \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}%
+ \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}{#6}%
}% no hash
\LWR@ensuredoingapar%
\LWR@htmltag{/span}%
@@ -12650,7 +12813,7 @@ end -- not --version
\begin{warpprint}
-\NewDocumentEnvironment{lateximage}{s o s o o}
+\NewDocumentEnvironment{lateximage}{s o s o o d()}
{\begin{varwidth}[b]{\linewidth}}
{\end{varwidth}}
@@ -12660,33 +12823,33 @@ end -- not --version
\begin{warpHTML}
\newenvironment*{LWR@HTML@center}
-{
- \LWR@forcenewpage
- \ifbool{FormatWP}
- {\BlockClass[\LWR@print@mbox{text-align:center}]{center}}
- {\BlockClass{center}}
+{%
+ \LWR@forcenewpage%
+ \ifbool{FormatWP}%
+ {\BlockClass[\LWR@print@mbox{text-align:center}]{center}}%
+ {\BlockClass{center}}%
}
{\endBlockClass}
\LWR@formattedenv{center}
\newenvironment*{LWR@HTML@flushright}
-{
- \LWR@forcenewpage
- \ifbool{FormatWP}
- {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}}
- {\BlockClass{flushright}}
+{%
+ \LWR@forcenewpage%
+ \ifbool{FormatWP}%
+ {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}}%
+ {\BlockClass{flushright}}%
}
{\endBlockClass}
\LWR@formattedenv{flushright}
\newenvironment*{LWR@HTML@flushleft}
-{
- \LWR@forcenewpage
- \ifbool{FormatWP}
- {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}}
- {\BlockClass{flushleft}}
+{%
+ \LWR@forcenewpage%
+ \ifbool{FormatWP}%
+ {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}}%
+ {\BlockClass{flushleft}}%
}
{\endBlockClass}
@@ -12764,7 +12927,7 @@ end -- not --version
\LWR@PreloadedPackage{ulem}
-\LWR@PreloadedPackage{xetexko-vertical}
+\LWR@PreloadedPackage{xetexko}
\LWR@PreloadedPackage{geometry}
@@ -13042,6 +13205,7 @@ end -- not --version
}{}%
\setlength{\linewidth}{\LWR@minipagewidth}%
\LWR@print@raggedright%
+ \LWR@newautopagelabel{page}%
\def\@mpfn{mpfootnote}%
\def\thempfn{\thempfootnote}\c@mpfootnote\z@%
\let\@footnotetext\@mpfootnotetext%
@@ -13090,7 +13254,7 @@ end -- not --version
}
\LWR@formatted{parbox}
-\newcommand*{\LWR@HTML@mbox}[1]{#1}
+\newcommand*{\LWR@HTML@mbox}[1]{{#1}}
\LWR@formatted{mbox}
\NewDocumentCommand{\LWR@@makebox@paren}{m m}{%
@@ -13171,6 +13335,7 @@ end -- not --version
\newcommand*{\LWR@fboxstyle}{%
\LWR@findcurrenttextcolor%
+\LWR@traceinfo{LWR@fboxstyle B}%
border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; %
padding:\LWR@printlength{\fboxsep} ; %
color:\LWR@origpound\LWR@tempcolor%
@@ -13178,10 +13343,12 @@ color:\LWR@origpound\LWR@tempcolor%
\newcommand{\LWR@HTML@fbox}[1]{%
\LWR@traceinfo{HTML fbox}%
\LWR@forceminwidth{\fboxrule}%
+\LWR@traceinfo{HTML fbox B}%
\InlineClass[%
\LWR@print@mbox{display:inline-block} ; %
\LWR@fboxstyle%
]{fbox}{#1}%
+\LWR@traceinfo{HTML fbox: done}%
}
\AtBeginDocument{\LWR@formatted{fbox}}
\end{warpHTML}
@@ -13629,7 +13796,7 @@ color:\LWR@origpound\LWR@tempcolor%
\newcommand*{\LWR@tempcolor}{}
\newcommand*{\LWR@tempcolortwo}{}
\newcommand*{\LWR@findcurrenttextcolor}{%
-\renewcommand{\LWR@tempcolor}{000000}%
+ \renewcommand{\LWR@tempcolor}{000000}%
}
\NewDocumentCommand{\LWR@textcurrentcolor}{m}{%
\renewcommand*{\LWR@currenttextcolor}{black}%