From c64b76557cb363f0c2990ee6a72dd2f8cf231af4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Feb 2022 22:09:57 +0000 Subject: lwarp (1feb22) git-svn-id: svn://tug.org/texlive/trunk@61842 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty | 9 +- .../texmf-dist/tex/latex/lwarp/lwarp-abstract.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-acronym.sty | 10 +- .../tex/latex/lwarp/lwarp-algorithm2e.sty | 28 +- Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty | 4 +- Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-authblk.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty | 8 +- .../texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-caption.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-caption3.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty | 27 +- .../texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty | 4 +- .../tex/latex/lwarp/lwarp-chemformula.sty | 35 +- .../tex/latex/lwarp/lwarp-chemmacros.sty | 33 +- .../texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty | 6 +- .../texmf-dist/tex/latex/lwarp/lwarp-cmbright.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty | 1 + .../lwarp/lwarp-common-mathjax-newpxtxmath.sty | 156 ++- .../lwarp/lwarp-common-mathjax-nonunicode.sty | 114 +- Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty | 4 + .../texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty | 68 +- .../texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-flushend.sty | 6 +- .../texmf-dist/tex/latex/lwarp/lwarp-footnote.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-fourier.sty | 4 +- Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty | 112 +- .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 5 +- .../texmf-dist/tex/latex/lwarp/lwarp-hanging.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty | 7 +- .../tex/latex/lwarp/lwarp-kpfonts-otf.sty | 54 +- Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty | 5 +- .../texmf-dist/tex/latex/lwarp/lwarp-mathalpha.sty | 10 +- .../texmf-dist/tex/latex/lwarp/lwarp-mathptmx.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty | 108 +- .../texmf-dist/tex/latex/lwarp/lwarp-microtype.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty | 11 +- .../texmf-dist/tex/latex/lwarp/lwarp-multirow.sty | 77 +- .../texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty | 4 + .../texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty | 44 +- .../texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-physics.sty | 2 +- .../tex/latex/lwarp/lwarp-showlabels.sty | 26 + .../tex/latex/lwarp/lwarp-siunitx-v2.sty | 149 ++- .../tex/latex/lwarp/lwarp-thm-listof.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-titling.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty | 4 +- Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-wrapfig2.sty | 57 + Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty | 295 ++--- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 1269 +++++++++++--------- 60 files changed, 1659 insertions(+), 1157 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-showlabels.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig2.sty (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty index 8c1c2340eac..8903a05daba 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty @@ -15,7 +15,7 @@ %% 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. -\@ifpackageloaded{xeCJK}{}{ +\IfPackageLoadedTF{xeCJK}{}{ \LWR@loadnever{CJK}{ctex, xeCJK} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty index 8e7f93be9d6..6624af06008 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty @@ -15,7 +15,7 @@ %% 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. -\@ifpackageloaded{xeCJK}{}{ +\IfPackageLoadedTF{xeCJK}{}{ \LWR@loadnever{CJKutf8}{ctex, xeCJK} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty index 7265a223b12..325ab3544f9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty @@ -20,8 +20,9 @@ \DeclareRobustCommand{\LWR@HTML@unit}[2]{% \LWR@subsingledollar*% lwarp {% alt tag - \textbackslash{}unit\{\LWR@HTMLsanitize{#1}\}% - \{ \LWR@HTMLsanitize{#2}\}% extra space + \textbackslash{}unit% + \{\LWR@HTMLsanitizedetokenized{\detokenize{#1}}\}% + \{ \LWR@HTMLsanitizedetokenized{\detokenize{#2}}\}% extra space }% {SIunits}% add'l hashing {% @@ -33,8 +34,8 @@ \@inunitcommandtrue% original \LWR@subsingledollar*% lwarp {% alt tag - \textbackslash{}unit\{\LWR@HTMLsanitize{#1}\}% - \{ \LWR@HTMLsanitize{#2}\}% extra space + \textbackslash{}unit\{\LWR@HTMLsanitizedetokenized{\detokenize{#1}}\}% + \{ \LWR@HTMLsanitizedetokenized{\detokenize{#2}}\}% extra space }% {SIunits}% add'l hashing {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index 30f5a02459d..ccfef32c6a1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -32,7 +32,7 @@ \InlineClass{abstractrunintitle}{\abstractname}% \@bslabeldelim}% } -\@ifclassloaded{memoir} +\IfClassLoadedTF{memoir} { \renewenvironment{abstract}{% \setup@bstract diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty index 0763785c648..c6776726207 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty @@ -35,10 +35,10 @@ \LWR@formatted{acro_dot_fill:} \ExplSyntaxOff \ExplSyntaxOn -\@ifpackagelater{acro}{2020/04/29}% +\IfPackageAtLeastTF{acro}{2020/04/29}% {}% v3 or later {% before v3 -\@ifpackagelater{acro}{2019/09/23}% +\IfPackageAtLeastTF{acro}{2019/09/23}% {% v2.10 or later \cs_gset_protected:Npn \__acro_typeset:nn #1#2 { diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty index e4d8a30fbf7..8c41238b2c3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty @@ -24,11 +24,11 @@ \renewcommand*\AC@acs[1]{% \expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}} -\renewcommand{\@starttoc}[1]{ -\LWR@htmlelementclass{nav}{#1} -\LetLtxMacro\@verridelabel\@gobble -\LWR@orig@starttoc{#1} -\LWR@htmlelementclassend{nav}{#1} +\renewcommand{\@starttoc}[1]{% + \LWR@htmlelementclass{nav}{#1} + \LetLtxMacro\@verridelabel\@gobble + \LWR@orig@starttoc{#1} + \LWR@htmlelementclassend{nav}{#1} } \renewcommand*\AC@und@newl@bel[3]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty index 5b6cda0091a..90eb953941f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty @@ -33,21 +33,21 @@ \renewcommand*{\LWR@floatstyle@algocf}{plain} }{} \renewcommand{\algocf@everypar}{% -\ifbool{LWR@algocf@dopars}{% - \ifbool{LWR@doingstartpars}{% - \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% - {}% - {% - \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% - \algocf@everyparnl\algocf@everyparhanging% - }% + \ifbool{LWR@algocf@dopars}{% + \ifbool{LWR@doingstartpars}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% + \algocf@everyparnl\algocf@everyparhanging% + }% + }{}% }{}% -}{}% } \renewcommand{\algocf@makecaption}[2]{% -\LWR@HTML@caption@begin{algocf}% -\LWR@isolate{\algocf@captiontext{#1}{#2}}% -\LWR@HTML@caption@end% + \LWR@HTML@caption@begin{algocf}% + \LWR@isolate{\algocf@captiontext{#1}{#2}}% + \LWR@HTML@caption@end% } \renewcommand{\algocf@makecaption@plain}[2]{% \LWR@HTML@caption@begin{algocf}% @@ -67,7 +67,7 @@ \LWR@HTML@caption@end% } \long\def\algocf@latexcaption#1[#2]#3{% original definition of caption -\boolfalse{LWR@algocf@dopars}% lwarp +\boolfalse{LWR@algocf@dopars}% lwarp \par% \addcontentsline{\csname ext@#1\endcsname}{#1}% {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \LWR@isolate{#2}}}% @@ -79,7 +79,7 @@ \normalsize% \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par% \endgroup% -\booltrue{LWR@algocf@dopars}% lwarp +\booltrue{LWR@algocf@dopars}% lwarp } \renewcommand{\algocf@printnl}[1]{% \InlineClass{alg2elinenumber}{\NlSty{#1}}~% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index e9acd1f1b6b..892ed4fc9f3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. -\@ifpackageloaded{mdframed}{ +\IfPackageLoadedTF{mdframed}{ \PackageError{lwarp} {% Package mdframed must be loaded after package amsthm.\MessageBreak @@ -91,7 +91,7 @@ \GetTitleString{#3}% lwarp \let\@currentlabelname\GetTitleStringResult% lwarp \item[% - \LWR@newautopagelabel{page}% + \LWR@newautopagelabel{page}\LWR@orignewline% \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty index c13e5e3f1b6..b820e491172 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty @@ -15,7 +15,7 @@ %% 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. -\@ifpackageloaded{array}{}{% +\IfPackageLoadedTF{array}{}{% \let\firsthline\relax \let\lasthline\relax } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty index 67fc8067a9b..8d48303d176 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty @@ -15,7 +15,7 @@ %% 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. -\@ifpackageloaded{titling}{ +\IfPackageLoadedTF{titling}{ \PackageError{lwarp-authblk} {Package authblk must be loaded before titling} {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty index a9e0e08eb9d..fe96c69ad91 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty @@ -22,23 +22,23 @@ \CustomizeMathJax{\newcommand{\bnfpn}[1]{\langle \text{\textrm{#1}} \rangle}} \CustomizeMathJax{\newcommand{\bnfor}{\; \mid \;}} \CustomizeMathJax{\newcommand{\bnfsp}{\;}} -\@ifpackagewith{backnaur}{perp}{ +\IfPackageLoadedWithOptionsTF{backnaur}{perp}{ \CustomizeMathJax{\newcommand{\bnfes}{\perp}} }{ - \@ifpackagewith{backnaur}{epsilon}{ + \IfPackageLoadedWithOptionsTF{backnaur}{epsilon}{ \CustomizeMathJax{\newcommand{\bnfes}{\epsilon}} }{ \CustomizeMathJax{\newcommand{\bnfes}{\lambda}} } } -\@ifpackagewith{backnaur}{tsrm}{ +\IfPackageLoadedWithOptionsTF{backnaur}{tsrm}{ \CustomizeMathJax{\newcommand{\bnfts}[1]{\text{#1}}} }{ \CustomizeMathJax{\newcommand{\bnfts}[1]{\text{\texttt{#1}}}} } \CustomizeMathJax{\newcommand{\bnftd}[1]{\text{\textit{#1}}}} \CustomizeMathJax{\newcommand{\bnfsk}{\dots}} -\@ifpackagewith{backnaur}{altpo}{ +\IfPackageLoadedWithOptionsTF{backnaur}{altpo}{ \CustomizeMathJax{\newcommand{\bnfpo}{::=}} }{ \CustomizeMathJax{\newcommand{\bnfpo}{\models}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty index 1559610660a..48e191cf6a1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty @@ -66,7 +66,7 @@ \xpatchcmd{\blx@addbackref@i} {\c@page} - {\c@LWR@previousautopagelabel}% refto the most recent object + {\c@LWR@previousautopagelabel}% ref to the most recent object {} {\LWR@patcherror{biblatex}{blx@addbackref@i B}} \DeclareListFormat{pageref}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index ded005a30b8..7a14726b6e6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -15,7 +15,7 @@ %% 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. -\@ifpackageloaded{booktabs}{}{ +\IfPackageLoadedTF{booktabs}{}{ \LetLtxMacro\toprule\relax \LetLtxMacro\midrule\relax \LetLtxMacro\cmidrule\cline diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty index 27617226181..5fdd7cb174c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty @@ -46,7 +46,7 @@ \LetLtxMacro\bcancel\cancel \LetLtxMacro\xcancel\cancel \begin{warpMathJax} -\PackageWarningNoLine{lwarp, cancel}{The MathJax v3 extension will be used} +\PackageNoteNoLine{lwarp, cancel}{The MathJax v3 extension will be used} \CustomizeMathJax{\require{cancel}} \end{warpMathJax} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 9b6059c84b6..5ed75c1419d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -76,7 +76,7 @@ } \caption@AtBeginDocument{ -\@ifpackageloaded{lwarp-scrextend}{ +\IfPackageLoadedTF{lwarp-scrextend}{ \LetLtxMacro\captionbelow\caption \LetLtxMacro\captionabove\caption \LetLtxMacro\captionofbelow\captionof diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty index 57bbd7dc5e6..1bd2fd32d2c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{caption3}[2020/10/21] -\@ifpackagelater{caption3}{2020/08/23}{ +\IfPackageAtLeastTF{caption3}{2020/08/23}{ \renewcommand\caption@@@make[2]{% \LWR@traceinfo{caption@@@make}% \LWR@stoppars% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty index c337b064ee0..b4985b5c6cf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty @@ -15,7 +15,7 @@ %% 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. -\LWR@ProvidesPackagePass{cases}[2002/05/02] +\LWR@ProvidesPackagePass{cases}[2020/03/29] \BeforeBeginEnvironment{numcases}{ \begin{BlockClass}{displaymathnumbered} \LWR@newautoidanchor% @@ -37,6 +37,31 @@ \AfterEndEnvironment{subnumcases}{ \end{lateximage}\end{BlockClass} } + +\makeatletter +\begin{warpHTML} +\AtBeginDocument{ + \@ifpackageloaded{amsmath} + { + \xpatchcmd{\tagform@}{\leftprotrusion{(}}{(} + {} + {\LWR@patcherror{cases}{tagform@ A}}% + \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)} + {} + {\LWR@patcherror{cases}{tagform@ B}}% + } + { + \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(} + {} + {\LWR@patcherror{cases}{@eqnnum A}}% + \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)} + {} + {\LWR@patcherror{cases}{@eqnnum A}}% + }% +} +\end{warpHTML} +\makeatother + \endinput %% %% End of file `lwarp-cases.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty index 03505e42403..39faeb474c3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty @@ -20,7 +20,7 @@ \catcode`\_=11 -\@ifpackagelater{chemfig}{2020/03/05} +\IfPackageAtLeastTF{chemfig}{2020/03/05} { \xpretocmd\charge{\begin{lateximage}[-chemfig-~\PackageDiagramAltText]} {}{\LWR@patcherror{chemfig}{charge}} @@ -30,7 +30,7 @@ {}{\LWR@patcherror{chemfig}{charge_c}} }{} -\@ifpackagelater{chemfig}{2019/04/18}% +\IfPackageAtLeastTF{chemfig}{2019/04/18}% {% 2019/04/18 or newer \xpretocmd{\CF_chemfiga} {\begin{lateximage}[-chemfig-~\PackageDiagramAltText]} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty index 47e3eafc9e8..a3a5b4cd00b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty @@ -29,9 +29,15 @@ \begingroup% \boolfalse{mathjax}% \LWR@subsingledollar*{% lwarp - \textbackslash{}ch\{\LWR@HTMLsanitize{#2}\}% alt text + \textbackslash{}% + ch% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#2}}% + \}% alt text }{% - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% add'l hashing + \protect\LWR@HTMLsanitizedetokenized{% + \detokenize\expandafter{#1}% + }% add'l hashing }% {% \chemformula_ch:nn {#1} {#2}% original @@ -39,15 +45,19 @@ \endgroup% } } -\@ifpackagelater{chemformula}{2019/10/13}{ +\IfPackageAtLeastTF{chemformula}{2019/10/13}{ \cs_gset_protected:Npn \chemformula_chcpd:nn #1#2 { \begingroup% \boolfalse{mathjax}% \LWR@subsingledollar*{% lwarp - \textbackslash{}chcpd\{\LWR@HTMLsanitize{#2}\}% + \textbackslash{}% + chcpd% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#2}}% + \}% }{% - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% }{% original \group_begin: \tl_if_blank:nF {#2} @@ -76,9 +86,13 @@ \begingroup% \boolfalse{mathjax}% \LWR@subsingledollar*{% lwarp - \textbackslash{}chcpd\{\LWR@HTMLsanitize{#2}\}% + \textbackslash{}% + chcpd% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#2}}% + \}% }{% - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% }{% original \group_begin: \tl_if_blank:nF {#2} @@ -110,7 +124,10 @@ \RenewDocumentCommand \chname { R(){}R(){} } { \begin{lateximage}*[% - \textbackslash{}chname(\LWR@HTMLsanitize{#1})(\LWR@HTMLsanitize{#2}) + \textbackslash{}% + chname% + (\LWR@HTMLsanitizedetokenized{\detokenize{#1}})% + (\LWR@HTMLsanitizedetokenized{\detokenize{#2}})% ]*% \chemformula_chwritebelow:nn {#1} {#2} \end{lateximage} @@ -121,7 +138,7 @@ \boolfalse{mathjax}% \LWR@subsingledollar*{\textbackslash{}chlewis\{#2\}\{#3\}}% { - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% }{ \chemformula_lewis:nnn {#1} {#2} {#3} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty index 964176492db..e4ea9d2845d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty @@ -41,9 +41,14 @@ \begingroup \boolfalse{mathjax} \LWR@subsingledollar*{ - \textbackslash{}p\{\LWR@HTMLsanitize{#1}\} + \textbackslash{}% + p% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#1}}% + \} }{ - chemmacrosp\protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% + chemmacrosp% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% }{ \group_begin: \mbox @@ -463,7 +468,10 @@ \IfValueTF{#1} { \begin{lateximage}[% - \textbackslash{}orbital{[}\LWR@HTMLsanitize{#1}{]}\{#2\}% + \textbackslash{}% + orbital{[}% + \LWR@HTMLsanitizedetokenized{\detokenize{#1}}% + {]}\{#2\}% ]*[][margin-left: 1em ; margin-right: 1em] } { @@ -530,18 +538,26 @@ \IfBooleanTF {#1} { \LWR@subsingledollar*{% yes hash - \textbackslash{}ox*\{\LWR@HTMLsanitize{#3}\}% alt + \textbackslash{}% + ox*% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#3}}% + \}% alt }{% - star \protect\LWR@HTMLsanitize{\detokenize\expandafter{#2}}% + star \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#2}}% }{% \LWR@chemmacros@ox* {#2} {#3}% contents }% } { \LWR@subsingledollar*{% yes hash - \textbackslash{}ox*\{\LWR@HTMLsanitize{#3}\}% alt + \textbackslash{}% + ox*% + \{% + \LWR@HTMLsanitizedetokenized{\detokenize{#3}}% + \}% alt }{% - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#2}}% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#2}}% }{% \LWR@chemmacros@ox {#2} {#3}% contents }% @@ -785,7 +801,8 @@ name = \chemmacros_translate:n {scheme-name} \boolfalse{mathjax} \chemmacros_set_keys:nn {thermodynamics} {#1} \LWR@subsingledollar*{% yes hashing - \textbackslash{}state\{\LWR@HTMLsanitize{#2}\}% alt + \textbackslash{}state% + \{\LWR@HTMLsanitizedetokenized{\detokenize{#2}}\}% alt }{% chemmacros_state% add'l hashing #1% options diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty index dad79523ff0..c32e2d0c748 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cleveref.sty @@ -119,7 +119,7 @@ \LWR@absorbstar{Cpagerefrange} \LWR@absorbstar{labelcref} \LWR@absorbstar{labelcpageref} -\@ifpackageloaded{varioref}{ +\IfPackageLoadedTF{varioref}{ \LWR@absorbstar{vref} \LWR@absorbstar{Vref} \LWR@absorbstar{vrefrange} @@ -127,14 +127,14 @@ \LWR@absorbstar{fullref} \LWR@absorbstar{Fullref} }{}% varioref -\@ifclassloaded{memoir}{ +\IfClassLoadedTF{memoir}{ \AtBeginDocument{ \def\sf@memsub@label(#1)#2{% \protected@edef\mem@currentlabelname{#1}% \sf@@memsub@label{#2}} } }{} -\@ifpackageloaded{subfig}{ +\IfPackageLoadedTF{subfig}{ \def\sf@sub@label(#1)#2{% \ifhyperrefloaded \protected@edef\@currentlabelname{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cmbright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cmbright.sty index a90525a017a..bc680cdf250 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cmbright.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cmbright.sty @@ -22,7 +22,7 @@ \begin{warpMathJax} -\@ifpackagewith{cmbright}{slantedGreek} +\IfPackageLoadedWithOptionsTF{cmbright}{slantedGreek} { \LWR@mathjax@addgreek@u@it*{}{} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty index 1c6938a0cee..4d601fc2bdf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty @@ -17,6 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{color}[2016/07/10] \RequirePackage{xcolor} +\let\color@endgroup\endgroup \endinput %% %% End of file `lwarp-color.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-newpxtxmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-newpxtxmath.sty index 245f4efea93..1d8a6b4d48b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-newpxtxmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-newpxtxmath.sty @@ -47,7 +47,9 @@ \CustomizeMathJax{\let\overgroupra\overrightarrow} \CustomizeMathJax{\let\undergroup\underparen} \CustomizeMathJax{\let\undergroupla\underleftarrow} -\CustomizeMathJax{\newcommand{\widering}[1]{\stackrel{\unicode{x2218}}{\overgroup{#1}}}} +\CustomizeMathJax{\newcommand{\widering}[1]{% + \stackrel{\unicode{x2218}}{\overgroup{#1}}% +}} \CustomizeMathJax{\let\widearc\overparen} \CustomizeMathJax{\let\wideOarc\overrightarrow} \CustomizeMathJax{\newcommand{\LWRvvstar}[2]{{\overrightarrow{#1}_{#2}}}} @@ -59,8 +61,12 @@ \CustomizeMathJax{\newcommand{\smallointsl}{\mathop{\unicode{x222E}}\limits}} \CustomizeMathJax{\newcommand{\smalloiintsl}{\mathop{\unicode{x222F}}\limits}} \CustomizeMathJax{\newcommand{\smalloiiintsl}{\mathop{\unicode{x2230}}\limits}} -\CustomizeMathJax{\newcommand{\smallvarointclockwisesl}{\mathop{\unicode{x2232}}\limits}} -\CustomizeMathJax{\newcommand{\smallointctrclockwisesl}{\mathop{\unicode{x2233}}\limits}} +\CustomizeMathJax{\newcommand{\smallvarointclockwisesl}{% + \mathop{\unicode{x2232}}\limits% +}} +\CustomizeMathJax{\newcommand{\smallointctrclockwisesl}{% + \mathop{\unicode{x2233}}\limits% +}} \CustomizeMathJax{\newcommand{\smallsumintsl}{\mathop{\unicode{x2A0B}}\limits}} \CustomizeMathJax{\newcommand{\smallfintsl}{\mathop{\unicode{x2A0F}}\limits}} \CustomizeMathJax{\newcommand{\smallsqintsl}{\mathop{\unicode{x2A16}}\limits}} @@ -71,8 +77,12 @@ \CustomizeMathJax{\newcommand{\smallointup}{\mathop{\unicode{x222E}}\limits}} \CustomizeMathJax{\newcommand{\smalloiintup}{\mathop{\unicode{x222F}}\limits}} \CustomizeMathJax{\newcommand{\smalloiiintup}{\mathop{\unicode{x2230}}\limits}} -\CustomizeMathJax{\newcommand{\smallvarointclockwiseup}{\mathop{\unicode{x2232}}\limits}} -\CustomizeMathJax{\newcommand{\smallointctrclockwiseup}{\mathop{\unicode{x2233}}\limits}} +\CustomizeMathJax{\newcommand{\smallvarointclockwiseup}{% + \mathop{\unicode{x2232}}\limits% +}} +\CustomizeMathJax{\newcommand{\smallointctrclockwiseup}{% + \mathop{\unicode{x2233}}\limits% +}} \CustomizeMathJax{\newcommand{\smallsumintup}{\mathop{\unicode{x2A0B}}\limits}} \CustomizeMathJax{\newcommand{\smallfintup}{\mathop{\unicode{x2A0F}}\limits}} \CustomizeMathJax{\newcommand{\smallsqintup}{\mathop{\unicode{x2A16}}\limits}} @@ -105,8 +115,12 @@ \CustomizeMathJax{\let\ointup\oint} \CustomizeMathJax{\newcommand{\oiintup}{\mathop{\unicode{x222F}}\limits}} \CustomizeMathJax{\newcommand{\oiiintup}{\mathop{\unicode{x2230}}\limits}} -\CustomizeMathJax{\newcommand{\varointclockwiseup}{\mathop{\unicode{x2232}}\limits}} -\CustomizeMathJax{\newcommand{\ointctrclockwiseup}{\mathop{\unicode{x2233}}\limits}} +\CustomizeMathJax{\newcommand{\varointclockwiseup}{% + \mathop{\unicode{x2232}}\limits% +}} +\CustomizeMathJax{\newcommand{\ointctrclockwiseup}{% + \mathop{\unicode{x2233}}\limits% +}} \CustomizeMathJax{\newcommand{\sumintup}{\mathop{\unicode{x2A0B}}\limits}} \CustomizeMathJax{\newcommand{\fintup}{\mathop{\unicode{x2A0F}}\limits}} \CustomizeMathJax{\newcommand{\sqintup}{\mathop{\unicode{x2A16}}\limits}} @@ -130,48 +144,90 @@ \CustomizeMathJax{\newcommand{\medbullet}{\mathbin{\unicode{x025CF}}}} \CustomizeMathJax{\newcommand{\varparallel}{\mathrel{\unicode{x02AFD}}}} \CustomizeMathJax{\newcommand{\varparallelinv}{\mathrel{\unicode{x244A}}}} -\CustomizeMathJax{\newcommand{\nvarparallel}{\mathrel{\LWRoverlaysymbols{-}{\unicode{x02AFD}}}}} -\CustomizeMathJax{\newcommand{\nvarparallelinv}{\mathrel{\LWRoverlaysymbols{-}{\unicode{x244A}}}}} +\CustomizeMathJax{\newcommand{\nvarparallel}{% + \mathrel{\LWRoverlaysymbols{-}{\unicode{x02AFD}}}% +}} +\CustomizeMathJax{\newcommand{\nvarparallelinv}{% + \mathrel{\LWRoverlaysymbols{-}{\unicode{x244A}}}% +}} \CustomizeMathJax{\newcommand{\coloneq}{\mathrel{\unicode{x02254}}}} \CustomizeMathJax{\newcommand{\eqcolon}{\mathrel{\unicode{x02255}}}} \CustomizeMathJax{\newcommand{\VDash}{\mathrel{\unicode{x22AB}}}} \CustomizeMathJax{\newcommand{\preceqq}{\mathrel{\unicode{x02AB3}}}} \CustomizeMathJax{\newcommand{\succeqq}{\mathrel{\unicode{x02AB4}}}} -\CustomizeMathJax{\newcommand{\nprecsim}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0227E}}}}} -\CustomizeMathJax{\newcommand{\nsuccsim}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0227F}}}}} +\CustomizeMathJax{\newcommand{\nprecsim}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0227E}}}% +}} +\CustomizeMathJax{\newcommand{\nsuccsim}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0227F}}}% +}} \CustomizeMathJax{\newcommand{\nlesssim}{\mathrel{\unicode{x02274}}}} \CustomizeMathJax{\newcommand{\ngtrsim}{\mathrel{\unicode{x02275}}}} \CustomizeMathJax{\newcommand{\nsubset}{\mathrel{\unicode{x02284}}}} \CustomizeMathJax{\newcommand{\nsupset}{\mathrel{\unicode{x02285}}}} \CustomizeMathJax{\newcommand{\notni}{\mathrel{\unicode{x220C}}}} \CustomizeMathJax{\let\notowns\notni} -\CustomizeMathJax{\newcommand{\nlessapprox}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02A85}}}}} -\CustomizeMathJax{\newcommand{\ngtrapprox}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02A86}}}}} -\CustomizeMathJax{\newcommand{\npreccurlyeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0227C}}}}} -\CustomizeMathJax{\newcommand{\nsucccurlyeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0227D}}}}} +\CustomizeMathJax{\newcommand{\nlessapprox}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02A85}}}% +}} +\CustomizeMathJax{\newcommand{\ngtrapprox}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02A86}}}% +}} +\CustomizeMathJax{\newcommand{\npreccurlyeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0227C}}}% +}} +\CustomizeMathJax{\newcommand{\nsucccurlyeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0227D}}}% +}} \CustomizeMathJax{\newcommand{\ngtrless}{\mathrel{\unicode{x02279}}}} \CustomizeMathJax{\newcommand{\nlessgtr}{\mathrel{\unicode{x2278}}}} -\CustomizeMathJax{\newcommand{\nbumpeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0224F}}}}} -\CustomizeMathJax{\newcommand{\nBumpeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0224E}}}}} -\CustomizeMathJax{\newcommand{\nbacksim}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0223D}}}}} -\CustomizeMathJax{\newcommand{\nbacksimeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x022CD}}}}} +\CustomizeMathJax{\newcommand{\nbumpeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0224F}}}% +}} +\CustomizeMathJax{\newcommand{\nBumpeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0224E}}}% +}} +\CustomizeMathJax{\newcommand{\nbacksim}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0223D}}}% +}} +\CustomizeMathJax{\newcommand{\nbacksimeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x022CD}}}% +}} \CustomizeMathJax{\newcommand{\nasymp}{\mathrel{\unicode{x226D}}}} \CustomizeMathJax{\newcommand{\nequiv}{\mathrel{\unicode{x2262}}}} \CustomizeMathJax{\newcommand{\napprox}{\mathrel{\unicode{x2249}}}} -\CustomizeMathJax{\newcommand{\nll}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0226A}}}}} -\CustomizeMathJax{\newcommand{\ngg}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0226B}}}}} +\CustomizeMathJax{\newcommand{\nll}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0226A}}}% +}} +\CustomizeMathJax{\newcommand{\ngg}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0226B}}}% +}} \CustomizeMathJax{\newcommand{\nthickapprox}{% \mathrel{\LWRoverlaysymbols{/}{{\mathbf{\unicode{x02248}}}}}% }} -\CustomizeMathJax{\newcommand{\napproxeq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0224A}}}}} -\CustomizeMathJax{\newcommand{\nprecapprox}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB7}}}}} -\CustomizeMathJax{\newcommand{\nsuccapprox}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB8}}}}} -\CustomizeMathJax{\newcommand{\npreceqq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB3}}}}} -\CustomizeMathJax{\newcommand{\nsucceqq}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB4}}}}} +\CustomizeMathJax{\newcommand{\napproxeq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0224A}}}% +}} +\CustomizeMathJax{\newcommand{\nprecapprox}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB7}}}% +}} +\CustomizeMathJax{\newcommand{\nsuccapprox}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB8}}}% +}} +\CustomizeMathJax{\newcommand{\npreceqq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB3}}}% +}} +\CustomizeMathJax{\newcommand{\nsucceqq}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02AB4}}}% +}} \CustomizeMathJax{\newcommand{\nsimeq}{\mathrel{\unicode{x02244}}}} -\CustomizeMathJax{\newcommand{\nSubset}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x022D0}}}}} -\CustomizeMathJax{\newcommand{\nSupset}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x022D1}}}}} +\CustomizeMathJax{\newcommand{\nSubset}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x022D0}}}% +}} +\CustomizeMathJax{\newcommand{\nSupset}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x022D1}}}% +}} \CustomizeMathJax{\newcommand{\nsqsubseteq}{\mathrel{\unicode{x022E2}}}} \CustomizeMathJax{\newcommand{\nsqsupseteq}{\mathrel{\unicode{x022E3}}}} \CustomizeMathJax{\newcommand{\coloneqq}{\mathrel{\unicode{x02254}}}} @@ -179,11 +235,21 @@ \CustomizeMathJax{\newcommand{\Coloneqq}{\mathrel{\unicode{x02A74}}}} \CustomizeMathJax{\newcommand{\Coloneq}{\mathrel{\unicode{x2237}-}}} \CustomizeMathJax{\newcommand{\Eqcolon}{\mathrel{-\unicode{x2237}}}} -\CustomizeMathJax{\newcommand{\lvec}[1]{\mathord{\overset{\unicode{x02190}}{#1}}}} -\CustomizeMathJax{\newcommand{\lrvec}[1]{\mathord{\overset{\unicode{x2194}}{#1}}}} -\CustomizeMathJax{\newcommand{\harpoonacc}[1]{\mathord{\overset{\unicode{x021C0}}{#1}}}} -\CustomizeMathJax{\newcommand{\lharpoonacc}[1]{\mathord{\overset{\unicode{x021BC}}{#1}}}} -\CustomizeMathJax{\newcommand{\lrharpoonacc}[1]{\mathord{\overset{\unicode{x0294E}}{#1}}}} +\CustomizeMathJax{\newcommand{\lvec}[1]{% + \mathord{\overset{\unicode{x02190}}{#1}}% +}} +\CustomizeMathJax{\newcommand{\lrvec}[1]{% + \mathord{\overset{\unicode{x2194}}{#1}}% +}} +\CustomizeMathJax{\newcommand{\harpoonacc}[1]{% + \mathord{\overset{\unicode{x021C0}}{#1}}% +}} +\CustomizeMathJax{\newcommand{\lharpoonacc}[1]{% + \mathord{\overset{\unicode{x021BC}}{#1}}% +}} +\CustomizeMathJax{\newcommand{\lrharpoonacc}[1]{% + \mathord{\overset{\unicode{x0294E}}{#1}}% +}} \CustomizeMathJax{\newcommand{\barbar}[1]{\mathord{\overset{=}{#1}}}} \CustomizeMathJax{\newcommand{\bartilde}[1]{\mathord{\overset{\simeq}{#1}}}} \CustomizeMathJax{\newcommand{\barhat}[1]{\mathord{\hat{\bar{#1}}}}} @@ -214,9 +280,15 @@ \CustomizeMathJax{\newcommand{\lrtimes}{\mathrel{\unicode{x2A1D}}}} \CustomizeMathJax{\newcommand{\Diamondblack}{\mathord{\unicode{x025C6}}}} -\CustomizeMathJax{\newcommand{\nplus}{\mathrel{\LWRoverlaysymbols{+}{\unicode{x02229}}}}} -\CustomizeMathJax{\newcommand{\nsqsubset}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x0228F}}}}} -\CustomizeMathJax{\newcommand{\nsqsupset}{\mathrel{\LWRoverlaysymbols{/}{\unicode{x02290}}}}} +\CustomizeMathJax{\newcommand{\nplus}{% + \mathrel{\LWRoverlaysymbols{+}{\unicode{x02229}}}% +}} +\CustomizeMathJax{\newcommand{\nsqsubset}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x0228F}}}% +}} +\CustomizeMathJax{\newcommand{\nsqsupset}{% + \mathrel{\LWRoverlaysymbols{/}{\unicode{x02290}}}% +}} \CustomizeMathJax{\newcommand{\dasharrow}{\mathrel{\unicode{x021E2}}}} \CustomizeMathJax{\newcommand{\leftsquigarrow}{\mathrel{\unicode{x021DC}}}} \CustomizeMathJax{\newcommand{\ntwoheadrightarrow}{\mathrel{\unicode{x02900}}}} @@ -240,8 +312,12 @@ \CustomizeMathJax{\newcommand{\leadstoext}{\mathrel{\unicode{xFF5E}}}} -\CustomizeMathJax{\newcommand{\sqcupplus}{\mathbin{\LWRoverlaysymbols{+}{\unicode{x02294}}}}} -\CustomizeMathJax{\newcommand{\sqcapplus}{\mathbin{\LWRoverlaysymbols{+}{\unicode{x02293}}}}} +\CustomizeMathJax{\newcommand{\sqcupplus}{% + \mathbin{\LWRoverlaysymbols{+}{\unicode{x02294}}}% +}} +\CustomizeMathJax{\newcommand{\sqcapplus}{% + \mathbin{\LWRoverlaysymbols{+}{\unicode{x02293}}}% +}} \CustomizeMathJax{\newcommand{\dlb}{\mathopen{\unicode{x027E6}}}} \CustomizeMathJax{\newcommand{\drb}{\mathopen{\unicode{x027E7}}}} @@ -256,7 +332,9 @@ \CustomizeMathJax{\newcommand{\forallAlt}{\mathord{\unicode{x02200}}}} \CustomizeMathJax{\newcommand{\emptysetAlt}{\mathord{\unicode{x02205}}}} -\CustomizeMathJax{\newcommand{\uppartial}{\mathord{\unicode{x02202}}}}% not upright +\CustomizeMathJax{\newcommand{\uppartial}{% + \mathord{\unicode{x02202}}% +}}% not upright \CustomizeMathJax{\let\varmathbb\mathbb} \CustomizeMathJax{\let\vmathbb\mathbb} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-nonunicode.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-nonunicode.sty index 299b3e86a53..801f1fdc5d5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-nonunicode.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-mathjax-nonunicode.sty @@ -36,31 +36,71 @@ \CustomizeMathJax{\newcommand{\Longmmappedfrom}{\mathrel{\unicode{x027FD}}}} \CustomizeMathJax{\let\Mmapsfrom\Mmappedfrom}% from kpfonts-otf \CustomizeMathJax{\let\Longmmapsfrom\Longmmappedfrom}% from kpfonts-otf -\CustomizeMathJax{\newcommand{\boxright}{\mathrel{\unicode{x025A1}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\boxleft}{\mathrel{\unicode{x02190}\!\unicode{x025A1}}}} -\CustomizeMathJax{\newcommand{\boxdotright}{\mathrel{\unicode{x022A1}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\boxdotleft}{\mathrel{\unicode{x02190}\!\unicode{x022A1}}}} - -\CustomizeMathJax{\newcommand{\Diamondright}{\mathrel{\unicode{x025C7}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\Diamondleft}{\mathrel{\unicode{x02190}\!\unicode{x025C7}}}} -\CustomizeMathJax{\newcommand{\Diamonddotright}{\mathrel{\unicode{x027D0}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\Diamonddotleft}{\mathrel{\unicode{x02190}\!\unicode{x027D0}}}} - -\CustomizeMathJax{\newcommand{\boxRight}{\mathrel{\unicode{x025A1}\!\unicode{x021D2}}}} -\CustomizeMathJax{\newcommand{\boxLeft}{\mathrel{\unicode{x021D0}\!\unicode{x025A1}}}} -\CustomizeMathJax{\newcommand{\boxdotRight}{\mathrel{\unicode{x022A1}\!\unicode{x021D2}}}} -\CustomizeMathJax{\newcommand{\boxdotLeft}{\mathrel{\unicode{x021D0}\!\unicode{x022A1}}}} - -\CustomizeMathJax{\newcommand{\DiamondRight}{\mathrel{\unicode{x025C7}\!\unicode{x021D2}}}} -\CustomizeMathJax{\newcommand{\DiamondLeft}{\mathrel{\unicode{x021D0}\!\unicode{x025C7}}}} -\CustomizeMathJax{\newcommand{\DiamonddotRight}{\mathrel{\unicode{x027D0}\!\unicode{x021D2}}}} -\CustomizeMathJax{\newcommand{\DiamonddotLeft}{\mathrel{\unicode{x021D0}\!\unicode{x027D0}}}} +\CustomizeMathJax{\newcommand{\boxright}{% + \mathrel{\unicode{x025A1}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\boxleft}{% + \mathrel{\unicode{x02190}\!\unicode{x025A1}}% +}} +\CustomizeMathJax{\newcommand{\boxdotright}{% + \mathrel{\unicode{x022A1}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\boxdotleft}{% + \mathrel{\unicode{x02190}\!\unicode{x022A1}}% +}} + +\CustomizeMathJax{\newcommand{\Diamondright}{% + \mathrel{\unicode{x025C7}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\Diamondleft}{% + \mathrel{\unicode{x02190}\!\unicode{x025C7}}% +}} +\CustomizeMathJax{\newcommand{\Diamonddotright}{% + \mathrel{\unicode{x027D0}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\Diamonddotleft}{% + \mathrel{\unicode{x02190}\!\unicode{x027D0}}% +}} + +\CustomizeMathJax{\newcommand{\boxRight}{% + \mathrel{\unicode{x025A1}\!\unicode{x021D2}}% +}} +\CustomizeMathJax{\newcommand{\boxLeft}{% + \mathrel{\unicode{x021D0}\!\unicode{x025A1}}% +}} +\CustomizeMathJax{\newcommand{\boxdotRight}{% + \mathrel{\unicode{x022A1}\!\unicode{x021D2}}% +}} +\CustomizeMathJax{\newcommand{\boxdotLeft}{% + \mathrel{\unicode{x021D0}\!\unicode{x022A1}}% +}} + +\CustomizeMathJax{\newcommand{\DiamondRight}{% + \mathrel{\unicode{x025C7}\!\unicode{x021D2}}% +}} +\CustomizeMathJax{\newcommand{\DiamondLeft}{% + \mathrel{\unicode{x021D0}\!\unicode{x025C7}}% +}} +\CustomizeMathJax{\newcommand{\DiamonddotRight}{% + \mathrel{\unicode{x027D0}\!\unicode{x021D2}}% +}} +\CustomizeMathJax{\newcommand{\DiamonddotLeft}{% + \mathrel{\unicode{x021D0}\!\unicode{x027D0}}% +}} \CustomizeMathJax{\newcommand{\Diamonddot}{\mathrel{\unicode{x027D0}}}} -\CustomizeMathJax{\newcommand{\circleright}{\mathrel{\unicode{x025CB}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\circleleft}{\mathrel{\unicode{x02190}\!\unicode{x025CB}}}} -\CustomizeMathJax{\newcommand{\circledotright}{\mathrel{\unicode{x02299}\!\unicode{x02192}}}} -\CustomizeMathJax{\newcommand{\circledotleft}{\mathrel{\unicode{x02190}\!\unicode{x02299}}}} +\CustomizeMathJax{\newcommand{\circleright}{% + \mathrel{\unicode{x025CB}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\circleleft}{% + \mathrel{\unicode{x02190}\!\unicode{x025CB}}% +}} +\CustomizeMathJax{\newcommand{\circledotright}{% + \mathrel{\unicode{x02299}\!\unicode{x02192}}% +}} +\CustomizeMathJax{\newcommand{\circledotleft}{% + \mathrel{\unicode{x02190}\!\unicode{x02299}}% +}} \CustomizeMathJax{\let\circleddotright\circledotright} \CustomizeMathJax{\let\circleddotleft\circledotleft} @@ -68,7 +108,9 @@ \CustomizeMathJax{\newcommand{\multimapboth}{\mathrel{\unicode{x029DF}}}} \CustomizeMathJax{\newcommand{\multimapdot}{{\mathrel{-\!\bullet}}}} \CustomizeMathJax{\newcommand{\multimapdotinv}{\mathrel{\bullet\!-}}} -\CustomizeMathJax{\newcommand{\multimapdotboth}{\mathrel{{\bullet\!\!-\!\!\bullet}}}} +\CustomizeMathJax{\newcommand{\multimapdotboth}{% + \mathrel{{\bullet\!\!-\!\!\bullet}}% +}} \CustomizeMathJax{\newcommand{\multimapdotbothA}{\mathrel{\unicode{x022B6}}}} \CustomizeMathJax{\newcommand{\multimapdotbothB}{\mathrel{\unicode{x22B7}}}} @@ -113,11 +155,17 @@ \CustomizeMathJax{\newcommand{\colonapprox}{\mathrel{:\approx}}} \CustomizeMathJax{\newcommand{\colonsim}{\mathrel{:\sim}}} -\CustomizeMathJax{\newcommand{\Colonapprox}{\mathrel{\unicode{x2237}\!\approx}}} +\CustomizeMathJax{\newcommand{\Colonapprox}{% + \mathrel{\unicode{x2237}\!\approx}% +}} \CustomizeMathJax{\newcommand{\Colonsim}{\mathrel{\unicode{x2237}\!\sim}}} -\CustomizeMathJax{\newcommand{\strictif}{\mathrel{\unicode{x0297D}}}}% right fish tail -\CustomizeMathJax{\newcommand{\strictfi}{\mathrel{\unicode{x0297C}}}}% left fish tail +\CustomizeMathJax{\newcommand{\strictif}{% + \mathrel{\unicode{x0297D}}% +}}% right fish tail +\CustomizeMathJax{\newcommand{\strictfi}{% + \mathrel{\unicode{x0297C}}% +}}% left fish tail \CustomizeMathJax{\newcommand{\strictiff}{% \mathrel{\unicode{x0297C}\!\!\unicode{x0297D}}% }}% left/right fish tails @@ -130,8 +178,12 @@ }} \CustomizeMathJax{\newcommand{\circledbar}{\mathbin{\unicode{x029B6}}}} -\CustomizeMathJax{\newcommand{\openJoin}{\mathrel{\unicode{x2AA4}}}}% overlapping >< -\CustomizeMathJax{\newcommand{\opentimes}{\mathrel{\unicode{x2AA4}}}}% overlapping >< +\CustomizeMathJax{\newcommand{\openJoin}{% + \mathrel{\unicode{x2AA4}}% +}}% overlapping >< +\CustomizeMathJax{\newcommand{\opentimes}{% + \mathrel{\unicode{x2AA4}}% +}}% overlapping >< \CustomizeMathJax{\newcommand{\VvDash}{\mathrel{\unicode{x22AA}}}} @@ -141,7 +193,9 @@ \CustomizeMathJax{\newcommand{\lambdaslash}{\mathord{\unicode{x019B}}}} -\CustomizeMathJax{\newcommand{\Wr}{\mathbin{\unicode{x02240}\!\unicode{x02240}}}} +\CustomizeMathJax{\newcommand{\Wr}{% + \mathbin{\unicode{x02240}\!\unicode{x02240}}% +}} \CustomizeMathJax{\newcommand{\dashleftrightarrow}{% \mathrel{\unicode{x021E0}\!\unicode{x021E2}}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty index eef7b71ca10..f33aa3fb5c4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty @@ -15,9 +15,11 @@ %% 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. -\LWR@ProvidesPackageDrop{cuted}[2012/10/04] +\LWR@ProvidesPackageDrop{cuted}[2021/10/04] \newenvironment{strip}{}{} \newskip\stripsep +\newtoks\preCutedStrip \preCutedStrip{} +\newtoks\postCutedStrip \postCutedStrip{} \def\oldcolsbreak#1{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty index 5124b8bf8a6..767b4bc48a1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty @@ -25,6 +25,10 @@ \LWR@formatted{@makeenmark} \def\makeenmark{\@makeenmark} +\apptocmd{\LWR@nullifyfootnotes}{% + \renewcommand{\endnote}[2][]{}% + \renewcommand{\endnotemark}[1]{}% +}{}{} \begin{warpMathJax} \def\endnotename{endnote} \appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRendnote}{\theendnote}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 203d04dc6a0..6583d40db0f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -77,9 +77,9 @@ \csgpreto{Beqnarray*}{\boolfalse{LWR@numbereqnarray}} \renewcommand{\GenericCaption}[1]{% -\LWR@figcaption% -\LWR@isolate{#1}% -\endLWR@figcaption% + \LWR@figcaption% + \LWR@isolate{#1}% + \endLWR@figcaption% } \RenewDocumentEnvironment{Btrivlist}{m o} {% @@ -93,7 +93,7 @@ \LWR@startpars% } \AtBeginEnvironment{LWR@nestspan}{% -\RenewDocumentEnvironment{Btrivlist}{m o}{}{}% + \RenewDocumentEnvironment{Btrivlist}{m o}{}{}% } \let\LWRFB@origitemizeitem\LWR@itemizeitem \let\LWRFB@origdescitem\LWR@descitem @@ -114,14 +114,40 @@ }% } \RenewDocumentCommand{\LWR@nestspanitem}{d()}{% -\if@newlist\else{\LWR@htmltagc{br /}}\fi% -\LWR@origitem% -} -\renewenvironment{Bitemize}[1][]{\begin{itemize}}{\end{itemize}} -\renewenvironment{Benumerate}[1][]{\begin{enumerate}}{\end{enumerate}} -\renewenvironment{Bdescription}[1][]{\begin{description}}{\end{description}} + \if@newlist\else{ + \LWR@htmltagc{br /}% + \LWR@orignewline% + }\fi% + \LWR@origitem% +} +\renewenvironment{Bitemize}[1][] + {% + \LWR@spanwarnformat{Bitemize}% + \booltrue{LWR@starting@fancybox}% + \begin{itemize}% + \boolfalse{LWR@starting@fancybox}% + } + {\end{itemize}} + +\renewenvironment{Benumerate}[1][] + {% + \LWR@spanwarnformat{Benumerate}% + \booltrue{LWR@starting@fancybox}% + \begin{enumerate}% + \boolfalse{LWR@starting@fancybox}% + } + {\end{enumerate}} + +\renewenvironment{Bdescription}[1][] + {% + \LWR@spanwarnformat{Bdescription}% + \booltrue{LWR@starting@fancybox}% + \begin{description}% + \boolfalse{LWR@starting@fancybox}% + } + {\end{description}} \RenewDocumentCommand{\boxput}{s d() m m}{% -\IfBooleanTF{#1}{#3\quad#4}{#4\quad#3}% + \IfBooleanTF{#1}{#3\quad#4}{#4\quad#3}% } \RenewDocumentCommand{\fancyput}{s d() m}{} \RenewDocumentCommand{\thisfancyput}{s d() m}{} @@ -135,24 +161,24 @@ \def\endLandscape{} \let\LWRFB@UseVerbatim\UseVerbatim \renewcommand*{\UseVerbatim}[1]{% -\LWR@atbeginverbatim{Verbatim}% -\LWRFB@UseVerbatim{#1}% -\LWR@afterendverbatim% + \LWR@atbeginverbatim{Verbatim}% + \LWRFB@UseVerbatim{#1}% + \LWR@afterendverbatim% } \let\LWRFB@LUseVerbatim\LUseVerbatim \renewcommand*{\LUseVerbatim}[1]{% -\LWR@atbeginverbatim{LVerbatim}% -\noindent% -\LWRFB@LUseVerbatim{#1}% -\LWR@afterendverbatim% + \LWR@atbeginverbatim{LVerbatim}% + \noindent% + \LWRFB@LUseVerbatim{#1}% + \LWR@afterendverbatim% } \def\@BUseVerbatim[#1]#2{% -\LWR@atbeginverbatim{BVerbatim}% -\LWRFB@UseVerbatim{#2}% -\LWR@afterendverbatim% + \LWR@atbeginverbatim{BVerbatim}% + \LWRFB@UseVerbatim{#2}% + \LWR@afterendverbatim% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index c5ee4554ab9..d25998c13c4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -25,7 +25,7 @@ \newbool{LWR@subcaptionloaded} \AtBeginDocument{ -\@ifpackageloaded{subcaption} +\IfPackageLoadedTF{subcaption} {\booltrue{LWR@subcaptionloaded}} {\boolfalse{LWR@subcaptionloaded}} } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty index 7ac45f39c73..29adaec65c2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty @@ -15,13 +15,13 @@ %% 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. -\LWR@ProvidesPackageDrop{flushend}[2017/03/27] +\LWR@ProvidesPackageDrop{flushend}[2021/10/04] \newcommand*{\flushend}{} \newcommand*{\raggedend}{} \newcommand*{\flushcolsend}{} \newcommand*{\raggedcolsend}{} -\newcommand*{\atColsBreak}[1]{} -\newcommand*{\atColsEnd}[1]{} +\newtoks\atColsBreak \atColsBreak={} +\newtoks\atColsEnd \atColsEnd={} \newcommand*{\showcolsendrule}{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 676e0700ace..44895081ad4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -81,7 +81,7 @@ \begingroup% \let\@makefntext\@empty% \let\@finalstrut\@gobble% - \LetLtxMacro\rule\@gobbletwo% *8* also the optional argument? + \LetLtxMacro\rule\@gobbletwo% \booltrue{LWR@spewingnotes}% lwarp \@footnotetext{\unvbox\z@}% \endgroup% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fourier.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fourier.sty index 6d0ff9446a5..7b61fb32e2e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fourier.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fourier.sty @@ -24,13 +24,13 @@ \begin{warpMathJax} -\@ifpackagewith{fourier}{sloped} +\IfPackageLoadedWithOptionsTF{fourier}{sloped} { \LWR@mathjax@addgreek@l@up{other}{} \LWR@mathjax@addgreek@u@it*{other}{} }% sloped {% not sloped - \@ifpackagewith{fourier}{upright} + \IfPackageLoadedWithOptionsTF{fourier}{upright} {% upright option \LWR@mathjax@addgreek@l@up{}{} \LWR@mathjax@addgreek@u@up*{}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty index ef338125feb..1b44e7875b1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty @@ -17,54 +17,60 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{framed}[2011/10/22] -\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec +\AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec -\renewenvironment{framed}{% -\LWR@forcenewpage -\BlockClass{framed}% +\renewenvironment{framed} +{% + \LWR@forcenewpage + \BlockClass{framed}% } {\endBlockClass} -\renewenvironment{oframed}{% -\LWR@forcenewpage -\BlockClass{framed}% +\renewenvironment{oframed} +{% + \LWR@forcenewpage + \BlockClass{framed}% } {\endBlockClass} -\renewenvironment{shaded}{% -\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% -\LWR@forcenewpage -\BlockClass[background: \LWR@origpound\LWR@tempcolor]{shaded}% +\renewenvironment{shaded} +{% + \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% + \LWR@forcenewpage + \BlockClass[background: \LWR@origpound\LWR@tempcolor]{shaded}% } {\endBlockClass} -\renewenvironment{shaded*}{% -\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% -\LWR@forcenewpage -\BlockClass[background: \LWR@origpound\LWR@tempcolor]{shaded}% +\renewenvironment{shaded*} +{% + \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% + \LWR@forcenewpage + \BlockClass[background: \LWR@origpound\LWR@tempcolor]{shaded}% } {\endBlockClass} \renewenvironment{leftbar}{% -\LWR@forcenewpage + \LWR@forcenewpage \BlockClass{framedleftbar} - \def\FrameCommand{}% - \MakeFramed {} + \def\FrameCommand{}% + \MakeFramed {} }% - {\endMakeFramed\endBlockClass} +{\endMakeFramed\endBlockClass} -\renewenvironment{snugshade}{% -\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% -\LWR@forcenewpage -\BlockClass[background: \LWR@origpound\LWR@tempcolor]{snugframed}% +\renewenvironment{snugshade} +{% + \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% + \LWR@forcenewpage + \BlockClass[background: \LWR@origpound\LWR@tempcolor]{snugframed}% } {\endBlockClass} -\renewenvironment{snugshade*}{% -\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% -\LWR@forcenewpage -\BlockClass[background: \LWR@origpound\LWR@tempcolor]{snugframed}% +\renewenvironment{snugshade*} +{% + \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% + \LWR@forcenewpage + \BlockClass[background: \LWR@origpound\LWR@tempcolor]{snugframed}% } {\endBlockClass} @@ -72,35 +78,35 @@ \let\endoframed\endframed \RenewEnviron{titled-frame}[1]{% -\CustomFBox{#1}{}{0pt}{0pt}{0pt}{0pt}{\BODY} + \CustomFBox{#1}{}{0pt}{0pt}{0pt}{0pt}{\BODY} } \renewcommand{\CustomFBox}[7]{% -\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% -\LWR@forcenewpage -\begin{BlockClass}[border: 3px solid \LWR@origpound\LWR@tempcolor]{framed}% -\ifthenelse{\isempty{#1}}{}{% not empty - \begin{BlockClass}[background: \LWR@origpound\LWR@tempcolor]{framedtitle}% - \textcolor{TFTitleColor}{\textbf{#1}}% - \end{BlockClass} -}% not empty - -#7 - -\ifthenelse{\isempty{#2}}{}{% not empty \convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% - \begin{BlockClass}[background: \LWR@origpound\LWR@tempcolor]{framedtitle}% - \textcolor{TFTitleColor}{\textbf{#2}}% - \end{BlockClass} -}% not empty -\end{BlockClass} + \LWR@forcenewpage + \begin{BlockClass}[border: 3px solid \LWR@origpound\LWR@tempcolor]{framed}% + \ifthenelse{\isempty{#1}}{}{% not empty + \begin{BlockClass}[background: \LWR@origpound\LWR@tempcolor]{framedtitle}% + \textcolor{TFTitleColor}{\textbf{#1}}% + \end{BlockClass}% + }% not empty + + #7 + + \ifthenelse{\isempty{#2}}{}{% not empty + \convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% + \begin{BlockClass}[background: \LWR@origpound\LWR@tempcolor]{framedtitle}% + \textcolor{TFTitleColor}{\textbf{#2}}% + \end{BlockClass}% + }% not empty + \end{BlockClass}% } -\renewcommand\TitleBarFrame[3][]{ -\CustomFBox - {#2}{}% - \fboxrule\fboxrule\fboxrule\fboxrule - {#3}% +\renewcommand\TitleBarFrame[3][]{% + \CustomFBox% + {#2}{}% + \fboxrule\fboxrule\fboxrule\fboxrule% + {#3}% } \renewcommand{\TF@Title}[1]{#1} @@ -109,12 +115,12 @@ \let\endMakeFramed\relax \NewEnviron{MakeFramed}[1]{% -\FrameCommand{\begin{minipage}{\linewidth}\BODY\end{minipage}}% + \FrameCommand{\begin{minipage}{\linewidth}\BODY\end{minipage}}% } \renewcommand*{\fb@put@frame}[2]{% -\relax% -\@tempboxa% + \relax% + \@tempboxa% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index f80b6cb9502..a5be245f732 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -108,7 +108,7 @@ \define@key{igraph}{alt}{\renewcommand*{\LWR@igalt}{#1}} \define@key{igraph}{scale}{% \ifthenelse{\equal{#1}{1}}{}{% must expand #1 - \PackageWarning{lwarp}{% + \PackageNote{lwarp}{% It is recommended to use ``[width=xx\protect\linewidth]''\MessageBreak instead of ``[scale=yy]'',% }% @@ -161,11 +161,10 @@ \AtBeginDocument{ \define@key{Gin}{class}{} -\define@key{Gin}{alt}{} } \AtBeginDocument{ -\@ifpackageloaded{epstopdf} +\IfPackageLoadedTF{epstopdf} { \newcommand*{\LWR@replaceEPSSVG}{} }{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty index 7b798d8eb70..9163eb17db9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{hanging}[2009/09/02] -\@ifclassloaded{memoir}{ +\IfClassLoadedTF{memoir}{ \let\hangpara\relax \let\hangparas\relax \let\endhangparas\relax diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index e9877b4b347..a1e05c89510 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -19,7 +19,7 @@ \LWR@ProvidesPackagePass{keyfloat}[2019/09/23] -\@ifpackagelater{keyfloat}{2019/09/23}{\relax}{ +\IfPackageAtLeastTF{keyfloat}{2019/09/23}{\relax}{ \PackageError{lwarp-keyfloat} {% The keyfloat package is out of date.\MessageBreak @@ -31,7 +31,9 @@ } \AtBeginDocument{ + \providecommand*{\KFLT@LWR@hook@boxouter}{} + \renewcommand*{\KFLT@LWR@hook@boxouter}{% \ifbool{KFLT@keywrap}{% }{% @@ -44,7 +46,6 @@ \normalcolor% } \LetLtxMacro\KFLT@LWR@hook@keysubfloats\KFLT@LWR@hook@boxouter - \let\KFLT@LWR@hook@keyfloatsminipage\relax \let\endKFLT@LWR@hook@keyfloatsminipage\relax \newenvironment*{KFLT@LWR@hook@keyfloatsminipage}[1]{}{} @@ -177,7 +178,7 @@ }% text to add } -\@ifpackageloaded{tocdata} +\IfPackageLoadedTF{tocdata} {} {% tocdata not loaded diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-kpfonts-otf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-kpfonts-otf.sty index 2f62205bd10..0702a7ef430 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-kpfonts-otf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-kpfonts-otf.sty @@ -54,17 +54,49 @@ \CustomizeMathJax{\let\variiiint\iiiint} \CustomizeMathJax{\let\varidotsint\idotsint} -\CustomizeMathJax{\newcommand{\varointctrclockwise}{\mathop{\unicode{x2939}\!\!\unicode{x0222E}}}} -\CustomizeMathJax{\newcommand{\oiintclockwise}{\mathop{\unicode{x0222F}\!\!\unicode{x2938}}}} -\CustomizeMathJax{\newcommand{\oiintctrclockwise}{\mathop{\unicode{x2939}\!\!\unicode{x0222F}}}} -\CustomizeMathJax{\newcommand{\varoiintclockwise}{\mathop{\unicode{x0222F}\!\!\unicode{x2938}}}} -\CustomizeMathJax{\newcommand{\varoiintctrclockwise}{\mathop{\unicode{x2939}\!\!\unicode{x0222F}}}} -\CustomizeMathJax{\newcommand{\oiiintclockwise}{\mathop{\unicode{x02230}\!\!\unicode{x2938}}}} -\CustomizeMathJax{\newcommand{\oiiintctrclockwise}{\mathop{\unicode{x2939}\!\!\unicode{x02230}}}} -\CustomizeMathJax{\newcommand{\varoiiintclockwise}{\mathop{\unicode{x02230}\!\!\unicode{x2938}}}} -\CustomizeMathJax{\newcommand{\varoiiintctrclockwise}{\mathop{\unicode{x2939}\!\!\unicode{x02230}}}} -\CustomizeMathJax{\newcommand{\sqiint}{\mathop{\unicode{x2A16}\!\!\unicode{x2A16}}}} -\CustomizeMathJax{\newcommand{\sqiiint}{\mathop{\unicode{x2A16}\!\!\unicode{x2A16}\!\!\unicode{x2A16}}}} +\CustomizeMathJax{\newcommand{\varointctrclockwise}{% + \mathop{\unicode{x2939}\!\!\unicode{x0222E}}% +}} + +\CustomizeMathJax{\newcommand{\oiintclockwise}{% + \mathop{\unicode{x0222F}\!\!\unicode{x2938}}% +}} + +\CustomizeMathJax{\newcommand{\oiintctrclockwise}{% + \mathop{\unicode{x2939}\!\!\unicode{x0222F}}% +}} + +\CustomizeMathJax{\newcommand{\varoiintclockwise}{% + \mathop{\unicode{x0222F}\!\!\unicode{x2938}}% +}} + +\CustomizeMathJax{\newcommand{\varoiintctrclockwise}{% + \mathop{\unicode{x2939}\!\!\unicode{x0222F}}% +}} + +\CustomizeMathJax{\newcommand{\oiiintclockwise}{% + \mathop{\unicode{x02230}\!\!\unicode{x2938}}% +}} + +\CustomizeMathJax{\newcommand{\oiiintctrclockwise}{% + \mathop{\unicode{x2939}\!\!\unicode{x02230}}% +}} + +\CustomizeMathJax{\newcommand{\varoiiintclockwise}{% + \mathop{\unicode{x02230}\!\!\unicode{x2938}}% +}} + +\CustomizeMathJax{\newcommand{\varoiiintctrclockwise}{% + \mathop{\unicode{x2939}\!\!\unicode{x02230}}% +}} + +\CustomizeMathJax{\newcommand{\sqiint}{% + \mathop{\unicode{x2A16}\!\!\unicode{x2A16}}% +}} + +\CustomizeMathJax{\newcommand{\sqiiint}{% + \mathop{\unicode{x2A16}\!\!\unicode{x2A16}\!\!\unicode{x2A16}}% +}} \CustomizeMathJax{\let\widearc\overparen} \CustomizeMathJax{\let\widearcarrow\overrightarrow} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty index 3c449f854df..6ad72bee986 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lipsum.sty @@ -16,7 +16,10 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{lipsum}[2021-03-03] -\SetLipsumParListItemEnd{\LWR@closeparagraph} +\SetLipsumParListItemEnd{% + \LWR@closeparagraph% + \leavevmode\LWR@orignewline% +} \endinput %% %% End of file `lwarp-lipsum.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathalpha.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathalpha.sty index 59e534e4d84..c37d6bb3ea6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathalpha.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathalpha.sty @@ -15,13 +15,21 @@ %% 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. -\LWR@ProvidesPackagePass{mathalpha}[2019/10/05] +\LWR@ProvidesPackagePass{mathalpha}[2021/11/18] \begin{warpMathJax} +\CustomizeMathJax{\newcommand{\mathbfbb}[1]{\boldsymbol{\mathbb{#1}}}}% not bold +\CustomizeMathJax{\newcommand{\mathbfcal}[1]{\boldsymbol{\mathcal{#1}}}} +\CustomizeMathJax{\newcommand{\mathbffrak}[1]{\boldsymbol{\mathfrak{#1}}}} +\CustomizeMathJax{\newcommand{\mathbfscr}[1]{\boldsymbol{\mathscr{#1}}}}% not bold + +\IfPackageLoadedWithOptionsTF{mathalpha}{oldbold} +{ \CustomizeMathJax{\newcommand{\mathbbb}[1]{\boldsymbol{\mathbb{#1}}}}% not bold \CustomizeMathJax{\newcommand{\mathbcal}[1]{\boldsymbol{\mathcal{#1}}}} \CustomizeMathJax{\newcommand{\mathbfrak}[1]{\boldsymbol{\mathfrak{#1}}}} \CustomizeMathJax{\newcommand{\mathbscr}[1]{\boldsymbol{\mathscr{#1}}}}% not bold +}{} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathptmx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathptmx.sty index 403e04ba503..cbccd17b3c3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathptmx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathptmx.sty @@ -21,7 +21,7 @@ \begin{warpMathJax} \LWR@infoprocessingmathjax{mathptmx} -\@ifpackagewith{mathptmx}{slantedGreek} +\IfPackageLoadedWithOptionsTF{mathptmx}{slantedGreek} {\LWR@mathjax@addgreek@u@it*{}{}} {} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty index 58b9be68356..9d7059c5960 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty @@ -21,71 +21,85 @@ \LetLtxMacro\LWR@mhchem@origce\ce \newcommand{\LWR@mhchem@HTML@ce}[1]{% -\LWR@findcurrenttextcolor% sets \LWR@tempcolor -\ifbool{LWR@xfakebold}% - {\def\LWR@tempone{Y}}% - {\def\LWR@tempone{N}}% -\begin{lateximage}*[\textbackslash{}ce\{\LWR@HTMLsanitize{#1}\}]*% - [% - FM\LWR@f@family% - SR\LWR@f@series% - SH\LWR@f@shape% - SHC\LWR@f@shapecaps% - CL\LWR@tempcolor% - FB\LWR@tempone% xfakebold - ]% -\LWR@setcurrentfont% -\LWR@mhchem@origce{#1}% -\end{lateximage}% -\endgroup% -\addtocounter{LWR@mhchem@cedepth}{-1}% + \LWR@findcurrenttextcolor% sets \LWR@tempcolor + \ifbool{LWR@xfakebold}% + {\def\LWR@tempone{Y}}% + {\def\LWR@tempone{N}}% + \begin{lateximage}% + *% + [% + \textbackslash{}% + ce% + \{\LWR@HTMLsanitizedetokenized{\detokenize{#1}}\}% + ]% + *% + [% + FM\LWR@f@family% + SR\LWR@f@series% + SH\LWR@f@shape% + SHC\LWR@f@shapecaps% + CL\LWR@tempcolor% + FB\LWR@tempone% xfakebold + ]% + \LWR@setcurrentfont% + \LWR@mhchem@origce{#1}% + \end{lateximage}% + \endgroup% + \addtocounter{LWR@mhchem@cedepth}{-1}% } \newcounter{LWR@mhchem@cedepth} \setcounter{LWR@mhchem@cedepth}{0} \renewcommand{\ce}{% -\begingroup% -\ifnumequal{\value{LWR@mhchem@cedepth}}{0}{% - \catcode`\$=3% math shift -}{}% -\addtocounter{LWR@mhchem@cedepth}{1}% -\LWR@mhchem@HTML@ce% + \begingroup% + \ifnumequal{\value{LWR@mhchem@cedepth}}{0}{% + \catcode`\$=3% math shift + }{}% + \addtocounter{LWR@mhchem@cedepth}{1}% + \LWR@mhchem@HTML@ce% } \LetLtxMacro\LWR@mhchem@origcesplit\cesplit \newcommand*{\LWR@mhchem@HTML@cesplit}[2] {% -\LWR@findcurrenttextcolor% sets \LWR@tempcolor -\ifbool{LWR@xfakebold}% - {\def\LWR@tempone{Y}}% - {\def\LWR@tempone{N}}% -\begin{lateximage}*[\textbackslash{}cesplit\{\LWR@HTMLsanitize{#2}\}]*% - [% - FM\LWR@f@family% - SR\LWR@f@series% - SH\LWR@f@shape% - SHC\LWR@f@shapecaps% - CL\LWR@tempcolor% - FB\LWR@tempone% xfakebold - ]% -\LWR@setcurrentfont% -\LWR@mhchem@origcesplit{#1}{#2}% -\end{lateximage}% -\endgroup% + \LWR@findcurrenttextcolor% sets \LWR@tempcolor + \ifbool{LWR@xfakebold}% + {\def\LWR@tempone{Y}}% + {\def\LWR@tempone{N}}% + \begin{lateximage}% + *% + [% + \textbackslash{}% + cesplit% + \{\LWR@HTMLsanitizedetokenized{\detokenize{#2}}\}% + ]% + *% + [% + FM\LWR@f@family% + SR\LWR@f@series% + SH\LWR@f@shape% + SHC\LWR@f@shapecaps% + CL\LWR@tempcolor% + FB\LWR@tempone% xfakebold + ]% + \LWR@setcurrentfont% + \LWR@mhchem@origcesplit{#1}{#2}% + \end{lateximage}% + \endgroup% } \newcounter{LWR@mhchem@cesplitdepth} \setcounter{LWR@mhchem@cesplitdepth}{0} \renewcommand{\cesplit}{% -\begingroup% -\ifnumequal{\value{LWR@mhchem@cesplitdepth}}{0}{% - \catcode`\$=3% math shift -}{}% -\addtocounter{LWR@mhchem@cesplitdepth}{1}% -\LWR@mhchem@HTML@cesplit% + \begingroup% + \ifnumequal{\value{LWR@mhchem@cesplitdepth}}{0}{% + \catcode`\$=3% math shift + }{}% + \addtocounter{LWR@mhchem@cesplitdepth}{1}% + \LWR@mhchem@HTML@cesplit% } \appto\LWR@restoreorigformatting{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty index 4d8c642c94b..77111cd48d3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty @@ -37,7 +37,7 @@ \DeclareDocumentCommand{\microtypesetup}{m}{} \DeclareDocumentCommand{\microtypecontext}{m}{} \DeclareDocumentCommand{\textmicrotypecontext}{m m}{#2} -\@ifpackageloaded{letterspace}{\let\MT@textls\relax}{% +\IfPackageLoadedTF{letterspace}{\let\MT@textls\relax}{% \DeclareDocumentCommand{\lsstyle}{}{} \DeclareDocumentCommand{\textls}{o +m}{} \DeclareDocumentCommand{\lslig}{m}{#1} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty index 00cb4b0881f..ae65fed6d4c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty @@ -15,7 +15,7 @@ %% 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. -\LWR@ProvidesPackagePass{minted}[2017/07/19] +\LWR@ProvidesPackagePass{minted}[2021/12/24] \xpatchcmd{\minted} {\setkeys{minted@opt@cmd}{#1}} {% @@ -57,6 +57,15 @@ } {} {\LWR@patcherror{minted}{inputminted}} + +\renewenvironment{minted@snugshade*}[1]% +{% + \colorlet{shadecolor}{#1}% + \begin{snugshade*}% +} +{% + \end{snugshade*}% +} \endinput %% %% End of file `lwarp-minted.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index 45963f2ddbe..956db127e34 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -18,46 +18,49 @@ \LetLtxMacro\multirow\relax -\LWR@ProvidesPackagePass{multirow}[2021/01/29] +\LWR@ProvidesPackagePass{multirow}[2021/03/15] \newcommand{\LWR@multirowborder}{} -\newcommand*{\LWR@multirow@par}{\LWR@htmltag{br /}\LWR@origpar}% +\newcommand*{\LWR@multirow@par}{% + \LWR@htmltag{br /}% +}% \NewDocumentCommand{\LWR@HTML@multirow}{O{c} m o m o +m}% {% -\LWR@traceinfo{*** LWR@HTML@multirow #1 #2 #4}% -\booltrue{LWR@usedmultirow}% -\LWR@maybenewtablerow% -\LWR@tabularleftedge% -\LWR@htmltag{td rowspan=\textquotedbl#2\textquotedbl\ % -class=\textquotedbl{}td% -\LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% -\LWR@addcmidruletrim% -\LWR@addleftmostbartag% -\LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% -\textquotedbl% -\LWR@tdstartstyles% -\ifstrequal{#1}{c}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:middle}}{}% -\ifstrequal{#1}{b}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:bottom}}{}% -\ifstrequal{#1}{t}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:top}}{}% -\ifdefvoid{\LWR@multirowborder}{}{% - \LWR@tdaddstyle% - \LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % - \LWR@print@mbox{padding-\LWR@multirowborder:} 2px% -}% -\LWR@addcmidrulewidth% -\LWR@addcdashline% -\LWR@addtabularrulecolors% -\LWR@tdendstyles% -}% -\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% -\begingroup% - \LetLtxMacro{\\}{\LWR@endofline}% - \let\par\LWR@multirow@par% - #6% -\endgroup% -\LWR@stoppars% -\boolfalse{LWR@intabularmetadata}% -\renewcommand{\LWR@multirowborder}{}% -\LWR@traceinfo{*** LWR@HTML@multirow done}% + \LWR@traceinfo{LWR@HTML@multirow #1 #2 #4}% + \booltrue{LWR@usedmultirow}% + \LWR@maybenewtablerow% + \LWR@tabularleftedge% + \LWR@htmltag{% + td rowspan=\textquotedbl#2\textquotedbl\ % + class=\textquotedbl{}td% + \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% + \LWR@addcmidruletrim% + \LWR@addleftmostbartag% + \LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% + \textquotedbl% + \LWR@tdstartstyles% + \ifstrequal{#1}{c}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:middle}}{}% + \ifstrequal{#1}{b}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:bottom}}{}% + \ifstrequal{#1}{t}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:top}}{}% + \ifdefvoid{\LWR@multirowborder}{}{% + \LWR@tdaddstyle% + \LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % + \LWR@print@mbox{padding-\LWR@multirowborder:} 2px% + }% + \LWR@addcmidrulewidth% + \LWR@addcdashline% + \LWR@addtabularrulecolors% + \LWR@tdendstyles% + }% + \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% + \begingroup% + \LetLtxMacro{\\}{\LWR@endofline}% + \booltrue{LWR@in@multirow@par}% + #6% + \endgroup% + \LWR@stoppars% + \boolfalse{LWR@intabularmetadata}% + \renewcommand{\LWR@multirowborder}{}% + \LWR@traceinfo{LWR@HTML@multirow done}% }% \LWR@formatted{multirow} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty index 3dd306947d6..09a86224e80 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty @@ -16,6 +16,10 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{nccfoots}[2005/02/03] +\apptocmd{\LWR@nullifyfootnotes}{% + \renewcommand*{\Footnote}[1]{}% + \renewcommand*{\Footnotemark}[1]{}% +}{}{} \begin{warpMathJax} \CustomizeMathJax{\newcommand{\Footnotemark}[1]{{}^{\mathrm{#1}}}} \CustomizeMathJax{\newcommand{\Footnote}[2]{\Footnotemark{#1}}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 7febe5f1619..b85daa39599 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -50,7 +50,7 @@ \LWR@ProvidesPackagePass{ntheorem}[2011/08/15] \newcommand{\LWR@newtheoremstyle}{plain} \AtBeginDocument{ -\@ifpackageloaded{cleveref}{ +\IfPackageLoadedTF{cleveref}{ \gdef\@thm#1#2#3{% \if@thmmarks \stepcounter{end\InTheoType ctr}% @@ -198,7 +198,7 @@ \LWR@htmltag{% a id=\textquotedbl\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}\textquotedbl% }% -\LWR@htmltag{/a}% +\LWR@htmltag{/a}\LWR@orignewline% \LWR@startpars% } \gdef\newtheoremstyle#1#2#3{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty index 02bf57768d4..0712c18e14f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty @@ -35,29 +35,59 @@ } \def\PN@parnotes@real{% +\ifPN@inparnotes +\else + \LWR@stoppars% + \addtocounter{LWR@spandepth}{1}% % We call \par later, so this avoids recursion with \PN@parnotes@auto \PN@inparnotestrue - \unless\ifvmode\par\fi % Avoid page breaks between a paragraph and its parnotes - \nopagebreak\addvspace{\parnotevskip}% - \LWR@forcenewpage% lwarp \begin{BlockClass}(note){footnotes}% lwarp - {\parnotefmt{\PN@text}\par}% + \leavevmode\LWR@orignewline% + {% + \parnotefmt{\PN@text}% + }% + \leavevmode\LWR@orignewline% \end{BlockClass}% lwarp + \leavevmode\LWR@orignewline% \global\def\PN@text{}% - \addvspace{\parnotevskip}% % % These can be enabled or disabled by package options % \PN@disable@indent \PN@reset@optional \PN@inparnotesfalse + \addtocounter{LWR@spandepth}{-1}% +\fi } +\newbool{LWR@parnotes@doingauto} +\boolfalse{LWR@parnotes@doingauto} + +\def\PN@parnotes@auto{% + \ifbool{LWR@parnotes@doingauto}{ + \ifx\@currenvir\@PN@autopn + \unless\ifPN@inparnotes + \unless\ifx\PN@text\@empty + \expandafter\PN@parnotes@real + \fi + \fi + \fi + }{}% +} +\renewenvironment{autopn}% + {\booltrue{LWR@parnotes@doingauto}} + {\PN@parnotes@auto}% \AtBeginDocument{ - \crefname{parnotemark}{paragraph note}{paragraph notes} - \Crefname{parnotemark}{Paragraph note}{Paragraph notes} + \ifdef{\crefname}{ + \crefname{parnotemark}{paragraph note}{paragraph notes} + \Crefname{parnotemark}{Paragraph note}{Paragraph notes} + }{} } +\apptocmd{\LWR@nullifyfootnotes}{% + \renewcommand{\parnote}[2][]{}% + \renewcommand\parnotemark[1]{}% +}{}{} \begin{warpMathJax} \providecommand{\parnotename}{parnote} \appto\LWR@syncnotenumbers{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty index b58cfa49057..57796c34341 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{pdftricks}[2003/08/10] \def\PDFTfigname{\BaseJobname-fig\thepsfig} -\PackageWarning{lwarp-pdftricks}{ +\PackageWarning{lwarp-pdftricks}{% When the pdftricks images change, remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty index 4ec05659310..b13a1c35c6f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{physics}% No date is provided by the package. \begin{warpMathJax} -\PackageWarningNoLine{lwarp, physics}{The MathJax v3 extension will be used} +\PackageNoteNoLine{lwarp, physics}{The MathJax v3 extension will be used} \CustomizeMathJax{\require{physics}} \end{warpMathJax} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showlabels.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showlabels.sty new file mode 100644 index 00000000000..af4ac783ac9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showlabels.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-showlabels.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `showlabels') +%% This is a generated file. +%% Copyright 2016-2020 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% 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. +\LWR@ProvidesPackageDrop{showlabels}[2021/10/27] +\providecommand{\showlabelfont}{} +\providecommand{\showlabelsetlabel}[1]{} +\newcommand*{\showlabels}[2][]{} +\newcommand*{\showlabelrefline}{} +\newcommand*{\showlabelsinline}{} +\endinput +%% +%% End of file `lwarp-showlabels.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty index f7ac9e0342a..edcbd9e259d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty @@ -42,7 +42,7 @@ { \__siunitx_ensure_ltr:n { - \begingroup% lwarp + \color@begingroup \__siunitx_print_color: \__siunitx_font_shape: \__siunitx_font_weight: @@ -61,7 +61,7 @@ }% lwarp }% lwarp } - \endgroup% lwarp + \color@endgroup } } } @@ -95,16 +95,19 @@ } { \__siunitx_unit_output_pre_print: - \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + \begingroup% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( % space + \LWR@HTMLsanitizedetokenized{% + \detokenize{#1}% + } \textbackslash)% lwarp }{siunitx}{% \__siunitx_print:nn { number } {% \LWR@origensuredmath{#1}% }% - }% lwarp - \endgroup% lwarp + }% lwarp + \endgroup% lwarp \__siunitx_unit_output_print: } \group_end:% lwarp @@ -123,15 +126,18 @@ { \__siunitx_unit_output_pre_print: \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( % space + \LWR@HTMLsanitizedetokenized{% + \detokenize{#1}% + } \textbackslash)% lwarp }{siunitx}{% \__siunitx_print:nn { number } {% \LWR@origensuredmath{#1}% - } % lwarp - }% lwarp - \endgroup% lwarp + } % lwarp + }% lwarp + \endgroup% lwarp \__siunitx_unit_output_print: } } @@ -139,16 +145,19 @@ \tl_if_empty:nF {#1} { \tl_set:Nn \l__siunitx_unit_tl {#2} - \begingroup% lwarp - \boolfalse{mathjax}% lwarp - \LWR@subsingledollar{% lwarp - \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + \begingroup% lwarp + \boolfalse{mathjax}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( % space + \LWR@HTMLsanitizedetokenized{% + \detokenize{#1}% + } \textbackslash)% lwarp }{siunitx}{% \__siunitx_print:nn { number } { \LWR@origensuredmath{#1}% - }% lwarp - }% lwarp - \endgroup% lwarp + }% lwarp + }% lwarp + \endgroup% lwarp \__siunitx_unit_output_print: } } @@ -285,47 +294,39 @@ \ifblank{#3}{}{\num{#3}^{\unicode{x2033}}}% \dblprime }} \CustomizeMathJax{\newcommand{\ang}[2][]{\LWRsiunitxang#2;;;\LWRsiunitxEND}} -\CustomizeMathJax{\newcommand{\LWRsiunitxnumscientific}[2]{% - \ifblank{#1}% - {}% - {% - \ifstrequal{#1}{-}% - {-}% - {\LWRsiunitxprintdecimal{#1}\times}% - }% - 10^{\LWRsiunitxprintdecimal{#2}} -}} \ExplSyntaxOn \AtBeginDocument{ \ifdefstring{\l__siunitx_output_decimal_tl}{{,}} - {% Use decimal comma - \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1.#2.#3\LWRsiunitxEND{% - \mathrm{#1}% - \ifblank{#2} - {}% - {,\mathrm{#2}} - }} - - \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% - \LWRsiunitxprintdecimalsub#1...\LWRsiunitxEND% - }} - } - {% Use decimal point - \CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1,#2,#3\LWRsiunitxEND{% - \mathrm{#1}% - \ifblank{#2} - {}% - {.\mathrm{#2}} - }} - - \CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% - \LWRsiunitxprintdecimalsub#1,,,\LWRsiunitxEND% - }} - } + {\CustomizeMathJax{\def\LWRsiunitxdecimal{,}}} + {\CustomizeMathJax{\def\LWRsiunitxdecimal{.}}} } \ExplSyntaxOff +\CustomizeMathJax{\newcommand{\LWRsiunitxENDTWO}{}} + +\CustomizeMathJax{\def\LWRsiunitxprintdecimalsubtwo#1,#2,#3\LWRsiunitxENDTWO{% + \ifblank{#1}{0}{\mathrm{#1}}% + \ifblank{#2}% + {}% + {% + {\LWRsiunitxdecimal}% + \mathrm{#2}% + }% +}} +\CustomizeMathJax{\def\LWRsiunitxprintdecimalsub#1.#2.#3\LWRsiunitxEND{% + \LWRsiunitxprintdecimalsubtwo#1,,\LWRsiunitxENDTWO% + \ifblank{#2}% + {}% + {% + {\LWRsiunitxdecimal}% + \LWRsiunitxprintdecimalsubtwo#2,,\LWRsiunitxENDTWO% + }% +}} + +\CustomizeMathJax{\newcommand{\LWRsiunitxprintdecimal}[1]{% + \LWRsiunitxprintdecimalsub#1...\LWRsiunitxEND% +}} \CustomizeMathJax{\def\LWRsiunitxnumplus#1+#2+#3\LWRsiunitxEND{% - \ifblank{#2} + \ifblank{#2}% {\LWRsiunitxprintdecimal{#1}}% no plus {% \ifblank{#1}% @@ -337,17 +338,15 @@ }% }% }} - \CustomizeMathJax{\def\LWRsiunitxnumminus#1-#2-#3\LWRsiunitxEND{% - \ifblank{#2} + \ifblank{#2}% {\LWRsiunitxnumplus#1+++\LWRsiunitxEND}% {% - \LWRsiunitxprintdecimal{#1}% + \ifblank{#1}{}{\LWRsiunitxprintdecimal{#1}}% \unicode{x02212}% mathematical minus sign \LWRsiunitxprintdecimal{#2}% }% }} - \CustomizeMathJax{\def\LWRsiunitxnumpm#1+-#2+-#3\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumminus#1---\LWRsiunitxEND}% @@ -357,7 +356,6 @@ \LWRsiunitxprintdecimal{#2}% }% }} - \CustomizeMathJax{\def\LWRsiunitxnumx#1x#2x#3x#4\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumpm#1+-+-\LWRsiunitxEND}% @@ -377,38 +375,37 @@ }% }% }} - +\CustomizeMathJax{\newcommand{\LWRsiunitxnumscientific}[2]{% + \ifblank{#1}% + {}% + {% + \ifstrequal{#1}{-}% + {-}% + {\LWRsiunitxprintdecimal{#1}\times}% + }% + 10^{\LWRsiunitxprintdecimal{#2}} +}} \CustomizeMathJax{\def\LWRsiunitxnumD#1D#2D#3\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumx#1xxxxx\LWRsiunitxEND}% {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% }} - \CustomizeMathJax{\def\LWRsiunitxnumd#1d#2d#3\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumD#1DDD\LWRsiunitxEND}% {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% }} - \CustomizeMathJax{\def\LWRsiunitxnumE#1E#2E#3\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumd#1ddd\LWRsiunitxEND}% {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% }} - \CustomizeMathJax{\def\LWRsiunitxnume#1e#2e#3\LWRsiunitxEND{% \ifblank{#2}% {\LWRsiunitxnumE#1EEE\LWRsiunitxEND}% {\mathrm{\LWRsiunitxnumscientific{#1}{#2}}}% }} - -\CustomizeMathJax{\def\LWRsiunitxnumcomma#1,#2,#3\LWRsiunitxEND{% - \ifblank{#2} - {\LWRsiunitxnume#1eee\LWRsiunitxEND} - {\LWRsiunitxnume#1.#2eee\LWRsiunitxEND} -}} - -\CustomizeMathJax{\newcommand{\num}[2][]{\LWRsiunitxnumcomma#2,,,\LWRsiunitxEND}} +\CustomizeMathJax{\newcommand{\num}[2][]{\LWRsiunitxnume#2eee\LWRsiunitxEND}} \CustomizeMathJax{\newcommand{\si}[2][]{\mathrm{#2}}} \CustomizeMathJax{\def\LWRsiunitxSIopt#1[#2]#3{% {#2}\num{#1}{#3}% @@ -422,9 +419,9 @@ {\LWRsiunitxSIopt{#2}}% {\LWRsiunitxSI{#2}}% }} -\CustomizeMathJax{\newcommand{\numlist}[2][]{\mathrm{#2}}} +\CustomizeMathJax{\newcommand{\numlist}[2][]{\text{#2}}} \CustomizeMathJax{\newcommand{\numrange}[3][]{\num{#2}\,\unicode{x2013}\,\num{#3}}} -\CustomizeMathJax{\newcommand{\SIlist}[3][]{\mathrm{#2\,#3}}} +\CustomizeMathJax{\newcommand{\SIlist}[3][]{\text{#2}\,#3}} \CustomizeMathJax{\newcommand{\SIrange}[4][]{\num{#2}\,#4\,\unicode{x2013}\,\num{#3}\,#4}} \CustomizeMathJax{\newcommand{\tablenum}[2][]{\mathrm{#2}}} \CustomizeMathJax{\newcommand{\ampere}{\mathrm{A}}} @@ -516,7 +513,7 @@ \CustomizeMathJax{\newcommand{\square}[1]{\mathrm{#1}^2}} \CustomizeMathJax{\newcommand{\cubed}{^3}} \CustomizeMathJax{\newcommand{\cubic}[1]{\mathrm{#1}^3}} -\CustomizeMathJax{\newcommand{\per}{/}} +\CustomizeMathJax{\newcommand{\per}{\,\mathrm{/}}} \CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}} \CustomizeMathJax{\newcommand{\fg}{\femto\gram}} \CustomizeMathJax{\newcommand{\pg}{\pico\gram}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty index 2a66e72c96f..aa5a7976dcb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thm-listof.sty @@ -16,7 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{thm-listof}[2019/12/22] -\@ifpackagelater{thm-listof}{2020/08/01}{% v0.72 +\IfPackageAtLeastTF{thm-listof}{2020/08/01}{% v0.72 \def\thmtlo@newentry{% \csdef{l@\thmt@envname}##1##2{\hypertocfloat{1}{figure}{lof}{##1}{##2}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index a859df3535e..5a3744689fe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -21,7 +21,7 @@ \newbool{LWR@tikzbabel} -\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 +\IfPackageAtLeastTF{tikz}{2013/12/20}% Test for Tikz version v3.0.0 {\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} {\boolfalse{LWR@tikzbabel}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 18b9724d20c..60d53a2df03 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -111,7 +111,7 @@ \renewcommand{\thanksmarkseries}[1]{% \def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}% } -\@ifclassloaded{memoir}{ +\IfClassLoadedTF{memoir}{ \thanksmarkseries{arabic} }{% not memoir \if@titlepage diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty index 6dcc3520d29..b7a2c92aad5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty @@ -35,7 +35,6 @@ ] \@nameuse{@done\the\c@todo}: {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2% } - \xpatchcmd{\@displaytodo} {\todoformat #1}{\todoformat \textbf{#1}}{} {\PackageWarning{lwarp-todo}{Unable to patch @displaytodo.}} @@ -49,10 +48,11 @@ \patchcmd{\astodos}{\todoformat #1}{\todoformat \textbf{#1}}{} {\PackageWarning{lwarp-todo}{Unable to patch astodos.}} - \AtBeginDocument{ +\ifdef{\crefname}{ \crefname{todo}{todo}{todos} \Crefname{todo}{Todo}{Todos} +}{} } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty index eb48f578a75..fde92cdc296 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty @@ -80,8 +80,8 @@ \BlockClass[\LWR@vwcolstyle]{multicols} } { -\endBlockClass -\LWR@startpars + \endBlockClass + \LWR@startpars } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index e4213c168d6..7ace689afff 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -21,10 +21,10 @@ \LWR@ProvidesPackageDrop{wrapfig}[2003/01/31] \newcommand*{\LWR@wrapposition}{} -\newcommand{\LWR@wrapfig@printHTMLwidth}{width:\LWR@printlength{\LWR@templengthone}} +\newcommand{\LWR@wrapfig@printHTMLwidth}{\LWR@printlength{\LWR@templengthone}} \AtBeginDocument{ - \@ifpackageloaded{keyfloat}{ + \IfPackageLoadedTF{keyfloat}{ \renewcommand{\LWR@wrapfig@printHTMLwidth}{% \ifboolexpr{ test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}} or diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig2.sty new file mode 100644 index 00000000000..4a1f1f193d7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig2.sty @@ -0,0 +1,57 @@ +%% +%% This is file `lwarp-wrapfig2.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `wrapfig2') +%% This is a generated file. +%% Copyright 2016-2020 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% 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. + + + +\LWR@ProvidesPackageDrop{wrapfig2}[2021-12-21] + +\LWR@origRequirePackage{lwarp-wrapfig} +\RenewDocumentEnvironment{wrapfigure}{o m o G{0pt} s}% original + {\wrapfloat{figure}[#1]{#2}[#3]{#4}}% + {\endwrapfloat} + +\RenewDocumentEnvironment{wraptable}{o m o G{0pt} s}% original + {\wrapfloat{table}[#1]{#2}[#3]{#4}}% + {\endwrapfloat} + +\RenewDocumentEnvironment{wrapfloat}{m o m o G{0pt}}% lwarp +{% + \begin{LWR@setvirtualpage}*% + \LWR@subwrapfigure{#3}{#5}% + \renewcommand*{\@captype}{#1}% +} +{% + \endLWR@BlockClassWP% + \end{LWR@setvirtualpage}% +} + +\NewDocumentEnvironment{wraptext}% + {O{l} D||{0.5\columnwidth} D<>{0} D(){figure}}% +{% + \wrapfloat{#4}[]{#1}[]{#2}% + \tcolorbox% +} +{% + \endtcolorbox% + \endwrapfloat% + \ignorespaces% +} + +\endinput +%% +%% End of file `lwarp-wrapfig2.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 83dd68dfd44..0cf6d141cdd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -19,80 +19,82 @@ \LWR@ProvidesPackagePass{xcolor}[2016/05/11] +\let\color@endgroup\endgroup + \LetLtxMacro\LWR@print@pagecolor\pagecolor \LetLtxMacro\LWR@print@nopagecolor\nopagecolor \appto\LWR@restoreorigformatting{% -\LetLtxMacro\pagecolor\LWR@print@pagecolor% -\LetLtxMacro\nopagecolor\LWR@print@nopagecolor% + \LetLtxMacro\pagecolor\LWR@print@pagecolor% + \LetLtxMacro\nopagecolor\LWR@print@nopagecolor% } \DeclareRobustCommand{\LWR@HTML@normalcolor}{\color{black}}% \LWR@formatted{normalcolor} \renewcommand*{\LWR@findcurrenttextcolor}{% -\LWR@traceinfo{LWR@findcurrenttextcolor}% -\protect\colorlet{LWR@current@color}{.}% -\LWR@traceinfo{LWR@findcurrenttextcolor B}% -\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% -\LWR@traceinfo{LWR@findcurrenttextcolor: done}% + \LWR@traceinfo{LWR@findcurrenttextcolor}% + \protect\colorlet{LWR@current@color}{.}% + \LWR@traceinfo{LWR@findcurrenttextcolor B}% + \protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% + \LWR@traceinfo{LWR@findcurrenttextcolor: done}% } \newcommand*{\LWR@currenttextcolorstyle}{% -\LWR@findcurrenttextcolor% -\ifdefstring{\LWR@tempcolor}{000000}% -{}% -{color: \LWR@origpound\LWR@tempcolor ; }% + \LWR@findcurrenttextcolor% + \ifdefstring{\LWR@tempcolor}{000000}% + {}% + {color: \LWR@origpound\LWR@tempcolor ; }% } \DeclareDocumentCommand{\LWR@textcurrentcolor}{m}{% -\begingroup% -\LWR@hook@processingtags% -\LWR@findcurrenttextcolor% -\InlineClass[color:\LWR@origpound\LWR@tempcolor]{textcolor}{% - \renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% - #1% -}% -\endgroup% + \begingroup% + \LWR@hook@processingtags% + \LWR@findcurrenttextcolor% + \InlineClass[color:\LWR@origpound\LWR@tempcolor]{textcolor}{% + \renewcommand*{\LWR@currenttextcolor}{\LWR@origpound\LWR@tempcolor}% + #1% + }% + \endgroup% } \NewDocumentCommand{\LWR@colorstyle}{m m}{% -\begingroup% -\LWR@hook@processingtags% -\convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% -\LWR@origpound\LWR@tempcolor% -\endgroup% + \begingroup% + \LWR@hook@processingtags% + \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% + \LWR@origpound\LWR@tempcolor% + \endgroup% } \NewDocumentCommand{\LWR@backgroundcolor}{O{named} m m}{% -\begingroup% -\LWR@hook@processingtags% -\InlineClass[background:\LWR@colorstyle{#1}{#2}]{backgroundcolor}{% -#3% -}% -\endgroup% + \begingroup% + \LWR@hook@processingtags% + \InlineClass[background:\LWR@colorstyle{#1}{#2}]{backgroundcolor}{% + #3% + }% + \endgroup% } \newcommand*{\LWR@borderpadding}[2]{% -border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % -padding:\LWR@printlength{\fboxsep}% + border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % + padding:\LWR@printlength{\fboxsep}% } \NewDocumentCommand{\LWR@HTML@color}{o m}{% -\IfValueTF{#1}{% - \LWR@print@color[#1]{#2}% - \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% -}{% - \LWR@print@color{#2}% - \convertcolorspec{named}{#2}{HTML}\LWR@tempcolor% -}% -\edef\LWR@currenttextcolor{\LWR@origpound\LWR@tempcolor}% + \IfValueTF{#1}{% + \LWR@print@color[#1]{#2}% + \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% + }{% + \LWR@print@color{#2}% + \convertcolorspec{named}{#2}{HTML}\LWR@tempcolor% + }% + \edef\LWR@currenttextcolor{\LWR@origpound\LWR@tempcolor}% } \LWR@formatted{color} \NewDocumentCommand{\LWR@HTML@textcolor}{o m m}{% -\begingroup% -\LWR@hook@processingtags% -\IfValueTF{#1}{% - \color[#1]{#2}% -}{% - \color{#2}% -}% -\InlineClass[color:\LWR@currenttextcolor]{textcolor}{#3}% -\endgroup% + \begingroup% + \LWR@hook@processingtags% + \IfValueTF{#1}{% + \color[#1]{#2}% + }{% + \color{#2}% + }% + \InlineClass[color:\LWR@currenttextcolor]{textcolor}{#3}% + \endgroup% }% \LWR@formatted{textcolor} @@ -102,128 +104,131 @@ padding:\LWR@printlength{\fboxsep}% \renewcommand*{\nopagecolor}{} \NewDocumentCommand{\LWR@HTML@colorbox}{O{named} m +m}{% -\begingroup% -\LWR@hook@processingtags% -\InlineClass[% -background:\LWR@colorstyle{#1}{#2} ; % -padding:\LWR@printlength{\fboxsep}% -]{colorbox}{#3}% -\endgroup% + \begingroup% + \LWR@hook@processingtags% + \InlineClass[% + background:\LWR@colorstyle{#1}{#2} ; % + padding:\LWR@printlength{\fboxsep}% + ]{colorbox}{#3}% + \endgroup% } \NewDocumentCommand{\LWR@HTML@colorboxBlock}{O{named} m +m}{% -\begingroup% -\LWR@hook@processingtags% -\LWR@stoppars% -\begin{BlockClass}[% -background:\LWR@colorstyle{#1}{#2} ; % -padding:\LWR@printlength{\fboxsep}% -]{colorboxBlock} -#3 -\end{BlockClass}% -\endgroup% -\global\booltrue{LWR@minipagethispar}% + \begingroup% + \LWR@hook@processingtags% + \LWR@stoppars% + \begin{BlockClass}[% + background:\LWR@colorstyle{#1}{#2} ; % + padding:\LWR@printlength{\fboxsep}% + ]{colorboxBlock} + #3 + \end{BlockClass}% + \endgroup% + \global\booltrue{LWR@minipagethispar}% } \NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{#1} m +m}{% -\LWR@traceinfo{HTML fcolorbox #2 #4}% -\begingroup% -\LWR@hook@processingtags% -\LWR@forceminwidth{\fboxrule}% -\ifthenelse{\equal{#4}{none}}% - {% no background color - \InlineClass[% - \LWR@borderpadding{#1}{#2}% - ]{fcolorbox}{#5}% - }% - {% yes background color - \InlineClass[% - \LWR@borderpadding{#1}{#2} ; % - background:\LWR@colorstyle{#3}{#4}% - ]{fcolorbox}{#5}% - }% -\endgroup% + \LWR@traceinfo{HTML fcolorbox #2 #4}% + \begingroup% + \LWR@hook@processingtags% + \LWR@forceminwidth{\fboxrule}% + \ifthenelse{\equal{#4}{none}}% + {% no background color + \InlineClass[% + \LWR@borderpadding{#1}{#2}% + ]{fcolorbox}{#5}% + }% + {% yes background color + \InlineClass[% + \LWR@borderpadding{#1}{#2} ; % + background:\LWR@colorstyle{#3}{#4}% + ]{fcolorbox}{#5}% + }% + \endgroup% } \NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{#1} m +m}{% -\LWR@traceinfo{HTML fcolorboxBlock #2 #4}% -\begingroup% -\LWR@hook@processingtags% -\LWR@forceminwidth{\fboxrule}% -\LWR@stoppars% -\ifthenelse{\equal{#4}{none}}% - {% no background color - \begin{BlockClass}[% - \LWR@borderpadding{#1}{#2}% - ]{fcolorboxBlock} - #5 - \end{BlockClass}% - }% - {% yes background color - \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% - \begin{BlockClass}[% - background:\LWR@origpound\LWR@tempcolortwo\ ; % - \LWR@borderpadding{#1}{#2}% - ]{fcolorboxBlock} - #5 - \end{BlockClass}% - }% -\endgroup% -\global\booltrue{LWR@minipagethispar}% -\LWR@traceinfo{HTML fcolorboxBlock done}% + \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% + \begingroup% + \LWR@hook@processingtags% + \LWR@forceminwidth{\fboxrule}% + \LWR@stoppars% + \ifthenelse{\equal{#4}{none}}% + {% no background color + \begin{BlockClass}[% + \LWR@borderpadding{#1}{#2}% + ]{fcolorboxBlock} + #5 + \end{BlockClass}% + }% + {% yes background color + \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% + \begin{BlockClass}[% + background:\LWR@origpound\LWR@tempcolortwo\ ; % + \LWR@borderpadding{#1}{#2}% + ]{fcolorboxBlock} + #5 + \end{BlockClass}% + }% + \endgroup% + \global\booltrue{LWR@minipagethispar}% + \LWR@traceinfo{HTML fcolorboxBlock done}% } \NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{% -\LWR@stoppars% -\begin{BlockClass}[% -#3% -\LWR@borderpadding{#1}{#2} ; % -\IfValueT{#4}{height:\LWR@printlength{\LWR@tempheight} ; }% -width:\LWR@printlength{\LWR@tempwidth}% -]{fcolorminipage}% + \LWR@stoppars% + \begin{BlockClass}[% + #3% + \LWR@borderpadding{#1}{#2} ; % + \IfValueT{#4}{height:\LWR@printlength{\LWR@tempheight} ; }% + width:\LWR@printlength{\LWR@tempwidth}% + ]{fcolorminipage}% } \NewDocumentEnvironment{LWR@HTML@fcolorminipage}{O{named} m O{#1} m O{c} o o m} {% -\LWR@hook@processingtags% -\setlength{\LWR@tempwidth}{#8}% -\IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% -\LWR@forceminwidth{\fboxrule}% -\convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% -\ifthenelse{\equal{#4}{none}}% - {\LWR@subfcolorminipage{#1}{#2}{}{#6}}% - {% - \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% - \LWR@subfcolorminipage{#1}{#2}% - {background:\LWR@origpound\LWR@tempcolortwo\ ; }% - {#6}% - }% + \LWR@hook@processingtags% + \setlength{\LWR@tempwidth}{#8}% + \IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% + \LWR@forceminwidth{\fboxrule}% + \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% + \ifthenelse{\equal{#4}{none}}% + {\LWR@subfcolorminipage{#1}{#2}{}{#6}}% + {% + \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% + \LWR@subfcolorminipage{#1}{#2}% + {background:\LWR@origpound\LWR@tempcolortwo\ ; }% + {#6}% + }% }% {% \end{BlockClass}% \global\booltrue{LWR@minipagethispar}% } \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{} ; % -width:\LWR@printlength{\LWR@tempwidth} ; % -height:\LWR@printlength{\LWR@tempheight}% -]{boxframe}{}% -}% + {% + \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} % space + solid % space + \LWR@currenttextcolor{} ; % space + width:\LWR@printlength{\LWR@tempwidth} ; % + height:\LWR@printlength{\LWR@tempheight}% + ]{boxframe}{}% + }% } \LWR@formatted{boxframe} \newcommand*{\LWR@xcolortempcolor}{} \def\rowc@l@rs[#1]#2#3#4% -{ -\rownum=1% +{% + \rownum=1% \@rowcolorstrue% \@ifxempty{#3}% {\def\@oddrowcolor{\@norowcolor}}% @@ -264,7 +269,7 @@ height:\LWR@printlength{\LWR@tempheight}% \ignorespaces% } \def\@norowcolor{% -\renewcommand{\LWR@xcolorrowHTMLcolor}{}% + \renewcommand{\LWR@xcolorrowHTMLcolor}{}% } \def\@rowc@lors{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index b04b62b8cba..66aaf534644 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/10/01 v0.902 Allows LaTeX to directly produce HTML5 output.] + [2022/02/01 v0.903 Allows LaTeX to directly produce HTML5 output.] @@ -43,12 +43,13 @@ \fi \fi \RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc. +\long\def\etb@carsquare#1#2#3\@nil{#1#2} \RequirePackage{xpatch} \RequirePackage{ifplatform}% sense op-system platform \RequirePackage{letltxmacro} \newcommand*{\LWR@loadafter}[1]{% -\@ifpackageloaded{#1} +\IfPackageLoadedTF{#1} { \PackageError{lwarp} {% @@ -67,26 +68,26 @@ {\relax} } -\@ifclassloaded{memoir} +\IfClassLoadedTF{memoir} {\newcommand*{\LWR@notmemoirloadafter}[1]{}} {\LetLtxMacro\LWR@notmemoirloadafter\LWR@loadafter} \LetLtxMacro\LWR@notltjloadafter\LWR@loadafter -\@ifclassloaded{ltjarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjsarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjsbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjsreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjspf}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjskiyou}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjtarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjtbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} -\@ifclassloaded{ltjtreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjsarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjsbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjsreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjspf}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjskiyou}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjtarticle}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjtbook}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} +\IfClassLoadedTF{ltjtreport}{\renewcommand*{\LWR@notltjloadafter}[1]{}}{} \newcommand*{\LWR@loadbefore}[1]{% -\@ifpackageloaded{#1} +\IfPackageLoadedTF{#1} {\relax} { \PackageError{lwarp} @@ -131,12 +132,12 @@ }{}% } \newcommand*{\LWR@earlyloadnever}[2]{% - \@ifpackageloaded{#1}{% + \IfPackageLoadedTF{#1}{% \LWR@loadnever{#1}{#2}% }{}% } \newcommand*{\LWR@earlyclassloadnever}[2]{% -\@ifclassloaded{#1}{% +\IfClassLoadedTF{#1}{% \PackageError{lwarp} {% Class #1 is not supported\MessageBreak @@ -177,7 +178,7 @@ \LWR@checkloadnever{libgreek}{libertinust1math, newtx} \LWR@checkloadnever{newthm}{ntheorem} \LWR@checkloadnever{pdfcprot}{microtype} -\LWR@checkloadnever{picins}{floatflt, wrapfig} +\LWR@checkloadnever{picins}{floatflt, wrapfig, wrapfig2} \LWR@checkloadnever{rplain}{fancyhdr} \LWR@checkloadnever{si}{siunitx} \LWR@checkloadnever{sistyle}{siunitx} @@ -193,7 +194,7 @@ \LWR@checkloadnever{arraycols}{} \LWR@checkloadnever{bidi}{} \LWR@checkloadnever{cals}{} -\LWR@checkloadnever{cellspace}{} +\LWR@checkloadnever{cellspace}{tabls} \LWR@checkloadnever{cgloss4e}{} \LWR@checkloadnever{collcell}{} \LWR@checkloadnever{colophon}{} @@ -264,7 +265,7 @@ } \LetLtxMacro\LWR@checkloadnever\LWR@earlyloadnever \LWR@checkloadnevers -\@ifpackageloaded{xeCJK}{}{ +\IfPackageLoadedTF{xeCJK}{}{ \LWR@checkloadnever{CJK}{ctex, xeCJK} \LWR@checkloadnever{CJKutf8}{ctex, xeCJK} } @@ -685,6 +686,7 @@ \LWR@loadafter{shadow} \LWR@loadafter{shapepar} \LWR@notmemoirloadafter{showidx} +\LWR@loadafter{showlabels} \LWR@loadafter{showkeys} \LWR@loadafter{showtags} \LWR@loadafter{shuffle} @@ -792,6 +794,7 @@ \LWR@loadafter{widows-and-orphans} \LWR@loadafter{witharrows} \LWR@loadafter{wrapfig} +\LWR@loadafter{wrapfig2} \LWR@loadafter{xbmks} \LWR@loadafter{xcolor} \LWR@loadafter{xechangebar} @@ -832,8 +835,8 @@ \newcommand*{\LWR@pdfencoding}{% \RequirePackage[T1]{fontenc} - \@ifpackageloaded{inputenc}{}{ - \@ifpackageloaded{inputenx}{}{ + \IfPackageLoadedTF{inputenc}{}{ + \IfPackageLoadedTF{inputenx}{}{ \RequirePackage[utf8]{inputenc} } } @@ -898,7 +901,7 @@ \fi \ifxetexorluatex \AtBeginDocument{ - \@ifpackageloaded{kpfonts}{ + \IfPackageLoadedTF{kpfonts}{ \PackageError{lwarp} {% When using XeLaTeX or LuaLaTeX,\MessageBreak @@ -940,13 +943,21 @@ }% {Please contact the maintainer of the Lwarp package.}% } +\providecommand*{\csNewCommandCopycs}[2]{% + \expandafter\NewCommandCopy\csname#1\expandafter\endcsname% + \csname#2\endcsname% +} +\providecommand*{\NewEnvironmentCopy}[2]{% + \csNewCommandCopycs{#1}{#2}% + \csNewCommandCopycs{end#1}{end#2}% +} \newcommand{\LWR@isolate}[1]{#1}% -\@ifpackageloaded{ctexpatch}{ +\IfPackageLoadedTF{ctexpatch}{ \renewcommand{\LWR@isolate}[1]{\null#1\null}% }{} -\@ifpackageloaded{xeCJK}{ +\IfPackageLoadedTF{xeCJK}{ \renewcommand{\LWR@isolate}[1]{\null#1\null}% }{} \newcommand*{\LWR@disablepinyin}{} @@ -1353,7 +1364,7 @@ \begin{warpHTML} \ifxetexorluatex -\@ifpackageloaded{fontspec}{}{ +\IfPackageLoadedTF{fontspec}{}{ \usepackage[no-math]{fontspec} } \defaultfontfeatures[\rmfamily]{Ligatures={NoCommon,TeX}} @@ -1362,7 +1373,7 @@ \else -\RequirePackage {microtype} +\RequirePackage{microtype} \microtypesetup{ protrusion=false, @@ -1375,7 +1386,7 @@ \end{warpHTML} \begin{warpHTML} -\@ifpackageloaded{geometry} +\IfPackageLoadedTF{geometry} {}{ \RequirePackage[ reset, @@ -1451,9 +1462,6 @@ \RequirePackage{gettitlestring} -\@ifundefined{bxjs@everypar}{}{\let\everypar\bxjs@everypar} - -\RequirePackage{everyhook} \end{warpHTML} \begin{warpall} @@ -1464,7 +1472,7 @@ \LetLtxMacro\LWR@orig@filec@ntents\filec@ntents - \@ifpackagelater{filecontents}{2011/10/08} + \IfPackageAtLeastTF{filecontents}{2011/10/08} { \renewcommand*{\filec@ntents}[1][]{\LWR@orig@filec@ntents} } @@ -1672,7 +1680,7 @@ \PassOptionsToPackage{\CurrentOption}{#1}% }% \ProcessOptions\relax% - \@ifpackageloaded{#1}{% + \IfPackageLoadedTF{#1}{% \edef\LWR@tempone{\csuse{opt@#1.sty}}% \IfValueTF{#2}% {% @@ -1868,8 +1876,7 @@ \newcommand*{\LWR@formatted}[1]{% \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% - \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% - \csname#1\endcsname% + \csNewCommandCopycs{LWR@print@#1}{#1}% }{}% \ifcsundef{#1}{% \expandafter\newrobustcmd\csname #1\endcsname{% @@ -1884,8 +1891,7 @@ \newcommand*{\LWR@expandableformatted}[1]{% \LWR@formatted@checkname{#1}% \ifcsundef{LWR@print@#1}{% - \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% - \csname#1\endcsname% + \csNewCommandCopycs{LWR@print@#1}{#1}% }{}% \ifcsundef{#1}{% \expandafter\newcommand\csname #1\endcsname{% @@ -1901,9 +1907,7 @@ \LWR@formatted@checkname{#1}% \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% - \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% - \csname#1\endcsname% - \csletcs{endLWR@print@#1}{end#1}% + \NewEnvironmentCopy{LWR@print@#1}{#1}% }{}% \DeclareDocumentEnvironment{#1}{}% {% @@ -1917,9 +1921,7 @@ \LWR@formatted@checkname{#1}% \LWR@formatted@checkendname{#1}% \ifcsundef{LWR@print@#1}{% - \expandafter\LetLtxMacro\csname LWR@print@#1\expandafter\endcsname% - \csname#1\endcsname% - \csletcs{endLWR@print@#1}{end#1}% + \NewEnvironmentCopy{LWR@print@#1}{#1}% }{}% \DeclareExpandableDocumentEnvironment{#1}{}% {% @@ -2057,7 +2059,7 @@ \LetLtxMacro\LWR@orig@textquotedbl\LWR@orig@@textquotedbl \AtEndPreamble{ -\@ifpackageloaded{libertinus-otf}{ +\IfPackageLoadedTF{libertinus-otf}{ \renewcommand{\LWR@orig@textquotedbl}{\LWR@orig@@textquotedbl\kern-.15em} \LetLtxMacro\textquotedbl\LWR@orig@textquotedbl }{} @@ -2333,24 +2335,24 @@ \def\LWR@tempprintlatexcmd{% \LWR@compilecmd{latex}{} \LWR@addcompilecmd{dvips}{} - \LWR@addcompilecmd{ps2pdf}{}.ps + \LWR@addcompilecmd{ps2pdf -dALLOWPSTRANSPARENCY}{}.ps } \def\LWR@tempHTMLlatexcmd{% \LWR@compilecmd{latex}{_html} \LWR@addcompilecmd{dvips}{_html} - \LWR@addcompilecmd{ps2pdf}{_html}.ps + \LWR@addcompilecmd{ps2pdf -dALLOWPSTRANSPARENCY}{_html}.ps } } } \fi% \ifXeTeX \fi% \ifpdf }% latexmk -\@ifclassloaded{ujarticle}{\LWR@compileuplatex}{} -\@ifclassloaded{ujbook}{\LWR@compileuplatex}{} -\@ifclassloaded{ujreport}{\LWR@compileuplatex}{} -\@ifclassloaded{utarticle}{\LWR@compileuplatex}{} -\@ifclassloaded{utbook}{\LWR@compileuplatex}{} -\@ifclassloaded{utreport}{\LWR@compileuplatex}{} +\IfClassLoadedTF{ujarticle}{\LWR@compileuplatex}{} +\IfClassLoadedTF{ujbook}{\LWR@compileuplatex}{} +\IfClassLoadedTF{ujreport}{\LWR@compileuplatex}{} +\IfClassLoadedTF{utarticle}{\LWR@compileuplatex}{} +\IfClassLoadedTF{utbook}{\LWR@compileuplatex}{} +\IfClassLoadedTF{utreport}{\LWR@compileuplatex}{} \ifdefempty{\LWR@PrintLatexCmd}{ \def\LWR@PrintLatexCmd{\LWR@tempprintlatexcmd} }{} @@ -2402,7 +2404,7 @@ \begin{filecontents*}[overwrite]{lwarp.css} /* CSS stylesheet for the LaTeX Lwarp package - Copyright 2016-2021 Brian Dunn — BD Tech Concepts LLC + Copyright 2016-2022 Brian Dunn — BD Tech Concepts LLC */ /* a fix for older browsers: */ @@ -2899,7 +2901,7 @@ div.bodywithoutsidetoc main.bodycontainer { } section.textbody div.footnotes{ - margin: 3ex 2em .5ex 2em ; + margin: 1ex 2em 2ex 2em ; border-bottom: 2px solid silver ; } @@ -2934,6 +2936,8 @@ body dir, body menu { li { margin: 0ex 0em 1ex 0em; } +li.p { display: inline ; } + html { margin: 0; padding: 0; @@ -4837,9 +4841,9 @@ MathJax = { \begin{filecontents*}[overwrite]{lwarpmk.lua} #!/usr/bin/env texlua --- Copyright 2016-2021 Brian Dunn +-- Copyright 2016-2022 Brian Dunn -printversion = "v0.902" +printversion = "v0.903" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -5220,8 +5224,15 @@ function pdftohtml () -- Convert to text: print ("lwarpmk: Converting " .. sourcename .."_html.pdf to " .. sourcename .. "_html.html") -os.execute("pdftotext -enc " .. pdftotextenc .. " -nopgbrk -layout " +err = os.execute("pdftotext -enc " .. pdftotextenc .. " -nopgbrk -layout " .. sourcename .. "_html.pdf " .. sourcename .. "_html.html") +if ( err ~= 0 ) then + print ("lwarpmk: ===") + print ("lwarpmk: Ensure that the Poppler utilities are installed." ) + print ("lwarpmk: See the Lwarp manual: `Installing additional utilities'." ) + print ("lwarpmk: ===") + os.exit(1) +end -- Split the result into individual HTML files: splitfile (homehtmlfilename .. ".html" , sourcename .. "_html.html") end @@ -5921,14 +5932,19 @@ end -- not --version \end{warpHTML} \begin{warpHTML} +\newbool{LWR@setexparray@doingparhooks} + \NewDocumentCommand{\LWR@setexparray}{m m m}{% - \let\LWR@temp@par\par% + \let\ifLWR@setexparray@doingparhooks\ifLWR@doingparhooks% + \setbool{LWR@doingparhooks}{false}% + \let\LWR@setexparray@par\par% \let\par\relax% - \edef\LWR@thisexparrayname{#1#2}% + \xdef\LWR@thisexparrayname{#1#2}% \ifstrempty{#3}% {\csdef{\LWR@thisexparrayname}{}}% {\csedef{\LWR@thisexparrayname}{#3}}% - \let\par\LWR@temp@par% + \let\ifLWR@doingparhooks\ifLWR@setexparray@doingparhooks% + \let\par\LWR@setexparray@par% } \newcommand*{\LWR@getexparray}[2]{% \@nameuse{#1#2}% @@ -6378,60 +6394,59 @@ end -- not --version } \newcommand*{\LWR@nestspanitem}{% - \if@newlist\else{\LWR@htmltagc{br /}}\fi% + \if@newlist\else{ + \LWR@htmltagc{br /}% + \LWR@orignewline% + }\fi% \LWR@origitem% } \newenvironment*{LWR@nestspan} {% -\LWR@traceinfo{LWR@nestspan starting}% -\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% -{% - \LWR@traceinfo{LWR@nestspan: inside a lateximage}% -}% -{% not in a lateximage - \LWR@traceinfo{LWR@nestspan: NOT inside a lateximage}% - \addtocounter{LWR@spandepth}{1}% - \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}% - {\LWR@spanwarnformat{minipage or \protect\parbox}}% - {}% - \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% - }% - \renewcommand{\LWR@forcenewpage}{}% - \renewcommand{\LWR@liststart}{% - \LetLtxMacro\item\LWR@nestspanitem% - }% - \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% - \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% - \renewenvironment{quotation}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% -}% not in a lateximage -\LWR@traceinfo{LWR@nestspan starting: done}% + \LWR@traceinfo{LWR@nestspan starting}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {% + \LWR@traceinfo{LWR@nestspan: inside a lateximage}% + }% + {% not in a lateximage + \LWR@traceinfo{LWR@nestspan: NOT inside a lateximage}% + \addtocounter{LWR@spandepth}{1}% + \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}% + {\LWR@spanwarnformat{minipage or \protect\parbox}}% + {}% + \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% + }% + \renewcommand{\LWR@forcenewpage}{}% + \renewcommand{\LWR@liststart}{\LetLtxMacro\item\LWR@nestspanitem}% + \renewcommand{\LWR@listend}{\leavevmode}% + \renewenvironment{quote}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% + \renewenvironment{quotation}{\LWR@htmltagc{br /}}{\LWR@htmltagc{br /}}% + }% not in a lateximage + \LWR@traceinfo{LWR@nestspan starting: done}% }% starting env {% ending env -\LWR@traceinfo{LWR@nestspan ending}% -\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% -{}% -{\addtocounter{LWR@spandepth}{-1}}% -\LWR@traceinfo{LWR@nestspan ending: done}% + \LWR@traceinfo{LWR@nestspan ending}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {\addtocounter{LWR@spandepth}{-1}}% + \LWR@traceinfo{LWR@nestspan ending: done}% } -\AfterEndEnvironment{LWR@nestspan}{\global\let\par\LWR@closeparagraph} - \NewDocumentCommand{\LWR@htmlspan}{m +m}{% -\LWR@ensuredoingapar% -\LWR@htmltagc{#1}% -\begin{LWR@nestspan}% -#2% -\LWR@htmltagc{/#1}% -\end{LWR@nestspan}% + \LWR@ensuredoingapar% + \LWR@htmltagc{#1}% + \begin{LWR@nestspan}% + #2% + \LWR@htmltagc{/#1}% + \end{LWR@nestspan}% } \NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{% @@ -6449,71 +6464,67 @@ end -- not --version \newcommand*{\LWR@htmltag}[1]{% -\LWR@htmltagc{#1}% + \LWR@htmltagc{#1}% } \newcommand*{\LWR@htmlopencomment}{% -{% -\begingroup% -\LWR@hook@processingtags% -\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% -\LWR@print@mbox{\LWR@origtextless{}!-\/-}% -\endgroup% -}% + \begingroup% + \LWR@hook@processingtags% + \ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% + \LWR@print@mbox{\LWR@origtextless{}!-\/-}% + \endgroup% } \newcommand*{\LWR@htmlclosecomment}{% -{% -\begingroup% -\LWR@hook@processingtags% -\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% -\LWR@print@mbox{-\/-\LWR@origtextgreater}% -\endgroup% -}% + \begingroup% + \LWR@hook@processingtags% + \ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% + \LWR@print@mbox{-\/-\LWR@origtextgreater}% + \endgroup% } \newcommand{\LWR@htmlcomment}[1]{% -\ifmmode% -\else% - \LWR@htmlopencomment{}% - {% - \LWR@print@normalfont% - \LWR@origttfamily% break ligatures - #1% - }% - \LWR@htmlclosecomment{}% -\fi% + \ifmmode% + \else% + \LWR@htmlopencomment{}% + {% + \LWR@print@normalfont% + \LWR@origttfamily% break ligatures + #1% + }% + \LWR@htmlclosecomment{}% + \fi% } \newcommand{\LWR@htmlblockcomment}[1] -{\LWR@stoppars\LWR@htmlcomment{#1}\LWR@startpars} + {\LWR@stoppars\LWR@htmlcomment{#1}\LWR@startpars} \newcommand*{\LWR@htmlblocktag}[1]{% -\LWR@stoppars% -\LWR@htmltag{#1}% -\LWR@startpars% + \LWR@stoppars% + \LWR@htmltag{#1}% + \LWR@startpars% } \NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{% -\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}% -\ifblank{#2}% -{% empty style - \LWR@htmltag{% - #1% - \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% spaces - \ifblank{#4}{}{ class=\textquotedbl#4\textquotedbl}% spaces + \LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}% + \ifblank{#2}% + {% empty style + \LWR@htmltag{% + #1% + \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% spaces + \ifblank{#4}{}{ class=\textquotedbl#4\textquotedbl}% spaces + }% }% -}% -{% non-empty style - \LWR@htmltag{% - #1\LWR@indentHTML% - \ifblank{#3}{}{role=\textquotedbl#3\textquotedbl\LWR@indentHTML}% - \ifblank{#4}{}{class=\textquotedbl#4\textquotedbl\LWR@indentHTML}% - style=\textquotedbl#2\textquotedbl\LWR@orignewline% + {% non-empty style + \LWR@htmltag{% + #1\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}% + \LWR@traceinfo{LWR@subhtmlelementclass done}% } \NewDocumentCommand{\LWR@htmlelementclass}{m o D(){} m}{% @@ -6547,35 +6558,33 @@ end -- not --version \NewDocumentCommand{\LWR@htmlelementclassline}{m o m +m}{% -\LWR@stoppars -\LWR@forceemptyline% -\LWR@subhtmlelementclass{#1}[#2]{#3}% -#4% -\LWR@htmltag{/#1} -\LWR@startpars + \LWR@stoppars + \LWR@forceemptyline% + \LWR@subhtmlelementclass{#1}[#2]{#3}% + #4% + \LWR@htmltag{/#1} + \LWR@startpars } \newcommand*{\LWR@htmlelement}[1]{% -\LWR@htmlblocktag{#1} + \LWR@htmlblocktag{#1} } \newcommand*{\LWR@htmlelementend}[1]{% -\LWR@stoppars -\LWR@htmltag{/#1} -\LWR@startpars + \LWR@stoppars + \LWR@htmltag{/#1} + \LWR@startpars } \end{warpHTML} -\begin{warpprint} +\begin{warpall} \NewDocumentEnvironment{BlockClass}{o D(){} m}{}{} -\end{warpprint} +\end{warpall} \begin{warpHTML} -\NewDocumentEnvironment{LWR@print@BlockClass}{o D(){} m}{}{}% - \NewDocumentEnvironment{LWR@HTML@BlockClass}{o D(){} m}% {\LWR@htmldivclass[#1](#2){#3}}% {\LWR@htmldivclassend{#3}} @@ -6593,58 +6602,54 @@ end -- not --version \LWR@formatted{BlockClassSingle} \end{warpHTML} -\begin{warpprint} +\begin{warpall} \NewDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{#4}% -\end{warpprint} +\end{warpall} \begin{warpHTML} -\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@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} +\begin{warpall} \NewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}{}{} -\end{warpprint} +\end{warpall} \begin{warpHTML} -\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#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#4\textquotedbl% - \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% - \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}% - }% -}% not FormatWP -\LWR@startpars% -} -{\LWR@htmldivclassend{#4}} + {% + \LWR@stoppars% + \ifbool{FormatWP}% + {% + \addtocounter{LWR@thisautoidWP}{1}% + \LWR@htmltag{% + 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#4\textquotedbl% + \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% + \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}% + }% + }% not FormatWP + \LWR@startpars% + } + {\LWR@htmldivclassend{#4}} \LWR@formattedenv{LWR@BlockClassWP} \end{warpHTML} @@ -6682,12 +6687,20 @@ end -- not --version \end{warpHTML} - \begin{warpHTML} \newcounter{LWR@spandepth} \setcounter{LWR@spandepth}{0} +\newbool{LWR@doingparhooks} +\boolfalse{LWR@doingparhooks} + +\newbool{LWR@in@multirow@par} +\boolfalse{LWR@in@multirow@par} + +\newbool{LWR@starting@fancybox} +\boolfalse{LWR@starting@fancybox} + \newbool{LWR@doingstartpars} \boolfalse{LWR@doingstartpars} @@ -6701,25 +6714,29 @@ end -- not --version \newcommand*{\LWR@openparagraph} {% -\ifbool{LWR@doingstartpars}% -{% handling pars \ifboolexpr{ - test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or - test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} - }% nested par tags? - {}% no nested par tags - {% yes nest par tags - \ifbool{LWR@doingapar}{}{% - \PN@parnotes@auto% - \global\booltrue{LWR@doingapar}% - \ifbool{LWR@algocf@dopars}{}{% - \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% + bool{LWR@doingparhooks} and + bool{LWR@doingstartpars} + }% + {% handling pars + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} + }% nested par tags? + {}% no nested par tags + {% yes nest par tags + \ifbool{LWR@doingapar}{}{% + \PN@parnotes@auto% + \global\booltrue{LWR@doingapar}% + \ifbool{LWR@algocf@dopars}{}{% + \ifbool{LWR@in@multirow@par}% + {}% + {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}% + }% }% - }% - \let\par\LWR@closeparagraph% - }% end of yes nest par tags -}% end of handling pars -{}% not handling pars + }% end of yes nest par tags + }% end of handling pars + {}% not handling pars } \let\LWR@ensuredoingapar\LWR@openparagraph @@ -6729,55 +6746,58 @@ end -- not --version \ifboolexpr{ test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} and - not bool {LWR@intabularmetadata} + not bool {LWR@starting@fancybox} and + not bool {LWR@intabularmetadata} or + bool {LWR@in@multirow@par} }% - {% - \unskip\LWR@htmltagc{br /}% - }% + {\unskip\LWR@htmltagc{br /}}% {}% } \newcommand*{\LWR@closeparagraph} {% -\ifbool{LWR@doingapar}% -{% handling pars - \ifboolexpr{ - test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or - test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} - }% - {% no nested par tags - \LWR@closeparagraph@br% - }% no nested par tags - {% yes nest par tags - \@hspacer{\fill}% \hspace*{\fill} - \leavevmode\LWR@orignewline% - \LWR@htmltagc{/\LWR@tagregularparagraph}% - \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 - \LWR@closeparagraph@br% -}% not handling pars -\ifboolexpr{% - not bool {LWR@doingapar} and - test {\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}} and - test { - \ifnumcomp{\value{LWR@tabulardepth}}{=}{\value{LWR@tabularpardepth}} - } and - bool {LWR@intabularmetadata} and - not bool {LWR@tableparcell} and - test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} -}% -{% - \LWR@getmynexttoken% -}{% - \LWR@origpar% -}% + \ifbool{LWR@doingparhooks}{% + \ifbool{LWR@doingapar}% + {% handling pars + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} or + bool{LWR@in@multirow@par} + }% + {% no nested par tags + \LWR@closeparagraph@br% + }% no nested par tags + {% yes nest par tags + \@hspacer{\fill}% \hspace*{\fill} + \leavevmode\LWR@orignewline% + \LWR@htmltagc{/\LWR@tagregularparagraph}% + \global\boolfalse{LWR@doingapar}% + \global\boolfalse{LWR@minipagethispar}% + \PN@parnotes@auto% + }% end of yes nest par tags + }% LWR@doingapar: end of handling pars + {% not LWR@doingapar: not handling pars + \LWR@closeparagraph@br% + }% not handling pars + \ifboolexpr{% + not bool {LWR@doingapar} and + test {\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}} and + test { + \ifnumcomp{\value{LWR@tabulardepth}}{=}{\value{LWR@tabularpardepth}} + } and + bool {LWR@intabularmetadata} and + not bool {LWR@tableparcell} and + test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} + }% + {\LWR@getmynexttoken}% + {}% + }% LWR@doingparhooks + {}% not LWR@doingparhooks } +\AddToHook{para/begin}[lwarp]{\LWR@openparagraph} +\AddToHook{para/end}[lwarp]{\LWR@closeparagraph} + \end{warpHTML} @@ -6785,48 +6805,40 @@ end -- not --version \newcommand*{\LWR@startpars}% {% -\ifboolexpr{ - test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or - test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} -}% -{}% -{% - \ifbool{LWR@doingstartpars}% - {}% - {% - \ClearPreHook{par}% - \PushPreHook{par}{\LWR@openparagraph}% - \let\par\LWR@closeparagraph - - }% an intentionally blank line - \global\setbool{LWR@doingstartpars}{true}% - \global\boolfalse{LWR@doingapar}% -}% nestspan + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} + }% + {}% nesting + {% not nesting + \ifboolexpr {bool{LWR@doingparhooks} and bool{LWR@doingstartpars}}% + {}% + {\par}% + \global\booltrue{LWR@doingstartpars}% + \global\boolfalse{LWR@doingapar}% + }% not nesting } \newcommand*{\LWR@stoppars}% {% -\ifboolexpr{ - test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or - test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} -}% -{}% -{% - \ifbool{LWR@doingapar}% - {% - \leavevmode\LWR@orignewline% - \LWR@htmltagc{/\LWR@tagregularparagraph}% - \LWR@orignewline% - \global\boolfalse{LWR@doingapar}% - \global\boolfalse{LWR@minipagethispar} + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} }% - {}% - \ifbool{LWR@doingstartpars}% - {\ClearPreHook{par}}% - {}% - \global\setbool{LWR@doingstartpars}{false}% - \global\boolfalse{LWR@doingapar}% -}% nestspan + {}% nesting + {% not nesting + \ifboolexpr{bool{LWR@doingparhooks} and bool{LWR@doingapar}}% + {% + \leavevmode\LWR@orignewline% + \LWR@htmltagc{/\LWR@tagregularparagraph}% + \LWR@orignewline% + \global\boolfalse{LWR@doingapar}% + \global\boolfalse{LWR@minipagethispar}% + }% + {}% + \global\setbool{LWR@doingstartpars}{false}% + \global\boolfalse{LWR@doingapar}% + }% not nesting } \end{warpHTML} @@ -6870,8 +6882,8 @@ end -- not --version \newcommand*{\LWR@currentcss}{lwarp.css} \newcommand*{\CSSFilename}[1]{% -\renewcommand*{\LWR@currentcss}{#1}% -\@onelevel@sanitize\LWR@currentcss% + \renewcommand*{\LWR@currentcss}{#1}% + \@onelevel@sanitize\LWR@currentcss% } \end{warpHTML} @@ -7044,6 +7056,11 @@ end -- not --version \fi } +\newcommand*{\LWR@nullifyfootnotes}{% + \renewcommand{\footnote}[2][]{}% + \renewcommand{\footnotemark}[1][]{}% +} + \end{warpHTML} \begin{warpHTML} @@ -7051,27 +7068,32 @@ end -- not --version \renewcommand{\marginpar}[2][]{% \ifbool{FormatWP}% {% -\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}% -#2 -\end{LWR@BlockClassWP}% + \begin{LWR@BlockClassWP}% + {width:2in; float:right; margin:10pt}{}(note){marginblock}% + #2 + \end{LWR@BlockClassWP}% }% {% \LWR@htmlspanclass(note){marginpar}{#2}% }% } \newcommand{\marginparBlock}[2][]{% -\LWR@stoppars% -\ifbool{FormatWP}% -{% - \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}% - #2 - \end{LWR@BlockClassWP} -}{% - \begin{BlockClass}[width:2in; float:right; margin:10pt](note){marginparblock}% - #2 - \end{BlockClass} -}% -\LWR@startpars% + \LWR@stoppars% + \ifbool{FormatWP}% + {% + \begin{LWR@BlockClassWP}% + {width:2in; float:right; margin:10pt}{}% + (note){marginblock}% + #2 + \end{LWR@BlockClassWP} + }% + {% + \begin{BlockClass}[width:2in; float:right; margin:10pt]% + (note){marginparblock}% + #2 + \end{BlockClass} + }% + \LWR@startpars% } \renewcommand*{\reversemarginpar}{} \renewcommand*{\normalmarginpar}{} @@ -7323,13 +7345,15 @@ end -- not --version \catcode`\#=6 \catcode`\&=4 -\newrobustcmd{\LWR@HTMLsanitize}[1]{% +\newrobustcmd{\LWR@HTMLsanitizedetokenized}[1]{% + \LWR@traceinfo{LWR@HTMLsanitizedetokenized !#1!}% \begingroup% \LWR@hook@processingtags% - \edef\LWR@strresult{\detokenize{#1}}% + \edef\LWR@strresult{#1}% \LWR@subHTMLsanitize% \LWR@strresult% \endgroup% + \LWR@traceinfo{LWR@HTMLsanitize done}% } \edef\LWR@beginspaceleftbrace{begin \LWRleftbrace} @@ -7342,10 +7366,10 @@ end -- not --version \edef\LWR@endrightbrace{end\LWRrightbrace} \edef\LWR@endrightbrace{\detokenize\expandafter{\LWR@endrightbrace}} -\newrobustcmd{\LWR@HTMLsanitizeexpand}[1]{% +\newrobustcmd{\LWR@HTMLsanitizeexpanded}[1]{% \begingroup% \LWR@hook@processingtags% - \edef\LWR@strresult{\detokenize\expandafter{#1}}% + \edef\LWR@strresult{#1}% \protect\StrSubstitute{\LWR@strresult}% {\LWR@beginspaceleftbrace}{\LWR@beginleftbrace}[\LWR@strresult]% \protect\StrSubstitute{\LWR@strresult}% @@ -7379,7 +7403,7 @@ end -- not --version \StrLen{\detokenize{#1}}[\LWR@tempone]% \ifnumgreater{\LWR@tempone}{350}{% \AtEndDocument{% - \PackageWarningNoLine{lwarp}{% + \PackageNoteNoLine{lwarp}{% To ensure faster MathJax compilation, place each\MessageBreak custom macro in its own \protect\CustomizeMathJax.\MessageBreak See the Lwarp documentation regarding customizing\MessageBreak @@ -7732,18 +7756,28 @@ end -- not --version \LWR@traceinfo{LWR@section: about to LWR@setlatestname}% \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% }% -\ifbool{HTMLDebugComments}{% - \begingroup% - \LWR@nullfonts% - \IfBooleanTF{#1}% starred - {\LWR@htmlcomment{Opening #4*}}% +\begingroup% +\LWR@nullfonts% +\LWR@nullifyfootnotes% +\LWR@htmlcomment{................................}% +\LWR@orignewline% +\ifbool{HTMLDebugComments}% {% - \IfNoValueTF{#2}% short TOC - {\LWR@htmlcomment{Opening #4 ``#3''}}% - {\LWR@htmlcomment{Opening #4 ``#2''}}% - }\LWR@orignewline% - \endgroup% -}{} + \IfBooleanTF{#1}% starred + {% + \IfNoValueTF{#2}% short TOC + {\LWR@htmlcomment{Opening #4* ``#3''}}% + {\LWR@htmlcomment{Opening #4* ``#2''}}% + }% + {% + \IfNoValueTF{#2}% short TOC + {\LWR@htmlcomment{Opening #4 ``#3''}}% + {\LWR@htmlcomment{Opening #4 ``#2''}}% + }% + \LWR@orignewline% + }% + {}% +\endgroup% \ifthenelse{% \cnttest{\@nameuse{LWR@depth#4}}{>=}{\LWR@depthparagraph}% }% @@ -7986,10 +8020,14 @@ end -- not --version \LWR@nullfonts% \edef\theHTMLSection{#1}% \StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection]% -\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection]% -\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection]% -\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection]% -\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}% + {\detokenize{-----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}% + {\detokenize{----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}% + {\detokenize{---}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}% + {\detokenize{--}}{\detokenize{-}}[\theHTMLSection]% \IfBeginWith{\theHTMLSection}{\detokenize{-}}{% \StrGobbleLeft{\theHTMLSection}{1}[\theHTMLSection]% }{}% @@ -8108,8 +8146,10 @@ end -- not --version \setlength{\abovecaptionskip}{0ex} \renewcommand{\ps@plain}{} \let\LWR@origcaption\caption +\global\booltrue{LWR@doingparhooks} \global\boolfalse{LWR@doingapar} \global\boolfalse{LWR@doingstartpars} +\let\color@endgroup\endgroup \mainmatter \LWR@origpagenumbering{arabic} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} @@ -8196,6 +8236,7 @@ end -- not --version \LWR@maybe@orignewpage } + \ifdef{\AddToHook}{% newer kernel \AddToHook{enddocument/info}{% \if@filesw @@ -8272,7 +8313,7 @@ end -- not --version } \AtBeginDocument{ -\@ifpackageloaded{titling}{ +\IfPackageLoadedTF{titling}{ \AtBeginEnvironment{titlingpage}{ \renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}} } @@ -8349,7 +8390,7 @@ end -- not --version \newcommand*{\printdate}{{\small\textit{\@date}}} \end{warpprint} \begin{warpHTML} -\@ifclassloaded{memoir} +\IfClassLoadedTF{memoir} { \newcommand{\LWR@setfootnoteseries}{% \renewcommand\thefootnote{\@arabic\c@footnote}% @@ -8444,7 +8485,7 @@ end -- not --version \begin{warpall} \newcommand*{\AddSubtitlePublished}{% -\@ifpackageloaded{titling}{% yes titling package +\IfPackageLoadedTF{titling}{% yes titling package \newcommand{\@published}{}% \newcommand{\published}[1]{\gdef\@published{##1}}% \renewcommand*{\maketitlehooka}{\printpublished}% @@ -8645,9 +8686,25 @@ end -- not --version \LWR@afterendverbatim% }% } +\AtBeginEnvironment{verbatim*}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@forcenewpage% + \LWR@atbeginverbatim{verbatim}% + }% +} +\AfterEndEnvironment{verbatim*}{% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@afterendverbatim% + }% +} } -\newcommand*{\LWR@HTML@tabbing}{% +\newenvironment*{LWR@HTML@tabbing} +{% \LWR@forcenewpage% \LWR@atbeginverbatim{tabbing}% \let\enskip\LWR@origenskip% @@ -8659,14 +8716,12 @@ end -- not --version \let\negthinspace\LWR@orignegthinspace% \LWR@print@tabbing% } - -\newcommand*{\LWR@HTML@endtabbing}{% - \LWR@print@endtabbing% +{% + \endLWR@print@tabbing% \LWR@afterendverbatim% } -\LWR@formatted{tabbing} -\LWR@formatted{endtabbing} +\LWR@formattedenv{tabbing} \end{warpHTML} @@ -8717,9 +8772,7 @@ end -- not --version \if@noparitem \@donoparitem \else - \par \ifhmode - \par \fi \if@newlist \if@nobreak @@ -8749,7 +8802,9 @@ end -- not --version \LWR@stoppars% \LWR@startnewdepth{listitem}% \LWR@htmltag{li}% + \LWR@orignewline% \LWR@startpars% + \LWR@ensuredoingapar% \LWR@origitem% } @@ -8791,7 +8846,9 @@ end -- not --version \LWR@stoppars% \LWR@startnewdepth{listitem}% \LWR@htmltag{li}% + \LWR@orignewline% \LWR@startpars% + \LWR@ensuredoingapar% \LWR@origitem% } @@ -8902,17 +8959,21 @@ end -- not --version \newcommand\LWR@mynexttoken\relax - - - \def\LWR@futurenonspacelet#1{\def\LWR@cs{#1}% \afterassignment\LWR@fnslone\let\nexttoken= } \def\LWR@fnslone{\expandafter\futurelet\LWR@cs\LWR@fnsltwo} \def\LWR@fnsltwo{% -\expandafter\ifx\LWR@cs\@sptoken\let\next=\LWR@fnslthree% -\else\let\next=\nexttoken\fi\next} + \expandafter\ifx\LWR@cs\@sptoken% + \let\next=\LWR@fnslthree% + \else% + \expandafter\ifx\LWR@cs\par% + \let\next=\LWR@fnslthree% + \else% + \let\next=\nexttoken% + \fi% + \fi\next} \def\LWR@fnslthree{\afterassignment\LWR@fnslone\let\next= } @@ -9735,11 +9796,10 @@ end -- not --version \booltrue{LWR@doingcmidrule}% } -\NewDocumentCommand{\LWR@docdashline} - {>{\SplitArgument{1}{-}}m}% - {% - \LWR@subcdashline#1% - } +\NewDocumentCommand{\LWR@docdashline}{>{\SplitArgument{1}{-}}m}% +{% + \LWR@subcdashline#1% +} \newcommand*{\LWR@tdstartstyles}{\boolfalse{LWR@tdhavecellstyle}} @@ -9760,7 +9820,7 @@ end -- not --version \newcommand*{\LWR@subaddcmidruletrim}[2]{% \setlength{\LWR@templengthone}{% - \LWR@getexparray{LWR@midrules}{\arabic{LWR@tableLaTeXcolindex}}% + \LWR@getexparray{LWR@midrules}{\arabic{LWR@tableLaTeXcolindex}}% }% \ifdimcomp{\LWR@templengthone}{>}{0pt}% {% @@ -10302,8 +10362,8 @@ end -- not --version {}% }% no version of multirow was loaded {% \@xmultirow defined, so some version of multirow was loaded -\@ifpackageloaded{multirow}{% v2.0 or newer -\@ifpackagelater{multirow}{2016/09/01}% 2016/09/27 for v2.0 +\IfPackageLoadedTF{multirow}{% v2.0 or newer +\IfPackageAtLeastTF{multirow}{2016/09/01}% 2016/09/27 for v2.0 {% v2.0+: \DeclareExpandableDocumentCommand{\LWR@print@multicolumnrow}% {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% @@ -10430,10 +10490,11 @@ end -- not --version \ifdefequal{\LWR@mynexttoken}{\lasthdashline}% {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\par}% - {\global\let\LWR@mynextaction\LWR@donothing}{}% - \LWR@traceinfo{LWR@tabledatacolumntag: about to do mynext}% + {% + \global\let\LWR@mynextaction\LWR@donothing% + }{}% + \LWR@traceinfo{LWR@tabledatacolumntag: done, about to do LWR@mynextaction}% \LWR@mynextaction% - \LWR@traceinfo{LWR@tabledatacolumntag: done}% } \end{warpHTML} @@ -10474,7 +10535,7 @@ end -- not --version } \AtBeginDocument{ -\@ifpackageloaded{lwarp-tabls} +\IfPackageLoadedTF{lwarp-tabls} { \newcommand*{\LWR@HTMLhline}[1][]{% \ifbool{FormatWP}% @@ -10533,8 +10594,10 @@ end -- not --version \boolfalse{LWR@foundmrowcell}% \renewcommand*{\LWR@multicoltext}{}% \booltrue{LWR@intabularmetadata}% - \LWR@traceinfo{LWR@@tabular: About to LWR@forecenewpage.}% - \LWR@forcenewpage + \ifbool{LWR@in@multirow@par}% + {\leavevmode\LWR@orignewline}% + {\LWR@forcenewpage}% + \boolfalse{LWR@in@multirow@par}% \LWR@htmlblocktag{table}% \LWR@parsetablecols{#3}% \LWR@stoppars% @@ -10694,8 +10757,7 @@ end -- not --version \fi} \newcommand*{\LWR@nameref}[1]{% \begingroup% - \renewcommand{\footnote}[2][]{}% - \renewcommand{\footnotemark}[1][]{}% + \LWR@nullifyfootnotes% \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}% \endgroup% } @@ -10864,7 +10926,24 @@ end -- not --version {\LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}}% {% \LWR@startref{#2}% - \LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}% + \edef\@tempa{\LWR@currentautosecpageref{#2}}% + \ifdefstring{\@tempa}{??}% + {??}% + {% + \edef\@tempa{% + \csname + r@\BaseJobname-autopage-\LWR@currentautosecpageref{#2}% + \endcsname% + }% + \edef\@tempa{\expandafter\@firstoftwo\@tempa}% + \expandafter\ifblank\expandafter{\@tempa}% + {*} + {% + \LWR@print@ref{% + \BaseJobname-autopage-\LWR@currentautosecpageref{#2}% + }% + }% + }% \LWR@htmltag{/a}% }% } @@ -10984,8 +11063,8 @@ end -- not --version \newcommand*{\LWR@subinlineimage}[6]{% \ifblank{#6}% - {\renewcommand*{\LWR@tempone}{}} - {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}} + {\renewcommand*{\LWR@tempone}{}}% + {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}}% \ifblank{#1}% {% \LWR@htmltag{img \LWR@indentHTML @@ -11044,7 +11123,7 @@ end -- not --version } \AtBeginDocument{ -\@ifpackageloaded{tocbasic}{ +\IfPackageLoadedTF{tocbasic}{ \appto\figure@atbegin{% \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% @@ -11145,7 +11224,7 @@ end -- not --version \AtBeginDocument{\providecommand*{\CaptionSeparator}{:~}} \AtBeginDocument{ - \@ifpackageloaded{caption}{}{ + \IfPackageLoadedTF{caption}{}{ \let\LWR@orig@caption\@caption% \long\def\@caption#1[#2]{% \LWR@spanwarnformat{caption}% @@ -11215,7 +11294,7 @@ end -- not --version } \AtBeginDocument{% -\@ifpackageloaded{caption}{ +\IfPackageLoadedTF{caption}{ \let\LWR@origcaptionlistentry\captionlistentry \renewcommand*{\captionlistentry}{% @@ -11440,12 +11519,12 @@ end -- not --version \LWR@traceinfo{hypertoc done}% } -\@ifclassloaded{memoir}{}{ +\IfClassLoadedTF{memoir}{}{ \newcounter{lofdepth} \setcounter{lofdepth}{1} } -\@ifclassloaded{memoir}{}{ +\IfClassLoadedTF{memoir}{}{ \newcounter{lotdepth} \setcounter{lotdepth}{1} } @@ -11826,8 +11905,9 @@ end -- not --version \LWR@traceinfo{LWR@restoreorigformatting}% \renewcommand*{\LWR@formatting}{print}% \linespread{1}% - \let\par\LWR@origpar% + \setbool{LWR@doingparhooks}{false}% \LWR@select@print@hspace% + \def\color@endgroup{\endgraf\endgroup}% \LetLtxMacro\hfil\LWR@orighfil% \let\hss\LWR@orighss% \let\llap\LWR@origllap% @@ -12074,12 +12154,12 @@ end -- not --version \IfFileExists{\LWR@baselinename}% { - \@ifpackageloaded{graphicx}{ + \IfPackageLoadedTF{graphicx}{ \newcommand*{\LWR@addbaselinemarker}{% \LWR@origincludegraphics{\LWR@baselinename}% } }{ - \@ifpackageloaded{graphics}{ + \IfPackageLoadedTF{graphics}{ \newcommand*{\LWR@addbaselinemarker}{% \LWR@origincludegraphics{\LWR@baselinename}% } @@ -12089,7 +12169,7 @@ end -- not --version } \AtEndDocument{ \ifbool{LWR@warnbaselinemarker}{ - \PackageWarningNoLine{lwarp}{% + \PackageNoteNoLine{lwarp}{% Load graphicx or graphics for improved\MessageBreak SVG math sizing and baselines% } @@ -12166,6 +12246,7 @@ end -- not --version } \newcommand*{\LWR@subsingledollarsvg}[4]{% + \LWR@traceinfo{LWR@subsingledollartsvg}% \LWR@singledollarmeasure{#4}% \ifdimgreater{\LWR@singledollarwidth}{.7\LWR@singledollarheight}{% \def\LWR@singledollarstyle{% @@ -12205,19 +12286,20 @@ end -- not --version \def\LWR@singledollardepthstyle{}% }{}% \ifbool{LWR@dynamicmath}{% - \LWR@traceinfo{subsingledollar: dynamic}% + \LWR@traceinfo{subsingledollarsvg: dynamic}% \begin{lateximage}% no hashing [\MathImageAltText]% alt tag []% no add'l hashing [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS (math)% ARIA }{% not dynamic math - \LWR@traceinfo{subsingledollar: static}% + \LWR@traceinfo{subsingledollarsvg: static}% \IfValueTF{#1}{% #1 True \LWR@findcurrenttextcolor% sets \LWR@tempcolor \ifbool{LWR@xfakebold}% {\def\LWR@tempone{Y}}% {\def\LWR@tempone{N}}% + \LWR@traceinfo{subsingledollarsvg about to lateximage}% \begin{lateximage}*% use hashing [#2]% alt *% do not add open/closing braces @@ -12232,6 +12314,7 @@ end -- not --version ]% [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS (math)% ARIA + \LWR@traceinfo{subsingledollar did lateximage}% }{% #1 False \begin{lateximage}% no hashing [#2]% alt @@ -12254,7 +12337,7 @@ end -- not --version \newsavebox{\LWR@singledollarbox} \NewDocumentCommand{\LWR@subsingledollar}{s m m m}{% - \LWR@traceinfo{LWR@subsingledollar}% + \LWR@traceinfo{LWR@subsingledollar !#2!}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {% \LWR@traceinfo{LWR@subsingledollar: already in a lateximage}% @@ -12281,7 +12364,7 @@ end -- not --version \textbackslash(% {% \ifmmode\else\LWR@print@ttfamily\fi% - \LWR@HTMLsanitize{#4}% + \LWR@HTMLsanitizedetokenized{\detokenize{#4}}% }% \textbackslash)% }% @@ -12312,63 +12395,70 @@ end -- not --version \protected\gdef\LWR@newsingledollar{\@ifnextchar$\LWR@doubledollar\LWR@singledollar}% \protected\gdef\LWR@doubledollar$#1$${% -\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% -{ + \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% + {% intentional blank line: - \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] - }% + \IfSubStr{\detokenize\expandafter{#1}}{\detokenize{note}}{% + \LWR@hidelatexequation{math}{#1}% + \InlineClass{hidden}{\LWR@syncnotenumbers}% + \textbackslash[% + {% + \LWR@print@ttfamily% + \LWR@HTMLsanitizedetokenized{\detokenize{#1}}% + }% + \textbackslash] + \InlineClass{hidden}{\LWR@syncnotenames}% + }{% + \textbackslash[% + {% + \LWR@print@ttfamily% + \LWR@HTMLsanitizedetokenized{\detokenize{#1}}% + }% + \textbackslash] + }% -}% mathjax -{% not mathjax - \begin{BlockClass}{displaymath}% - \LWR@newautoidanchor% - \booltrue{LWR@indisplaymathimage}% - \begin{lateximage}% - [% - \textbackslash{[} % extra space - \LWR@HTMLsanitize{#1} % extra space - \textbackslash{]}% - ]% - *% do not add open/closing braces - (math)% ARIA - \LWR@applyxfakebold% - \LWR@origdollar\LWR@origdollar#1\LWR@origdollar\LWR@origdollar% - \end{lateximage}% - \end{BlockClass}% -}% not mathjax -\gdef\LWR@ThisAltText{}% + }% mathjax + {% not mathjax + \begin{BlockClass}{displaymath}% + \LWR@newautoidanchor% + \booltrue{LWR@indisplaymathimage}% + \begin{lateximage}% + [% + \textbackslash{[} % extra space + \LWR@HTMLsanitizedetokenized{\detokenize{#1}} % extra space + \textbackslash{]}% + ]% + *% do not add open/closing braces + (math)% ARIA + \LWR@applyxfakebold% + \LWR@origdollar\LWR@origdollar#1\LWR@origdollar\LWR@origdollar% + \end{lateximage}% + \end{BlockClass}% + }% not mathjax + \gdef\LWR@ThisAltText{}% }% \protected\gdef\LWR@singledollar#1${% -\ifbool{mathjax}{% - \LWR@subsingledollar*% - {% alt tag - \textbackslash( % - \LWR@HTMLsanitize{#1} % extra space - \textbackslash)% - }% - {singledollar}% add'l hashing - {#1}% contents -}{% not mathjax - \LWR@subsingledollar*% - {% alt tag - \textbackslash( % - \LWR@HTMLsanitize{#1} % extra space - \textbackslash)% - }% - {singledollar}% add'l hashing - {\LWR@origensuredmath{#1}}% contents -}% not mathjax -\gdef\LWR@ThisAltText{}% + \LWR@traceinfo{LWR@singledollar}% + \ifbool{mathjax}{% + \LWR@subsingledollar*% + {% alt tag + \textbackslash( % + \LWR@HTMLsanitizedetokenized{\detokenize{#1}} % extra space + \textbackslash)% + }% + {singledollar}% add'l hashing + {#1}% contents + }{% not mathjax + \LWR@subsingledollar*% + {% alt tag + \textbackslash( % + \LWR@HTMLsanitizedetokenized{\detokenize{#1}} % extra space + \textbackslash)% + }% + {singledollar}% add'l hashing + {\LWR@origensuredmath{#1}}% contents + }% not mathjax + \gdef\LWR@ThisAltText{}% } \AtBeginDocument{ @@ -12388,7 +12478,7 @@ end -- not --version \ifbool{mathjax}{% \LWR@subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}% {% - \protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}% + \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% }% {% \relax% @@ -12403,7 +12493,11 @@ end -- not --version {% \LWR@subsingledollar*% {\AltTextOpen\MathImageAltText\AltTextClose}% - {\protect\LWR@HTMLsanitize{\detokenize\expandafter{#1}}}% + {% + \protect\LWR@HTMLsanitizedetokenized{% + \detokenize\expandafter{#1}% + }% + }% {\LWR@origensuredmath{#1}}% }% \fi% @@ -12535,7 +12629,7 @@ end -- not --version {\{\arabic{LWR@maxfields@}\}}% {}% \LWR@orignewline% - \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#2}}% + \LWR@HTMLsanitizeexpanded{\detokenize\expandafter{#2}}% \LWR@orignewline% \textbackslash{}end\{#1\} }% @@ -12574,7 +12668,7 @@ end -- not --version (\LWR@equationtag) % automatic numbering }% \textbackslash{begin\{#2\}} % extra space - \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space + \LWR@HTMLsanitizeexpanded{\detokenize\expandafter{#1}} % extra space \textbackslash{end\{#2\}}% ]*(math)% alt tag, ARIA \LWR@applyxfakebold% @@ -12834,7 +12928,7 @@ end -- not --version \newcommand*{\LWR@amsmathbody}[1] {% \textbackslash\{begin\}\{#1\} % extra space - \LWR@HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}% + \LWR@HTMLsanitizeexpanded{\detokenize\expandafter{\the\@envbody}}% \textbackslash\{end\}\{#1\}% } @@ -12858,6 +12952,7 @@ end -- not --version } \newcommand{\LWR@lateximage@oneimage}[5]{% + \LWR@traceinfo{LWR@lateximage@oneimage !#1!#2!#3!#4!#5!}% \ifdefvoid{\LWR@ThisAltText}{% \IfBooleanTF{#4}{% \LWR@lateximage@oneimageb{#1}{#2}{#3}{#5}% @@ -12877,6 +12972,7 @@ end -- not --version \NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{} D(){}}% {% +\LWR@traceinfo{lateximage !#1!#2!#3!#4!#5!#6!}% \LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}% \LWR@traceinfo{lateximage: entering depth is \arabic{LWR@lateximagedepth}}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% @@ -12999,6 +13095,7 @@ end -- not --version \LWR@print@vspace*{.5\baselineskip}% \LWR@htmlclosecomment% \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}% + \LWR@traceinfo{about to LWR@lateximage@oneimage !#2!}% \IfBooleanTF{#1}% starred {% hash \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}{#6}% @@ -13095,7 +13192,7 @@ end -- not --version \begin{warpHTML} \newcommand*{\LWR@PreloadedPackage}[1]{% - \@ifpackageloaded{#1}% + \IfPackageLoadedTF{#1}% {% \AtBeginDocument{ \LWR@origRequirePackage{lwarp-#1}% @@ -13181,9 +13278,8 @@ end -- not --version \begin{warpprint} \define@key{Gin}{class}{} -\define@key{Gin}{alt}{} \AtBeginDocument{ -\@ifpackageloaded{overpic}{ +\IfPackageLoadedTF{overpic}{ \newcommand*{\overpicfontsize}{12} \newcommand*{\overpicfontskip}{14} }{} @@ -13192,7 +13288,7 @@ end -- not --version \begin{warpall} \AtBeginDocument{ -\@ifpackageloaded{xcolor}{ +\IfPackageLoadedTF{xcolor}{ \LWR@traceinfo{patching xcolor} \LetLtxMacro\colorboxBlock\colorbox \LetLtxMacro\LWR@orig@print@fcolorbox\fcolorbox @@ -13200,86 +13296,82 @@ end -- not --version \newsavebox{\LWR@colorminipagebox} \NewDocumentCommand{\LWR@print@fcolorbox}{o m o m +m}{% -\LWR@traceinfo{LWR@print@fcolorbox #2 #4}% -\begin{lrbox}{\LWR@colorminipagebox}% -#5% -\end{lrbox}% -\ifstrequal{#4}{none}% -{% #4 none - \LWR@traceinfo{background is none}% - {% scope the \colorlet - \colorlet{LWR@currentcolor}{.}% - \color{#2}% - \fbox{% - \color{LWR@currentcolor}% - \usebox{\LWR@colorminipagebox}% - }% fbox - }% colorlet -}% #4 none -{% #4 not none -\LWR@traceinfo{background not none}% -\IfValueTF{#1}% -{% - \IfValueTF{#3}% - {\LWR@orig@print@fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% - {\LWR@orig@print@fcolorbox[#1]{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% -}% -{% no value #1 - \IfValueTF{#3}% - {\LWR@orig@print@fcolorbox{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% - {\LWR@orig@print@fcolorbox{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% -}% no value #1 -}% #4 not none -\LWR@traceinfo{LWR@print@fcolorbox done}% + \LWR@traceinfo{LWR@print@fcolorbox #2 #4}% + \begin{lrbox}{\LWR@colorminipagebox}% + #5% + \end{lrbox}% + \ifstrequal{#4}{none}% + {% #4 none + \LWR@traceinfo{background is none}% + {% scope the \colorlet + \colorlet{LWR@currentcolor}{.}% + \color{#2}% + \fbox{% + \color{LWR@currentcolor}% + \usebox{\LWR@colorminipagebox}% + }% fbox + }% colorlet + }% #4 none + {% #4 not none + \LWR@traceinfo{background not none}% + \IfValueTF{#1}% + {% + \IfValueTF{#3}% + {\LWR@orig@print@fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% + {\LWR@orig@print@fcolorbox[#1]{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% + }% + {% no value #1 + \IfValueTF{#3}% + {\LWR@orig@print@fcolorbox{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% + {\LWR@orig@print@fcolorbox{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% + }% no value #1 + }% #4 not none + \LWR@traceinfo{LWR@print@fcolorbox done}% } \renewrobustcmd*{\fcolorbox}{\LWR@print@fcolorbox}% \newcommand*{\LWR@print@fcolorboxBlock}{\LWR@print@fcolorbox} \newrobustcmd*{\fcolorboxBlock}{\LWR@print@fcolorboxBlock} -\NewDocumentEnvironment{LWR@print@fcolorminipage}{o m o m O{c} O{} o m} +\NewDocumentEnvironment{fcolorminipage}{o m o m O{c} O{} o m} {% -\LWR@traceinfo{*** fcolorminipage: #2 #4 #8}% -\begin{lrbox}{\LWR@colorminipagebox}% -\IfValueTF{#7}% -{\begin{minipage}[#5][#6][#7]{#8}}% -{\begin{minipage}[#5][#6][#5]{#8}}% + \LWR@traceinfo{*** fcolorminipage: #2 #4 #8}% + \begin{lrbox}{\LWR@colorminipagebox}% + \IfValueTF{#7}% + {\begin{minipage}[#5][#6][#7]{#8}}% + {\begin{minipage}[#5][#6][#5]{#8}}% }% {% -\end{minipage}% -\end{lrbox}% -\LWR@traceinfo{*** starting end fcolorminipage #1 #2 #3 #4 #8}% -\ifstrequal{#4}{none}% -{% #4 none - {% scope the \colorlet - \colorlet{LWR@currentcolor}{.}% - \color{#2}% - \fbox{% - \color{LWR@currentcolor}% - \usebox{\LWR@colorminipagebox}% - }% fbox - }% colorlet -}% #4 none -{% #4 not none - \IfValueTF{#1}% - {% - \IfValueTF{#3}% - {\LWR@orig@print@fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% - {\LWR@orig@print@fcolorbox[#1]{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% - }% - {% no value #1 - \IfValueTF{#3}% - {\LWR@orig@print@fcolorbox{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% - {\LWR@orig@print@fcolorbox{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% - }% no value #1 -}% #4 not none -\LWR@traceinfo{*** finished end fcolorminipage}% + \end{minipage}% + \end{lrbox}% + \LWR@traceinfo{*** starting end fcolorminipage #1 #2 #3 #4 #8}% + \ifstrequal{#4}{none}% + {% #4 none + {% scope the \colorlet + \colorlet{LWR@currentcolor}{.}% + \color{#2}% + \fbox{% + \color{LWR@currentcolor}% + \usebox{\LWR@colorminipagebox}% + }% fbox + }% colorlet + }% #4 none + {% #4 not none + \IfValueTF{#1}% + {% + \IfValueTF{#3}% + {\LWR@orig@print@fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% + {\LWR@orig@print@fcolorbox[#1]{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% + }% + {% no value #1 + \IfValueTF{#3}% + {\LWR@orig@print@fcolorbox{#2}[#3]{#4}{\usebox{\LWR@colorminipagebox}}}% + {\LWR@orig@print@fcolorbox{#2}{#4}{\usebox{\LWR@colorminipagebox}}}% + }% no value #1 + }% #4 not none + \LWR@traceinfo{*** finished end fcolorminipage}% } -\NewDocumentEnvironment{fcolorminipage}{} - {\LWR@print@fcolorminipage} - {\endLWR@print@fcolorminipage} - \LWR@formatted{colorbox} \LWR@formatted{colorboxBlock} \LWR@formatted{fcolorbox} @@ -13294,7 +13386,7 @@ end -- not --version \begin{warpprint} \AtBeginDocument{ -\@ifpackageloaded{chemmacros}{ +\IfPackageLoadedTF{chemmacros}{ \DeclareDocumentEnvironment{polymerdelims}{} {}{} @@ -13562,17 +13654,18 @@ padding:\LWR@printlength{\fboxsep} ; % 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}% + \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} + \begin{warpall} \let\fboxBlock\fbox \end{warpall} @@ -13581,9 +13674,7 @@ color:\LWR@origpound\LWR@tempcolor% \newcommand{\LWR@HTML@fboxBlock}[1]{% \LWR@forceminwidth{\fboxrule}% \LWR@stoppars% -\begin{BlockClass}[% -\LWR@fboxstyle% -]{fboxBlock} +\begin{BlockClass}[\LWR@fboxstyle]{fboxBlock} #1 \end{BlockClass} \LWR@startpars% @@ -13596,7 +13687,7 @@ color:\LWR@origpound\LWR@tempcolor% \newsavebox{\LWR@fminipagebox} -\NewDocumentEnvironment{LWR@print@fminipage}{O{t} o O{t} m} +\NewDocumentEnvironment{fminipage}{O{t} o O{t} m} {% \IfValueTF{#3}% {\def\LWR@thisalign{#3}} @@ -13615,10 +13706,6 @@ color:\LWR@origpound\LWR@tempcolor% \fbox{\usebox{\LWR@fminipagebox}}% \endminipage% } - -\LetLtxMacro\fminipage\LWR@print@fminipage -\LetLtxMacro\endfminipage\endLWR@print@fminipage - \end{warpall} \begin{warpHTML} @@ -13700,7 +13787,7 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textbf} -\@ifpackageloaded{nfssext-cfr}{ +\IfPackageLoadedTF{nfssext-cfr}{ \DeclareRobustCommand{\LWR@HTML@texteb}[1]{% {% \LWR@HTML@ebweight% @@ -13713,7 +13800,7 @@ color:\LWR@origpound\LWR@tempcolor% \providerobustcmd{\texteb}[1]{} } -\@ifpackageloaded{nfssext-cfr}{ +\IfPackageLoadedTF{nfssext-cfr}{ \DeclareRobustCommand{\LWR@HTML@textlg}[1]{% {% \LWR@HTML@lgweight% @@ -13894,7 +13981,7 @@ color:\LWR@origpound\LWR@tempcolor% } \LWR@formatted{bfseries} -\@ifpackageloaded{nfssext-cfr}{ +\IfPackageLoadedTF{nfssext-cfr}{ \newrobustcmd*{\LWR@HTML@ebweight}{% \LWR@print@ebweight% \renewcommand*{\LWR@f@series}{eb}% @@ -13902,7 +13989,7 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{ebweight} }{} -\@ifpackageloaded{nfssext-cfr}{ +\IfPackageLoadedTF{nfssext-cfr}{ \newrobustcmd*{\LWR@HTML@lgweight}{% \LWR@print@lgweight% \renewcommand*{\LWR@f@series}{lg}% @@ -14310,8 +14397,8 @@ color:\LWR@origpound\LWR@tempcolor% } \AtBeginDocument{ - \@ifpackageloaded{graphics}{ - \@ifpackageloaded{metalogo}{}{ + \IfPackageLoadedTF{graphics}{ + \IfPackageLoadedTF{metalogo}{}{ \renewrobustcmd*{\Xe} {X\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}} } @@ -14320,7 +14407,7 @@ color:\LWR@origpound\LWR@tempcolor% \AtEndDocument{ \ifbool{LWR@warnXe}{ - \PackageWarningNoLine{lwarp}{Load graphicx or graphics + \PackageNoteNoLine{lwarp}{Load graphicx or graphics for improved XeTeX logo} }{} } @@ -14449,7 +14536,7 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpHTML} \AtBeginDocument{ - \@ifpackageloaded{everyshi}{ + \IfPackageLoadedTF{everyshi}{ \RequirePackage{lwarp-everyshi} }{} } @@ -14460,29 +14547,29 @@ color:\LWR@origpound\LWR@tempcolor% \end{warpHTML} \begin{warpHTML} -\@ifpackageloaded{amsthm}{ +\IfPackageLoadedTF{amsthm}{ \RequirePackage{lwarp-amsthm} }{} -\@ifpackageloaded{amsmath}{ +\IfPackageLoadedTF{amsmath}{ \RequirePackage{lwarp-amsmath} }{} -\@ifpackageloaded{centernot}{ +\IfPackageLoadedTF{centernot}{ \RequirePackage{lwarp-centernot} }{} \end{warpHTML} \begin{warpHTML} -\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} -\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} -\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} +\IfClassLoadedTF{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} +\IfClassLoadedTF{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} +\IfClassLoadedTF{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} \end{warpHTML} \begin{warpprint} -\@ifclassloaded{memoir}{\LWR@origRequirePackage{xcolor}}{} +\IfClassLoadedTF{memoir}{\LWR@origRequirePackage{xcolor}}{} \end{warpprint} \begin{warpHTML} -\@ifclassloaded{memoir}{\RequirePackage{lwarp-patch-memoir}}{} +\IfClassLoadedTF{memoir}{\RequirePackage{lwarp-patch-memoir}}{} \end{warpHTML} \begin{warpHTML} @@ -14528,28 +14615,28 @@ color:\LWR@origpound\LWR@tempcolor% } } -\@ifclassloaded{ujarticle}{\LWR@patchujtclasses}{} -\@ifclassloaded{ujbook}{\LWR@patchujtclasses}{} -\@ifclassloaded{ujreport}{\LWR@patchujtclasses}{} -\@ifclassloaded{utarticle}{\LWR@patchujtclasses}{} -\@ifclassloaded{utbook}{\LWR@patchujtclasses}{} -\@ifclassloaded{utreport}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjarticle}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjbook}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjreport}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjsarticle}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjsbook}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjsreport}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjskiyou}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjspf}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjtarticle}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjtbook}{\LWR@patchujtclasses}{} -\@ifclassloaded{ltjtreport}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ujarticle}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ujbook}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ujreport}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{utarticle}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{utbook}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{utreport}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjarticle}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjbook}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjreport}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjsarticle}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjsbook}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjsreport}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjskiyou}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjspf}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjtarticle}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjtbook}{\LWR@patchujtclasses}{} +\IfClassLoadedTF{ltjtreport}{\LWR@patchujtclasses}{} \end{warpHTML} \begin{warpHTML} \AtBeginDocument{ - \@ifpackageloaded{ctexpatch}{% + \IfPackageLoadedTF{ctexpatch}{% \def\@partcntformat#1{% \LWR@isolate{\CTEX@partname}~% \CTEX@part@aftername% @@ -14568,7 +14655,7 @@ color:\LWR@origpound\LWR@tempcolor% \end{warpHTML} \begin{warpHTML} \AtBeginDocument{ -\@ifpackageloaded{kotexutf}{% +\IfPackageLoadedTF{kotexutf}{% \def\LWR@kotexutf@setref#1#2#3{% \@setref@dhucs@orig{#1}{#2}{#3}% \ifx#1\relax\else @@ -14589,24 +14676,22 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpHTML} \AtBeginDocument{ -\@ifpackageloaded{polyglossia}{ - \PackageWarningNoLine{lwarp} +\IfPackageLoadedTF{polyglossia}{ + \PackageNoteNoLine{lwarp} {% Polyglossia has been loaded. Lwarp also uses cleveref.\MessageBreak See the cleveref documentation regarding\MessageBreak - polyglossia support. Some languages are not supported% + polyglossia support. Some languages are not supported.\MessageBreak + --- \MessageBreak + If the error\MessageBreak + \space\space Undefined control sequence ... + \protect\__hook begindocument\MessageBreak + occurs here, use the polyglossia macro:\MessageBreak + \space\space\protect\setmainlanguage\protect{...\protect} } - \typeout{---} - \typeout{Package lwarp:} - \typeout{If the error} - \typeout{\space\space``! Undefined control sequence. - \space ... \space \protect\__hook begindocument''} - \typeout{occurs here, use the polyglossia macro:} - \typeout{\space\space\protect\setmainlanguage\protect{...\protect}} - \typeout{---} }{ - \@ifpackageloaded{babel}{ - \PackageWarningNoLine{lwarp} + \IfPackageLoadedTF{babel}{ + \PackageNoteNoLine{lwarp} {% Babel has been loaded. Lwarp also uses cleveref.\MessageBreak See the cleveref documentation regarding\MessageBreak @@ -14618,7 +14703,7 @@ color:\LWR@origpound\LWR@tempcolor% } \end{warpHTML} \newcommand*{\LWR@mathjaxwarn}[2]{% - \@ifpackageloaded{lwarp-#1}{% + \IfPackageLoadedTF{lwarp-#1}{% \ifblank{#2}{% \PackageWarningNoLine{lwarp} {% @@ -14637,7 +14722,7 @@ color:\LWR@origpound\LWR@tempcolor% } \newcommand*{\LWR@nomathjaxwarn}[2]{% - \@ifpackageloaded{lwarp-#1}{% + \IfPackageLoadedTF{lwarp-#1}{% \ifblank{#2}{% \PackageWarningNoLine{lwarp} {% @@ -14669,8 +14754,7 @@ color:\LWR@origpound\LWR@tempcolor% \AtBeginDocument{ \ifbool{mathjax}{ \LWR@nomathjaxwarn{aligned-overset}{} - \LWR@nomathjaxwarn{amscdx} - {\LWR@forceSVGmessage{amscdx}} + \LWR@nomathjaxwarn{amscdx}{\LWR@forceSVGmessage{amscdx}} \LWR@mathjaxwarn{arydshln} {In a math array, do not use the optional argument\MessageBreak for \protect\cdashline.\space\space @@ -14693,10 +14777,8 @@ color:\LWR@origpound\LWR@tempcolor% {Colors are ignored in MathJax.\MessageBreak (Text mode tabular does support colortbl.)\MessageBreak \LWR@forceSVGmessage{colortbl}} - \LWR@mathjaxwarn{delarray} - {\LWR@forceSVGmessage{delarray}} - \LWR@nomathjaxwarn{gauss} - {\LWR@forceSVGmessage{gauss}} + \LWR@mathjaxwarn{delarray}{\LWR@forceSVGmessage{delarray}} + \LWR@nomathjaxwarn{gauss}{\LWR@forceSVGmessage{gauss}} \LWR@mathjaxwarn{hhline} {A simple \protect\hline\space is used} \LWR@mathjaxwarn{isomath} @@ -14704,8 +14786,7 @@ color:\LWR@origpound\LWR@tempcolor% do not use a sans font because MathJax does not yet\MessageBreak have sans Greek. Tensors may look like vectors% } - \LWR@nomathjaxwarn{jkmath} - {\LWR@forceSVGmessage{jkmath}} + \LWR@nomathjaxwarn{jkmath}{\LWR@forceSVGmessage{jkmath}} \LWR@mathjaxwarn{libertinust1math} {Some of the symbol font macros such as \protect\mathsfbfit\MessageBreak do not use a sans font because MathJax does not yet\MessageBreak @@ -14730,8 +14811,10 @@ color:\LWR@origpound\LWR@tempcolor% \protect\CodeBefore\space cannot be done with MathJax.\MessageBreak \LWR@forceSVGmessage{nicematrix}% } - \LWR@nomathjaxwarn{pb-diagram} - {\LWR@forceSVGmessage{pb-diagram}} + \LWR@nomathjaxwarn{pb-diagram}{\LWR@forceSVGmessage{pb-diagram}} + \LWR@mathjaxwarn{siunitx} + {Place \protect\sisetup\space before \protect\begin{document}.\MessageBreak + Many optional arguments are ignored} \LWR@nomathjaxwarn{tensind}{} \LWR@mathjaxwarn{unicode-math} {Do not use embedded Unicode characters.\MessageBreak -- cgit v1.2.3