diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
20 files changed, 415 insertions, 359 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty index 27ed987b674..c13e5e3f1b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty @@ -15,15 +15,20 @@ %% 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. -\let\firsthline\relax -\let\lasthline\relax +\@ifpackageloaded{array}{}{% + \let\firsthline\relax + \let\lasthline\relax +} \LWR@ProvidesPackagePass{array}[2018/12/30] +\HTMLnewcolumntype{w}[2]{#1} +\HTMLnewcolumntype{W}[2]{#1} \newcommand*{\LWR@HTML@firsthline}{\LWR@HTMLhline}% \LWR@expandableformatted{firsthline} \newcommand*{\LWR@HTML@lasthline}{\LWR@HTMLhline}% \LWR@expandableformatted{lasthline} +\let\tabularnewline\\ \providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline} \LWR@formatted{tabularnewline} \CustomizeMathJax{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-centernot.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-centernot.sty index c595d961d20..2bb3b879791 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-centernot.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-centernot.sty @@ -16,12 +16,8 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{centernot}[2016/05/16] -\LWR@origRequirePackage{lwarp-common-mathjax-overlaysymbols} - \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\centernot}[1]{% - \LWRoverlaysymbols{\unicode{x2215}}{#1} -}} +\CustomizeMathJax{\require{centernot}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty index 21fc08d2864..73423c71bbe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty @@ -18,6 +18,8 @@ \let\rowcolor\relax \LWR@ProvidesPackagePass{colortbl}[2018/12/12] +\ProvideDocumentCommand{\columncolor}{O{named} m o o}{}% + \NewDocumentCommand{\LWR@HTML@columncolor}{O{named} m o o}{% \convertcolorspec{#1}{#2}{HTML}\LWR@columnHTMLcolor% \LWR@addtabularcellcolor% @@ -59,9 +61,26 @@ \AtBeginDocument{\LWR@expandableformatted{doublerulesepcolornexttoken}} \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\columncolor}[2][]{\LWRabsorbtwooptions}} -\CustomizeMathJax{\let\rowcolor\columncolor} -\CustomizeMathJax{\let\cellcolor\columncolor} + +\CustomizeMathJax{\require{colortbl}} +\CustomizeMathJax{\let\LWRorigcolumncolor\columncolor} +\CustomizeMathJax{\renewcommand{\columncolor}[2][named]{% + \LWRorigcolumncolor[#1]{#2}% + \LWRabsorbtwooptions% +}} + +\CustomizeMathJax{\let\LWRorigrowcolor\rowcolor} +\CustomizeMathJax{\renewcommand{\rowcolor}[2][named]{% + \LWRorigrowcolor[#1]{#2}% + \LWRabsorbtwooptions% +}} + +\CustomizeMathJax{\let\LWRorigcellcolor\cellcolor} +\CustomizeMathJax{\renewcommand{\cellcolor}[2][named]{% + \LWRorigcellcolor[#1]{#2}% + \LWRabsorbtwooptions% +}} + \end{warpMathJax} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty index 1c1c2c91806..2bd51e0709f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty @@ -15,7 +15,14 @@ %% 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{dcolumn}[2014/10/28] +\LWR@ProvidesPackagePass{dcolumn}[2014/10/28] +\newcommand*{\LWR@HTML@DC@}[3]{} +\LWR@formatted{DC@} + +\providecommand*{\DC@end}{} + +\newcommand*{\LWR@HTML@DC@end}{} +\LWR@formatted{DC@end} \endinput %% %% End of file `lwarp-dcolumn.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gensymb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gensymb.sty index cd2a10ac370..19bce7d2907 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-gensymb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gensymb.sty @@ -17,11 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{gensymb}[2003/07/02] \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}} -\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}} -\CustomizeMathJax{\newcommand{\perthousand}{\unicode{x2030}}} -\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}} -\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}} +\CustomizeMathJax{\require{gensymb}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 6a5d70df83e..bf5e0657c28 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -334,11 +334,11 @@ \begingroup% \LetLtxMacro\Gin@setfile\LWR@HTML@Gin@setfile% \edef\LWR@tempone{#4}% - \StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]% - \StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]% + \StrSubstitute{\LWR@tempone}{.pdf}{}[\LWR@tempone]% + \StrSubstitute{\LWR@tempone}{.PDF}{}[\LWR@tempone]% \LWR@replaceEPSSVG% \xdef\LWR@parsedfilename{\LWR@tempone}% - \Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}% + \Ginclude@graphics{\detokenize\expandafter{\LWR@parsedfilename}}% \endgroup% \filename@parse{\LWR@parsedfilename}% \StrSubstitute{\LWR@parsedfilename}{//}{/}[\LWR@parsedfilename]% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 63ffeb1ef23..e9877b4b347 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -230,7 +230,7 @@ (note)% {marginblock}% \renewcommand*{\@captype}{#2}% - \minipage{\LWR@usersmarginparwidth}% + \minipage{1.2\LWR@usersmarginparwidth}% \setlength{\marginparwidth}{.95\LWR@usersmarginparwidth}% } {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjp-tascmac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjp-tascmac.sty new file mode 100644 index 00000000000..01ed9457db4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjp-tascmac.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-lltjp-tascmac.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lltjp-tascmac') +%% 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{lltjp-tascmac}[2020/12/24] +\endinput +%% +%% End of file `lwarp-lltjp-tascmac.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 6b4723383fd..e6caecee83b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -93,6 +93,7 @@ \def\endfirsthead{\LWR@longtable@maybeheaderror} \def\endfoot{\LWR@longtable@headerror} \def\endlastfoot{\LWR@longtable@headerror} +\let\tabularnewline\\ \providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline} \LWR@formatted{tabularnewline} \newcommand{\setlongtables}{}% Obsolete command, does nothing. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty index 70c119f42ac..b827fde1a6d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty @@ -35,72 +35,19 @@ \mathtoolsset{mathic=false} \MHInternalSyntaxOff \begin{warpMathJax} +\CustomizeMathJax{\require{mathtools}} + \LWR@infoprocessingmathjax{mathtools} -\CustomizeMathJax{\newcommand{\mathllap}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\mathrlap}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\mathclap}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\mathmbox}[1]{#1}} -\CustomizeMathJax{\newcommand{\clap}[1]{#1}} -\CustomizeMathJax{\newcommand{\LWRmathmakebox}[2][]{#2}} -\CustomizeMathJax{\newcommand{\mathmakebox}[1][]{\LWRmathmakebox}} -\CustomizeMathJax{\newcommand{\cramped}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\crampedllap}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\crampedrlap}[2][]{{#1#2}}} -\CustomizeMathJax{\newcommand{\crampedclap}[2][]{{#1#2}}} \CustomizeMathJax{\newenvironment{crampedsubarray}[1]{}{}} -\CustomizeMathJax{\newcommand{\crampedsubstack}{}} -\CustomizeMathJax{\newcommand{\smashoperator}[2][]{#2\limits}} -\CustomizeMathJax{\newcommand{\adjustlimits}{}} -\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}} -\CustomizeMathJax{\require{extpfeil}} -\CustomizeMathJax{\Newextarrow\xleftrightarrow{10,10}{0x2194}} -\CustomizeMathJax{\Newextarrow\xLeftarrow{10,10}{0x21d0}} -\CustomizeMathJax{\Newextarrow\xhookleftarrow{10,10}{0x21a9}} -\CustomizeMathJax{\Newextarrow\xmapsto{10,10}{0x21a6}} -\CustomizeMathJax{\Newextarrow\xRightarrow{10,10}{0x21d2}} -\CustomizeMathJax{\Newextarrow\xLeftrightarrow{10,10}{0x21d4}} -\CustomizeMathJax{\Newextarrow\xhookrightarrow{10,10}{0x21aa}} -\CustomizeMathJax{\Newextarrow\xrightharpoondown{10,10}{0x21c1}} -\CustomizeMathJax{\Newextarrow\xleftharpoondown{10,10}{0x21bd}} -\CustomizeMathJax{\Newextarrow\xrightleftharpoons{10,10}{0x21cc}} -\CustomizeMathJax{\Newextarrow\xrightharpoonup{10,10}{0x21c0}} -\CustomizeMathJax{\Newextarrow\xleftharpoonup{10,10}{0x21bc}} -\CustomizeMathJax{\Newextarrow\xleftrightharpoons{10,10}{0x21cb}} +\CustomizeMathJax{\newcommand{\smashoperator}[2][]{#2\limits}} -\CustomizeMathJax{\newcommand{\LWRdounderbracket}[3]{% - \mathinner{\underset{#3}{\underline{\llcorner{#1}\lrcorner}}}% -}} -\CustomizeMathJax{\newcommand{\LWRunderbracket}[2][]{\LWRdounderbracket{#2}}} -\CustomizeMathJax{\newcommand{\underbracket}[1][]{\LWRunderbracket}} -\CustomizeMathJax{\newcommand{\LWRdooverbracket}[3]{% - \mathinner{\overset{#3}{\overline{\ulcorner{#1}\urcorner}}}% -}} -\CustomizeMathJax{\newcommand{\LWRoverbracket}[2][]{\LWRdooverbracket{#2}}} -\CustomizeMathJax{\newcommand{\overbracket}[1][]{\LWRoverbracket}} +\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}} \CustomizeMathJax{\newcommand{\LaTeXunderbrace}[1]{\underbrace{#1}}} \CustomizeMathJax{\newcommand{\LaTeXoverbrace}[1]{\overbrace{#1}}} -\CustomizeMathJax{\newenvironment{matrix*}[1][]{\begin{matrix}}{\end{matrix}}} -\CustomizeMathJax{\newenvironment{pmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}} -\CustomizeMathJax{\newenvironment{bmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}} -\CustomizeMathJax{\newenvironment{Bmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}} -\CustomizeMathJax{\newenvironment{vmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}} -\CustomizeMathJax{\newenvironment{Vmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}} -\CustomizeMathJax{\newenvironment{smallmatrix*}[1][]{\begin{matrix}}{\end{matrix}}} -\CustomizeMathJax{\newenvironment{psmallmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}} -\CustomizeMathJax{\newenvironment{bsmallmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}} -\CustomizeMathJax{\newenvironment{Bsmallmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}} -\CustomizeMathJax{\newenvironment{vsmallmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}} -\CustomizeMathJax{\newenvironment{Vsmallmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}} -\CustomizeMathJax{\newenvironment{psmallmatrix}[1][]{\begin{pmatrix}}{\end{pmatrix}}} -\CustomizeMathJax{\newenvironment{bsmallmatrix}[1][]{\begin{bmatrix}}{\end{bmatrix}}} -\CustomizeMathJax{\newenvironment{Bsmallmatrix}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}} -\CustomizeMathJax{\newenvironment{vsmallmatrix}[1][]{\begin{vmatrix}}{\end{vmatrix}}} -\CustomizeMathJax{\newenvironment{Vsmallmatrix}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}} - \CustomizeMathJax{\newcommand{\LWRmultlined}[1][]{\begin{multline*}}} \CustomizeMathJax{\newenvironment{multlined}[1][]{\LWRmultlined}{\end{multline*}}} @@ -109,37 +56,8 @@ \CustomizeMathJax{\let\LWRorigshoveright\shoveright} \CustomizeMathJax{\renewcommand{\shoveright}[1][]{\LWRorigshoveright}} -\CustomizeMathJax{\newenvironment{dcases}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{dcases*}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{rcases}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{rcases*}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{drcases}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{drcases*}{\begin{cases}}{\end{cases}}} -\CustomizeMathJax{\newenvironment{cases*}{\begin{cases}}{\end{cases}}} - -\CustomizeMathJax{\newcommand{\MoveEqLeft}[1][]{}} - -\CustomizeMathJax{% special parsing to handle '&' in argument - \def\LWRAboxed#1!|!{\fbox{\(#1\)}&\fbox{\(#2\)}} - \newcommand{\Aboxed}[1]{\LWRAboxed#1&&!|!} -} -\CustomizeMathJax{ - \newcommand{\LWRABLines}[1][\Updownarrow]{#1 \notag \\}% star/nostar the same - \newcommand{\ArrowBetweenLines}{\ifstar\LWRABLines\LWRABLines} -} \CustomizeMathJax{\newcommand{\shortintertext}[1]{\text{#1}\notag \\}} -\CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}} -\CustomizeMathJax{\newcommand{\LWRshortvdotswithinstar}[1]{\vdots \hspace{.5em} & \\}} -\CustomizeMathJax{\newcommand{\LWRshortvdotswithinnostar}[1]{& \hspace{.5em}\vdots \\}} -\CustomizeMathJax{% - \newcommand{\shortvdotswithin}% - {\ifstar\LWRshortvdotswithinstar\LWRshortvdotswithinnostar}% -} - -\CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}} -\CustomizeMathJax{\newcommand{\MTFlushSpaceBelow}{\\}} - \LetLtxMacro\LWR@mathtools@orig@DeclarePairedDelimiter\DeclarePairedDelimiter \renewcommand{\DeclarePairedDelimiter}[3]{ \LWR@mathtools@orig@DeclarePairedDelimiter{#1}{#2}{#3} @@ -236,36 +154,8 @@ \@onlypreamble\DeclareParedDelimiterXPP \@onlypreamble\DeclareParedDelimiterX -\CustomizeMathJax{\newcommand\lparen{(}} -\CustomizeMathJax{\newcommand\rparen{)}} -\CustomizeMathJax{\newcommand{\ordinarycolon}{:}} \CustomizeMathJax{\newcommand{\vcentcolon}{\mathrel{\unicode{x2236}}}} -\CustomizeMathJax{\newcommand\dblcolon{\mathrel{\unicode{x2237}}}} -\CustomizeMathJax{\newcommand\coloneqq{\mathrel{\unicode{x2236}\!=}}} -\CustomizeMathJax{\newcommand\Coloneqq{\mathrel{\unicode{x2237}\!=}}} -\CustomizeMathJax{\newcommand\coloneq{\mathrel{\unicode{x2236}-}}} -\CustomizeMathJax{\newcommand\Coloneq{\mathrel{\unicode{x2237}-}}} - -\CustomizeMathJax{\newcommand\eqqcolon{\mathrel{=\!\unicode{x2236}}}} -\CustomizeMathJax{\newcommand\Eqqcolon{\mathrel{=\!\unicode{x2237}}}} -\CustomizeMathJax{\newcommand\eqcolon{\mathrel{-\unicode{x2236}}}} -\CustomizeMathJax{\newcommand\Eqcolon{\mathrel{-\unicode{x2237}}}} - -\CustomizeMathJax{\newcommand\colonapprox{\mathrel{\unicode{x2236}\!\approx}}} -\CustomizeMathJax{\newcommand\Colonapprox{\mathrel{\unicode{x2237}\!\approx}}} -\CustomizeMathJax{\newcommand\colonsim{\mathrel{\unicode{x2236}\!\sim}}} -\CustomizeMathJax{\newcommand\Colonsim{\mathrel{\unicode{x2237}\!\sim}}} - -\CustomizeMathJax{\newcommand{\nuparrow}{\mathrel{\cancel{\uparrow}}}} -\CustomizeMathJax{\newcommand{\ndownarrow}{\mathrel{\cancel{\downarrow}}}} -\CustomizeMathJax{\newcommand{\bigtimes}{\mathop{\Large\times}\limits}} - -\CustomizeMathJax{\newcommand{\prescript}[3]{{}^{#1}_{#2}#3}} - -\CustomizeMathJax{\newenvironment{lgathered}{\begin{gathered}}{\end{gathered}}} -\CustomizeMathJax{\newenvironment{rgathered}{\begin{gathered}}{\end{gathered}}} - \LetLtxMacro\LWR@mathtools@orig@newgathered\newgathered \renewcommand{\newgathered}[4]{% \LWR@mathtools@orig@newgathered{#1}{#2}{#3}{#4}% @@ -277,8 +167,6 @@ } \@onlypreamble\newgathered -\CustomizeMathJax{\newcommand{\splitfrac}[2]{{}^{#1}_{#2}}} -\CustomizeMathJax{\let\splitdfrac\splitfrac} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mwe.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mwe.sty new file mode 100644 index 00000000000..521f903755f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mwe.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-mwe.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `mwe') +%% 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@ProvidesPackagePass{mwe}[2018/03/30] +\AtEndDocument{% + \PackageWarningNoLine{lwarp}{% + For package mwe, copy any mwe images to be used for\MessageBreak + HTML, such as PNG or JPG, to the document's base\MessageBreak + directory. Neither a subdirectory nor the mwe\MessageBreak + directory will work, due to the TeX file search\MessageBreak + algorithm% + }% +}% +\endinput +%% +%% End of file `lwarp-mwe.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty index 52e8f2c297b..d8762302c3e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicematrix.sty @@ -97,6 +97,7 @@ }% } \CustomizeMathJax{\let\hdottedline\hdashline} +\CustomizeMathJax{\let\Hline\hline} \CustomizeMathJax{\newcommand{\ldots}[1][]{\dots}} \CustomizeMathJax{\newcommand{\Cdots}[1][]{\cdots}} 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 5009c7e3032..f7ac9e0342a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty @@ -29,6 +29,12 @@ \DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar} }% AtBeginDocument +\AtBeginDocument{ +\HTMLnewcolumntype{S}{c} +\HTMLnewcolumntype{s}{c} +} + + \ExplSyntaxOn \cs_set_protected:Npn \__siunitx_print_aux: { diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-statex2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-statex2.sty index a003d482a93..e1bb2b23a6c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-statex2.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-statex2.sty @@ -86,7 +86,7 @@ \CustomizeMathJax{\newcommand{\iid}{\;\stackrel{\mb{\mathrm{iid}}}{\sim}\;}} \CustomizeMathJax{\newcommand{\ind}{\;\stackrel{\mb{\mathrm{ind}}}{\sim}\;}} \CustomizeMathJax{\newcommand{\indpr}{% - \;\stackrel{\mb{\mathrm{ind}}}{\stackrel{\mb{\mathrm{prior}}}{\sim}}\;% + \;\stackrel{\mb{\mathrm{ind}}}{\stackrel{\mb{\mathrm{prior}}}{\sim}}\; }} \CustomizeMathJax{\newcommand{\post}{\;\stackrel{\mb{\mathrm{post}}}{\sim}\;}} \CustomizeMathJax{\newcommand{\prior}{\;\stackrel{\mb{\mathrm{prior}}}{\sim}\;}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index 7e92bfd07c8..f66a2b055a5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -20,14 +20,15 @@ \LWR@ProvidesPackageDrop{tabularx}[2016/02/03] \RequirePackage{array} +\def\tabularxcolumn#1{p{#1}} +\newcolumntype{X}{p{1in}} \DeclareDocumentEnvironment{tabularx}{m o m} -{\tabular{#3}} -{\endtabular} + {\tabular{#3}} + {\endtabular} \DeclareDocumentEnvironment{tabularx*}{m o m} -{\tabular{#3}} -{\endtabular} - + {\tabular{#3}} + {\endtabular} \endinput %% %% End of file `lwarp-tabularx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty index 34f90324b8b..abdead7a4af 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty @@ -27,7 +27,10 @@ \NewDocumentEnvironment{tabulary*}{m o m} {\tabular{#3}} {\endtabular} - +\newcolumntype{L}{l} +\newcolumntype{C}{c} +\newcolumntype{R}{r} +\newcolumntype{J}{l} \newdimen\tymin \newdimen\tymax \def\tyformat{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index 1e78f0318b7..60efecc649a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -153,6 +153,7 @@ }% FilenameNullify }% AtBeginDocument +\CustomizeMathJax{\require{textcomp}} \endinput %% %% End of file `lwarp-textcomp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-upgreek.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-upgreek.sty index 8867ad622b7..99963919c6f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-upgreek.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-upgreek.sty @@ -16,14 +16,8 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{upgreek}[2003/02/12] -\LWR@origRequirePackage{lwarp-common-mathjax-letters} - \begin{warpMathJax} -\LWR@infoprocessingmathjax{upgreek} - -\LWR@mathjax@addgreek@l@up{up}{} -\LWR@mathjax@addgreek@u@up{Up}{} - +\CustomizeMathJax{\require{upgreek}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 1596d07a9e5..83dd68dfd44 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -111,10 +111,6 @@ padding:\LWR@printlength{\fboxsep}% \endgroup% } -\AtBeginDocument{ - \LWR@formatted{colorbox} -} - \NewDocumentCommand{\LWR@HTML@colorboxBlock}{O{named} m +m}{% \begingroup% \LWR@hook@processingtags% @@ -129,10 +125,6 @@ padding:\LWR@printlength{\fboxsep}% \global\booltrue{LWR@minipagethispar}% } -\AtBeginDocument{ - \LWR@formatted{colorboxBlock} -} - \NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{#1} m +m}{% \LWR@traceinfo{HTML fcolorbox #2 #4}% \begingroup% @@ -153,10 +145,6 @@ padding:\LWR@printlength{\fboxsep}% \endgroup% } -\AtBeginDocument{ - \LWR@formatted{fcolorbox} -} - \NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{#1} m +m}{% \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% \begingroup% @@ -185,10 +173,6 @@ padding:\LWR@printlength{\fboxsep}% \LWR@traceinfo{HTML fcolorboxBlock done}% } -\AtBeginDocument{ - \LWR@formatted{fcolorboxBlock} -} - \NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{% \LWR@stoppars% \begin{BlockClass}[% @@ -218,10 +202,6 @@ width:\LWR@printlength{\LWR@tempwidth}% \end{BlockClass}% \global\booltrue{LWR@minipagethispar}% } - -\AtBeginDocument{ -\LWR@formattedenv{fcolorminipage} -} \newcommand*{\LWR@HTML@boxframe}[3]{% {% \setlength{\LWR@tempwidth}{#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 50306247b96..cbda8bad396 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/07/17 v0.900 Allows LaTeX to directly produce HTML5 output.] + [2021/08/27 v0.901 Allows LaTeX to directly produce HTML5 output.] @@ -195,6 +195,7 @@ \LWR@checkloadnever{cals}{} \LWR@checkloadnever{cellspace}{} \LWR@checkloadnever{cgloss4e}{} +\LWR@checkloadnever{collcell}{} \LWR@checkloadnever{colophon}{} \LWR@checkloadnever{cooltooltips}{} \LWR@checkloadnever{covington}{} @@ -508,6 +509,7 @@ \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{listliketab} +\LWR@loadafter{lltjp-tascmac} \LWR@loadafter{longtable} \LWR@loadafter{lpic} \LWR@loadafter{lscape} @@ -568,6 +570,7 @@ \LWR@loadafter{multirow} \LWR@loadafter{multitoc} \LWR@loadafter{musicography} +\LWR@loadafter{mwe} \LWR@loadafter{nameauth} \LWR@loadafter{nameref} \LWR@loadafter{natbib} @@ -1330,6 +1333,16 @@ {\LWR@excludecomment{warpMathJax}{mathjax}} \end{warpHTML} +\begin{warpprint} +\LWR@includecomment{warpsvg}{mathsvg} +\end{warpprint} + +\begin{warpHTML} +\ifbool{mathjax} + {\LWR@excludecomment{warpsvg}{mathsvg}} + {\LWR@includecomment{warpsvg}{mathsvg}} +\end{warpHTML} + \ifbool{LWR@creatinglwarpmk} {\LWR@includecomment{LWRcreatelwarpmk}{lwarpmk}} {\LWR@excludecomment{LWRcreatelwarpmk}{lwarpmk}} @@ -1816,21 +1829,43 @@ \begin{warpHTML} \newcommand*{\LWR@formatting}{HTML} \newcommand*{\LWR@formatted@checkname}[1]{% + \ifcsundef{#1}{% + \ifcsundef{LWR@print@#1}{% + \PackageError{lwarp} + {% + \LWRbackslash#1 or \protect\LWR@print@#1\MessageBreak + must be defined before using \protect\LWR@formatted, etc% + } + {Perhaps #1 is misspelled.} + }{\relax}% + }{\relax}% \ifcsundef{LWR@HTML@#1}{% \PackageError{lwarp} {% - \protect\LWR@HTML@#1 is not defined% + \protect\LWR@HTML@#1 must be defined + before using \protect\LWR@formatted, etc% } - {Perhaps it is misspelled.} + {Perhaps #1 is misspelled.} }{\relax}% } \newcommand*{\LWR@formatted@checkendname}[1]{% + \ifcsundef{end#1}{% + \ifcsundef{endLWR@print@#1}{% + \PackageError{lwarp} + {% + \protect\end#1 or \protect\endLWR@print@#1\MessageBreak + must be defined before using \protect\LWR@formatted, etc% + } + {Perhaps #1 is misspelled.} + }{\relax}% + }{\relax}% \ifcsundef{endLWR@HTML@#1}{% \PackageError{lwarp} {% - \protect\endLWR@HTML@#1 is not defined% + \protect\endLWR@HTML@#1 must be defined + before using \protect\LWR@formatted, etc% } - {Perhaps it is misspelled.} + {Perhaps #1 is misspelled.} }{\relax}% } \newcommand*{\LWR@formatted}[1]{% @@ -1899,6 +1934,15 @@ } \end{warpHTML} +\begin{warpprint} + +\newcommand*{\LWR@formatted}[1]{} +\newcommand*{\LWR@expandableformatted}[1]{} +\newcommand*{\LWR@formattedenv}[1]{} +\newcommand*{\LWR@expandableformattedenv}[1]{} + +\end{warpprint} + \begin{warpall} \newbool{FormatEPUB} \boolfalse{FormatEPUB} @@ -2430,9 +2474,11 @@ kbd, span.texttt, p span.texttt { pre { padding: 3pt ; } -span.strong, span.textbf, div.strong, div.textbf { font-weight: bold; } +span.strong, span.textbf, div.strong, div.textbf, table td.tdbfseries { font-weight: bold; } + +span.textit, div.textit, table td.tditshape { font-style: italic; } -span.textit, div.textit { font-style: italic; } +table td.tdbfit { font-weight: bold ; font-style:italic } span.textmd, div.textmd { font-weight: normal; } @@ -3311,6 +3357,12 @@ figure.subfigure, figure.subtable { div.figurecaption .minipage { margin:0 ; padding: 0 } +/* for subcaptions: */ +figure div.minipage div.figurecaption { + max-width: 100% ; /* fallback if min() does not work */ + max-width: min(30em,100%) +} + div.minipage figure { border: none ; box-shadow: none ; } div.minipage figure.table { margin: 0ex } div.minipage div.footnotes { margin: 1ex 2em 0ex 2em } @@ -3322,12 +3374,20 @@ div.floatrow figure { display: inline-block ; margin: 1ex 2% ; } div.floatfoot { font-size: .85em ; border-top: 1px solid silver ; line-height: 1.2 ; } +/* Center if only one line, "start" align if more than one line: */ div.figurecaption , .lstlistingtitle { font-size: .85em ; - text-align: center ; font-weight: bold ; - margin-top: 1ex ; - margin-bottom: 1ex ; + text-align: start ; + margin: 1ex auto; + width: max-content; + max-width: 100%; +} + +/* A marginblock is small, so always center and don't mess with the width. */ +div.marginblock div.figurecaption { + width: 100% ; + text-align: center ; } figure.subfigure div.figurecaption, figure.subtable div.figurecaption { @@ -3391,9 +3451,6 @@ table td.tdr { text-align: right ; vertical-align: middle ; } table td.tdp { text-align: left ; vertical-align: bottom ; } table td.tdm { text-align: left ; vertical-align: middle ; } table td.tdb { text-align: left ; vertical-align: top ; } -table td.tdP { text-align: center ; vertical-align: bottom ; } -table td.tdM { text-align: center ; vertical-align: middle ; } -table td.tdB { text-align: center ; vertical-align: top ; } table td.tvertbarl { border-left: 1px solid black } table td.tvertbarldouble { border-left: 4px double black } @@ -3405,6 +3462,10 @@ table td.tvertbarldoubledash { border-left: 2px dashed black } table td.tvertbarrdash { border-right: 1px dashed black } table td.tvertbarrdoubledash { border-right: 2px dashed black } +table td.tdcenter { text-align: center} +table td.tdleft { text-align: left} +table td.tdright { text-align: right} + /* for cmidrules: */ table td.tdrule { border-top: 1px solid #A0A0A0 ; @@ -4762,7 +4823,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.900" +printversion = "v0.901" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -9104,7 +9165,7 @@ end -- not --version } \newcommand*{\LWR@colparameter}{} -\newcommand*{\LWR@parseatcolumn}{% +\newcommand*{\LWR@parseatcolumn}[1]{% \LWR@traceinfo{at column}% \defaddtocounter{LWR@tablecolspecindex}{1}% \LWR@traceinfo{about to read the next token:}% @@ -9134,7 +9195,7 @@ end -- not --version \let\LWR@colparameter\relax% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsebangcolumn}{% +\newcommand*{\LWR@parsebangcolumn}[1]{% \LWR@traceinfo{bang column}% \defaddtocounter{LWR@tablecolspecindex}{1}% \LWR@traceinfo{about to read the next token:}% @@ -9160,31 +9221,63 @@ end -- not --version \let\LWR@colparameter\relax% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsebeforecolumn}{% +\newcommand*{\LWR@checkbeforeaddclass}[2]{% + \ifcsstrequal{LWR@tempone}{#1}% + {% + \LWR@setexparray{LWR@coladdclass}% + {\arabic{LWR@tabletotalLaTeXcolsnext}}% + { #2}% space is intentional + }{}% +} +\newcommand*{\LWR@checkmathcolpar}{% + \IfSubStr{\detokenize\expandafter{\LWR@colparameter}}{\LWRdollar}% + {% + \PackageError{lwarp}% + {% + Lwarp does not support `$' in column specifiers.\MessageBreak + Specify `$' math for each cell in the column.\MessageBreak + Enter 'h' for more info% + }% + {% + For example, replace `>{$}c<{$}' with `c', and then\MessageBreak + use `$cell contents$' for each cell in the column.% + }% + }{}% +} +\newcommand*{\LWR@parsebeforecolumn}[1]{% \defaddtocounter{LWR@tablecolspecindex}{1}% \expandarg% \StrChar{\LWR@origcolspec}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]% \fullexpandarg% + \LWR@checkmathcolpar% \LWR@setexparray{LWR@colbeforespec}% {\arabic{LWR@tabletotalLaTeXcolsnext}}% {\expandafter\@firstofone\LWR@colparameter}% + \edef\LWR@tempone{\expandafter\@firstofone\LWR@colparameter}% + \LWR@checkbeforeaddclass{LWR@detect@centeringarraybackslash}{tdcenter} + \LWR@checkbeforeaddclass{LWR@detect@raggedrightarraybackslash}{tdleft} + \LWR@checkbeforeaddclass{LWR@detect@raggedleftarraybackslash}{tdright} + \LWR@checkbeforeaddclass{LWR@detect@itshape}{tditshape} + \LWR@checkbeforeaddclass{LWR@detect@bfseries}{tdbfseries} + \LWR@checkbeforeaddclass{LWR@detect@bfit}{tdbfit} \let\LWR@colparameter\relax% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parseaftercolumn}{% +\newcommand*{\LWR@parseaftercolumn}[1]{% \defaddtocounter{LWR@tablecolspecindex}{1}% \expandarg% \StrChar{\LWR@origcolspec}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]% \fullexpandarg% + \LWR@checkmathcolpar% \LWR@setexparray{LWR@colafterspec}% {\arabic{LWR@tabletotalLaTeXcols}}% {\expandafter\@firstofone\LWR@colparameter}% \let\LWR@colparameter\relax% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsebarcolumn}{% +\newcommand*{\LWR@parsebarcolumn}[1]{% \LWR@traceinfo{LWR@parsebarcolumn}% \ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: @@ -9209,7 +9302,7 @@ end -- not --version }% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsecoloncolumn}{% +\newcommand*{\LWR@parsecoloncolumn}[1]{% \LWR@traceinfo{LWR@parsecoloncolumn}% \ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: @@ -9230,11 +9323,10 @@ end -- not --version }% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsesemicoloncolumn}{% - \LWR@parsecoloncolumn% - \defaddtocounter{LWR@tablecolspecindex}{1}% +\newcommand*{\LWR@parsesemicoloncolumn}[1]{% + \LWR@parsecoloncolumn{}% } -\newcommand*{\LWR@parsenormalcolumn}[1]{% +\newcommand*{\LWR@HTML@LWR@parsenormalcolumn}[1]{% \defaddtocounter{LWR@tabletotalLaTeXcols}{1}% \defaddtocounter{LWR@tabletotalLaTeXcolsnext}{1}% \LWR@setexparray{LWR@tablecolspec}{\arabic{LWR@tabletotalLaTeXcols}}{#1}% @@ -9244,71 +9336,111 @@ end -- not --version \LWR@setexparray{LWR@colbeforespec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% \LWR@setexparray{LWR@colafterspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% \LWR@setexparray{LWR@colbarspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% + \LWR@setexparray{LWR@coladdclass}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@parsepcolumn}[1]{% - \LWR@parsenormalcolumn{#1}% - \defaddtocounter{LWR@tablecolspecindex}{1}% -} +\newcommand*{\LWR@print@LWR@parsenormalcolumn}[1]{} -\newcommand*{\LWR@parsewcolumn}{% +\LWR@formatted{LWR@parsenormalcolumn} + +\newcommand*{\LWR@parsewcolumn}[1]{% \LWR@columnspeclookahead{1}% \expandafter\LWR@parsenormalcolumn\expandafter{\LWR@strresulttwo}% - \defaddtocounter{LWR@tablecolspecindex}{2}% } -\newcommand*{\LWR@parsestarcolumn}{% - \defaddtocounter{LWR@tablecolspecindex}{2}% -} +\newcommand*{\LWR@parsestarcolumn}[1]{} -\newcommand*{\LWR@parseDcolumn}[1]{% - \LWR@parsenormalcolumn{#1}% - \defaddtocounter{LWR@tablecolspecindex}{3}% + +\newcommand*{\LWR@expandpreamble}[1]{% + \edef\@tempa{\@temptokena={#1}}% + \@tempa% + \@tempswatrue% + \@whilesw\if@tempswa\fi{% + \@tempswafalse\the\NC@list% + }% } -\newcount\LWR@starcount -\newcommand*{\LWR@expcolspec}{} -\newcounter{LWR@splitstarindex} -\newcounter{LWR@splitstarcopies} -\newcommand*{\LWR@splitstarcontents}{} -\newcommand*{\expandcolspec}{% - \StrPosition{\LWR@origcolspec}{*}[\LWR@tempone]% - \whileboolexpr{ test {\ifnumgreater{\LWR@tempone}{0}}}% - {% - \setcounter{LWR@splitstarindex}{\LWR@tempone}% - \addtocounter{LWR@splitstarindex}{-1}% - \StrLeft{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@expcolspec]% - \addtocounter{LWR@splitstarindex}{2}% - \StrChar{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@tempone]% - \setcounter{LWR@splitstarcopies}{\expandafter\@firstofone\LWR@tempone}% - \addtocounter{LWR@splitstarindex}{1}% - \StrChar{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\LWR@splitstarcontents]% - \ifnumgreater{\value{LWR@splitstarcopies}}{0}% - {% - \LWR@starcount=\value{LWR@splitstarcopies}% - \loop - \appto\LWR@expcolspec{% - \expandafter\@firstofone\LWR@splitstarcontents% +\newcommand*{\LWR@modifycolumntype}[5]{% + \LWR@traceinfo{LWR@modifycolumntype !#1!#2!#3!#4!#5!}% + \LWR@traceinfo{LWR@modifycolumntype #1}% + \edef\@tempa{% + \noexpand\csdef{LWR@columntype@#1}{% + \noexpand\@nameuse{#3}{#1}% + \noexpand\defaddtocounter{LWR@tablecolspecindex}{#2}% }% - \advance \LWR@starcount -1 - \ifnum \LWR@starcount>0 \repeat - }{}% - \StrGobbleLeft{\LWR@origcolspec}{\value{LWR@splitstarindex}}[\colspecremainder]% - \appto{\LWR@expcolspec}{\colspecremainder}% - \edef\LWR@origcolspec{\LWR@expcolspec}% - \StrPosition{\LWR@origcolspec}{*}[\LWR@tempone]% - }% + \noexpand\csdef{LWR@columntype@mctype@#1}{% + \noexpand\@nameuse{#4}{#1}% + }% + \noexpand\csdef{LWR@columntype@mcdata@#1}{% + \noexpand\@nameuse{#5}{#2}% + }% + }% + \@tempa% + \LWR@traceinfo{LWR@modifycolumntype done}% } +\LWR@modifycolumntype{l}{0}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@normal} + +\LWR@modifycolumntype{c}{0}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@normal} + +\LWR@modifycolumntype{r}{0}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@normal} +\LWR@modifycolumntype{@}{0}{LWR@parseatcolumn} + {LWR@printmccoltype@ignore}{LWR@printmccoldata@other} + +\LWR@modifycolumntype{!}{0}{LWR@parsebangcolumn} + {LWR@printmccoltype@ignore}{LWR@printmccoldata@other} + +\LWR@modifycolumntype{>}{0}{LWR@parsebeforecolumn} + {LWR@printmccoltype@ignore}{LWR@printmccoldata@other} + +\LWR@modifycolumntype{<}{0}{LWR@parseaftercolumn} + {LWR@printmccoltype@ignore}{LWR@printmccoldata@other} + +\LWR@modifycolumntype{|}{0}{LWR@parsebarcolumn} + {LWR@printmccoltype@vertbar}{LWR@printmccoldata@skip} + +\LWR@modifycolumntype{:}{0}{LWR@parsecoloncolumn} + {LWR@printmccoltype@colon}{LWR@printmccoldata@skip} +\LWR@modifycolumntype{;}{1}{LWR@parsesemicoloncolumn} + {LWR@printmccoltype@semicolon}{LWR@printmccoldata@skip} +\LWR@modifycolumntype{p}{1}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph} + +\LWR@modifycolumntype{m}{1}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph} + +\LWR@modifycolumntype{b}{1}{LWR@parsenormalcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@paragraph} +\LWR@modifycolumntype{w}{2}{LWR@parsewcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@normal} + +\LWR@modifycolumntype{W}{2}{LWR@parsewcolumn} + {LWR@printmccoltype@normal}{LWR@printmccoldata@normal} +\LWR@modifycolumntype{*}{2}{LWR@parsestarcolumn} + {LWR@printmccoltype@ignore}{LWR@printmccoldata@skip} +\NewDocumentCommand{\HTMLnewcolumntype}{m O{0} m}{% + \expandafter\newcommand\expandafter*% + \csname LWR@HTML@NC@rewrite@#1\endcsname[#2]{\NC@find #3}% + \LWR@formatted{NC@rewrite@#1}% +} +\end{warpHTML} +\begin{warpprint} +\NewDocumentCommand{\HTMLnewcolumntype}{m O{0} m}{} +\end{warpprint} +\begin{warpHTML} \newcommand*{\LWR@parsetablecols}[1]{% \LWR@traceinfo{LWR@parsetablecols}% \renewcommand*{\LWR@origcolspec}{#1}% \expandarg% \StrSubstitute{\LWR@origcolspec}{ }{}[\LWR@origcolspec]% - \expandcolspec% + \LWR@expandpreamble{\LWR@origcolspec}% + \edef\LWR@origcolspec{\the\@temptokena}% \defcounter{LWR@tabletotalLaTeXcols}{0}% \defcounter{LWR@tabletotalLaTeXcolsnext}{1}% \LWR@setexparray{LWR@colatspec}{leftedge}{}% @@ -9329,6 +9461,9 @@ end -- not --version \LWR@setexparray{LWR@colbarspec}{1}{}% \LWR@setexparray{LWR@colbarspec}{2}{}% \LWR@setexparray{LWR@colbarspec}{3}{}% + \LWR@setexparray{LWR@coladdclass}{1}{}% + \LWR@setexparray{LWR@coladdclass}{2}{}% + \LWR@setexparray{LWR@coladdclass}{3}{}% \defcounter{LWR@tablecolspecindex}{1}% \expandarg% \StrLen{\LWR@origcolspec}[\LWR@strresult]% @@ -9352,37 +9487,13 @@ end -- not --version \ifbool{LWR@opttablecol}% {}% inside an optional argument {% not an optional tabular argument - \IfStrEq{\LWR@strresult}{l}{\LWR@parsenormalcolumn{l}}{}% - \IfStrEq{\LWR@strresult}{c}{\LWR@parsenormalcolumn{c}}{}% - \IfStrEq{\LWR@strresult}{r}{\LWR@parsenormalcolumn{r}}{}% - \IfStrEq{\LWR@strresult}{L}{\LWR@parsenormalcolumn{l}}{}% - \IfStrEq{\LWR@strresult}{C}{\LWR@parsenormalcolumn{c}}{}% - \IfStrEq{\LWR@strresult}{R}{\LWR@parsenormalcolumn{r}}{}% - \IfStrEq{\LWR@strresult}{J}{\LWR@parsenormalcolumn{l}}{}% - \IfStrEq{\LWR@strresult}{S}{\LWR@parsenormalcolumn{c}}{}% - \IfStrEq{\LWR@strresult}{s}{\LWR@parsenormalcolumn{c}}{}% - \IfStrEq{\LWR@strresult}{\detokenize{@}}{\LWR@parseatcolumn}{}% - \IfStrEq{\LWR@strresult}{!}{\LWR@parsebangcolumn}{}% - \IfStrEq{\LWR@strresult}{>}{\LWR@parsebeforecolumn}{}% - \IfStrEq{\LWR@strresult}{<}{\LWR@parseaftercolumn}{}% - \IfStrEq{\LWR@strresult}{|}{\LWR@parsebarcolumn}{}% - \IfStrEq{\LWR@strresult}{:}{\LWR@parsecoloncolumn}{}% - \IfStrEq{\LWR@strresult}{;}{\LWR@parsesemicoloncolumn}{}% - \IfStrEq{\LWR@strresult}{p}{\LWR@parsepcolumn{p}}{}% - \IfStrEq{\LWR@strresult}{m}{\LWR@parsepcolumn{m}}{}% - \IfStrEq{\LWR@strresult}{b}{\LWR@parsepcolumn{b}}{}% - \IfStrEq{\LWR@strresult}{w}{\LWR@parsewcolumn}{}% - \IfStrEq{\LWR@strresult}{W}{\LWR@parsewcolumn}{}% - \IfStrEq{\LWR@strresult}{*}{\LWR@parsestarcolumn}{}% - \IfStrEq{\LWR@strresult}{D}{\LWR@parseDcolumn{c}}{}% - \IfStrEq{\LWR@strresult}{X}{\LWR@parsenormalcolumn{X}}{}% - \IfStrEq{\LWR@strresult}{P}{\LWR@parsepcolumn{P}}{}% - \IfStrEq{\LWR@strresult}{M}{\LWR@parsepcolumn{M}}{}% - \IfStrEq{\LWR@strresult}{B}{\LWR@parsepcolumn{B}}{}% - \ifbool{LWR@validtablecol}{}{% - \LWR@traceinfo{invalid column type: \LWR@strresult}% - \LWR@parsenormalcolumn{l}% - }% + \ifcsdef{LWR@columntype@\LWR@strresult}% + {\csuse{LWR@columntype@\LWR@strresult}}% + {}% + \ifbool{LWR@validtablecol}{}{% + \LWR@traceinfo{invalid column type: \LWR@strresult}% + \LWR@parsenormalcolumn{l}% + }% }% not an optional column argument \IfStrEq{\LWR@strresult}{]}{\boolfalse{LWR@opttablecol}}{}% \defaddtocounter{LWR@tablecolspecindex}{1}% @@ -9471,8 +9582,8 @@ end -- not --version \LWR@tdendstyles% }% \ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}% - {}% - {\LWR@atbangspec}% + {}% + {\LWR@atbangspec}% \LWR@htmltag{/td}\LWR@orignewline% \global\booltrue{LWR@tabularcelladded}% }% not empty @@ -9515,6 +9626,8 @@ end -- not --version \LWR@addcmidruletrim% \LWR@addleftmostbartag% \LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% + \LWR@getexparray{LWR@coladdclass}% + {\arabic{LWR@tableLaTeXcolindex}}% \textquotedbl{}% \LWR@tdstartstyles% \LWR@addcmidrulewidth% @@ -9532,11 +9645,7 @@ end -- not --version \ifboolexpr{% test{ \ifdefstring{\LWR@strresult}{p} } or test{ \ifdefstring{\LWR@strresult}{m} } or - test{ \ifdefstring{\LWR@strresult}{b} } or - test{ \ifdefstring{\LWR@strresult}{P} } or - test{ \ifdefstring{\LWR@strresult}{M} } or - test{ \ifdefstring{\LWR@strresult}{B} } or - test{ \ifdefstring{\LWR@strresult}{X} } + test{ \ifdefstring{\LWR@strresult}{b} } }% {% allow pars \LWR@traceinfo{LWR@tabledatasinglecolumntag: about to LWR@startpars}% @@ -9725,9 +9834,6 @@ end -- not --version \IfSubStr{#1}{p}{\LWR@WPcell{left}{bottom}}{}% \IfSubStr{#1}{m}{\LWR@WPcell{left}{middle}}{}% \IfSubStr{#1}{b}{\LWR@WPcell{left}{top}}{}% - \IfSubStr{#1}{P}{\LWR@WPcell{center}{bottom}}{}% - \IfSubStr{#1}{M}{\LWR@WPcell{center}{middle}}{}% - \IfSubStr{#1}{B}{\LWR@WPcell{center}{top}}{}% }{}% } @@ -9872,100 +9978,70 @@ end -- not --version +\newcommand*{\LWR@printmccoltype@normal}[1]{% + #1% + \boolfalse{LWR@mcolvertbaronleft}% +} + +\newcommand*{\LWR@printmccoltype@ignore}[1]{}% + +\newcommand*{\LWR@printmccoltype@vertbar}[1]{% + \ifbool{LWR@mcolvertbaronleft}% + {\defaddtocounter{LWR@mcolvertbarsl}{1}}% left edge + {\defaddtocounter{LWR@mcolvertbarsr}{1}}% not left edge +} + +\newcommand*{\LWR@printmccoltype@colon}[1]{% + \ifbool{LWR@mcolvertbaronleft}% + {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge + {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge +} + +\let\LWR@printmccoltype@semicolon\LWR@printmccoltype@colon + \newcommand*{\LWR@printmccoltype}[1]{% \LWR@traceinfo{lwr@printmccoltype -#1-}% \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% - \IfStrEq{\LWR@strresult}{l}{l}{}% - \IfStrEq{\LWR@strresult}{c}{c}{}% - \IfStrEq{\LWR@strresult}{r}{r}{}% - \IfStrEq{\LWR@strresult}{p}{p}{}% - \IfStrEq{\LWR@strresult}{m}{m}{}% - \IfStrEq{\LWR@strresult}{b}{b}{}% - \IfStrEq{\LWR@strresult}{P}{P}{}% - \IfStrEq{\LWR@strresult}{M}{M}{}% - \IfStrEq{\LWR@strresult}{B}{B}{}% - \IfStrEq{\LWR@strresult}{w}{w}{}% - \IfStrEq{\LWR@strresult}{W}{W}{}% - \IfStrEq{\LWR@strresult}{S}{c}{}% - \IfStrEq{\LWR@strresult}{s}{c}{}% - \IfStrEq{\LWR@strresult}{X}{p}{}% - \IfStrEq{\LWR@strresult}{|}% - {% - \ifbool{LWR@mcolvertbaronleft}% - {\defaddtocounter{LWR@mcolvertbarsl}{1}}% left edge - {\defaddtocounter{LWR@mcolvertbarsr}{1}}% not left edge - }% - {% - \IfStrEq{\LWR@strresult}{:}% - {% - \ifbool{LWR@mcolvertbaronleft}% - {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge - {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge - }% - {% - \IfStrEq{\LWR@strresult}{;}% - {% - \ifbool{LWR@mcolvertbaronleft}% - {\defaddtocounter{LWR@mcolvertbarsldash}{1}}% left edge - {\defaddtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge - }% - {\boolfalse{LWR@mcolvertbaronleft}}% - }% - }% + \edef\LWR@strresult{\detokenize\expandafter{\LWR@strresult}}% + \ifcsdef{LWR@columntype@mctype@\LWR@strresult}% + {\csuse{LWR@columntype@mctype@\LWR@strresult}}% + {\boolfalse{LWR@mcolvertbaronleft}}% \LWR@traceinfo{lwr@printmccoltype done}% } -\newcommand*{\LWR@multicolpartext}[1]{% - \LWR@startpars% - \LWR@multicoltext% - \defaddtocounter{LWR@tablemulticolspos}{#1}% - \LWR@stoppars% -} - -\newcommand*{\LWR@multicolother}[1]{% +\newcommand*{\LWR@printmccoldata@other}[2]{% \defaddtocounter{LWR@tablemulticolspos}{1}% - \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% + \StrChar{#2}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% \LWR@strresult% \booltrue{LWR@validtablecol}% } -\newcommand*{\LWR@multicolskip}{% +\newcommand*{\LWR@printmccoldata@skip}[2]{% + \defaddtocounter{LWR@tablemulticolspos}{#1}% \booltrue{LWR@validtablecol}% } + +\newcommand*{\LWR@printmccoldata@normal}[2]{% + \LWR@multicoltext% + \defaddtocounter{LWR@tablemulticolspos}{#1}% +} + +\newcommand*{\LWR@printmccoldata@paragraph}[2]{% + \LWR@startpars% + \LWR@multicoltext% + \defaddtocounter{LWR@tablemulticolspos}{#1}% + \LWR@stoppars% +} + \newcommand*{\LWR@printmccoldata}[1]{% \LWR@traceinfo{lwr@printmccoldata -#1}% \boolfalse{LWR@validtablecol}% \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% \edef\LWR@printmccoldatatoken{\LWR@strresult}% - \IfStrEq{\LWR@printmccoldatatoken}{l}{\LWR@multicoltext}{}% - \IfStrEq{\LWR@printmccoldatatoken}{c}{\LWR@multicoltext}{}% - \IfStrEq{\LWR@printmccoldatatoken}{r}{\LWR@multicoltext}{}% - \IfStrEq{\LWR@printmccoldatatoken}{D}{% - \defaddtocounter{LWR@tablemulticolspos}{3}% skip parameters - \LWR@multicoltext% - }{}% - \IfStrEq{\LWR@printmccoldatatoken}{p}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{m}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{b}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{P}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{M}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{B}{\LWR@multicolpartext{2}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{w}{\LWR@multicolpartext{3}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{W}{\LWR@multicolpartext{3}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{S}{\LWR@multicoltext}{}% - \IfStrEq{\LWR@printmccoldatatoken}{s}{\LWR@multicoltext}{}% - \IfStrEq{\LWR@printmccoldatatoken}{X}{\LWR@multicolpartext{1}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{|}{\LWR@multicolskip}{}% - \IfStrEq{\LWR@printmccoldatatoken}{:}{\LWR@multicolskip}{}% - \IfStrEq{\LWR@printmccoldatatoken}{;}{% - \LWR@multicolskip% - \defaddtocounter{LWR@tablemulticolspos}{1}% skip parameter - }{}% - \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{@}}{\LWR@multicolother{#1}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{!}}{\LWR@multicolother{#1}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{>}}{\LWR@multicolother{#1}}{}% - \IfStrEq{\LWR@printmccoldatatoken}{\detokenize{<}}{\LWR@multicolother{#1}}{}% + \ifcsdef{LWR@columntype@mcdata@\LWR@printmccoldatatoken}% + {\csuse{LWR@columntype@mcdata@\LWR@printmccoldatatoken}{#1}}% + {}% \ifbool{LWR@validtablecol}{}{\LWR@multicoltext{}}% \LWR@traceinfo{lwr@printmccoldata done}% } @@ -9981,7 +10057,7 @@ end -- not --version }% }% {% - #2{#1}% + \csuse{#2}{#1}% \defaddtocounter{LWR@tablemulticolspos}{1}% }% } @@ -10034,6 +10110,8 @@ end -- not --version #6% \booltrue{LWR@validtablecol}% }% + \LWR@expandpreamble{#5}% + \edef\LWR@origmccolspec{\the\@temptokena}% \defcounter{LWR@lastmulticolumn}{\value{LWR@tableLaTeXcolindex}}% \defaddtocounter{LWR@lastmulticolumn}{#3}% \defaddtocounter{LWR@lastmulticolumn}{-1}% @@ -10049,7 +10127,7 @@ end -- not --version \defcounter{LWR@mcolvertbarsldash}{0}% \defcounter{LWR@mcolvertbarsrdash}{0}% \booltrue{LWR@mcolvertbaronleft}% - \LWR@parsemulticolumnalignment{#5}{\LWR@printmccoltype}% + \LWR@parsemulticolumnalignment{\LWR@origmccolspec}{LWR@printmccoltype}% \LWR@subaddcmidruletrim% {% \LWR@getexparray{LWR@trimlrules}% @@ -10088,11 +10166,11 @@ end -- not --version \LWR@addcdashline% \LWR@addtabularhrulecolor% \LWR@addmulticolvertrulecolor% - \LWR@addformatwpalignment{#5}% + \LWR@addformatwpalignment{\LWR@origmccolspec}% \LWR@tdendstyles% }% end of the opening table data tag \boolfalse{LWR@intabularmetadata}% - \LWR@parsemulticolumnalignment{#5}{\LWR@printmccoldata}% + \LWR@parsemulticolumnalignment{\LWR@origmccolspec}{LWR@printmccoldata}% } @@ -10117,7 +10195,7 @@ end -- not --version \LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalLaTeXcols}}% \LWR@domulticolumn{\arabic{LWR@tabletotalLaTeXcols}}% {\arabic{LWR@tabhtmlcoltotal}}% - {P}% + {p}% {% \LWR@domulticolumn \IfBooleanTF{#1}% star? {% yes star @@ -13190,6 +13268,12 @@ end -- not --version {\LWR@print@fcolorminipage} {\endLWR@print@fcolorminipage} +\LWR@formatted{colorbox} +\LWR@formatted{colorboxBlock} +\LWR@formatted{fcolorbox} +\LWR@formatted{fcolorboxBlock} +\LWR@formattedenv{fcolorminipage} + \LWR@traceinfo{xcolor patches done} }{}% xcolor loaded }% AtBeginDocument @@ -13597,6 +13681,7 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textbf} +\@ifpackageloaded{nfssext-cfr}{ \DeclareRobustCommand{\LWR@HTML@texteb}[1]{% {% \LWR@HTML@ebweight% @@ -13605,7 +13690,11 @@ color:\LWR@origpound\LWR@tempcolor% } \LWR@formatted{texteb} +}{% if not loaded + \providerobustcmd{\texteb}[1]{} +} +\@ifpackageloaded{nfssext-cfr}{ \DeclareRobustCommand{\LWR@HTML@textlg}[1]{% {% \LWR@HTML@lgweight% @@ -13614,6 +13703,9 @@ color:\LWR@origpound\LWR@tempcolor% } \LWR@formatted{textlg} +}{% if not loaded + \providerobustcmd{\textlg}[1]{} +} \DeclareRobustCommand{\LWR@HTML@textrm}[1]{% {% @@ -13776,17 +13868,21 @@ color:\LWR@origpound\LWR@tempcolor% } \LWR@formatted{bfseries} +\@ifpackageloaded{nfssext-cfr}{ \newrobustcmd*{\LWR@HTML@ebweight}{% \LWR@print@ebweight% \renewcommand*{\LWR@f@series}{eb}% } \LWR@formatted{ebweight} +}{} +\@ifpackageloaded{nfssext-cfr}{ \newrobustcmd*{\LWR@HTML@lgweight}{% \LWR@print@lgweight% \renewcommand*{\LWR@f@series}{lg}% } \LWR@formatted{lgweight} +}{} \newrobustcmd*{\LWR@HTML@rmfamily}{% \LWR@print@rmfamily% @@ -14316,6 +14412,16 @@ color:\LWR@origpound\LWR@tempcolor% \end{warpHTML} \begin{warpHTML} +\RequirePackage{array} +\edef\LWR@detect@centeringarraybackslash{\centering\arraybackslash} +\edef\LWR@detect@raggedrightarraybackslash{\raggedright\arraybackslash} +\edef\LWR@detect@raggedleftarraybackslash{\raggedleft\arraybackslash} +\def\LWR@detect@itshape{\itshape} +\def\LWR@detect@bfseries{\bfseries} +\def\LWR@detect@bfit{\bfseries\itshape} +\end{warpHTML} + +\begin{warpHTML} \AtBeginDocument{ \@ifpackageloaded{everyshi}{ \RequirePackage{lwarp-everyshi} @@ -14595,6 +14701,7 @@ color:\LWR@origpound\LWR@tempcolor% {Keys/values are ignored in MathJax.\MessageBreak \protect\Cdots, etc. do not span multiple cells.\MessageBreak AutoNiceMatrix, etc. are not supported for MathJax.\MessageBreak + \protect\CodeBefore\space cannot be done with MathJax.\MessageBreak \LWR@forceSVGmessage{nicematrix}% } \LWR@nomathjaxwarn{pb-diagram} |