diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
24 files changed, 883 insertions, 335 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty index bedab9b7f17..e09ac024345 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty @@ -18,6 +18,8 @@ \LWR@ProvidesPackagePass{SIunits}[2007/12/02] \ifbool{mathjax}{ \DeclareRobustCommand{\LWR@HTML@unit}[2]{% + \begingroup% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \LWR@subsingledollar*% lwarp {% alt tag \textbackslash{}unit% @@ -28,6 +30,7 @@ {% #1\,{#2}% }% contents + \endgroup% } }{% not MathJax \DeclareRobustCommand{\LWR@HTML@unit}[2]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 06793e4e1c1..3aa70a0e706 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -90,7 +90,7 @@ { \LWR@endhideamsmath \boolfalse{LWR@amsmultline} - \LWR@addmathjax{#2}{\the\@envbody} + \LWR@addmathjax{#2}{\the\@envbody}% } {\LWR@amsmathenv@@after} \gdef\LWR@ThisAltText{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-apxproof.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-apxproof.sty new file mode 100644 index 00000000000..8db2a57f23f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-apxproof.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-apxproof.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `apxproof') +%% This is a generated file. +%% Copyright 2016-2022 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{apxproof}[2022/10/14] +\xpatchcmd{\FVB@axp@VerbatimOut} + {\FV@Scan} + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}\FV@Scan} + {} + {\LWR@patcherror{apxproof}{FVB@axp@VerbatimOut}} + +\endinput +%% +%% End of file `lwarp-apxproof.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty index b9015551411..27be0cfa2cc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty @@ -47,7 +47,7 @@ \def\LWR@attachfile@appearance{#1}% } \DeclareRobustCommand{\atfi@insert@file@annot}[1]{% - \LWR@href{#1}{\LWR@attachfile@appearance}% + \LWR@href@partsanitized{#1}{\LWR@attachfile@appearance}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty index b2781e3cb50..060fbdb6c90 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty @@ -59,7 +59,7 @@ \def\LWR@attachfile@appearance{#1}% } \DeclareRobustCommand{\atfi@insert@file@annot}[1]{% - \LWR@href{#1}{\LWR@attachfile@appearance}% + \LWR@href@partsanitized{#1}{\LWR@attachfile@appearance}% } \DeclareRobustCommand{\notextattachfile}[2][]{% \begingroup diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty index 733aca182ee..f8f2a28a68a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty @@ -21,7 +21,7 @@ \NewDocumentCommand{\LWR@burlaltb}{O{} +m m}{% \LWR@ensuredoingapar% \LWR@subhyperref{#2}% - \LWR@subhyperreftext{#3}% + \LWR@subhyperreftext@unsanitized{#3}% \endgroup% restore catcodes } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bussproofs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bussproofs.sty index 9873734d071..367db4592ee 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bussproofs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bussproofs.sty @@ -20,7 +20,10 @@ \CustomizeMathJax{\require{bussproofs}} \NewEnviron{LWR@HTML@prooftree}% - {\LWR@doequation{\BODY}{prooftree}}% + {% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% + \LWR@doequation{\BODY}{prooftree}% + }% [\LWR@doendequation{prooftree}] \LWR@formattedenv{prooftree} }{% SVG HTML diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 971c252bc3c..8136279f7b5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -24,11 +24,11 @@ \typeout{instead of: \protect\usepackage[options]\protect{caption\protect}.} \typeout{---} -\LWR@ProvidesPackagePass{caption}[2020/10/26] +\LWR@ProvidesPackagePass{caption}[2023/08/05] \long\def\caption@iibox@#1#2#3#4{% \caption@iiibox{#1}{#2}{#3}% []% lwarp - [\captionbox@hj@default]% + [\captionbox@innerpos@default]% {{#4}}% lwarp } \long\def\caption@iiiibox#1#2#3#4#5[#6][#7]#8{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty index 40833a0c9a9..89635694e32 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption3.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{caption3}[2020/10/21] +\LWR@ProvidesPackagePass{caption3}[2023/07/31] \IfPackageAtLeastTF{caption3}{2020/08/23}{ \renewcommand\caption@@@make[2]{% \LWR@traceinfo{caption@@@make}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty index 7f159fbd275..1905556a27a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty @@ -60,6 +60,59 @@ \AtBeginDocument{\LWR@expandableformatted{doublerulesepcolornexttoken}} +\newcommand*{\LWR@xcolortempcolor}{} + +\def\rowc@l@rs[#1]#2#3#4% +{% + \rownum=1% + \@rowcolorstrue% + \@ifxempty{#3}% + {\def\@oddrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#3}{HTML}\LWR@xcolortempcolor% + \edef\@oddrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \@ifxempty{#4}% + {\def\@evenrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#4}{HTML}\LWR@xcolortempcolor% + \edef\@evenrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \if@rowcmd + \def\@rowcolors + {% + \if@rowcolors + \relax\ifnum\rownum<#2\@norowcolor\else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi% + \fi% + }% + \else + \def\@rowcolors + {% + \if@rowcolors + \ifnum\rownum<#2% + \@norowcolor + \else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi% + \fi + \fi% + }% + \fi + \ignorespaces% +} +\def\@norowcolor{% + \renewcommand{\LWR@xcolorrowHTMLcolor}{}% +} + +\def\@rowc@lors{% + \advance\rownum\@ne% + \@rowcolors% +} + \begin{warpMathJax} \CustomizeMathJax{\require{colortbl}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 805383e72cc..4db9e79a29f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -39,7 +39,7 @@ \ignorespaces% }% \def\V@@@footnotetext{% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline% \strut\egroup% } @@ -159,6 +159,38 @@ \def\endLandScape{} \def\@Landscape#1#2#3{} \def\endLandscape{} +\def\Verbatim@List#1{% + \if@minipage\else\vskip\parskip\fi + \leftskip\@totalleftmargin + \@rightskip\@flushglue \rightskip\@rightskip + \parindent\z@ + \parskip\z@ + \parfillskip\@flushglue + \hfuzz\VerbatimFuzz\relax + \@@par + \global\@inlabelfalse %Prevents vspace from being inserted when + \Verbatim@Prep %first line exceeds \hsize. + \expandafter\def\expandafter\tmpb\expandafter{#1}% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \tmpb% lwarp + \Verbatim@Par}% + +\def\Verbatim@@Input{% + \let\protect\noexpand + \LetLtxMacro\tmpb\The@Verbatim% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \edef\The@Verbatim{% + \noexpand\Every@VerbatimLine + \tmpb% lwarp + \ifeof\Verbatim@Infile\else\noexpand\Verbatim@Par\fi}% + \let\protect\relax + \The@Verbatim + \ifeof\Verbatim@Infile\else + \let\The@Verbatim\The@GVerbatim + \def\The@GVerbatim{}\Verbatim@NextLine + \expandafter\Verbatim@@Input + \fi}% + \let\LWRFB@UseVerbatim\UseVerbatim \renewcommand*{\UseVerbatim}[1]{% \LWR@atbeginverbatim{Verbatim}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index d496a4461b0..a73bd19cfbc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -17,10 +17,171 @@ %% version 2005/12/01 or later. \AtBeginDocument{\RequirePackage{xcolor}}% for \convertcolorspec -\LWR@ProvidesPackagePass{fancyvrb}[2008/02/07] +\LWR@ProvidesPackagePass{fancyvrb}[2023/11/06] \fvset{frame=none}% + +\define@key{FV}{gobble}{% + \@tempcnta=#1\relax + \ifnum\@tempcnta<\@ne + \let\FV@Gobble\relax + \else + \ifnum\@tempcnta>9 + \FV@Error{gobble parameter must be less than 10}\FV@eha + \else + \renewcommand{\FV@@@@Gobble}[\@tempcnta]{}% + \let\FV@Gobble\FV@@Gobble% + \boolfalse{LWR@HTMLsanitize@tmpb@enable}% lwarp + \fi + \fi} + +\ifxetexorluatex +\def\LWR@HTML@FancyVerbSpace{\textvisiblespace} +\else +\@ifundefined{verbvisiblespace}% + {% + \@ifundefined{textvisiblespace}% + {\begingroup\catcode`\ =12 \gdef\LWR@HTML@FancyVerbSpace{\tt }\endgroup} + {\def\LWR@HTML@FancyVerbSpace{\textvisiblespace}} + }% + {\def\LWR@HTML@FancyVerbSpace{\verbvisiblespace}} +\fi +\LWR@formatted{FancyVerbSpace} + +\def\LWR@print@FancyVerbTab{|} +\def\LWR@HTML@FancyVerbTab{|}% +\LWR@formatted{FancyVerbTab} + +\fvset{tabsize=8,showtabs=false} + +\def\FV@CatCodes{% + \let\do\@makeother\dospecials % The usual stuff. + \FV@ActiveWhiteSpace % See below. + \FV@FontScanPrep % See below. + \FV@CatCodesHook % A style hook. + \FancyVerbCodes % A user-defined hook. + \catcode`\>=12% % lwarp + \catcode`\<=12% % lwarp +} +\def\FV@GetLine{% + \@noligs% + \catcode`\>=12% lwarp, and the next line as well + \catcode`\<=12 + \expandafter\FV@CheckScan\FancyVerbGetLine% +} + +\begingroup +\catcode`\^^M=\active% +\gdef\FancyVerbGetLine#1^^M{% + \@nil% + \FV@CheckEnd{#1}% + \ifx\@tempa\FV@EnvironName% % True if end is found + \ifx\@tempb\FV@@@CheckEnd\else\FV@BadEndError\fi% + \let\next\FV@EndScanning% + \else% + \ifbool{LWR@HTMLsanitize@tmpb@enable}% lwarp + {\def\FV@Line{\LWR@HTMLsanitize@use@tmpb{#1}}}% lwarp + {\def\FV@Line{#1}}% lwarp + \def\next{\FV@PreProcessLine\FV@GetLine}% + \fi% + \next}% +\endgroup +\def\FV@List#1{% + \begingroup + \FV@UseKeyValues + \FV@LeaveVMode + \if@inlabel\else\setbox\@labels=\box\voidb@x\fi + \FV@ListNesting{#1}% + \FV@ListParameterHook + \FV@ListVSpace + \FV@SetLineWidth + \FV@InterLinePenalty + \let\FV@ProcessLine\FV@ListProcessLine% lwarp + \FV@CatCodes + \FV@FormattingPrep + \FV@ObeyTabsInit + \FV@BeginListFrame} +\def\FV@ListProcessLine#1{% + \hbox to \hsize{% + \hbox to \VerbatimHTMLWidth {% + \ifcsvoid{FV@LeftListNumber}{}{\kern 2.5em}% + \FV@LeftListNumber% + \FancyVerbFormatLine{#1}% + \hss% + \FV@RightListNumber% + }% + \hss% required to avoid underfull hboxes +} +} + +\begingroup +\catcode`\^^M=\active% +\gdef\FVC@SaveVerb#1#2{% + \@namedef{FV@SV@#1}{}% + \begingroup% + \FV@UseKeyValues% + \FV@CatCodes% + \outer\def^^M{\FV@EOL}% + \global\let\@tempg\FancyVerbAfterSave% + \catcode`#2=12% + \def\@tempa{\def\FancyVerbGetVerb####1####2}% + \expandafter\@tempa\string#2{% + \endgroup% + \@namedef{FV@SV@#1}{% + \LWR@HTMLsanitize@use@tmpb{##2}% lwarp + }\@tempg% + }% + \FancyVerbGetVerb\FV@EOL}% +\endgroup + +\def\FV@UseVerb#1{% + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{span class=\textquotedbl{}fancyvrb\textquotedbl}}% lwarp + {}% lwarp + \mbox{\FV@UseKeyValues\FV@FormattingPrep#1}% + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{/span}}% lwarp + {}% lwarp +} + +\begingroup +\catcode`\^^M=\active% +\gdef\FVC@Verb#1{% + \begingroup% + \FV@UseKeyValues% + \FV@FormattingPrep% + \FV@CatCodes% + \outer\def^^M{}% + \catcode`#1=12% + \def\@tempa{\def\FancyVerbGetVerb####1####2}% + \expandafter\@tempa\string#1{% + \ifbool{LWR@verbtags}% lwarp + {% lwarp + \LWR@htmltag{span class=\textquotedbl{}fancyvrb\textquotedbl}% lwarp + \def\tmpb{##2}% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \mbox{\tmpb}% lwarp + \LWR@htmltag{/span}% lwarp + }% lwarp + {\mbox{##2}}% + \endgroup% + }% + \FancyVerbGetVerb\FV@EOL% +}% +\endgroup +\begingroup +\catcode`\^^M=\active +\gdef\FV@ReadLine{% + \ifeof\FV@InFile\else + \immediate\read\FV@InFile to\tmpb% + \LWR@HTMLsanitize@tmpb% + \expandafter\FV@@ReadLine\tmpb^^M\relax^^M\@nil% + \fi} +\endgroup +\newcommand*{\LWR@FVstyle}{} \AfterEndPreamble{ + \LWR@traceinfo{Patching fancyvrb.} + \def\VerbatimFootnotes{% \let\@footnotetext\V@footnotetext% \let\footnote\V@footnote% @@ -35,6 +196,9 @@ \csname p@footnote\endcsname\@thefnmark% }% @currentlabel \renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}% + \booltrue{LWR@verbtags}% + \booltrue{LWR@HTMLsanitize@tmpb@enable}% + \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline% \@makefntext{}% \bgroup% @@ -43,47 +207,71 @@ \ignorespaces% }% \def\V@@@footnotetext{% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline% \strut\egroup% } \preto\FVB@Verbatim{\LWR@forcenewpage} \preto\FVB@LVerbatim{\LWR@forcenewpage} -\def\FV@BeginListFrame@Single{% +\def\LWR@HTML@FV@BeginListFrame@Single{% \FV@SingleFrameLine{\z@}% } +\LWR@formatted{FV@BeginListFrame@Single} -\def\FV@EndListFrame@Single{% +\def\LWR@HTML@FV@EndListFrame@Single{% \FV@SingleFrameLine{\@ne}% } +\LWR@formatted{FV@EndListFrame@Single} -\def\FV@BeginListFrame@Lines{% +\def\LWR@HTML@FV@BeginListFrame@Lines{% \FV@SingleFrameLine{\z@}% } +\LWR@formatted{FV@BeginListFrame@Lines} -\def\FV@EndListFrame@Lines{% +\def\LWR@HTML@FV@EndListFrame@Lines{% \FV@SingleFrameLine{\@ne}% } +\LWR@formatted{FV@EndListFrame@Lines} -\renewcommand*{\FV@SingleFrameSep}{} -\def\FV@BUseVerbatim#1{% - \FV@BVerbatimBegin#1\FV@BVerbatimEnd% -} +\newcommand*{\LWR@HTML@FV@SingleFrameSep}{}% +\LWR@formatted{FV@SingleFrameSep} -\newcommand*{\LWR@FVstyle}{} \newcommand*{\LWR@fvstartnone}{% \LWR@traceinfo{fvstartnone}% -\BlockClass[\LWR@FVstyle]{fancyvrb} + \ifdefstring{\LWR@FVstyle}{\LWR@currenttextcolorstyle}% + {% + \LWR@findcurrenttextcolor% + \ifdefstring{\LWR@tempcolor}{000000}% + {\BlockClass{fancyvrb}}% + {\BlockClass[\LWR@FVstyle]{fancyvrb}}% + }% + {% + \BlockClass[\LWR@FVstyle]{fancyvrb}% + }% \LWR@stoppars \ifx\FV@LabelPositionTopLine\relax\else \ifx\FV@LabelBegin\relax\else \FancyVerbRuleColor{\LWR@FVfindbordercolor} - \LWR@htmltagc{% - div class=\textquotedbl{}fancyvrblabel\textquotedbl\ % space - style=\textquotedbl{}color: \LWR@origpound\LWR@tempcolor\textquotedbl% - } + \ifbool{LWR@verbtags}% lwarp + {% lwarp + \LWR@findcurrenttextcolor% + \LWR@htmltagc{% lwarp + div class=\textquotedbl{}fancyvrblabel\textquotedbl\ % space + style=\textquotedbl{}% + color: \LWR@origpound\LWR@tempcolor% + \textquotedbl% + }% + \LWR@orignewline% lwarp + }% lwarp + {}% lwarp \LWR@print@textrm{\FV@LabelBegin}% \textrm preserves emdash - \LWR@htmltagc{/div}\LWR@orignewline% + \LWR@orignewline% lwarp + \ifbool{LWR@verbtags}% lwarp + {% lwarp + \LWR@htmltagc{/div}% lwarp + \LWR@orignewline% lwarp + }% lwarp + {}% lwarp \fi \fi \LWR@atbeginverbatim{verbatim}% @@ -95,16 +283,30 @@ \LWR@stoppars% \ifx\FV@LabelPositionBottomLine\relax\else \ifx\FV@LabelEnd\relax\else - \FancyVerbRuleColor{\LWR@FVfindbordercolor} - \LWR@htmltagc{% - div class=\textquotedbl{}fancyvrblabel\textquotedbl\ % space - style=\textquotedbl{}color: \LWR@origpound\LWR@tempcolor\textquotedbl% - } - \LWR@print@textrm{\FV@LabelEnd} - \LWR@htmltagc{/div}\LWR@orignewline% + \FancyVerbRuleColor{\LWR@FVfindbordercolor}% lwarp + \ifbool{LWR@verbtags}% lwarp + {% lwarp + \LWR@findcurrenttextcolor% + \LWR@htmltagc{% lwarp + div class=\textquotedbl{}fancyvrblabel\textquotedbl\ % space + style=\textquotedbl{}% + color: \LWR@origpound\LWR@tempcolor% + \textquotedbl% + }% + \LWR@orignewline% lwarp + }% lwarp + {}% lwarp + \LWR@print@textrm{\FV@LabelEnd}% lwarp + \LWR@orignewline% lwarp + \ifbool{LWR@verbtags}% lwarp + {% lwarp + \LWR@htmltagc{/div}% lwarp + \LWR@orignewline% lwarp + }% lwarp + {}% lwarp \fi \fi -\endBlockClass +\endBlockClass% lwarp } \newcommand*{\LWR@fvstartsingle}{% @@ -143,16 +345,17 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt % space solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } -\def\FV@Frame@none{% +\def\LWR@HTML@FV@Frame@none{% \renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} +\LWR@formatted{FV@Frame@none} \FV@Frame@none% default values -\def\FV@Frame@single{% +\def\LWR@HTML@FV@Frame@single{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% \LWR@FVborderstyle{}% @@ -161,8 +364,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% \let\FV@EndListFrame\LWR@fvendsingle} +\LWR@formatted{FV@Frame@single} -\def\FV@Frame@lines{% +\def\LWR@HTML@FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% \LWR@FVborderstyle{-top}% @@ -173,8 +377,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} +\LWR@formatted{FV@Frame@lines} -\def\FV@Frame@topline{% +\def\LWR@HTML@FV@Frame@topline{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% \LWR@FVborderstyle{-top}% @@ -183,8 +388,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} +\LWR@formatted{FV@Frame@topline} -\def\FV@Frame@bottomline{% +\def\LWR@HTML@FV@Frame@bottomline{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% \LWR@FVborderstyle{-bottom}% @@ -193,8 +399,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} -\def\FV@FrameFillLine{}% -\def\FV@Frame@leftline{% +\LWR@formatted{FV@Frame@bottomline} +\def\FV@FrameFillLine{} +\def\LWR@HTML@FV@Frame@leftline{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% \LWR@FVborderstyle{-left}% @@ -212,7 +419,8 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} -\def\FV@SingleFrameLine#1{% +\LWR@formatted{FV@Frame@leftline} +\def\LWR@HTML@FV@SingleFrameLine#1{% \ifnum#1=\z@\relax \let\FV@Label\FV@LabelBegin \else @@ -231,32 +439,11 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \fi \fi } -\def\FV@ListProcessLine#1{% - \hbox to \hsize{% - \hbox to \VerbatimHTMLWidth {% - \ifcsvoid{FV@LeftListNumber}{}{\kern 2.5em}% - \FV@LeftListNumber% - \FancyVerbFormatLine{#1}% - \hss% - \FV@RightListNumber% - }% - \hss% required to avoid underfull hboxes -} -} - -\def\FV@ListProcessLine@i#1{% - \ifvoid\@labels\else - \hbox to \z@{\kern\@totalleftmargin\box\@labels\hss}% - \fi - \FV@ListProcessLine{#1}% -} - -\def\FV@ListProcessLastLine{} - +\LWR@formatted{FV@SingleFrameLine} \xpretocmd{\FV@BeginVBox} {% - \LWR@forcenewpage% instead of \preto + \LWR@forcenewpage% \LWR@atbeginverbatim{bverbatim}% } {} @@ -271,6 +458,22 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } % \AfterEndPreamble +\def\FVB@VerbatimOut#1{% + \@bsphack + \begingroup + \FV@UseKeyValues + \FV@DefineWhiteSpace + \def\FV@Space{\space}% + \FV@DefineTabOut + \def\FV@ProcessLine{\immediate\write\FV@OutFile}% + \immediate\openout\FV@OutFile #1\relax + \let\FV@FontScanPrep\relax +%% DG/SR modification begin - May. 18, 1998 (to avoid problems with ligatures) + \let\@noligs\relax +%% DG/SR modification end + \boolfalse{LWR@HTMLsanitize@tmpb@enable}% lwarp + \FV@Scan} + \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 066d023bdee..520c1b3d10c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -59,9 +59,9 @@ } \def\fn@endnote{% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}\LWR@orignewline% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% } \def\fn@startfntext{% \setbox\z@\vbox\bgroup% @@ -74,7 +74,7 @@ \def\fn@endfntext{% \fn@postfntext% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}% \LWR@orignewline% \egroup% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fvextra.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fvextra.sty index 414c82ff44f..0dcb88103aa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fvextra.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fvextra.sty @@ -15,28 +15,25 @@ %% 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{fvextra}[2022/11/30] +\LWR@ProvidesPackagePass{fvextra}[2023/11/28] \define@booleankey{FV}{obeytabs}% + {\let\FV@ObeyTabsInit\relax}% lwarp {\let\FV@ObeyTabsInit\relax} - {\let\FV@ObeyTabsInit\relax} - -\define@key{FV}{tabcolor}% - {} -\define@key{FV}{tab}{} +\define@key{FV}{tabcolor}{}% \define@booleankey{FV}{showtabs}% - {\let\FV@TabChar\relax} + {\def\FV@TabChar{\FV@TabColor{\FancyVerbTab}}}% {\let\FV@TabChar\relax} \newbool{LWR@FV@breaklines} \define@booleankey{FV}{breaklines}% - {\boolfalse{FV@breaklines} - \booltrue{LWR@FV@breaklines} - \let\FV@ListProcessLine\FV@ListProcessLine@NoBreak} - {\boolfalse{FV@breaklines} - \boolfalse{LWR@FV@breaklines} + {\boolfalse{FV@breaklines}% + \booltrue{LWR@FV@breaklines}% lwarp + \let\FV@ListProcessLine\FV@ListProcessLine@NoBreak}% lwarp + {\boolfalse{FV@breaklines}% + \boolfalse{LWR@FV@breaklines}% lwarp \let\FV@ListProcessLine\FV@ListProcessLine@NoBreak} \define@key{FV}{breakanywheresymbolpre}{\def\FancyVerbBreakAnywhereSymbolPre{}} @@ -66,6 +63,29 @@ \define@key{FV}{breaksymbolright}{\def\FancyVerbBreakSymbolRight{}} \fvset{breaksymbolright={}} +\def\FV@DefFVSpace{% + \ifbool{FV@showspaces}% + {% + \def\FV@Space{% + \FV@SpaceColor{\FancyVerbSpace}% + \allowbreak% + }% + }% + {\def\FV@Space{\nobreakspace\allowbreak}}% +} + +\ifxetexorluatex +\def\FancyVerbSpace{\textvisiblespace} +\else +\@ifundefined{verbvisiblespace}% + {% + \@ifundefined{textvisiblespace}% + {\begingroup\catcode`\ =12 \gdef\FancyVerbSpace{\tt }\endgroup} + {\def\FancyVerbSpace{\textvisiblespace}} + }% + {\def\FancyVerbSpace{\verbvisiblespace}} +\fi + \def\FV@ListProcessLine@NoBreak#1{% \FV@LeftListNumber% \FV@LeftListFrame% @@ -76,7 +96,6 @@ \FV@RightListNumber% \null\par% lwarp } - \newcommand*{\LWR@FV@linethensep}{% \ifbool{LWR@FV@breaklines}% {\theFancyVerbLine\kern\FV@NumberSep}% @@ -89,78 +108,198 @@ {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}}% } -\xpatchcmd{\FV@Numbers@left} +\xpatchcmd{\FV@Numbers@left}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@left A}} -\xpatchcmd{\FV@Numbers@left} +\xpatchcmd{\FV@Numbers@left}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@left B}} -\xpatchcmd{\FV@Numbers@left} +\xpatchcmd{\FV@Numbers@left}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@left C}} -\xpatchcmd{\FV@Numbers@right} +\xpatchcmd{\FV@Numbers@right}% {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} {\LWR@FV@septhenline} {} {\LWR@patcherror{fvextra}{FV@Numbers@right A}} -\xpatchcmd{\FV@Numbers@right} +\xpatchcmd{\FV@Numbers@right}% {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} {\LWR@FV@septhenline} {} {\LWR@patcherror{fvextra}{FV@Numbers@right B}} -\xpatchcmd{\FV@Numbers@right} +\xpatchcmd{\FV@Numbers@right}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@right C}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@both A}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@both B}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@both C}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} {\LWR@FV@septhenline} {} {\LWR@patcherror{fvextra}{FV@Numbers@both D}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} {\LWR@FV@septhenline} {} {\LWR@patcherror{fvextra}{FV@Numbers@both E}} -\xpatchcmd{\FV@Numbers@both} +\xpatchcmd{\FV@Numbers@both}% {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} {\LWR@FV@linethensep} {} {\LWR@patcherror{fvextra}{FV@Numbers@both F}} +\def\FVC@SaveVerb@Extra@ii#1#2#3{% + \global\let\FV@AfterSave\FancyVerbAfterSave + \endgroup + \@namedef{FV@SV@#1}{\LWR@HTMLsanitize@use@tmpb{#3}}% lwarp + \@namedef{FV@SVRaw@#1}{\LWR@HTMLsanitize@use@tmpb{#2}}% lwarp + \FV@AfterSave}% + +\def\FV@UseVerb@Extra#1{% + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{span class=\textquotedbl{}fancyvrb\textquotedbl}}% lwarp + {}% lwarp + \ifFV@breaklines + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\FV@InsertBreaks{\FancyVerbFormatInline}{#1}}% + {\mbox{#1}}% + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{/span}}% lwarp + {}% lwarp + \endgroup} + +\def\FVC@Verb@Extra@ii#1{% + \def\tmpb{#1}% lwarp + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{span class=\textquotedbl{}fancyvrb\textquotedbl}}% lwarp + {}% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \ifFV@breaklines + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\FV@InsertBreaks{\FancyVerbFormatInline}{\tmpb}}% lwarp + {\mbox{\tmpb}}% lwarp + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{/span}}% lwarp + {}% lwarp + \endgroup} + +\def\FVC@EscVerb@ii#1{% + \def\tmpb{#1}% lwarp + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{span class=\textquotedbl{}fancyvrb\textquotedbl}}% lwarp + {}% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \ifFV@breaklines + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\FV@InsertBreaks{\FancyVerbFormatInline}{\tmpb}}% lwarp + {\mbox{\tmpb}}% lwarp + \ifbool{LWR@verbtags}% lwarp + {\LWR@htmltag{/span}}% lwarp + {}% lwarp + \endgroup} + +\xpatchcmd{\FVB@VerbatimWrite} + {\FV@Scan} + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}\FV@Scan} + {} + {\LWR@patcherror{fvextra}{FVB@VerbatimWrite}} + +\xpatchcmd{\FVB@VerbatimBuffer} + {\FV@Scan} + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}\FV@Scan} + {} + {\LWR@patcherror{fvextra}{FVB@VerbatimBuffer}} + +\renewcommand{\VerbatimInsertBuffer}[1][]{% + \begingroup + \def\FV@KeyValues{#1}% + \def\FV@Scan{% + \FV@CatCodes + \xdef\FV@EnvironName{Verbatim}% + \ifnum\expandafter\value\expandafter{\FV@bufferlengthname}=\z@\relax + \PackageError{fvextra}% + {Buffer length counter \FV@bufferlengthname\space is invalid or zero}% + {}% + \let\FV@GetLine\relax + \fi + \FV@GetLine}% + \let\FV@CheckScan\relax + \setcounter{FancyVerbBufferIndex}{1}% + \def\VerbatimInsertBuffer@def@FV@Line##1{% + \FVExtraRetokenizeVArg{\def\FV@Line}{}{##1}% + \LetLtxMacro\tmpb\FV@Line% lwarp + \LWR@HTMLsanitize@tmpb% lwarp + \LetLtxMacro\FV@Line\tmpb% lwarp + }% + \def\FancyVerbGetLine{% + \ifnum\value{FancyVerbBufferIndex}>% + \expandafter\value\expandafter{\FV@bufferlengthname}\relax + \global\let\FV@EnvironName\relax + \let\next\relax + \else + \ifcsname \FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname + \expandafter\let\expandafter\FV@Line@Buffer + \csname\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}\endcsname + \expandafter\VerbatimInsertBuffer@def@FV@Line\expandafter{\FV@Line@Buffer}% + \def\next{\FV@PreProcessLine\FV@GetLine}% + \stepcounter{FancyVerbBufferIndex}% + \else + \def\next{% + \PackageError{fvextra}% + {Buffer with line macro named + "\FancyVerbBufferLineName\arabic{FancyVerbBufferIndex}" does not exist}% + {Check bufferlinename, bufferlengthname, and globalbuffer settings}% + }% + \fi + \fi + \next}% + \FVB@Verbatim + \FVE@Verbatim + \setcounter{FancyVerbBufferIndex}{0}% + \endgroup} + + \endinput %% %% End of file `lwarp-fvextra.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index e7637fd3922..8b0d5432dd6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -306,7 +306,7 @@ \NewDocumentCommand{\LWR@includegraphicsb}{s o o m} {% - \LWR@origtilde \LWR@orignewline% + \LWR@orignobreakspace \LWR@orignewline% \begin{LWR@setvirtualpage}% \large% \hbadness=10000\relax% @@ -347,7 +347,8 @@ bool {LWR@igkeepaspectratio} }{\LWR@ig@useactualimagesize{#1}{#2}{#3}{#4}}{}% \LWR@traceinfo{LWR@includegraphicsb: about to create href}% - \LWR@href{\LWR@parsedfilename}% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% + \LWR@href@partsanitized{\LWR@parsedfilename}% {% start of href \LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% \LWR@htmltag{\LWR@ig@htmltag}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 50865b64bb3..4addf49152a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -284,10 +284,10 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \NewDocumentCommand{\LWR@hyperimageb}{m +m}{% \LWR@ensuredoingapar% - \def\LWR@templink{#1}% - \@onelevel@sanitize\LWR@templink% + \edef\tmpb{#1}% + \LWR@HTMLsanitize@tmpb% \LWR@htmltag{% - img src=\textquotedbl\LWR@templink\textquotedbl\ % + img src=\textquotedbl\tmpb\textquotedbl\ % alt=\textquotedbl#2\textquotedbl\ % class=\textquotedbl{}hyperimage\textquotedbl% }% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-minted.sty index 1fa63587466..1006f44b2fd 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}[2022/12/12] +\LWR@ProvidesPackagePass{minted}[2023/09/12] \renewcommand{\setminted}[2][]{% \ifthenelse{\equal{#1}{}}% {\setkeys{minted@opt@g}{% @@ -39,7 +39,6 @@ #2, mathescape=false,breaklines,texcomments=false,highlightlines={}% lwarp }}} - \xpatchcmd{\RobustMintInlineProcess} {\setkeys{minted@opt@cmd}{#1}} {% @@ -47,6 +46,9 @@ #1,% mathescape=false,breaklines,texcomments=false,highlightlines={}% }% + \ifbool{minted@draft}% + {\booltrue{LWR@HTMLsanitize@tmpb@enable}}% + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}}% } {} {\LWR@patcherror{minted}{minted}} @@ -58,6 +60,9 @@ #1,% mathescape=false,breaklines,texcomments=false,highlightlines={}% }% + \ifbool{minted@draft}% + {\booltrue{LWR@HTMLsanitize@tmpb@enable}}% + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}}% } {} {\LWR@patcherror{minted}{minted}} @@ -69,6 +74,9 @@ #1,% mathescape=false,breaklines,texcomments=false,highlightlines={}% }% + \ifbool{minted@draft}% + {\booltrue{LWR@HTMLsanitize@tmpb@enable}}% + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}}% } {} {\LWR@patcherror{minted}{minted}} @@ -79,12 +87,13 @@ #1,% mathescape=false,breaklines,texcomments=false,highlightlines={}% }% + \ifbool{minted@draft}% + {\booltrue{LWR@HTMLsanitize@tmpb@enable}}% + {\boolfalse{LWR@HTMLsanitize@tmpb@enable}}% } {} {\LWR@patcherror{minted}{inputminted}} - - \renewenvironment{minted@snugshade*}[1]% {% \colorlet{shadecolor}{#1}% @@ -94,6 +103,22 @@ \end{snugshade*}% } +\xpatchcmd{\minted@input} + {\input{#1}} + {% + \LWR@minted@overrides% + \input{#1}% + } + {} + {\LWR@patcherror{minted}{minted@input}} + +\newcommand*{\LWR@minted@overrides}{ +\def\PYGZam{\char`\&} +\def\PYGZlt{\char`\<} +\def\PYGZgt{\char`\>} +\def\PYGZsq{\char`\'} +} + \endinput %% %% End of file `lwarp-minted.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty index 48b7403899e..a124053dc8e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty @@ -50,7 +50,7 @@ \LWR@formatted{musDottedNote} \NewDocumentCommand{\LWR@HTML@musMeter}{ m m }{% -\begin{lateximage}*[#1/#2][#1#2]*% +\begin{lateximage}*[#1/#2]*[#1#2]% \musStack{#1 #2}\kern0.05em% \end{lateximage}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index 96295c0f191..6d1e6f31f26 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -752,12 +752,14 @@ \renewcommand*{\shortsubcaption}{} \renewcommand*{\normalsubcaption}{} +\AfterEndPreamble{% \RenewDocumentEnvironment{sidecaption}{o m o} {} {% \IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}% \IfValueT{#3}{\label{#3}}% } +} \renewcommand*{\setsidecaps}[2]{} \renewcommand*{\sidecapmargin}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty index 868dec83f18..3bbcc4a06fd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty @@ -15,81 +15,35 @@ %% 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{simplebnf}[2022/05/08] +\LWR@ProvidesPackagePass{simplebnf}[2023-11-25] \ExplSyntaxOn -\RenewDocumentEnvironment { bnfgrammar } { O{llcll} O{[^\|]\|[^\|]} O{\|\|} +b } +\RenewDocumentEnvironment { bnf } { d() O{llcll} +b } { - \regex_gset:Nn \g_simplebnf_rhs_newline_r { #2 } - \regex_gset:Nn \g_simplebnf_rhs_nb_r { #3 } - - %% \l__input_seq is a list of term definitions. - \regex_split:nnN { ;; } { #4 } \l__input_seq - \begin{center} - \begin{lateximage}[#4]% lwarp - \tl_set:Nn \l__table_tl - { - \begin{tabular}{#1} - } - - \bool_set_true:N \l_tmp_first_term % Is this the first term in this grammar? - \seq_map_inline:Nn \l__input_seq - { - %% If not-first, add newline - \bool_if:NTF \l_tmp_first_term - { - \bool_set_false:N \l_tmp_first_term - } - { - \tl_put_right:Nn \l__table_tl { \\ } - } - - \regex_split:nnNTF { ::= } { ##1 } \l__term_seq - % Parse a ::= definition - { - %% \l__term_seq - (lhs, rhses)... - %% \l__term_tl - lhs - %% \l__keypairs_tl - rhses - \seq_pop_left:NN \l__term_seq \l__term_tl - \seq_pop_left:NN \l__term_seq \l__keypairs_tl + \begin{lateximage}[bnf:\space\detokenize{#3}]% lwarp - \simplebnf_typeset_lhs:n{\l__term_tl} - \tl_put_right:Nn \l__table_tl - { - & \SimpleBNFDefEq & - } - %% \l__keypairs_seq - (rhs:annot | rhs)... - \regex_split:NVN \g_simplebnf_rhs_newline_r \l__keypairs_tl \l__keypairs_seq + \IfNoValueF { #1 } + { \keys_set:nn { simplebnf } { #1 } } - \bool_set_true:N \l__first_rhs - \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n - } - { - % Else, parse a \in declaration - \regex_split:nnNTF { \c{in} } { ##1 } \l__term_seq - { - %% \l__term_seq - (lhs, rhs) - \seq_pop_left:NN \l__term_seq \l_tmpa_tl + \__simplebnf_build_grammar:n { #3 } - \simplebnf_typeset_lhs:n{\l_tmpa_tl} - \tl_put_right:Nn \l__table_tl - { - & $\in$ & $ - } - \seq_pop_left:NN \l__term_seq \l_tmpa_tl - \tl_put_right:NV \l__table_tl \l_tmpa_tl - \tl_put_right:Nn \l__table_tl - { - $ & - } - } - { \msg_error:nn {simplebnf} { Could not parser ##1 } } - } - } + \begin{@simplebnf_tblr_env}[expand=\l__simplebnf_table_tl]{#2} + \tl_use:N \l__simplebnf_table_tl + \end{@simplebnf_tblr_env} + \end{lateximage}% lwarp + } + { } - \tl_put_right:Nn \l__table_tl { \end{tabular} } - \tl_use:N \l__table_tl - \end{lateximage}% lwarp +\RenewDocumentEnvironment { bnfgrammar } { O{llcll} O{[^\|]\|[^\|]} O{\|\|} +b } + { + \msg_warning:nn { simplebnf } { dep } + \begin{center} + \begin{lateximage}[bnf:\space\detokenize{#4}]% lwarp + \begin{tabular}{#1} + \@dep__simplebnf_typeset_grammar:nnn { #2 } { #3 } { #4 } + \tl_use:N \l__simplebnf_table_tl + \end{tabular} + \end{lateximage}% lwarp \end{center} } { } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty index f2f3552d05c..92b342dca0f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty @@ -25,7 +25,7 @@ \RequirePackage{xcolor}% for \convertcolorspec -\LWR@ProvidesPackagePass{siunitx}[2022-02-15] +\LWR@ProvidesPackagePass{siunitx}[2023-11-14] \ExplSyntaxOn @@ -43,13 +43,14 @@ { \tl_set:Nn \l__siunitx_number_outputted_tl { + \boolfalse{mathjax}% lwarp \LWR@subsingledollar{% lwarp - \textbackslash( % space + \textbackslash( % space lwarp ALT text \LWR@HTMLsanitizedetokenized{% \detokenize{#1}% } \textbackslash)% lwarp }% - {siunitx unparsed}% + {siunitx unparsed}% lwarp add'l hashing {\ensuremath{#1}}% lwarp } } @@ -61,80 +62,90 @@ \tl_if_blank:nF {#1} { \seq_put_right:Nn \l__siunitx_compound_tmp_seq { + \boolfalse{mathjax}% lwarp \LWR@subsingledollar{% lwarp - \textbackslash( % space + \textbackslash( % space lwarp ALT tag \LWR@HTMLsanitizedetokenized{% \detokenize{#1}% } \textbackslash)% lwarp }% - {siunitx unparsed}% + {siunitx unparsed}% lwarp add'l hashing {\ensuremath{#1}}% lwarp } } } +\LetLtxMacro\LWR@siunitx@orig@mathrm\mathrm + +\newcommand*{\LWR@siunitx@mathrm}[1]{% + \ifmmode{\LWR@siunitx@orig@mathrm{#1}}\else{#1}\fi% +} \cs_set_protected:Npn \__siunitx_print_aux:nn #1#2 { - \tl_if_empty:cTF { l__siunitx_print_ #1 _color_tl } - { \use:n } - { \exp_args:Nv \textcolor { l__siunitx_print_ #1 _color_tl } } - { - \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% lwarp - { - \use:c - { - siunitx_print_ - \tl_use:c { l__siunitx_print_ #1 _mode_tl } :n - } - {#2} - } + \LetLtxMacro\mathrm\LWR@siunitx@mathrm% lwarp + \tl_if_empty:oF {#2} + { + \tl_if_empty:cTF { l__siunitx_print_ #1 _color_tl } + { \use:n } + { \exp_args:Nv \textcolor { l__siunitx_print_ #1 _color_tl } } { - \bool_lazy_all:nTF% lwarp - { - {\l__siunitx_print_text_family_bool} - {\l__siunitx_print_text_series_bool} - {\l__siunitx_print_text_shape_bool} - } - {% No font control if reset-text-family/series/shape - \use:c - { - siunitx_print_% lwarp - text% lwarp - :n% lwarp - }% lwarp - {#2}% lwarp - } - { - \LWR@textcurrentfont{% lwarp + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% lwarp + { + \use:c + { + siunitx_print_ + \tl_use:c { l__siunitx_print_ #1 _mode_tl } :n + } + {#2} + } + { + \bool_lazy_all:nTF% lwarp + { + {\l__siunitx_print_text_family_bool} + {\l__siunitx_print_text_series_bool} + {\l__siunitx_print_text_shape_bool} + } + {% No font control if reset-text-family/series/shape \use:c { - siunitx_print_% lwarp - text% lwarp - :n% lwarp - }% lwarp - {#2}% lwarp + siunitx_print_% lwarp + text% lwarp + :n% lwarp + }% lwarp + {#2}% lwarp } - } + { + \LWR@textcurrentfont{% lwarp + \use:c + { + siunitx_print_% lwarp + text% lwarp + :n% lwarp + }% lwarp + {#2}% lwarp + } + } + } } - } - } + } +} \newcommand*{\LWR@siunitx@complexrootstyle}{textrm} \newcommand*{\LWR@siunitx@complexrmi}{\mathrm{i}} \newcommand*{\LWR@siunitx@complexrmj}{\mathrm{j}} \newcommand*{\LWR@siunitx@setcomplexroot}{% - \renewcommand*{\LWR@siunitx@complexrootstyle}{textit}% + \renewcommand*{\LWR@siunitx@complexrootstyle}{ijit}% \ifdefequal{\l__siunitx_complex_output_root_tl}{\LWR@siunitx@complexrmi}% - {\renewcommand*{\LWR@siunitx@complexrootstyle}{textrm}}% + {\renewcommand*{\LWR@siunitx@complexrootstyle}{ijup}}% {}% \ifdefequal{\l__siunitx_complex_output_root_tl}{\LWR@siunitx@complexrmj}% - {\renewcommand*{\LWR@siunitx@complexrootstyle}{textrm}}% + {\renewcommand*{\LWR@siunitx@complexrootstyle}{ijup}}% {}% } -\cs_set_protected:Npn \__siunitx_complex_format_auxii:n #1 +\cs_set_protected:Npn \__siunitx_complex_format_cartesian_auxii:n #1 { \LWR@siunitx@setcomplexroot% lwarp - \__siunitx_complex_format_units:n {#1} + \__siunitx_complex_format_cartesian_units:n {#1} \tl_if_empty:NF \l__siunitx_complex_real_tl { \exp_after:wN \__siunitx_complex_drop_exponent:nnnnnnn \l__siunitx_complex_real_tl } \exp_after:wN \__siunitx_complex_format_sign:nnnnnnn \l__siunitx_complex_img_tl @@ -307,13 +318,14 @@ { \__siunitx_quantity_parsed:nn {#1} {#2} } { \tl_set:Nn \l__siunitx_quantity_number_tl { + \boolfalse{mathjax}% lwarp \LWR@subsingledollar{% lwarp - \textbackslash( % space + \textbackslash( % space lwaro ALT tag \LWR@HTMLsanitizedetokenized{% \detokenize{#1}% } \textbackslash)% lwarp }% - {siunitx unparsed}% + {siunitx unparsed}% lwarp add'l hashing {\ensuremath{#1}}% lwarp } \siunitx_unit_format:nN {#2} \l__siunitx_quantity_unit_tl diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty index d346c27e52f..9f53d91cccd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tcolorbox.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{tcolorbox}[2023/02/12] +\LWR@ProvidesPackagePass{tcolorbox}[2023/06/19] \newbool{LWR@havetcblower} \boolfalse{LWR@havetcblower} \newcommand{\LWR@tcolorbox@findcolors}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index cf66c76a9ea..844fe5e0e73 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -42,8 +42,8 @@ \newcommand*{\LWR@currenttextcolorstyle}{% \LWR@findcurrenttextcolor% \ifdefstring{\LWR@tempcolor}{000000}% - {}% - {color: \LWR@origpound\LWR@tempcolor ; }% + {}% + {color: \LWR@origpound\LWR@tempcolor ; }% } \DeclareDocumentCommand{\LWR@textcurrentcolor}{m}{% \begingroup% @@ -227,58 +227,6 @@ } \LWR@formatted{boxframe} -\newcommand*{\LWR@xcolortempcolor}{} - -\def\rowc@l@rs[#1]#2#3#4% -{% - \rownum=1% - \@rowcolorstrue% - \@ifxempty{#3}% - {\def\@oddrowcolor{\@norowcolor}}% - {% - \convertcolorspec{named}{#3}{HTML}\LWR@xcolortempcolor% - \edef\@oddrowcolor{% - \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% - }% - }% - \@ifxempty{#4}% - {\def\@evenrowcolor{\@norowcolor}}% - {% - \convertcolorspec{named}{#4}{HTML}\LWR@xcolortempcolor% - \edef\@evenrowcolor{% - \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% - }% - }% - \if@rowcmd - \def\@rowcolors - {% - \if@rowcolors - \relax\ifnum\rownum<#2\@norowcolor\else - \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi% - \fi% - }% - \else - \def\@rowcolors - {% - \if@rowcolors - \ifnum\rownum<#2% - \@norowcolor - \else - \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi% - \fi - \fi% - }% - \fi - \ignorespaces% -} -\def\@norowcolor{% - \renewcommand{\LWR@xcolorrowHTMLcolor}{}% -} - -\def\@rowc@lors{% - \advance\rownum\@ne% - \@rowcolors% -} \endinput %% %% End of file `lwarp-xcolor.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 1fc21a62319..16540b22088 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} - [2023/08/28 v0.912 Allows LaTeX to directly produce HTML5 output.] + [2024/01/05 v0.913 Allows LaTeX to directly produce HTML5 output.] @@ -28,7 +28,7 @@ \RequirePackage{iftex}[2019/11/07] \RequirePackage{ifpdf} -\RequirePackage{ifptex} +\RequirePackage{ifptex}% in case TL2019 or earlier \newif\ifxetexorluatex @@ -299,6 +299,7 @@ \LWR@loadafter{anonchap} \LWR@loadafter{anysize} \LWR@notmemoirloadafter{appendix} +\LWR@loadafter{apxproof} \LWR@loadafter{ar} \LWR@loadafter{arabicfront} \LWR@notmemoirloadafter{array} @@ -380,6 +381,7 @@ \LWR@loadafter{decorule} \LWR@loadafter{diagbox} \LWR@loadafter{dingbat} +\LWR@loadafter{doipubmed} \LWR@loadafter{DotArrow} \LWR@loadafter{dotlessi} \LWR@loadafter{dprogress} @@ -821,7 +823,9 @@ or \protect\mdfivesum.% } } -\let\LWR@mdfive\pdfmdfivesum +\ifdef{\pdfmdfivesum} + {\let\LWR@mdfive\pdfmdfivesum} + {} \ifLuaTeX \RequirePackage{pdftexcmds} \let\LWR@mdfive\pdf@mdfivesum @@ -981,7 +985,7 @@ \setcounter{LWR@texboxdepth}{0} \newcommand*{\LWR@maybe@orignewpage}{% \LWR@traceinfo{LWR@maybe@orignewpage}% - \ifnumgreater{\value{LWR@texboxdepth}}{0} + \ifnumgreater{\value{LWR@texboxdepth}}{0}% {}% {\LWR@orignewpage}% \LWR@traceinfo{LWR@maybe@orignewpage done}% @@ -2059,7 +2063,8 @@ \chardef\LWR@origpound=`\# \let\LWR@origcomma\, -\let\LWR@origtilde~ +\LetLtxMacro\LWR@origtilde~ +\LetLtxMacro\LWR@orignobreakspace\nobreakspace \let\LWR@orighfil\hfil \let\LWR@orighss\hss \let\LWR@origllap\llap @@ -2512,6 +2517,10 @@ span.textup, div.textup { font-variant-numeric: normal ; } +/* For complex number i,j symbols */ +span.ijit {font-style: italic; font-variant: normal} +span.ijup {font-style: normal; font-variant: normal} + span.textsc, div.textsc { font-variant: small-caps; font-variant-numeric: oldstyle-nums ; @@ -3066,8 +3075,10 @@ span.abstractrunintitle{ } .fancyvrb { - font-size:.85em ; - margin: 3ex 0pt 3ex 0pt + margin: 3ex 0pt 3ex 0pt ; + font-family: "DejaVu Mono", "Bitstream Vera Mono", "Lucida Console", + "Nimbus Mono L", "Liberation Mono", "FreeMono", "Andale Mono", + "Courier New", monospace; } .fancyvrblabel { @@ -3605,7 +3616,7 @@ div.programlisting pre.verbatim span.callout{ font-size: .85em ; } -span.verbatim { +span.verbatim, span.verb { font-family: "DejaVu Mono", "Bitstream Vera Mono", "Lucida Console", "Nimbus Mono L", "Liberation Mono", "FreeMono", "Andale Mono", "Courier New", monospace; @@ -4868,9 +4879,9 @@ MathJax = { \begin{filecontents*}[overwrite]{lwarpmk.lua} #!/usr/bin/env texlua --- Copyright 2016-2023 Brian Dunn +-- Copyright 2016-2024 Brian Dunn -printversion = "v0.912" +printversion = "v0.913" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -7046,7 +7057,7 @@ end -- not --version }% \@makefntext{#1}% \ifbool{LWR@spewingnotes}{}{% - \LWR@origtilde\LWR@orignewline% + \LWR@orignobreakspace\LWR@orignewline% \LWR@htmltagc{/\LWR@tagregularparagraph}% \LWR@orignewline% }% @@ -7389,29 +7400,70 @@ end -- not --version } \egroup +\newbool{LWR@HTMLsanitize@tmpb@enable} +\booltrue{LWR@HTMLsanitize@tmpb@enable} + +\newbool{LWR@HTMLsanitize@tmpb@removebackslash} +\booltrue{LWR@HTMLsanitize@tmpb@removebackslash} + \newbool{LWR@MathJax@silentquotes} \boolfalse{LWR@MathJax@silentquotes} -\catcode`\#=12 \catcode`\&=12 -\newcommand{\LWR@subHTMLsanitize}{% - \edef\tmpb{\detokenize\expandafter{\LWR@strresult}}% - \LWR@replacestrings{&}{&}% - \LWR@replacestrings{<}{<}% - \LWR@replacestrings{>}{>}% - \ifbool{LWR@MathJax@silentquotes} +\newcommand*{\LWR@HTMLsanitize@tmpb}{% + \ifbool{LWR@HTMLsanitize@tmpb@enable}% + {% + \LWR@replacestrings{&}{&}% must be first because & is used for lt, gt, etc. + \LWR@replacestrings{<}{<}% + \LWR@replacestrings{>}{>}% + \LWR@replacestrings{'}{'}% + \LWR@replacestrings{`}{`}% + \LWR@replacestrings{_}{\detokenize{_}}% + \ifbool{LWR@HTMLsanitize@tmpb@removebackslash}% {% - \expandafter\LWR@replacestrings\expandafter{\LWRbackslash"}{}% - \LWR@replacestrings{"}{}% + \def\@tempa{\LWR@replacestrings}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\detokenize{\#}}}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\LWRhash}}% + \@tempa% + \def\@tempa{\LWR@replacestrings}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\detokenize{\%}}}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\LWRpercent}}% + \@tempa% + \def\@tempa{\LWR@replacestrings}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\detokenize{\&}}}% + \expandafter\appto\expandafter\@tempa\expandafter{\expandafter{\LWRamp}}% + \@tempa% }% - {\LWR@replacestrings{"}{"}}% - \LWR@replacestrings{'}{'}% - \LWR@replacestrings{`}{`}% + {}% + \ifbool{LWR@MathJax@silentquotes} + {% + \expandafter\LWR@replacestrings\expandafter{\LWRbackslash"}{}% + \LWR@replacestrings{"}{}% + }% + {\LWR@replacestrings{"}{"}}% + }% enabled + {}% not enabled +} +\catcode`\&=4 + +\newcommand{\LWR@HTMLsanitize@use@tmpb}[1]{% + \ifbool{LWR@HTMLsanitize@tmpb@enable}% + {% + \def\tmpb{#1}% + \LWR@HTMLsanitize@tmpb% + \tmpb% + }% + {#1}% +} + +\catcode`\#=12 +\newcommand{\LWR@subHTMLsanitize}{% + \edef\tmpb{\detokenize\expandafter{\LWR@strresult}}% + \LWR@HTMLsanitize@tmpb% \LWR@replacestrings{##}{#}% \edef\LWR@strresult{\detokenize\expandafter{\tmpb}}% } \catcode`\#=6 -\catcode`\&=4 \newrobustcmd{\LWR@HTMLsanitizedetokenized}[1]{% \LWR@traceinfo{LWR@HTMLsanitizedetokenized !#1!}% @@ -7456,6 +7508,7 @@ end -- not --version \newcommand*{\LWR@subcustomizedmathjax}[1]{% \begingroup% \LWR@hook@processingtags% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \edef\LWR@strresult{\detokenize{#1}}% \LWR@subHTMLsanitize% \xdef\LWR@customizedMathJax{% @@ -8158,6 +8211,7 @@ end -- not --version \begingroup% \LWR@restoreoriglists% \boolfalse{LWR@verbtags}% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \IfFileExists{\LWR@mathjaxfilename}% {\verbatiminput{\LWR@mathjaxfilename}}% {% @@ -8169,7 +8223,6 @@ end -- not --version }% {Specify an existing file, or remove \protect\MathJaxFilename.}% }% - \booltrue{LWR@verbtags}% \endgroup% \LWR@stoppars% }% end of mathjax @@ -8284,7 +8337,7 @@ end -- not --version \LWR@stoppars \LWR@closeprevious{finished} \LWR@printpendingfootnotes -\label{\BaseJobname-autofile-last}\LWR@origtilde\LWR@orignewline +\label{\BaseJobname-autofile-last}\LWR@orignobreakspace\LWR@orignewline \LWR@htmlelementclassend{section}{textbody} \LWR@htmlelementclassend{main}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} @@ -8675,6 +8728,14 @@ end -- not --version \begin{warpHTML} +\ifxetexorluatex + +\newcommand*{\LWR@HTML@@setupverbvisiblespace}{\let\@xobeysp\textvisiblespace} + +\LWR@formatted{@setupverbvisiblespace} + +\fi + \newbool{LWR@verbtags} \booltrue{LWR@verbtags} @@ -8682,13 +8743,17 @@ end -- not --version \def\LWR@verb@egroup@endspan{% \LWR@orig@verb@egroup% - \LWR@htmltag{/span}% + \ifbool{LWR@verbtags}% + {\LWR@htmltag{/span}}% + {}% \endgroup% } \xpretocmd{\verb} {% \begingroup% - \LWR@htmltag{span class=\textquotedbl{}texttt\textquotedbl}% + \ifbool{LWR@verbtags}% + {\LWR@htmltag{span class=\textquotedbl{}verb\textquotedbl}}% + {}% \let\verb@egroup\LWR@verb@egroup@endspan% } {} @@ -8701,25 +8766,38 @@ end -- not --version \setlength{\topsep}{0pt}% \setlength{\partopsep}{0pt}% \hbadness=10000\relax% -\ifbool{LWR@verbtags}{% - \LWR@htmltag{pre class=\textquotedbl#2\textquotedbl% - \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}% +\ifbool{LWR@verbtags}% +{% + \ifnumcomp{\value{LWR@spandepth}}{=}{0}{% + \LWR@htmltag{pre class=\textquotedbl#2\textquotedbl% + \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}% + }% + \par% + }% + {% in a span + \LWR@spanwarnformat{verbatim}% }% - \par% }{}% \begingroup% \LWR@print@normalfont% \LWR@origttfamily% -\LWR@print@scriptsize% +\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}% + {\LWR@print@scriptsize}% + {}% \LWR@restoreoriglists% \LWR@hook@processingtags% \let\hspace\LWR@print@hspace% +\boolfalse{LWR@HTMLsanitize@nobreakspace}% } \newcommand*{\LWR@afterendverbatim}{% \endgroup% \par% -\ifbool{LWR@verbtags}{% +\ifboolexpr{ + bool{LWR@verbtags} and + test {\ifnumcomp{\value{LWR@spandepth}}{=}{0}} +}% +{% \noindent\LWR@htmltag{/pre}\par% pre }{}% \LWR@startpars% @@ -8775,7 +8853,8 @@ end -- not --version \let\enskip\LWR@print@enskip% \let\quad\LWR@print@quad% \let\qquad\LWR@print@qquad% - \let~\LWR@origtilde% + \LetLtxMacro~\LWR@origtilde% + \LetLtxMacro\nobreakspace\LWR@orignobreakspace% \let\,\LWR@origcomma% \let\thinspace\LWR@print@thinspace% \let\negthinspace\LWR@print@negthinspace% @@ -9919,7 +9998,7 @@ end -- not --version }% \ifdimcomp{\LWR@templengthone}{>}{0pt}% {% - \LWR@origtilde tdrule#1#2% + \space tdrule#1#2% \setlength{\LWR@thiscmidrulewidth}{\LWR@templengthone}% }% {% @@ -11099,6 +11178,11 @@ end -- not --version \LetLtxMacro\Nameref\nameref +\def\NR@gettitle#1{% + \GetTitleString{#1}% + \let\@currentlabelname\GetTitleStringResult +} + @@ -11125,15 +11209,24 @@ end -- not --version \NewDocumentCommand{\LWR@subhyperref}{m}{% \LWR@traceinfo{LWR@subhyperref !#1!}% - \LWR@sanitize{#1}% + \edef\tmpb{\detokenize\expandafter{#1}}% + \LWR@HTMLsanitize@tmpb% \LWR@htmltag{% - a href=\textquotedbl\LWR@sanitized\textquotedbl\ % space + a href=\textquotedbl\tmpb\textquotedbl\ % space \LWR@addlinktitle % space target=\textquotedbl\_{}blank\textquotedbl\ % space }% } -\newcommand{\LWR@subhyperreftext}[1]{% +\newcommand{\LWR@subhyperreftext@sanitized}[1]{% + \edef\tmpb{#1}% + \LWR@HTMLsanitize@tmpb% + \tmpb% + \LWR@htmltag{/a}% + \LWR@ensuredoingapar% +} + +\newcommand{\LWR@subhyperreftext@unsanitized}[1]{% #1% \LWR@htmltag{/a}% \LWR@ensuredoingapar% @@ -11155,7 +11248,7 @@ end -- not --version \LWR@ensuredoingapar% \LWR@subhyperref{#2}% \endgroup% restore catcodes - \LWR@subhyperreftext% + \LWR@subhyperreftext@unsanitized% takes the following text as an argument } \newrobustcmd*{\LWR@href}{% @@ -11164,11 +11257,37 @@ end -- not --version \LWR@hrefb% } +\DeclareDocumentCommand{\LWR@hrefb@sanitized}{O{} m}{% + \LWR@ensuredoingapar% + \LWR@subhyperref{#2}% + \endgroup% restore catcodes + \LWR@subhyperreftext@sanitized% takes the following text as an argument +} + +\newrobustcmd*{\LWR@href@sanitized}{% + \begingroup% + \LWR@linkcatcodes% + \LWR@hrefb@sanitized% +} + +\DeclareDocumentCommand{\LWR@hrefb@partsanitized}{O{} m}{% + \LWR@ensuredoingapar% + \LWR@subhyperref{#2}% + \endgroup% restore catcodes + \LWR@subhyperreftext@unsanitized% takes the following text as an argument +} + +\newrobustcmd*{\LWR@href@partsanitized}{% + \begingroup% + \LWR@linkcatcodes% + \LWR@hrefb@partsanitized% +} + \newcommand*{\LWR@nolinkurlb}[1]{% \LWR@ensuredoingapar% - \def\LWR@templink{#1}% - \@onelevel@sanitize\LWR@templink% - \LWR@templink% + \edef\tmpb{#1}% + \LWR@HTMLsanitize@tmpb% + \tmpb% \endgroup% } @@ -11180,9 +11299,7 @@ end -- not --version \DeclareDocumentCommand{\LWR@urlb}{m}{% \LWR@ensuredoingapar% - \def\LWR@templink{#1}% - \@onelevel@sanitize\LWR@templink% - \LWR@href{\LWR@templink}{\LWR@templink}% + \LWR@href@sanitized{#1}{#1}% \endgroup% } @@ -11193,6 +11310,8 @@ end -- not --version } \newcommand*{\LWR@subinlineimage}[6]{% + \begingroup% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \ifblank{#6}% {\renewcommand*{\LWR@tempone}{}}% {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}}% @@ -11215,6 +11334,7 @@ end -- not --version class=\textquotedbl#2\textquotedbl \LWR@orignewline }% }% + \endgroup% } \end{warpHTML} @@ -12065,7 +12185,8 @@ end -- not --version \let\sp\LWR@origsp% \let\sb\LWR@origsb% \LetLtxMacro\underline\LWR@origunderline% - \let~\LWR@origtilde% + \LetLtxMacro~\LWR@origtilde% + \LetLtxMacro\nobreakspace\LWR@orignobreakspace% \LetLtxMacro\endtabular\LWR@origendtabular% \csletcs{endtabular*}{LWR@origendtabular*}% \LetLtxMacro\noalign\LWR@orignoalign% @@ -12497,6 +12618,7 @@ end -- not --version {% \LWR@traceinfo{LWR@subsingledollar: Mathjax}% {% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \textbackslash(% {% \ifmmode\else\LWR@print@ttfamily\fi% @@ -12534,9 +12656,11 @@ end -- not --version \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% intentional blank line: + \begingroup% \IfSubStr{\detokenize\expandafter{#1}}{\detokenize{note}}{% \LWR@hidelatexequation{math}{#1}% \InlineClass{hidden}{\LWR@syncnotenumbers}% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \textbackslash[% {% \LWR@print@ttfamily% @@ -12544,14 +12668,17 @@ end -- not --version }% \textbackslash] \InlineClass{hidden}{\LWR@syncnotenames}% - }{% + }% yes note + {% no note + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \textbackslash[% {% \LWR@print@ttfamily% \LWR@HTMLsanitizedetokenized{\detokenize{#1}}% }% \textbackslash] - }% + }% no note + \endgroup% }% mathjax {% not mathjax @@ -12576,6 +12703,8 @@ end -- not --version \protected\gdef\LWR@singledollar#1${% \LWR@traceinfo{LWR@singledollar}% \ifbool{mathjax}{% + \begingroup% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \LWR@subsingledollar*% {% alt tag \textbackslash( % @@ -12584,6 +12713,7 @@ end -- not --version }% {singledollar}% add'l hashing {#1}% contents + \endgroup% }{% not mathjax \LWR@subsingledollar*% {% alt tag @@ -12612,6 +12742,8 @@ end -- not --version \renewcommand{\@ensuredmath}[1]{% \ifbool{mathjax}{% + \begingroup% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \LWR@subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}% {% \protect\LWR@HTMLsanitizedetokenized{\detokenize\expandafter{#1}}% @@ -12620,6 +12752,7 @@ end -- not --version \relax% \LWR@origensuredmath{#1}% }% + \endgroup% }{% SVG math \ifmmode% \LWR@origensuredmath{#1}% @@ -12753,7 +12886,7 @@ end -- not --version } \NewDocumentCommand{\LWR@addmathjax}{m +m}{% - \LWR@origtilde\LWR@orignewline + \LWR@orignobreakspace\LWR@orignewline {% \LWR@print@ttfamily% \textbackslash{}begin\{#1\} @@ -12765,6 +12898,7 @@ end -- not --version {\{\arabic{LWR@maxfields@}\}}% {}% \LWR@orignewline% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \LWR@HTMLsanitizeexpanded{\detokenize\expandafter{#2}}% \LWR@orignewline% \textbackslash{}end\{#1\} @@ -12922,7 +13056,7 @@ end -- not --version \newcommand*{\LWR@beginhideamsmath}{ \LWR@stoppars - \LWR@origtilde\LWR@orignewline + \LWR@orignobreakspace\LWR@orignewline \LWR@htmlopencomment \begingroup @@ -12950,6 +13084,7 @@ end -- not --version {% \LWR@syncmathjax% \boolfalse{LWR@amsmultline}% + \boolfalse{LWR@HTMLsanitize@tmpb@removebackslash}% \ifbool{LWR@numbereqnarray}% {% \LWR@beginhideamsmath% @@ -13128,6 +13263,8 @@ end -- not --version \addtocounter{LWR@lateximagenumber}{1}% \LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}% \boolfalse{mathjax}% + \boolfalse{LWR@verbtags}% + \boolfalse{LWR@HTMLsanitize@tmpb@enable}% \LWR@ensuredoingapar% \hbadness=10000\relax% \addtocounter{LWR@externalfilecnt}{1}% @@ -14121,9 +14258,9 @@ color:\LWR@origpound\LWR@tempcolor% {\InlineClass{textnormal}{#1}}% {% \InlineClass{% - text\LWR@f@family\LWR@origtilde{}% - text\LWR@f@series\LWR@origtilde{}% - text\LWR@f@shape\LWR@origtilde{}% + text\LWR@f@family\LWR@orignobreakspace{}% + text\LWR@f@series\LWR@orignobreakspace{}% + text\LWR@f@shape\LWR@orignobreakspace{}% text\LWR@f@shapecaps% }% {#1}% @@ -14135,9 +14272,9 @@ color:\LWR@origpound\LWR@tempcolor% \newenvironment*{LWR@blocktextcurrentfont}{% \LWR@stoppars% \BlockClass{% - text\LWR@f@family\LWR@origtilde{}% - text\LWR@f@series\LWR@origtilde{}% - text\LWR@f@shape\LWR@origtilde{}% + text\LWR@f@family\LWR@orignobreakspace{}% + text\LWR@f@series\LWR@orignobreakspace{}% + text\LWR@f@shape\LWR@orignobreakspace{}% text\LWR@f@shapecaps% }% }{\endBlockClass\LWR@startpars} @@ -14318,18 +14455,27 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpHTML} +\newbool{LWR@HTMLsanitize@nobreakspace} +\booltrue{LWR@HTMLsanitize@nobreakspace} \AtBeginDocument{% \renewrobustcmd*{\,}{\HTMLunicode{202f}}% HTML thin non-breakable space, not using LWR@formatted \newrobustcmd*{\LWR@HTML@thinspace}{\HTMLunicode{202f}}% HTML thin non-breakable space \LWR@formatted{thinspace} \newrobustcmd*{\LWR@HTML@negthinspace}{\HTMLunicode{202f}} % HTML thin non-breakable space \LWR@formatted{negthinspace} -\renewrobustcmd*{~}{\HTMLentity{nbsp}}% cannot use \LWR@formatted +\renewrobustcmd*{~}{% + \ifbool{LWR@HTMLsanitize@nobreakspace}% + {\leavevmode\nobreak\HTMLentity{nbsp}}% + {\LWR@orignobreakspace}% +} + +\LetLtxMacro\nobreakspace~ +\expandafter\LetLtxMacro\csname ?-\string\nobreakspace\endcsname~ \newrobustcmd*{\LWR@HTML@textellipsis}{\HTMLunicode{2026}} \LWR@formatted{textellipsis} \newrobustcmd*{\LWR@HTML@vdots}{\HTMLunicode{22EE}} \LWR@formatted{vdots} -} +}% AtBeginDocument \newcommand*{\LWR@font@size}{normalsize} \newrobustcmd*{\LWR@HTML@normalsize}{\renewcommand*{\LWR@font@size}{normalsize}} |