diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 390 |
1 files changed, 208 insertions, 182 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index cbda8bad396..b04b62b8cba 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,8 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2021/08/27 v0.901 Allows LaTeX to directly produce HTML5 output.] + [2021/10/01 v0.902 Allows LaTeX to directly produce HTML5 output.] + @@ -142,7 +143,7 @@ by lwarp's HTML conversion% \ifblank{#2}{}{% .\MessageBreak - Class(es) #2 may be useful instead% + #2 may be useful instead% }% } {% @@ -150,7 +151,7 @@ or is superceded by another class.% \ifblank{#2}{}{% \MessageBreak - For a possible alternative, see class(es) #2.% + For a possible alternative, see #2.% }% } }{\relax}% @@ -190,7 +191,6 @@ \LWR@checkloadnever{auto-pst-pdf-lua}{} \LWR@checkloadnever{algorithms}{} \LWR@checkloadnever{arraycols}{} -\LWR@checkloadnever{beamer}{} \LWR@checkloadnever{bidi}{} \LWR@checkloadnever{cals}{} \LWR@checkloadnever{cellspace}{} @@ -268,6 +268,7 @@ \LWR@checkloadnever{CJK}{ctex, xeCJK} \LWR@checkloadnever{CJKutf8}{ctex, xeCJK} } +\LWR@earlyclassloadnever{beamer}{beamerarticle} \LWR@earlyclassloadnever{jarticle}{ujarticle} \LWR@earlyclassloadnever{jbook}{ujbook} \LWR@earlyclassloadnever{jreport}{ujreport} @@ -316,6 +317,7 @@ \LWR@loadafter{backref} \LWR@loadafter{balance} \LWR@loadafter{bbding} +\LWR@loadafter{beamerarticle} \LWR@loadafter{bigdelim} \LWR@loadafter{bigfoot} \LWR@loadafter{bigstrut} @@ -718,6 +720,7 @@ \LWR@loadafter{supertabular} \LWR@loadafter{svg} \LWR@loadafter{swfigure} +\LWR@loadafter{sympytex} \LWR@loadafter{syntonly} \LWR@loadafter{t1inc} \LWR@loadafter{tabfigures} @@ -1519,12 +1522,6 @@ \end{warpHTML} -\begin{warpprint} - -\RequirePackage{varwidth} - -\end{warpprint} - \begin{warpall} \LetLtxMacro\LWR@origRequirePackage\RequirePackage \LetLtxMacro\LWR@origRequirePackageWithOptions\RequirePackageWithOptions @@ -2480,6 +2477,15 @@ span.textit, div.textit, table td.tditshape { font-style: italic; } table td.tdbfit { font-weight: bold ; font-style:italic } +span.textnormal, div.textnormal { + font-weight: normal; + font-style: normal; + font-variant: normal; + font-variant-numeric: normal ; + font-family: "DejaVu Serif", "Bitstream Vera Serif", + "Lucida Bright", Georgia, serif; +} + span.textmd, div.textmd { font-weight: normal; } span.textup, div.textup { @@ -3094,7 +3100,7 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} .fcolorbox .minipage, .fcolorboxBlock .minipage {border: none ; background: none;} -.fbox, .fboxBlock { border: 1px solid black ; } +.fbox, .fboxBlock { border: 1px solid black ; padding: 4pt } .fbox, .fboxBlock, .fcolorbox, .fcolorboxBlock, .colorbox, .colorboxBlock, .fminipage, .fcolorminipage @@ -3243,6 +3249,15 @@ div.generalframe { border: 6px groove black ; } +/* For beamerarticle: */ +div.beamerframe { + margin: 3ex 1em 3ex 1em ; + border: 1px solid gray; + border-radius: 0px ; + padding: .3ex 1em 0ex 1em ; + display: block ; +} + dl { margin: 1ex 2em 1ex 0em; line-height: 1.3; @@ -3618,6 +3633,7 @@ div.subtitle p { margin: 1ex ; } div.author { + text-align: center ; font-variant: normal ; font-style: normal ; font-size: 1em ; @@ -3773,7 +3789,7 @@ div.alg2enoline{ span.alg2elinenumber{ margin-right: .5em ; - font-size: 50% ; + font-size: 60% ; color: red ; } @@ -4823,7 +4839,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.901" +printversion = "v0.902" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -6195,7 +6211,7 @@ end -- not --version \LWR@popclose } -\newcommand*{\LWR@closeprevious}[1]{ +\newcommand*{\LWR@closeprevious}[1]{% \LWR@traceinfo{% LWR@closeprevious to depth \csuse{LWR@depth#1}, % depths are \LWR@subprintstack% @@ -6333,14 +6349,14 @@ end -- not --version \newcommand*{\LWR@htmltagc}[1]{% -\LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% -\begingroup% -\LWR@hook@processingtags% -\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% -\protect\LWR@origtextless% -\LWR@isolate{#1}% -\protect\LWR@origtextgreater% -\endgroup% + \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% + \begingroup% + \LWR@hook@processingtags% + \ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% + \protect\LWR@origtextless% + \LWR@isolate{#1}% + \protect\LWR@origtextgreater% + \endgroup% } \newcommand*{\LWR@spanwarnformat}[1]{% @@ -6362,8 +6378,8 @@ end -- not --version } \newcommand*{\LWR@nestspanitem}{% -\if@newlist\else{\LWR@htmltagc{br /}}\fi% -\LWR@origitem% + \if@newlist\else{\LWR@htmltagc{br /}}\fi% + \LWR@origitem% } \newenvironment*{LWR@nestspan} @@ -6391,7 +6407,7 @@ end -- not --version }% \renewcommand{\LWR@forcenewpage}{}% \renewcommand{\LWR@liststart}{% - \let\item\LWR@nestspanitem% + \LetLtxMacro\item\LWR@nestspanitem% }% \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% @@ -6678,11 +6694,8 @@ end -- not --version \newbool{LWR@doingapar} \global\boolfalse{LWR@doingapar} -\newcommand*{\LWR@ensuredoingapar}{% -\ifbool{LWR@doingstartpars}% -{\global\booltrue{LWR@doingapar}}% -{}% -} +\newbool{LWR@algocf@dopars} +\boolfalse{LWR@algocf@dopars} \def\PN@parnotes@auto{}% @@ -6696,15 +6709,21 @@ end -- not --version }% nested par tags? {}% no nested par tags {% yes nest par tags - \PN@parnotes@auto% - \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% - \global\booltrue{LWR@doingapar}% + \ifbool{LWR@doingapar}{}{% + \PN@parnotes@auto% + \global\booltrue{LWR@doingapar}% + \ifbool{LWR@algocf@dopars}{}{% + \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% + }% + }% \let\par\LWR@closeparagraph% }% end of yes nest par tags }% end of handling pars {}% not handling pars } +\let\LWR@ensuredoingapar\LWR@openparagraph + \newcommand*{\LWR@closeparagraph@br} {% \ifboolexpr{ @@ -6712,7 +6731,9 @@ end -- not --version test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} and not bool {LWR@intabularmetadata} }% - {\unskip\LWR@htmltagc{br /}}% + {% + \unskip\LWR@htmltagc{br /}% + }% {}% } @@ -6731,9 +6752,10 @@ end -- not --version \@hspacer{\fill}% \hspace*{\fill} \leavevmode\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}% - \global\boolfalse{LWR@doingapar}% + \global\boolfalse{LWR@doingapar}% keep \global\boolfalse{LWR@minipagethispar}% \PN@parnotes@auto% + \global\boolfalse{LWR@doingapar}% }% end of yes nest par tags }% end of handling pars {% not handling pars @@ -6772,6 +6794,7 @@ end -- not --version \ifbool{LWR@doingstartpars}% {}% {% + \ClearPreHook{par}% \PushPreHook{par}{\LWR@openparagraph}% \let\par\LWR@closeparagraph @@ -6913,14 +6936,21 @@ end -- not --version \begin{warpHTML} +\AtBeginDocument{ +\robustify{\footnote} +\robustify{\footnotemark} +} + \newbox\LWR@footnotebox -\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1} +\newbool{LWR@spewingnotes}% For the footnote package. +\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~{#1}} \def\@makefnmark{% \textsuperscript{\@thefnmark}% } \long\def\LWR@@footnotetext#1#2{% \LWR@traceinfo{LWR@footnotetext}% \LWR@newautopagelabel{page}% +\LWR@ensuredoingapar% \begingroup% \let\LWR@newautopagelabel\LWR@null@newautopagelabel% \global\setbox\csname #2\endcsname=\vbox{% @@ -6931,26 +6961,18 @@ end -- not --version \color@begingroup% \LWR@disablepinyin% \renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}% - \ifthenelse{% - \boolean{LWR@doingstartpars} \AND% - \cnttest{\value{LWR@lateximagedepth}}{=}{0}% + \ifbool{LWR@spewingnotes}{}{% + \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% }% - {}% - {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}% \@makefntext{#1}% - \ifthenelse{% - \boolean{LWR@doingstartpars} \AND% - \cnttest{\value{LWR@lateximagedepth}}{=}{0}% + \ifbool{LWR@spewingnotes}{}{% + \LWR@origtilde\LWR@orignewline% + \LWR@htmltagc{/\LWR@tagregularparagraph}% + \LWR@orignewline% }% - {\par}% - {% - \LWR@htmltagc{/\LWR@tagregularparagraph}% - \LWR@orignewline% - }% \color@endgroup% }% vbox \endgroup% -\LWR@ensuredoingapar% }% \long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}% @@ -6958,6 +6980,7 @@ end -- not --version \newbox\LWR@mpfootnotes \long\def\@mpfootnotetext#1{% \LWR@traceinfo{@mpfootnotetext}% +\LWR@ensuredoingapar% \global\setbox\LWR@mpfootnotes\vbox{% \unvbox\LWR@mpfootnotes% \reset@font\footnotesize% @@ -6966,22 +6989,12 @@ end -- not --version \protected@edef\@currentlabel% {\csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup% - \ifthenelse{% - \boolean{LWR@doingstartpars} \AND% - \cnttest{\value{LWR@lateximagedepth}}{=}{0}% - }% - {}% - {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}% + \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% \@makefntext{% \ignorespaces#1% }% - \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% - {}% - {% - \leavevmode\LWR@orignewline% - \LWR@htmltagc{/\LWR@tagregularparagraph}% - \LWR@origpar% - }% + \leavevmode\LWR@orignewline% + \LWR@htmltagc{/\LWR@tagregularparagraph}% \color@endgroup% }% vbox \LWR@ensuredoingapar% @@ -7434,6 +7447,23 @@ end -- not --version \CustomizeMathJax{\def\mathcode#1={\mathchar}} \CustomizeMathJax{\let\delcode\mathcode} \CustomizeMathJax{\let\delimiter\mathchar} +\CustomizeMathJax{\def\oe{\unicode{x0153}}} +\CustomizeMathJax{\def\OE{\unicode{x0152}}} +\CustomizeMathJax{\def\ae{\unicode{x00E6}}} +\CustomizeMathJax{\def\AE{\unicode{x00C6}}} +\CustomizeMathJax{\def\aa{\unicode{x00E5}}} +\CustomizeMathJax{\def\AA{\unicode{x00C5}}} +\CustomizeMathJax{\def\o{\unicode{x00F8}}} +\CustomizeMathJax{\def\O{\unicode{x00D8}}} +\CustomizeMathJax{\def\l{\unicode{x0142}}} +\CustomizeMathJax{\def\L{\unicode{x0141}}} +\CustomizeMathJax{\def\ss{\unicode{x00DF}}} +\CustomizeMathJax{\def\SS{\unicode{x1E9E}}} +\CustomizeMathJax{\def\dag{\unicode{x2020}}} +\CustomizeMathJax{\def\ddag{\unicode{x2021}}} +\CustomizeMathJax{\def\P{\unicode{x00B6}}} +\CustomizeMathJax{\def\copyright{\unicode{x00A9}}} +\CustomizeMathJax{\def\pounds{\unicode{x00A3}}} \end{warpMathJax} \begin{warpHTML}% due to warpMathJax @@ -8149,7 +8179,7 @@ end -- not --version \LWR@stoppars \LWR@closeprevious{finished} \LWR@printpendingfootnotes -\label{\BaseJobname-autofile-last} +\label{\BaseJobname-autofile-last}\LWR@origtilde\LWR@orignewline \LWR@htmlelementclassend{section}{textbody} \LWR@htmlelementclassend{main}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} @@ -8251,15 +8281,15 @@ end -- not --version \end{warpprint} \begin{warpHTML} \DeclareDocumentEnvironment{titlepage}{} -{ -\renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}} -\LWR@printpendingfootnotes -\LWR@forcenewpage -\BlockClass{titlepage} +{% + \renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}}% + \LWR@printpendingfootnotes + \LWR@forcenewpage + \BlockClass{titlepage} } { -\endBlockClass -\LWR@printpendingfootnotes + \endBlockClass + \LWR@printpendingfootnotes } \end{warpHTML} \begin{warpprint} @@ -8342,7 +8372,7 @@ end -- not --version } \long\def\@makefntext##1{% \textsuperscript{\@thefnmark}~% -##1% +{##1}% }% } @@ -8359,7 +8389,7 @@ end -- not --version \@ctrerr\fi% } \LWR@formatted{@fnsymbol} -\renewcommand*{\maketitle}{% +\newcommand*{\LWR@maketitle}{% \begin{titlepage} \LWR@maketitlesetup \@maketitle @@ -8378,7 +8408,10 @@ end -- not --version \global\let\date\relax \global\let\and\relax } -\DeclareDocumentCommand{\@maketitle}{}{% + +\LetLtxMacro\maketitle\LWR@maketitle +\providecommand*{\@maketitle}{} +\renewrobustcmd{\@maketitle}{% \LWR@stoppars% \LWR@htmltag{\LWR@tagtitle}% \@title% @@ -8713,132 +8746,100 @@ end -- not --version } \newcommand*{\LWR@listitem}{% -\LWR@stoppars% -\LWR@startnewdepth{listitem}% -\LWR@htmltag{li}% -\LWR@startpars% -\LWR@origitem% + \LWR@stoppars% + \LWR@startnewdepth{listitem}% + \LWR@htmltag{li}% + \LWR@startpars% + \LWR@origitem% } \newcommand*{\LWR@nulllistfills}{% -\renewcommand*{\hss}{}% -\renewcommand*{\llap}[1]{##1}% -\renewcommand*{\rlap}[1]{##1}% -\renewcommand*{\hfil}{}% -\renewcommand*{\hfilneg}{}% -\renewcommand*{\hfill}{}% + \renewcommand*{\hss}{}% + \renewcommand*{\llap}[1]{##1}% + \renewcommand*{\rlap}[1]{##1}% + \renewcommand*{\hfil}{}% + \renewcommand*{\hfilneg}{}% + \renewcommand*{\hfill}{}% } \newcommand*{\LWR@liststart}{% -\LWR@traceinfo{LWR@liststart}% -\LWR@stoppars% -\LWR@pushoneclose{list}% -\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% -\LWR@startpars% -\setlength{\topsep}{0pt}% -\setlength{\partopsep}{0pt}% -\setlength{\itemsep}{0pt}% -\setlength{\parsep}{0pt}% -\setlength{\leftmargin}{0pt}% -\setlength{\rightmargin}{0pt}% -\setlength{\listparindent}{0pt}% -\setlength{\itemindent}{0pt}% -\setlength{\labelsep}{1em}% -\LWR@nulllistfills% + \LWR@traceinfo{LWR@liststart}% + \LWR@stoppars% + \LWR@pushoneclose{list}% + \LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% + \LWR@startpars% + \setlength{\topsep}{0pt}% + \setlength{\partopsep}{0pt}% + \setlength{\itemsep}{0pt}% + \setlength{\parsep}{0pt}% + \setlength{\leftmargin}{0pt}% + \setlength{\rightmargin}{0pt}% + \setlength{\listparindent}{0pt}% + \setlength{\itemindent}{0pt}% + \setlength{\labelsep}{1em}% + \LWR@nulllistfills% } \newcommand*{\LWR@listend}{% -\LWR@traceinfo{LWR@listend}% -\LWR@stoppars% -\LWR@closeprevious{list}% -\LWR@startpars% + \LWR@traceinfo{LWR@listend}% + \LWR@stoppars% + \LWR@closeprevious{list}% + \LWR@startpars% } \newcommand*{\LWR@itemizeitem}{% -\LWR@stoppars% -\LWR@startnewdepth{listitem}% -\LWR@htmltag{li}% -\LWR@startpars% -\LWR@origitem% + \LWR@stoppars% + \LWR@startnewdepth{listitem}% + \LWR@htmltag{li}% + \LWR@startpars% + \LWR@origitem% } \newcommand*{\LWR@itemizestart}{% -\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} -\renewcommand*{\LWR@printopenlist}{% - ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}% -} -\let\item\LWR@itemizeitem% -\LWR@nulllistfills% + \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% + \renewcommand*{\LWR@printopenlist}{% + ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}% + }% + \LetLtxMacro\item\LWR@itemizeitem% + \LWR@nulllistfills% } \newcommand*{\LWR@enumeratestart}{% -\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} -\renewcommand*{\LWR@printopenlist}{% - ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}% -} -\let\item\LWR@itemizeitem% -\LWR@nulllistfills% + \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% + \renewcommand*{\LWR@printopenlist}{% + ul style=\textquotedbl\LWR@print@mbox{list-style-type:none}\textquotedbl{}% + }% + \LetLtxMacro\item\LWR@itemizeitem% + \LWR@nulllistfills% } -\newcommand*{\LWR@descitem}[1][]% -{% -\LWR@stoppars% -\LWR@setlatestname{#1}% -\LWR@startnewdepth{descitem}% -\begingroup% -\let\LWR@orig@desc@makelabel\makelabel -\renewcommand*{\makelabel}[1]{% - \LWR@htmltag{dt}% - \LWR@orig@desc@makelabel{#1}% - \LWR@htmltag{/dt}% -} -\LWR@select@html@nohspace% -\LWR@origitem[#1]% -\endgroup% -\LWR@orignewline% -\LWR@htmltag{dd}% -\LWR@startpars% +\newcommand*{\LWR@descitem}[1][]{% + \LWR@stoppars% + \LWR@setlatestname{#1}% + \LWR@startnewdepth{descitem}% + \begingroup% + \let\LWR@orig@desc@makelabel\makelabel + \renewcommand*{\makelabel}[1]{% + \LWR@htmltag{dt}% + \LWR@orig@desc@makelabel{#1}% + \LWR@htmltag{/dt}% + } + \LWR@select@html@nohspace% + \LWR@origitem[#1]% + \endgroup% + \LWR@orignewline% + \LWR@htmltag{dd}% + \LWR@startpars% } \newcommand*{\LWR@descriptionstart}{% \renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription} \renewcommand*{\LWR@printopenlist}{dl} - \let\item\LWR@descitem% + \LetLtxMacro\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% - }% - }% } @@ -10692,7 +10693,11 @@ end -- not --version \expandafter#2#1% \fi} \newcommand*{\LWR@nameref}[1]{% + \begingroup% + \renewcommand{\footnote}[2][]{}% + \renewcommand{\footnotemark}[1][]{}% \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}% + \endgroup% } \newcommand*{\LWR@currentautosecpageref}[1]{% \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffive{#1}% @@ -11270,7 +11275,6 @@ end -- not --version \newcommand*{\LWR@myshorttoc}[1]{% \LWR@traceinfo{LWR@myshorttoc: #1}% - \LWR@ensuredoingapar% \IfFileExists{\jobname.#1}{% \LWR@traceinfo{LWR@myshorttoc: loading}% \begingroup% @@ -11516,9 +11520,9 @@ end -- not --version \renewenvironment*{theindex}{% \LWR@indexsection{\indexname}% - \let\item\LWR@indexitem% - \let\subitem\LWR@indexsubitem% - \let\subsubitem\LWR@indexsubsubitem% + \LetLtxMacro\item\LWR@indexitem% + \LetLtxMacro\subitem\LWR@indexsubitem% + \LetLtxMacro\subsubitem\LWR@indexsubsubitem% }{} }% AtBeginDocument @@ -11859,6 +11863,7 @@ end -- not --version \let\enddisplaymath\LWR@orig@enddisplaymath% \LWR@restoreorigaccents% \LWR@restoreoriglists% + \let\@mpfootnotetext\LWR@orig@mpfootnotetext% \LWR@hook@processingtags% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {\LWR@restoreMathJaxformatting}% @@ -12889,7 +12894,7 @@ end -- not --version \LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}% \boolfalse{mathjax}% \LWR@ensuredoingapar% - \hbadness=10000\relax% + \hbadness=10000\relax% \addtocounter{LWR@externalfilecnt}{1}% \LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}% \setcounterpageref{LWR@LIpage}{% @@ -12937,17 +12942,25 @@ end -- not --version \LWR@traceinfo{lateximage: about to create a new page}% \LWR@maybe@orignewpage% \LWR@traceinfo{lateximage: about to create minipage}% + \setcounter{LWR@mpfootnote@store}{\value{mpfootnote}} \ifdimless{\linewidth}{6in}{% \LWR@print@minipage{\linewidth}% }{% \LWR@print@minipage{6in}% }% + \ifnumgreater{\value{LWR@minipage@depth}}{0}% + {\setcounter{mpfootnote}{\value{LWR@mpfootnote@store}}}% + {}% \@nameuse{LWR@print@\LateximageFontSizeName}% \LWR@traceinfo{lateximage: about to temporarily restore formatting}% \LWR@restoreorigformatting% - \def\@mpfn{footnote}% - \def\thempfn{\thefootnote}% - \LetLtxMacro\@footnotetext\LWR@footnotetext% + \ifnumgreater{\value{LWR@minipage@depth}}{0}% + {}% + {% + \def\@mpfn{footnote}% + \def\thempfn{\thefootnote}% + \LetLtxMacro\@footnotetext\LWR@footnotetext% + }% \LWR@traceinfo{lateximage: about to create label}% \LWR@orig@label{LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}% \LWR@traceinfo{lateximage: finished creating the label}% @@ -13010,8 +13023,7 @@ end -- not --version \begin{warpprint} \NewDocumentEnvironment{lateximage}{s o s o o d()} - {\begin{varwidth}[b]{\linewidth}} - {\end{varwidth}} + {}{} \end{warpprint} @@ -13352,6 +13364,11 @@ end -- not --version \begin{warpHTML} \newbool{LWR@minipagethispar} \boolfalse{LWR@minipagethispar} + +\newcounter{LWR@minipage@depth} +\setcounter{LWR@minipage@depth}{0} +\newcounter{LWR@mpfootnote@store} + \NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m} {% \LWR@traceinfo{minipage}% @@ -13411,6 +13428,7 @@ end -- not --version \def\@mpfn{mpfootnote}% \def\thempfn{\thempfootnote}\c@mpfootnote\z@% \let\@footnotetext\@mpfootnotetext% +\addtocounter{LWR@minipage@depth}{1}% \LWR@startpars% \ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{% @@ -13433,6 +13451,7 @@ end -- not --version \LWR@htmlelementend{div}% }{}% +\addtocounter{LWR@minipage@depth}{-1}% \LWR@htmldivclassend{minipage}% \end{LWR@setvirtualpage}% @@ -13795,7 +13814,14 @@ color:\LWR@origpound\LWR@tempcolor% \newrobustcmd{\LWR@HTML@textssc}[1]{\textsc{#1}} \LWR@formatted{textssc} -\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}} +\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{% + \LWR@HTML@mdseries% + \LWR@HTML@rmfamily% + \LWR@HTML@upshape% + \InlineClass(% + font-weight:normal; font-family:serif; font-style:normal + ){textnormal}{#1}% +} \LWR@formatted{textnormal} |