diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
51 files changed, 1705 insertions, 1198 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index 685ab3e4cd4..30f5a02459d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -32,32 +32,24 @@ \InlineClass{abstractrunintitle}{\abstractname}% \@bslabeldelim}% } - \@ifclassloaded{memoir} { \renewenvironment{abstract}{% - \null\vfil - \@beginparpenalty\@lowpenalty + \setup@bstract \if@bsrunin \else - \if@bsstyle - \abstitlestyle{\BlockClassSingle{abstracttitle}{\abstractname}} - \else \ifnumber@bs \num@bs \else \begin{\absnamepos}% \abstractnamefont \BlockClassSingle{abstracttitle}{\abstractname} - \@endparpenalty\@M \end\absnamepos% -%% \vspace{\abstitleskip}% + \vspace{\abstitleskip}% \fi - \fi - \vspace{\abstitleskip}% \fi \put@bsintoc% \begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}% - {\par\end{@bstr@ctlist}\vfil\null%\endtitlepage + {\par\end{@bstr@ctlist}%\vfil\null%\endtitlepage } }{% not memoir \if@titlepage diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty index 7ad03060b8a..e7c3421794d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty @@ -28,8 +28,8 @@ \ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR@mcolstype}{singlecolumn}}{}% \LWR@forcenewpage% \BlockClass[% -\LWR@print@mbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % -\LWR@print@mbox{margin-right:\LWR@printlength{\LWR@templengthtwo}}% + \LWR@print@mbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@print@mbox{margin-right:\LWR@printlength{\LWR@templengthtwo}}% ]{\LWR@mcolstype}% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty index aa763d1d474..740665cc7a8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty @@ -127,31 +127,31 @@ \renewcommand{\ResetInOut}[1]{}% \renewcommand{\algocf@Vline}[1]{% -\boolfalse{LWR@algocf@dopars}% -\begin{BlockClass}{alg2evline} -\booltrue{LWR@algocf@dopars}% -#1 -\boolfalse{LWR@algocf@dopars}% -\end{BlockClass} -\booltrue{LWR@algocf@dopars}% + \boolfalse{LWR@algocf@dopars}% + \begin{BlockClass}{alg2evline} + \booltrue{LWR@algocf@dopars}% + #1 + \boolfalse{LWR@algocf@dopars}% + \end{BlockClass} + \booltrue{LWR@algocf@dopars}% } \renewcommand{\algocf@Vsline}[1]{% -\boolfalse{LWR@algocf@dopars}% -\begin{BlockClass}{alg2evsline} -\booltrue{LWR@algocf@dopars}% -#1 -\boolfalse{LWR@algocf@dopars}% -\end{BlockClass} -\booltrue{LWR@algocf@dopars}% + \boolfalse{LWR@algocf@dopars}% + \begin{BlockClass}{alg2evsline} + \booltrue{LWR@algocf@dopars}% + #1 + \boolfalse{LWR@algocf@dopars}% + \end{BlockClass} + \booltrue{LWR@algocf@dopars}% } \renewcommand{\algocf@Noline}[1]{% -\boolfalse{LWR@algocf@dopars}% -\begin{BlockClass}{alg2enoline} -\booltrue{LWR@algocf@dopars}% -#1 -\boolfalse{LWR@algocf@dopars}% -\end{BlockClass} -\booltrue{LWR@algocf@dopars}% + \boolfalse{LWR@algocf@dopars}% + \begin{BlockClass}{alg2enoline} + \booltrue{LWR@algocf@dopars}% + #1 + \boolfalse{LWR@algocf@dopars}% + \end{BlockClass} + \booltrue{LWR@algocf@dopars}% } \LetLtxMacro\algocf@Here\algocf \LetLtxMacro\endalgocf@Here\endalgocf diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty index 3c51b816d43..2c52b079e1a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -19,11 +19,19 @@ \AfterEndPreamble{ \LWR@traceinfo{Patching alltt.} \AtBeginEnvironment{alltt}{% -\LWR@forcenewpage -\LWR@atbeginverbatim{3}{alltt}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@forcenewpage + \LWR@atbeginverbatim{3}{alltt}% + }% } \AfterEndEnvironment{alltt}{% - \LWR@afterendverbatim{2}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@afterendverbatim{2}% + }% } } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index c562cac1480..27e2398db3e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -19,10 +19,13 @@ \@ifpackageloaded{mdframed}{ \PackageError{lwarp} - {Package mdframed must be loaded after package amsthm} {% - Move \detokenize{\usepackage}{amsthm} before - \detokenize{\usepackage}{mdframed}.\MessageBreak + Package mdframed must be loaded after package amsthm.\MessageBreak + Enter 'H' for solutions% + } + {% + Move ``\protect\usepackage{amsthm}'' before + ``\protect\usepackage{mdframed}''.\MessageBreak Package amsthm may be loaded by something else,\MessageBreak which must also be moved before mdframed.% } @@ -56,31 +59,41 @@ \else % numbered theorem, need to check for optional arg \def\@tempa{\@oparg{\@ynthm{#2}}[]}% \fi - \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}}% lwarp + \AtBeginEnvironment{#2}{% + \edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}% + }% lwarp }% \@tempa } \newcommand{\LWR@haveamsthmname}{ -\renewcommand{\thmname}[1]{\InlineClass{amsthmname\LWR@thisthmstyle}{##1}} + \renewcommand{\thmname}[1]{% + \InlineClass{amsthmname\LWR@thisthmstyle}{##1}% + } } \newcommand{\LWR@haveamsthmnumber}{ -\renewcommand{\thmnumber}[1]{\InlineClass{amsthmnumber\LWR@thisthmstyle}{##1}} + \renewcommand{\thmnumber}[1]{% + \InlineClass{amsthmnumber\LWR@thisthmstyle}{##1}% + } } \newcommand{\LWR@haveamsthmnote}{ -\renewcommand{\thmnote}[1]{\InlineClass{amsthmnote\LWR@thisthmstyle}{##1}} + \renewcommand{\thmnote}[1]{% + \InlineClass{amsthmnote\LWR@thisthmstyle}{##1}% + } } \LWR@haveamsthmname \LWR@haveamsthmnumber \LWR@haveamsthmnote \def\@begintheorem#1#2[#3]{% + \GetTitleString{#3}% lwarp + \let\@currentlabelname\GetTitleStringResult% lwarp \item[ - \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp - \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp - \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp + \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp + \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp + \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp \thm@swap\swappedhead\thmhead{#1}{#2}{#3}% \the\thm@headpunct~ \thmheadnl % possibly a newline. @@ -90,8 +103,8 @@ \def\@thm#1#2#3{% \ifhmode\unskip\unskip\par\fi \normalfont - \LWR@forcenewpage% lwarp - \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp + \LWR@forcenewpage% lwarp + \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp \trivlist \let\thmheadnl\relax \let\thm@swap\@gobble @@ -114,8 +127,8 @@ \def\cref@thmoptarg[#1]#2#3#4{% \ifhmode\unskip\unskip\par\fi% \normalfont% - \LWR@forcenewpage% lwarp - \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp + \LWR@forcenewpage% lwarp + \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp \trivlist% \let\thmheadnl\relax% \let\thm@swap\@gobble% @@ -148,9 +161,9 @@ \def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box \appto\LWR@restoreorigformatting{% -\LetLtxMacro\openbox\LWR@orig@openbox% -\LetLtxMacro\blacksquare\LWR@orig@blacksquare% -\LetLtxMacro\Box\LWR@orig@Box% + \LetLtxMacro\openbox\LWR@orig@openbox% + \LetLtxMacro\blacksquare\LWR@orig@blacksquare% + \LetLtxMacro\Box\LWR@orig@Box% }% appto }{}% @ifundefined }% AtBeginDocument diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty index f8bd7ae224d..258fb7bf3b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty @@ -16,9 +16,12 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \@ifpackageloaded{titling}{ -\PackageError{lwarp-authblk} -{Package authblk must be loaded before titling} -{Titling appends authblk's author macro, so authblk must be loaded first.} + \PackageError{lwarp-authblk} + {Package authblk must be loaded before titling} + {% + Titling appends authblk's author macro, + so authblk must be loaded first.% + } } {} \LWR@ProvidesPackagePass{authblk}[2001/02/27] diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty index 3fd5af426a9..5bdeea8bf83 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty @@ -18,7 +18,13 @@ \LWR@ProvidesPackagePass{backref}[2016/05/21] -\def\backref{}\let\backrefxxx\hyper@section@backref +\def\backref{} + +\long\def\hyper@section@backref#1#2#3{% + \ref{#3}% +} + +\let\backrefxxx\hyper@section@backref \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty index 0472693e549..79c990761c1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty @@ -18,6 +18,8 @@ \ifdef{\newfloat@addtocontents@ORI}{ \let\addtocontents\newfloat@addtocontents@ORI }{} +\AtBeginDocument{\RequirePackage{hyperref}} + \LWR@ProvidesPackagePass{biblatex}[2018/03/04] \AfterPreamble{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty new file mode 100644 index 00000000000..0c025d229d9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-boxedminipage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `boxedminipage') +%% 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{boxedminipage}[2020/04/19] + +\newenvironment{LWR@HTML@boxedminipage}{% + \LWR@stoppars% + \begin{BlockClass}{framebox}% + \minipage% +} +{% + \endminipage% + \end{BlockClass}% + \LWR@startpars% +} +\LWR@formattedenv{boxedminipage} + +\endinput +%% +%% End of file `lwarp-boxedminipage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty index 3e9c5f3522b..42790dda96c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty @@ -17,19 +17,7 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{boxedminipage2e}[2015/03/09] - -\newenvironment{LWR@HTML@boxedminipage}{% - \LWR@stoppars% - \begin{BlockClass}{framebox}% - \minipage% -} -{% - \endminipage% - \end{BlockClass}% - \LWR@startpars% -} -\LWR@formattedenv{boxedminipage} +\LWR@ProvidesPackagePass{boxedminipage2e} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty index 2d4637fcf9c..4696791a82b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty @@ -19,74 +19,46 @@ \typeout{---} \typeout{Packages lwarp and caption:} \typeout{If a ``Missing \protect\begin\protect{document\protect}'' error occurs here,} -\typeout{try using: \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}} +\typeout{try using: \space \protect\usepackage\protect{caption\protect}\space% + \protect\captionsetup{options}} \typeout{instead of: \protect\usepackage[options]\protect{caption\protect}.} \typeout{---} -\LWR@ProvidesPackagePass{caption}[2019/09/01] +\LWR@ProvidesPackagePass{caption}[2020/01/03] -\renewcommand\caption@ibox[3]{% - \@testopt{\caption@iibox{#1}{#2}{#3}}{% - \linewidth% lwarp - }% -} -\long\def\caption@iibox#1#2#3[#4]{% - \@testopt{\caption@iiibox{#1}{#2}{#3}{#4}}\captionbox@hj@default +\long\def\caption@iibox@#1#2#3#4{% + \caption@iiibox{#1}{#2}{#3}% + []% lwarp + [\captionbox@hj@default]% + {{#4}}% lwarp } -\long\def\caption@iiibox#1#2#3#4[#5]#6{% +\long\def\caption@iiiibox#1#2#3#4#5[#6][#7]#8{% \begingroup #1*% set \caption@position \caption@iftop{% - \LWR@traceinfo{caption@iiibox top}% \endgroup - \parbox[t]{#4}{% + \minipagefullwidth% + \parbox[t]{\linewidth}{% #1\relax \caption@setposition t% - {\caption#2{#3}}% lwarp - #6% lwarp + {\caption#4{#5}}% + #8% }% }{% - \LWR@traceinfo{caption@iiibox bottom}% \endgroup - \parbox[b]{#4}{% + \minipagefullwidth% + \parbox[b]{\linewidth}{% #1\relax \caption@setposition b% - #6% lwarp - {\caption#2{#3}}% lwarp - }% + #8% + {\caption#4{#5}}% + }% }% -\LWR@traceinfo{caption@iiibox: done}% -} - - -\long\def\caption@@caption#1[#2]#3{% - \ifcaption@star - \else - \caption@prepareanchor{#1}{#2}% - \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}% - \@nameuse{nag@hascaptiontrue}% - \fi - \par - \caption@beginex{#1}{#2}{#3}% - \caption@setfloatcapt{% - \caption@boxrestore - \if@minipage - \@setminipage - \fi - \caption@normalsize - \ifcaption@star - \let\caption@makeanchor\@firstofone - #3% lwarp - \else% lwarp - \@makecaption{\csname fnum@#1\endcsname}% - {\ignorespaces\caption@makeanchor{#3}}% - \fi% lwarp - \caption@if@minipage\@minipagetrue\@minipagefalse}% - \caption@end% } \renewcommand\caption@@@make[2]{% \LWR@traceinfo{caption@@@make}% + \LWR@stoppars% lwarp \caption@ifempty{#2}{% \let\caption@lsep\@empty \let\caption@tfmt\@firstofone @@ -95,7 +67,7 @@ {\ifcaption@star\else \begingroup \captionlabelfont - #1% + \LWR@isolate{#1}% lwarp \endgroup \fi}% {\ifcaption@star\else @@ -107,27 +79,55 @@ \fi}% {{% \captiontextfont - \caption@tfmt{#2}% + \let\\\newline% lwarp + \LWR@isolate{\caption@tfmt{#2}}% lwarp }}% + \LWR@startpars% lwarp \LWR@traceinfo{caption@@@make done}% } \renewcommand{\caption@@make@}[2]{% - \caption@stepthecounter - \caption@beginhook + \caption@stepthecounter% + \caption@beginhook% \caption@@@make{#1}{#2}% - \caption@endhook + \caption@endhook% } \long\def\caption@makecaption#1#2{% \caption@@make{#1}{#2}% } +\AtBeginDocument{ + \let\@makecaption\caption@makecaption +} + +\AtBeginDocument{ + \def\@xfloat#1[#2]{% + \caption@ORI@xfloat{#1}[#2]% + \caption@settype{#1}% + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% + }% + \def\@xdblfloat#1[#2]{% + \caption@ORI@xfloat{#1}[#2]% + \caption@settype{#1}% + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% + }% +} + +\long\def\caption@lsep@default{.~} +\long\def\caption@lsep@colon{:~} +\long\def\caption@lsep@period{.~} +\long\def\caption@lsep@space{~} +\long\def\caption@lsep@endash{~\textendash~} +\long\def\caption@lsep@arabi{~:~} + +\DeclareCaptionBox{none}{#2} \DeclareCaptionBox{parbox}{% -#2% + #2% } + \DeclareCaptionBox{colorbox}{% -#2% + #2% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty index cb8cb93ecce..60f360d3fbb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty @@ -73,8 +73,8 @@ \end{BlockClass} }{% \PackageError{lwarp-common-multimedia} - {File '#2' not found} - {Perhaps an incorrect path?} + {File '#2' not found} + {Perhaps an incorrect path?} }% } \newcommand*{\LWR@multimedia@httpAV}[4]{% @@ -125,11 +125,13 @@ \newcommand*{\LWR@multimedia@percenterror}{% \PackageError{lwarp-media9} {% - Do not use a percent comment - between\MessageBreak + Do not use a percent comment between\MessageBreak \protect\includemedia\space arguments% } - {Percent is changed to a regular character to allow its use inside a URL.} + {% + Percent is changed to a regular character\MessageBreak + to allow its use inside a URL.% + } } \newcommand*{\LWR@multimediab}[3][]{% \if#1\@percentchar\LWR@multimedia@percenterror\fi% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty index af13cc11569..f6ec39b8f7b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty @@ -57,6 +57,7 @@ \PackageError{lwarp-ctable}{\MessageBreak You can, currently, use the sidecap option only with\MessageBreak memoir documents. Use topcap or botcap only} + {} \fi \fi \ifdim\@CTwidth=0pt\else @@ -64,6 +65,7 @@ \PackageError{lwarp-ctable}{\MessageBreak You may not use the width and maxwidth options together\MessageBreak Use either width or maxwidth} + {} \fi \fi \ifx\@CTpos\empty @@ -71,6 +73,7 @@ \PackageError{lwarp-ctable}{\MessageBreak You may not use the pos and sideways options together\MessageBreak Rotated tables and figures are always typeset on a separate page} + {} \fi \fi \ifx\@CTcaption\empty @@ -78,6 +81,7 @@ \PackageError{lwarp-ctable}{\MessageBreak You may not label a captionless table\MessageBreak Such a label can't be referenced} + {} \fi \fi \@CTbegin diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty index 40cc1e43207..2211e722418 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty @@ -18,12 +18,12 @@ \LWR@ProvidesPackagePass{easy-todo}[2014/01/01] -\let\LWR@origlistoftodos\listoftodos +\let\LWR@easytodo@origlistoftodos\listoftodos \renewcommand{\listoftodos}{% \begingroup \renewcommand{\flushright}{} -\LWR@origlistoftodos +\LWR@easytodo@origlistoftodos \endgroup } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index cbba1554b38..b6b39e759e1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -18,57 +18,37 @@ -\LWR@ProvidesPackageDrop{epigraph}[2009/09/02] +\LWR@ProvidesPackagePass{epigraph}[2020/01/02] -\DeclareDocumentCommand{\qitem}{m m} -{ -\begin{BlockClass}{qitem} -#1 -\LWR@stoppars% -\ifbool{FormatWP} -{\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}} -{\begin{BlockClass}{epigraphsource}} -#2 -\end{BlockClass} -\end{BlockClass} +\DeclareDocumentCommand{\LWR@HTML@qitem}{m m} +{% + \begin{BlockClass}{qitem}% + #1% + \LWR@stoppars% + \ifbool{FormatWP}% + {\begin{BlockClass}[border-top:1px solid gray]{epigraphsource}}% + {\begin{BlockClass}{epigraphsource}}% + #2% + \end{BlockClass}% + \end{BlockClass}% } +\LWR@formatted{qitem} -\DeclareDocumentCommand{\epigraph}{m m} -{ -\begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{epigraph} -\qitem{#1}{#2} -\end{LWR@BlockClassWP} +\DeclareDocumentCommand{\LWR@HTML@epigraph}{m m} +{% + \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{epigraph}% + \qitem{#1}{#2}% + \end{LWR@BlockClassWP}% } +\LWR@formatted{epigraph} -\DeclareDocumentEnvironment{epigraphs}{} -{\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}{epigraph}} -{\endLWR@BlockClassWP} -\newenvironment*{flushepinormal}{}{} -\@ifclassloaded{memoir}{ -\setlength{\epigraphwidth}{.5\linewidth} -\renewcommand{\textflush}{flushepinormal} +\DeclareDocumentEnvironment{LWR@HTML@epigraphs}{} + {\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}{epigraph}} + {\endLWR@BlockClassWP} +\LWR@formattedenv{epigraphs} \renewcommand{\epigraphhead}[2][0]{#2} \renewcommand{\dropchapter}[1]{} \renewcommand*{\undodrop}{} -}{% not memoir -\newlength{\epigraphwidth} -\setlength{\epigraphwidth}{.5\linewidth} -\newcommand{\textflush}{flushepinormal} -\newcommand{\epigraphflush}{flushright} -\newcommand{\sourceflush}{flushright} -\newcommand*{\epigraphsize}{\small} -\newlength{\epigraphrule} -\newlength{\beforeepigraphskip} -\newlength{\afterepigraphskip} -\newcommand{\epigraphhead}[2][0]{#2} -\newcommand{\dropchapter}[1]{} -\newcommand*{\undodrop}{} -}% not memoir - -\let\cleartoevenpage\relax% also in nextpage -\newcommand{\cleartoevenpage}[1][]{} -\newif\ifepigraphnoindent -\newcommand\epigraphnoindent{\epigraphnoindenttrue} \endinput %% %% End of file `lwarp-epigraph.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty index 1110138cd35..ebf5393ee4a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty @@ -20,7 +20,11 @@ \let\@wrindex\LWR@wrindex \newcommand{\ext@fixme}{lox} -\renewcommand{\l@fixme}[2]{\hypertocfloat{1}{fixme}{lox}{#1}{#2}} +\renewcommand{\l@fixme}[2]{% + \hypertocfloat{1}{fixme}{lox}% + {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1} + {#2} +} \def\FXFaceInlineHTMLStyle{font-weight:bold} \renewcommand*\FXLayoutInline[3]{ % diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index eed8100ed1f..bcb14753da4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -23,17 +23,21 @@ \newcommand*{\LWR@floatstyle}{plain} \NewDocumentCommand{\newfloat}{m m m o}{% -\IfValueTF{#4}% -{\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}}% -{\DeclareFloatingEnvironment[fileext=#3]{#1}}% -\csedef{LWR@floatstyle@#1}{\LWR@floatstyle}% -\cslet{listof#1s}\relax% -\cslet{listof#1es}\relax% -\cslet{l@#1}\relax% + \IfValueTF{#4}% + {\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}}% + {\DeclareFloatingEnvironment[fileext=#3]{#1}}% + \csedef{LWR@floatstyle@#1}{\LWR@floatstyle}% + \cslet{listof#1s}\relax% + \cslet{listof#1es}\relax% + \cslet{l@#1}\relax% } \NewDocumentCommand{\floatname}{m +m}{% - \SetupFloatingEnvironment{#1}{name=#2}% + \def\LWR@tempone{#2}% + \def\LWR@temptwo{\@nameuse{#1name}}% + \ifdefequal{\LWR@tempone}{\LWR@temptwo}{}{% + \SetupFloatingEnvironment{#1}{name=#2}% + }% } \newcommand*{\floatplacement}[2]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index 741d258186e..2679d8592c1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -37,7 +37,7 @@ }% {marginblock}% }% - \captionsetup{type=#2}% + \renewcommand*{\@captype}{#2}% } {% \endLWR@BlockClassWP% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index 4d86eb3fee4..c5ee4554ab9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -26,8 +26,8 @@ \AtBeginDocument{ \@ifpackageloaded{subcaption} -{\booltrue{LWR@subcaptionloaded}} -{\boolfalse{LWR@subcaptionloaded}} + {\booltrue{LWR@subcaptionloaded}} + {\boolfalse{LWR@subcaptionloaded}} } \NewDocumentCommand{\floatbox}{o m o o o +m +m}{% @@ -160,9 +160,9 @@ \newcommand{\RawCaption}[1]{#1} \NewDocumentCommand{\floatfoot}{s +m}{% -\begin{BlockClass}{floatfoot} -#2 -\end{BlockClass} + \begin{BlockClass}{floatfoot} + #2 + \end{BlockClass} } \newbool{LWR@insubfloatrow} @@ -170,15 +170,15 @@ \newenvironment*{subfloatrow}[1][2] { -\LWR@forcenewpage -\BlockClass{floatrow} -\begingroup -\booltrue{LWR@insubfloatrow} + \LWR@forcenewpage + \BlockClass{floatrow} + \begingroup% + \booltrue{LWR@insubfloatrow}% } -{ -\endgroup -\endBlockClass -\boolfalse{LWR@insubfloatrow} +{% + \endgroup% + \endBlockClass% + \boolfalse{LWR@insubfloatrow}% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty index 0ad467ea02d..f870fde79cf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty @@ -16,29 +16,17 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{fontaxes}[2014/03/23] -\newrobustcmd{\LWR@HTML@sscshape}{\LWR@HTML@scshape} -\LWR@formatted{sscshape} -\newcommand*{\LWR@null@sscshape}{} - -\newrobustcmd{\LWR@HTML@textssc}[1]{\textsc{#1}} -\LWR@formatted{textssc} -\newcommand*{\LWR@null@textssc}[1]{#1} - \ifdef{\LWR@HTML@swshape}{}{% duplicated by nfssext-cfr \newcommand{\LWR@HTML@swshape}{} \LWR@formatted{swshape} - \newcommand*{\LWR@null@swshape}{} \newcommand{\LWR@HTML@textsw}[1]{#1} \LWR@formatted{textsw} - \newcommand*{\LWR@null@textsw}[1]{#1} -} -\appto{\LWR@nullfonts}{% -\LetLtxMacro\sscshape\LWR@null@sscshape% -\LetLtxMacro\textssc\LWR@null@textssc% -\LetLtxMacro\swshape\LWR@null@swshape% -\LetLtxMacro\textsw\LWR@null@textsw% + \FilenameNullify{% + \LetLtxMacro\swshape\@empty% + \LetLtxMacro\textsw\firstofone% + } } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty index 83fbf2a8b3a..9a0fbfeec0e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty @@ -18,7 +18,9 @@ \LWR@ProvidesPackagePass{forest}[2017/07/14] -\BeforeBeginEnvironment{forest}{\begin{lateximage}[forest]} +\BeforeBeginEnvironment{forest}{% + \begin{lateximage}[-forest-~\PackageDiagramAltText]% +} \AfterEndEnvironment{forest}{\end{lateximage}} @@ -26,8 +28,9 @@ \forest@config{#2}% \IfBooleanTF{#1}{% \PackageError{lwarp-forest}% - {Starred \Forest is not supported}% - {Lwarp uses an environment for images, but \Forest* cannot work in an environment.}% + {\protect\Forest* is not supported}% + {Lwarp uses an environment for images,\MessageBreak + but \protect\Forest* cannot work in an environment.}% \let\forest@next\forest@env% }{\let\forest@next\forest@group@env}% \begin{lateximage}[-forest-~\PackageDiagramAltText]% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 578be1bc75d..7075dcd6e77 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -102,9 +102,8 @@ \define@key{igraph}{scale}{% \ifthenelse{\equal{#1}{1}}{}{% must expand #1 \PackageWarning{lwarp}{% - It is recommended to use\MessageBreak - [width=xx\protect\linewidth]\MessageBreak - instead of [scale=yy],% + It is recommended to use ``[width=xx\protect\linewidth]''\MessageBreak + instead of ``[scale=yy]'',% }% }% \renewcommand*{\LWR@igxscale}{#1}% @@ -434,7 +433,7 @@ \AtBeginDocument{ \newcommand{\LWR@HTML@reflectbox}[1]{% -\scalebox{-1}[1]{#1}% + \scalebox{-1}[1]{#1}% }% \reflectbox \LWR@formatted{reflectbox} @@ -444,7 +443,7 @@ \AtBeginDocument{ \NewDocumentCommand{\LWR@HTML@resizebox}{s m m m}{% -#4% + #4% } \LWR@formatted{resizebox} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 1f1cf1ac9d1..9a0ba31d9bb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -49,7 +49,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \NewDocumentCommand{\LWR@hyperdefb}{m m +m}{% \LWR@ensuredoingapar% - \LWR@sublabel{#1.#2}% + \LWR@label@createtag{#1.#2}% #3% \endgroup% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 49e594da490..aef7b681d0f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -211,7 +211,7 @@ {float:right; width:2in; margin:10pt}% {}% {marginblock}% - \captionsetup{type=#2}% + \renewcommand*{\@captype}{#2}% \minipage{\LWR@usersmarginparwidth}% \setlength{\marginparwidth}{.95\LWR@usersmarginparwidth}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty index 5205922e0a4..296ffef6dd4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{lettrine}[2018-08-28] \DeclareDocumentCommand{\lettrine}{o m m}{% -\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} % extra space + \InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} % extra space } \newcounter{DefaultLines} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 21962725d87..22e63e76955 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -52,14 +52,14 @@ \def\lst@framelr{}% \LWR@traceinfo{finished origlst@Init}% \lst@ifdisplaystyle% -\LWR@traceinfo{About to create verbatim.}% -\let\lsthk@EveryPar\relax% -\LWR@forcenewpage -\LWR@atbeginverbatim{2}{programlisting}% + \LWR@traceinfo{About to create verbatim.}% + \let\lsthk@EveryPar\relax% + \LWR@forcenewpage% + \LWR@atbeginverbatim{2}{programlisting}% -\let\lsthk@EveryPar\LWR@origlsthkEveryPar% + \let\lsthk@EveryPar\LWR@origlsthkEveryPar% \else% -\ifbool{LWR@verbtags}{\LWR@htmltag{span class="inlineprogramlisting"}}{}% + \ifbool{LWR@verbtags}{\LWR@htmltag{span class="inlineprogramlisting"}}{}% \fi% } @@ -73,6 +73,7 @@ \fi% \LWR@origlst@DeInit% } + \def\lst@MakeCaption#1{% \LWR@traceinfo{MAKING CAPTION at #1}% \lst@ifdisplaystyle @@ -111,9 +112,9 @@ \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption} \else \LWR@traceinfo{Making title: \lst@title}% -\begin{BlockClass}{lstlistingtitle}% lwarp -\lst@maketitle\lst@title% lwarp -\end{BlockClass}% lwarp +\begin{BlockClass}{lstlistingtitle}% lwarp +\lst@maketitle\lst@title% lwarp +\end{BlockClass}% lwarp \fi \LWR@traceinfo{About to assign label: !\lst@label!}% \ifx\lst@label\@empty\else @@ -131,6 +132,11 @@ \fi \LWR@traceinfo{DONE WITH CAPTION at #1}% } + +\renewcommand{\lst@maketitle}[1]{% + \LWR@isolate{#1}% +}% + \lst@Key{numbers}{none}{% \let\lst@PlaceNumber\@empty \lstKV@SwitchCases{#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 045f77844bb..97e5d4aad5e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -23,10 +23,14 @@ \boolfalse{LWR@longtable@havehead} \newenvironment{longtable*}[2][]{% \LWR@floatbegin{table}% - \setcaptiontype{\LTcaptype}% - \caption@setoptions{longtable}% - \caption@setoptions{@longtable}% - \caption@LT@setup% + \ifdef{\setcaptiontype}{% caption package: + \setcaptiontype{\LTcaptype}% + \caption@setoptions{longtable}% + \caption@setoptions{@longtable}% + \caption@LT@setup% + }{% w/o caption package: + \renewcommand*{\@captype}{\LTcaptype}% + }% \booltrue{LWR@starredlongtable}% \boolfalse{LWR@longtable@havehead}% \let\captionlistentry\LWR@LTcaptionlistentry% @@ -36,10 +40,14 @@ \newenvironment{longtable}[2][]{% \LWR@floatbegin{table}% - \setcaptiontype{\LTcaptype}% - \caption@setoptions{longtable}% - \caption@setoptions{@longtable}% - \caption@LT@setup% + \ifdef{\setcaptiontype}{% caption package: + \setcaptiontype{\LTcaptype}% + \caption@setoptions{longtable}% + \caption@setoptions{@longtable}% + \caption@LT@setup% + }{% w/o caption package: + \renewcommand*{\@captype}{\LTcaptype}% + }% \refstepcounter{\LTcaptype}% \boolfalse{LWR@longtable@havehead}% \let\captionlistentry\LWR@LTcaptionlistentry% @@ -49,7 +57,7 @@ \newcounter{LTchunksize} \newcommand*{\LWR@longtable@headerror}{% - \PackageError{lwarp} + \PackageError{lwarp-longtable} {For longtable:\MessageBreak 1: Keep either one of an \protect\endhead\space or \protect\endfirsthead\space\MessageBreak diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 72e38ced5a1..84526952ba2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -51,6 +51,7 @@ endinnercode={\LWR@stoppars}, } \newcommand*{\LWR@mdframedstart}{% \LWR@traceinfo{LWR@mdframedstart start}% + \LWR@spanwarninvalid{mdframe}% \LWR@stoppars% \LWR@htmltagc{div class="% mdframed% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index e4e67975e4a..772d4c8a40b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -27,13 +27,6 @@ \LWR@maybenewtablerow% \LWR@tabularleftedge% \LWR@htmltag{td rowspan="#2" % -\ifstrequal{#1}{c}{style="\LWR@print@mbox{vertical-align:middle}" }{}% -\ifstrequal{#1}{b}{style="\LWR@print@mbox{vertical-align:bottom}" }{}% -\ifstrequal{#1}{t}{style="\LWR@print@mbox{vertical-align:top}" }{}% -\ifdefvoid{\LWR@multirowborder}{}{% -style="\LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % -\LWR@print@mbox{padding-\LWR@multirowborder:} 2px" % -}% class="td% \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% \LWR@addcmidruletrim% @@ -41,6 +34,14 @@ class="td% \LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% "% \LWR@tdstartstyles% +\ifstrequal{#1}{c}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:middle}}{}% +\ifstrequal{#1}{b}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:bottom}}{}% +\ifstrequal{#1}{t}{\LWR@tdaddstyle\LWR@print@mbox{vertical-align:top}}{}% +\ifdefvoid{\LWR@multirowborder}{}{% + \LWR@tdaddstyle% + \LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % + \LWR@print@mbox{padding-\LWR@multirowborder:} 2px% +}% \LWR@addcmidrulewidth% \LWR@addcdashline% \LWR@addtabularrulecolors% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty index f0a4a1a0ef9..b3503f858b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{nfssext-cfr}[2017/03/28] \newrobustcmd{\LWR@HTML@lnstyle}{} -\newrobustcmd{\LWR@HTML@osstyle}{} +\newrobustcmd{\LWR@HTML@osstyle}{\LWR@HTML@scshape} \newrobustcmd{\LWR@HTML@instyle}{} \newrobustcmd{\LWR@HTML@sustyle}{} \newrobustcmd{\LWR@HTML@swstyle}{} @@ -34,7 +34,7 @@ \newrobustcmd{\LWR@HTML@qtstyle}{} \newrobustcmd{\LWR@HTML@shstyle}{} \newrobustcmd{\LWR@HTML@swashstyle}{} -\newrobustcmd{\LWR@HTML@tmstyle}{} +\newrobustcmd{\LWR@HTML@tmstyle}{\renewcommand*{\LWR@f@family}{tt}} \newrobustcmd{\LWR@HTML@tvstyle}{\renewcommand*{\LWR@f@family}{tt}} \newrobustcmd{\LWR@HTML@tstyle}{} \newrobustcmd{\LWR@HTML@lstyle}{} @@ -57,11 +57,11 @@ \newrobustcmd{\LWR@HTML@exwidth}{} \newrobustcmd{\LWR@HTML@uxwidth}{} \newrobustcmd{\LWR@HTML@mbweight}{\renewcommand*{\LWR@f@series}{md}} -\newrobustcmd{\LWR@HTML@dbweight}{\renewcommand*{\LWR@f@series}{bf}} -\newrobustcmd{\LWR@HTML@sbweight}{\renewcommand*{\LWR@f@series}{bf}} -\newrobustcmd{\LWR@HTML@ubweight}{\renewcommand*{\LWR@f@series}{eb}} -\newrobustcmd{\LWR@HTML@elweight}{\renewcommand*{\LWR@f@series}{lg}} -\newrobustcmd{\LWR@HTML@ulweight}{\renewcommand*{\LWR@f@series}{lg}} +\newrobustcmd{\LWR@HTML@dbweight}{\renewcommand*{\LWR@f@series}{db}} +\newrobustcmd{\LWR@HTML@sbweight}{\renewcommand*{\LWR@f@series}{sb}} +\newrobustcmd{\LWR@HTML@ubweight}{\renewcommand*{\LWR@f@series}{ub}} +\newrobustcmd{\LWR@HTML@elweight}{\renewcommand*{\LWR@f@series}{el}} +\newrobustcmd{\LWR@HTML@ulweight}{\renewcommand*{\LWR@f@series}{ul}} \newrobustcmd{\LWR@HTML@dfshape}{} \ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes @@ -116,6 +116,9 @@ \LWR@formatted{ubweight} \LWR@formatted{elweight} \LWR@formatted{ulweight} +\LWR@formatted{itshape}% adapt to the new print version +\LWR@formatted{scshape}% adapt to the new print version +\LWR@formatted{upshape}% adapt to the new print version \LWR@formatted{dfshape} \ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes @@ -123,114 +126,59 @@ } \LWR@formatted{ornament} - -\newcommand{\LWR@null@lnstyle}{} -\newcommand{\LWR@null@osstyle}{} -\newcommand{\LWR@null@instyle}{} -\newcommand{\LWR@null@sustyle}{} -\newcommand{\LWR@null@swstyle}{} -\newcommand{\LWR@null@pstyle}{} -\newcommand{\LWR@null@tistyle}{} -\newcommand{\LWR@null@ostyle}{} -\newcommand{\LWR@null@postyle}{} -\newcommand{\LWR@null@ltstyle}{} -\newcommand{\LWR@null@ofstyle}{} -\newcommand{\LWR@null@altstyle}{} -\newcommand{\LWR@null@regstyle}{} -\newcommand{\LWR@null@embossstyle}{} -\newcommand{\LWR@null@ornamentalstyle}{} -\newcommand{\LWR@null@qtstyle}{} -\newcommand{\LWR@null@shstyle}{} -\newcommand{\LWR@null@swashstyle}{} -\newcommand{\LWR@null@tmstyle}{} -\newcommand{\LWR@null@tvstyle}{} -\newcommand{\LWR@null@tstyle}{} -\newcommand{\LWR@null@lstyle}{} -\newcommand{\LWR@null@tlstyle}{} -\newcommand{\LWR@null@plstyle}{} -\newcommand{\LWR@null@tostyle}{} -\newcommand{\LWR@null@olshape}{} -\newcommand{\LWR@null@scolshape}{} -\newcommand{\LWR@null@ushape}{} -\newcommand{\LWR@null@scushape}{} -\newcommand{\LWR@null@uishape}{} -\newcommand{\LWR@null@rishape}{} -\newcommand{\LWR@null@regwidth}{} -\newcommand{\LWR@null@nwwidth}{} -\newcommand{\LWR@null@cdwidth}{} -\newcommand{\LWR@null@ecwidth}{} -\newcommand{\LWR@null@ucwidth}{} -\newcommand{\LWR@null@etwidth}{} -\newcommand{\LWR@null@epwidth}{} -\newcommand{\LWR@null@exwidth}{} -\newcommand{\LWR@null@uxwidth}{} -\newcommand{\LWR@null@mbweight}{} -\newcommand{\LWR@null@dbweight}{} -\newcommand{\LWR@null@sbweight}{} -\newcommand{\LWR@null@ubweight}{} -\newcommand{\LWR@null@elweight}{} -\newcommand{\LWR@null@ulweight}{} -\newcommand{\LWR@null@dfshape}{} - -\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes - \newcommand{\LWR@null@swshape}{} -} - -\newcommand{\LWR@null@ornament}[1]{} - -\appto{\LWR@nullfonts}{% -\LetLtxMacro\lnstyle\LWR@null@lnstyle% -\LetLtxMacro\osstyle\LWR@null@osstyle% -\LetLtxMacro\instyle\LWR@null@instyle% -\LetLtxMacro\sustyle\LWR@null@sustyle% -\LetLtxMacro\swstyle\LWR@null@swstyle% -\LetLtxMacro\pstyle\LWR@null@pstyle% -\LetLtxMacro\tistyle\LWR@null@tistyle% -\LetLtxMacro\ostyle\LWR@null@ostyle% -\LetLtxMacro\postyle\LWR@null@postyle% -\LetLtxMacro\ltstyle\LWR@null@ltstyle% -\LetLtxMacro\ofstyle\LWR@null@ofstyle% -\LetLtxMacro\altstyle\LWR@null@altstyle% -\LetLtxMacro\regstyle\LWR@null@regstyle% -\LetLtxMacro\embossstyle\LWR@null@embossstyle% -\LetLtxMacro\ornamentalstyle\LWR@null@ornamentalstyle% -\LetLtxMacro\qtstyle\LWR@null@qtstyle% -\LetLtxMacro\shstyle\LWR@null@shstyle% -\LetLtxMacro\swashstyle\LWR@null@swashstyle% -\LetLtxMacro\tmstyle\LWR@null@tmstyle% -\LetLtxMacro\tvstyle\LWR@null@tvstyle% -\LetLtxMacro\tstyle\LWR@null@tstyle% -\LetLtxMacro\lstyle\LWR@null@lstyle% -\LetLtxMacro\tlstyle\LWR@null@tlstyle% -\LetLtxMacro\plstyle\LWR@null@plstyle% -\LetLtxMacro\tostyle\LWR@null@tostyle% -\LetLtxMacro\olshape\LWR@null@olshape% -\LetLtxMacro\scolshape\LWR@null@scolshape% -\LetLtxMacro\ushape\LWR@null@ushape% -\LetLtxMacro\scushape\LWR@null@scushape% -\LetLtxMacro\uishape\LWR@null@uishape% -\LetLtxMacro\rishape\LWR@null@rishape% -\LetLtxMacro\regwidth\LWR@null@regwidth% -\LetLtxMacro\nwwidth\LWR@null@nwwidth% -\LetLtxMacro\cdwidth\LWR@null@cdwidth% -\LetLtxMacro\ecwidth\LWR@null@ecwidth% -\LetLtxMacro\ucwidth\LWR@null@ucwidth% -\LetLtxMacro\etwidth\LWR@null@etwidth% -\LetLtxMacro\epwidth\LWR@null@epwidth% -\LetLtxMacro\exwidth\LWR@null@exwidth% -\LetLtxMacro\uxwidth\LWR@null@uxwidth% -\LetLtxMacro\mbweight\LWR@null@mbweight% -\LetLtxMacro\dbweight\LWR@null@dbweight% -\LetLtxMacro\sbweight\LWR@null@sbweight% -\LetLtxMacro\ubweight\LWR@null@ubweight% -\LetLtxMacro\elweight\LWR@null@elweight% -\LetLtxMacro\ulweight\LWR@null@ulweight% -\LetLtxMacro\dfshape\LWR@null@dfshape% -\LetLtxMacro\swshape\LWR@null@swshape% -\LetLtxMacro\ornament\LWR@null@ornament% +\FilenameNullify{% + \LetLtxMacro\lnstyle\@empty% + \LetLtxMacro\osstyle\@empty% + \LetLtxMacro\instyle\@empty% + \LetLtxMacro\sustyle\@empty% + \LetLtxMacro\swstyle\@empty% + \LetLtxMacro\pstyle\@empty% + \LetLtxMacro\tistyle\@empty% + \LetLtxMacro\ostyle\@empty% + \LetLtxMacro\postyle\@empty% + \LetLtxMacro\ltstyle\@empty% + \LetLtxMacro\ofstyle\@empty% + \LetLtxMacro\altstyle\@empty% + \LetLtxMacro\regstyle\@empty% + \LetLtxMacro\embossstyle\@empty% + \LetLtxMacro\ornamentalstyle\@empty% + \LetLtxMacro\qtstyle\@empty% + \LetLtxMacro\shstyle\@empty% + \LetLtxMacro\swashstyle\@empty% + \LetLtxMacro\tmstyle\@empty% + \LetLtxMacro\tvstyle\@empty% + \LetLtxMacro\tstyle\@empty% + \LetLtxMacro\lstyle\@empty% + \LetLtxMacro\tlstyle\@empty% + \LetLtxMacro\plstyle\@empty% + \LetLtxMacro\tostyle\@empty% + \LetLtxMacro\olshape\@empty% + \LetLtxMacro\scolshape\@empty% + \LetLtxMacro\ushape\@empty% + \LetLtxMacro\scushape\@empty% + \LetLtxMacro\uishape\@empty% + \LetLtxMacro\rishape\@empty% + \LetLtxMacro\regwidth\@empty% + \LetLtxMacro\nwwidth\@empty% + \LetLtxMacro\cdwidth\@empty% + \LetLtxMacro\ecwidth\@empty% + \LetLtxMacro\ucwidth\@empty% + \LetLtxMacro\etwidth\@empty% + \LetLtxMacro\epwidth\@empty% + \LetLtxMacro\exwidth\@empty% + \LetLtxMacro\uxwidth\@empty% + \LetLtxMacro\mbweight\@empty% + \LetLtxMacro\dbweight\@empty% + \LetLtxMacro\sbweight\@empty% + \LetLtxMacro\ubweight\@empty% + \LetLtxMacro\elweight\@empty% + \LetLtxMacro\ulweight\@empty% + \LetLtxMacro\dfshape\@empty% + \LetLtxMacro\swshape\@empty% + \LetLtxMacro\ornament\@gobble% } -\newrobustcmd{\LWR@HTML@textln}[1]{#1} +\newrobustcmd{\LWR@HTML@textln}[1]{\InlineClass{textln}{#1}} \newrobustcmd{\LWR@HTML@textos}[1]{\textsc{#1}} \newrobustcmd{\LWR@HTML@textin}[1]{#1} \newrobustcmd{\LWR@HTML@textsu}[1]{#1} @@ -249,15 +197,15 @@ \newrobustcmd{\LWR@HTML@textorn}[1]{#1} \newrobustcmd{\LWR@HTML@textqt}[1]{#1} \newrobustcmd{\LWR@HTML@textsh}[1]{#1} -\newrobustcmd{\LWR@HTML@texttm}[1]{#1} +\newrobustcmd{\LWR@HTML@texttm}[1]{\texttt{#1}} \newrobustcmd{\LWR@HTML@texttv}[1]{\texttt{#1}} -\newrobustcmd{\LWR@HTML@textl}[1]{#1} -\newrobustcmd{\LWR@HTML@texto}[1]{#1} -\newrobustcmd{\LWR@HTML@textp}[1]{#1} -\newrobustcmd{\LWR@HTML@textt}[1]{#1} +\newrobustcmd{\LWR@HTML@textl}[1]{\InlineClass{textln}{#1}} +\newrobustcmd{\LWR@HTML@texto}[1]{\textsc{#1}} +\newrobustcmd{\LWR@HTML@textp}[1]{\InlineClass{textp}{#1}} +\newrobustcmd{\LWR@HTML@textt}[1]{\InlineClass{textt}{#1}} \newrobustcmd{\LWR@HTML@textpl}[1]{#1} \newrobustcmd{\LWR@HTML@textpo}[1]{\textsc{#1}} -\newrobustcmd{\LWR@HTML@texttl}[1]{#1} +\newrobustcmd{\LWR@HTML@texttl}[1]{\InlineClass{textln}{#1}} \newrobustcmd{\LWR@HTML@textto}[1]{\textsc{#1}} \newrobustcmd{\LWR@HTML@textol}[1]{#1} \newrobustcmd{\LWR@HTML@textswash}[1]{#1} @@ -274,12 +222,12 @@ \newrobustcmd{\LWR@HTML@textex}[1]{#1} \newrobustcmd{\LWR@HTML@textux}[1]{#1} \newrobustcmd{\LWR@HTML@textrw}[1]{#1} -\newrobustcmd{\LWR@HTML@textmb}[1]{\textmd{#1}} -\newrobustcmd{\LWR@HTML@textdb}[1]{\textbf{#1}} -\newrobustcmd{\LWR@HTML@textsb}[1]{\textbf{#1}} -\newrobustcmd{\LWR@HTML@textub}[1]{\texteb{#1}} -\newrobustcmd{\LWR@HTML@textel}[1]{\textlg{#1}} -\newrobustcmd{\LWR@HTML@textul}[1]{\textlg{#1}} +\newrobustcmd{\LWR@HTML@textmb}[1]{{\LWR@HTML@mbweight\InlineClass{textmb}{#1}}} +\newrobustcmd{\LWR@HTML@textdb}[1]{{\LWR@HTML@dbweight\InlineClass{textdb}{#1}}} +\newrobustcmd{\LWR@HTML@textsb}[1]{{\LWR@HTML@sbweight\InlineClass{textsb}{#1}}} +\newrobustcmd{\LWR@HTML@textub}[1]{{\LWR@HTML@ubweight\InlineClass{textub}{#1}}} +\newrobustcmd{\LWR@HTML@textel}[1]{{\LWR@HTML@elweight\InlineClass{textel}{#1}}} +\newrobustcmd{\LWR@HTML@textul}[1]{{\LWR@HTML@ulweight\InlineClass{textul}{#1}}} \LWR@formatted{textln} \LWR@formatted{textos} @@ -328,104 +276,53 @@ \LWR@formatted{textel} \LWR@formatted{textul} -\newrobustcmd{\LWR@null@textln}[1]{#1} -\newrobustcmd{\LWR@null@textos}[1]{#1} -\newrobustcmd{\LWR@null@textin}[1]{#1} -\newrobustcmd{\LWR@null@textsu}[1]{#1} -\newrobustcmd{\LWR@null@textdf}[1]{#1} - -\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes - \newrobustcmd{\LWR@null@textsw}[1]{#1} -} - -\newrobustcmd{\LWR@null@textti}[1]{#1} -\newrobustcmd{\LWR@null@textlt}[1]{#1} -\newrobustcmd{\LWR@null@textof}[1]{#1} -\newrobustcmd{\LWR@null@textalt}[1]{#1} -\newrobustcmd{\LWR@null@textreg}[1]{#1} -\newrobustcmd{\LWR@null@emboss}[1]{#1} -\newrobustcmd{\LWR@null@textorn}[1]{#1} -\newrobustcmd{\LWR@null@textqt}[1]{#1} -\newrobustcmd{\LWR@null@textsh}[1]{#1} -\newrobustcmd{\LWR@null@texttm}[1]{#1} -\newrobustcmd{\LWR@null@texttv}[1]{#1} -\newrobustcmd{\LWR@null@textl}[1]{#1} -\newrobustcmd{\LWR@null@texto}[1]{#1} -\newrobustcmd{\LWR@null@textp}[1]{#1} -\newrobustcmd{\LWR@null@textt}[1]{#1} -\newrobustcmd{\LWR@null@textpl}[1]{#1} -\newrobustcmd{\LWR@null@textpo}[1]{#1} -\newrobustcmd{\LWR@null@texttl}[1]{#1} -\newrobustcmd{\LWR@null@textto}[1]{#1} -\newrobustcmd{\LWR@null@textol}[1]{#1} -\newrobustcmd{\LWR@null@textswash}[1]{#1} -\newrobustcmd{\LWR@null@textu}[1]{#1} -\newrobustcmd{\LWR@null@textscu}[1]{#1} -\newrobustcmd{\LWR@null@textui}[1]{#1} -\newrobustcmd{\LWR@null@textri}[1]{#1} -\newrobustcmd{\LWR@null@textnw}[1]{#1} -\newrobustcmd{\LWR@null@textcd}[1]{#1} -\newrobustcmd{\LWR@null@textec}[1]{#1} -\newrobustcmd{\LWR@null@textuc}[1]{#1} -\newrobustcmd{\LWR@null@textet}[1]{#1} -\newrobustcmd{\LWR@null@textep}[1]{#1} -\newrobustcmd{\LWR@null@textex}[1]{#1} -\newrobustcmd{\LWR@null@textux}[1]{#1} -\newrobustcmd{\LWR@null@textrw}[1]{#1} -\newrobustcmd{\LWR@null@textmb}[1]{#1} -\newrobustcmd{\LWR@null@textdb}[1]{#1} -\newrobustcmd{\LWR@null@textsb}[1]{#1} -\newrobustcmd{\LWR@null@textub}[1]{#1} -\newrobustcmd{\LWR@null@textel}[1]{#1} -\newrobustcmd{\LWR@null@textul}[1]{#1} - -\appto{\LWR@nullfonts}{% -\LetLtxMacro\textln\LWR@null@textln% -\LetLtxMacro\textos\LWR@null@textos% -\LetLtxMacro\textin\LWR@null@textin% -\LetLtxMacro\textsu\LWR@null@textsu% -\LetLtxMacro\textdf\LWR@null@textdf% -\LetLtxMacro\textsw\LWR@null@textsw% -\LetLtxMacro\textti\LWR@null@textti% -\LetLtxMacro\textlt\LWR@null@textlt% -\LetLtxMacro\textof\LWR@null@textof% -\LetLtxMacro\textalt\LWR@null@textalt% -\LetLtxMacro\textreg\LWR@null@textreg% -\LetLtxMacro\emboss\LWR@null@emboss% -\LetLtxMacro\textorn\LWR@null@textorn% -\LetLtxMacro\textqt\LWR@null@textqt% -\LetLtxMacro\textsh\LWR@null@textsh% -\LetLtxMacro\texttm\LWR@null@texttm% -\LetLtxMacro\texttv\LWR@null@texttv% -\LetLtxMacro\textl\LWR@null@textl% -\LetLtxMacro\texto\LWR@null@texto% -\LetLtxMacro\textp\LWR@null@textp% -\LetLtxMacro\textt\LWR@null@textt% -\LetLtxMacro\textpl\LWR@null@textpl% -\LetLtxMacro\textpo\LWR@null@textpo% -\LetLtxMacro\texttl\LWR@null@texttl% -\LetLtxMacro\textto\LWR@null@textto% -\LetLtxMacro\textol\LWR@null@textol% -\LetLtxMacro\textswash\LWR@null@textswash% -\LetLtxMacro\textu\LWR@null@textu% -\LetLtxMacro\textscu\LWR@null@textscu% -\LetLtxMacro\textui\LWR@null@textui% -\LetLtxMacro\textri\LWR@null@textri% -\LetLtxMacro\textnw\LWR@null@textnw% -\LetLtxMacro\textcd\LWR@null@textcd% -\LetLtxMacro\textec\LWR@null@textec% -\LetLtxMacro\textuc\LWR@null@textuc% -\LetLtxMacro\textet\LWR@null@textet% -\LetLtxMacro\textep\LWR@null@textep% -\LetLtxMacro\textex\LWR@null@textex% -\LetLtxMacro\textux\LWR@null@textux% -\LetLtxMacro\textrw\LWR@null@textrw% -\LetLtxMacro\textmb\LWR@null@textmb% -\LetLtxMacro\textdb\LWR@null@textdb% -\LetLtxMacro\textsb\LWR@null@textsb% -\LetLtxMacro\textub\LWR@null@textub% -\LetLtxMacro\textel\LWR@null@textel% -\LetLtxMacro\textul\LWR@null@textul% +\FilenameNullify{% + \LetLtxMacro\textln\@firstofone% + \LetLtxMacro\textos\@firstofone% + \LetLtxMacro\textin\@firstofone% + \LetLtxMacro\textsu\@firstofone% + \LetLtxMacro\textdf\@firstofone% + \LetLtxMacro\textsw\@firstofone% + \LetLtxMacro\textti\@firstofone% + \LetLtxMacro\textlt\@firstofone% + \LetLtxMacro\textof\@firstofone% + \LetLtxMacro\textalt\@firstofone% + \LetLtxMacro\textreg\@firstofone% + \LetLtxMacro\emboss\@firstofone% + \LetLtxMacro\textorn\@firstofone% + \LetLtxMacro\textqt\@firstofone% + \LetLtxMacro\textsh\@firstofone% + \LetLtxMacro\texttm\@firstofone% + \LetLtxMacro\texttv\@firstofone% + \LetLtxMacro\textl\@firstofone% + \LetLtxMacro\texto\@firstofone% + \LetLtxMacro\textp\@firstofone% + \LetLtxMacro\textt\@firstofone% + \LetLtxMacro\textpl\@firstofone% + \LetLtxMacro\textpo\@firstofone% + \LetLtxMacro\texttl\@firstofone% + \LetLtxMacro\textto\@firstofone% + \LetLtxMacro\textol\@firstofone% + \LetLtxMacro\textswash\@firstofone% + \LetLtxMacro\textu\@firstofone% + \LetLtxMacro\textscu\@firstofone% + \LetLtxMacro\textui\@firstofone% + \LetLtxMacro\textri\@firstofone% + \LetLtxMacro\textnw\@firstofone% + \LetLtxMacro\textcd\@firstofone% + \LetLtxMacro\textec\@firstofone% + \LetLtxMacro\textuc\@firstofone% + \LetLtxMacro\textet\@firstofone% + \LetLtxMacro\textep\@firstofone% + \LetLtxMacro\textex\@firstofone% + \LetLtxMacro\textux\@firstofone% + \LetLtxMacro\textrw\@firstofone% + \LetLtxMacro\textmb\@firstofone% + \LetLtxMacro\textdb\@firstofone% + \LetLtxMacro\textsb\@firstofone% + \LetLtxMacro\textub\@firstofone% + \LetLtxMacro\textel\@firstofone% + \LetLtxMacro\textul\@firstofone% } \providecommand*{\zeroslash}{0} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty index 4d396fe6fe5..99ffe80d233 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. - \LWR@ProvidesPackageDrop{nowidow}[2011/09/20] \newcommand*{\nowidow}[1][]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 0bf7e1aa03a..9fc3fd7ffd5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -16,7 +16,20 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\DeclareOption{thref}{} +\DeclareOption{thref}{ + \AtEndDocument{ + \PackageWarningNoLine{lwarp}{% + Lwarp uses cleveref, which takes over ntheorem's\MessageBreak + referencing, including + \protect\label \space and \protect\thref.\MessageBreak + Cleveref does not accept ntheorem's optional\MessageBreak + argument for \protect\label, so it will appear\MessageBreak + in the text. It is recommended to remove the\MessageBreak + thref option, \protect\usepackage{cleveref} instead,\MessageBreak + and remove any trailing optional arguments for \protect\label% + }% + } +} \newbool{LWR@ntheoremmarks} \boolfalse{LWR@ntheoremmarks} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty index cef4d69bd91..f2a821bc783 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty @@ -45,7 +45,10 @@ }% \setkeys{LWRparcols}{#1}% } - {\end{LWR@setvirtualpage}} + {% + \colplacechunks% + \end{LWR@setvirtualpage}% + } \newcommand{\LWR@parcolumns@onecol}[1]{% \ifbool{LWR@parcolumns@started}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty index bec0e85c1fe..a3472dc516e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty @@ -55,8 +55,8 @@ } \AtBeginDocument{ -\crefname{parnotemark}{paragraph note}{paragraph notes}% -\Crefname{parnotemark}{Paragraph note}{Paragraph notes} + \crefname{parnotemark}{paragraph note}{paragraph notes} + \Crefname{parnotemark}{Paragraph note}{Paragraph notes} } \begin{warpMathJax} \providecommand{\parnotename}{parnote} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty index 2eee58b0529..4b3e87aff54 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty @@ -54,12 +54,14 @@ } } \AtBeginDocument{ +\AtBeginDocument{ \LetLtxMacro\captionbelow\caption \LetLtxMacro\captionabove\caption \LetLtxMacro\captionofbelow\captionof \LetLtxMacro\captionofabove\captionof } +} \RenewDocumentEnvironment{captionbeside}{o m o o o s} {} 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 20c2e566fda..fb45e2de613 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -41,14 +41,28 @@ \RequirePackage{lwarp-parskip} \RequirePackage{lwarp-setspace}% req'd \RequirePackage{lwarp-showidx} -\RequirePackage{lwarp-subcaption}% req'd for \subfloat \makeindex \RequirePackage{lwarp-titling}% req'd \RequirePackage{lwarp-tocloft}% req'd \RequirePackage{lwarp-verse}% req'd -\LetLtxMacro\LWR@orig@label\@mem@old@label +\let\LWR@orig@label\@mem@old@label +\let\@mem@old@label\LWR@new@label +\AtBeginDocument{ + \renewcommand*{\sf@@memsub@label}[1]{% + \@bsphack + \sf@@memsub@label@hook{#1}% + \@memoldlabel{#1}% + \LWR@label@createtag{sub@#1}% + \protected@write\@auxout{}{% + \string\newlabel{sub@#1}% + {{\@nameuse{@@thesub\@captype}}% + {\thepage}}}% + \LWR@write@lwarplabel{sub@#1}% + \@esphack + } +} \setstocksize{190in}{20in} \setlrmarginsandblock{2in}{2in}{*} @@ -406,10 +420,9 @@ \renewcommand*{\makeheadposition}[5]{} \renewcommand{\makepsmarks}[2]{} \renewcommand*{\makeheadfootstrut}[3]{} - -\renewcommand{\createplainmark}[3]{} +\renewcommand{\createmark}[5]{\csdef{#1mark}[1]{}} +\renewcommand{\createplainmark}[3]{\csdef{#1mark}{}} \renewcommand{\memUChead}[1]{} -\renewcommand{\createmark}[5]{} \renewcommand*{\clearplainmark}[1]{} \renewcommand*{\clearmark}[1]{} \renewcommand{\addtopsmarks}[3]{} @@ -636,10 +649,32 @@ \renewcommand{\settocpreprocessor}[2]{} \DeclareRobustCommand{\cftpagenumbersoff}[1]{} \DeclareRobustCommand{\cftpagenumberson}[1]{} +\AtBeginDocument{ +\def\@xfloat #1[#2]{% + \LWR@floatbegin{#1}[#2] + \normalsize + \@nameuse{#1adjustment}% + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% +} +\def\@xdblfloat #1[#2]{% + \LWR@floatbegin{#1}[#2] + \normalsize + \@nameuse{#1adjustment}% + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% +} +} \RenewDocumentCommand{\newfloat}{o m m m}{% - \IfValueTF{#1}% - {\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}% - {\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}% + \def\LWR@tempone{#4}% + \def\LWR@temptwo{\@nameuse{#2name}}% + \ifdefequal{\LWR@tempone}{\LWR@temptwo}{% recursive name, already defined + \IfValueTF{#1}% + {\DeclareFloatingEnvironment[fileext=#3,within=#1]{#2}}% + {\DeclareFloatingEnvironment[fileext=#3]{#2}}% + }{% not recursive name + \IfValueTF{#1}% + {\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}% + {\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}% + }% \cslet{listof#2s}\relax% \cslet{listof#2es}\relax% } @@ -667,7 +702,7 @@ \NewDocumentEnvironment{KFLTmemoir@marginfloat}{O{-1.2ex} m} {% start \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% - \captionsetup{type=#2}% + \renewcommand*{\@captype}{#2}% } {% \endLWR@BlockClassWP% @@ -696,14 +731,13 @@ \renewcommand{\flegfigure}{\figurename} \renewcommand{\flegtoctable}{} \renewcommand{\flegtocfigure}{} -\renewcommand{\subcaption}[2][]{% - \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}% +\renewcommand{\@makesubfloatcaption}[2]{% + \minipagefullwidth + \begin{minipage}{\linewidth}% + #1 \ignorespaces #2 \unskip% + \end{minipage} } -\renewcommand{\contsubcaption}{\ContinuedFloat\subcaption} - -\LetLtxMacro\subcaptionref\subref - \renewcommand*{\tightsubcaptions}{} \renewcommand*{\loosesubcaptions}{} @@ -727,11 +761,12 @@ \renewcommand*{\sidecapmargin}[1]{} \scapmargleftfalse \renewcommand*{\setsidecappos}[1]{} - \RenewDocumentEnvironment{sidecontcaption}{m o} {} {% - \ContinuedFloat% + \ifdef{\ContinuedFloat}% + {\ContinuedFloat}% + {\addtocounter{\@captype}{-1}}% \caption{#1}% \IfValueT{#2}{\label[\@captype]{#2}}% } @@ -769,7 +804,7 @@ \renewcommand*{\verbfootnote}[2][]{% \PackageError{lwarp,memoir}% - {Verbatim footnotes are not yet supported by lwarp.}% + {Verbatim footnotes are not yet supported by lwarp}% {This may be improved some day.}% } @@ -781,7 +816,7 @@ \renewcommand*{\newfootnoteseries}[1]{% \PackageError{lwarp,memoir}% - {Memoir footnote series are not yet supported by lwarp.}% + {Memoir footnote series are not yet supported by lwarp}% {This may be improved some day.}% } @@ -825,16 +860,32 @@ \renewcommand*{\sidefootmarkstyle}[1]{} \renewcommand*{\sidefoottextfont}{} \renewcommand*{\sidefootform}{} - \renewcommand*{\continuousnotenums}{\pncontopttrue}% from pagenote \renewcommand*{\notepageref}{} \renewcommand*{\prenotetext}{} \renewcommand*{\postnotetext}{} -\renewcommand*{\idtextinnotes}[1]{} -\renewcommand*{\printpageinnotes}[1]{} -\renewcommand*{\printpageinnoteshyperref}[1]{} +\LetLtxMacro\printpageinnoteshyperref\printpageinnotes \renewcommand*{\foottopagenote}{} \renewcommand*{\pagetofootnote}{} +\xpatchcmd{\m@m@wrpnote} + {\string\startnoteentry{\thepagenote}} + {\string\startnoteentry{{\thepagenote}{\arabic{pagenote}}}} + {} + {\LWR@patcherror{memoir}{m@m@wrpnote}} + +\renewcommand\startnoteentrystart[4]{% + \prenoteinnotes% + \noteidinnotes{\@firstoftwo#1}{#2}% + \@ifmtarg{#2}{% + \def\@currentlabel{\@firstoftwo#1}% lwarp + \def\cref@currentlabel{% lwarp + [pagenote][\@secondoftwo#1][]\@firstoftwo#1% lwarp + }% lwarp + }{}% + \pagenoteanchor{#4}% + \pageinnotes{#3}% + \prenotetext% +} \renewcommand*{\epigraphposition}[1]{} \renewcommand*{\epigraphtextposition}[1]{} \renewcommand*{\epigraphsourceposition}[1]{} @@ -866,10 +917,6 @@ \renewcommand*{\PoemTitlefont}{} \renewenvironment{qframe}{\framed}{\endframed} \renewenvironment{qshade}{\shaded}{\endshaded} -\renewcommand*{\commentsoff}[1]{\includecomment{#1}} -\renewcommand*{\commentson}[1]{\excludecomment{#1}} -\LetLtxMacro\renewcomment\commentson - \renewcommand*{\setverbatimfont}[1]{} \renewcommand*{\tabson}[1]{} \renewcommand*{\tabsoff}{} @@ -1087,32 +1134,50 @@ \endgroup% } -\RenewDocumentCommand{\subtop}{O{} O{} m}{% - \subfloat[#1][#2]{#3}% -} - -\RenewDocumentCommand{\subbottom}{O{} O{} m}{% - \subfloat[#1][#2]{#3}% -} -\renewcommand{\contsubtop}{% - \ContinuedFloat - \subtop% -} - -\renewcommand{\contsubbottom}{% - \ContinuedFloat - \subbottom% +\renewcommand{\@memsubbody}{% + \bgroup + \let\label=\memsub@label + \ifdonemaincaption\else + \advance\csname c@\@captype\endcsname\@ne + \fi + % \refstepcounter{sub\@captype}\@contkeep% + \@ifnextchar [% + {\@memsubfig}% + {\@memsubfig[\@empty]}} + +\renewcommand{\@memcontsubbody}{% + \bgroup + \let\label=\memsub@label + \@contset + % \refstepcounter{sub\@captype}\@contkeep% + \@ifnextchar [% + {\@memsubfig}% + {\@memsubfig[\@empty]}} + +\long\def\@memsubfloat#1[#2][#3]#4{% + \bgroup% + \mem@step@subcounter% + \LWR@stoppars% + \minipagefullwidth% lwarp + \begin{minipage}{\linewidth}% lwarp + \bgroup + \if@contbotsub + #4% \box\@tempboxa + \egroup + \ifx \@empty#3\relax \else + \@memsubcaption{#1}{#2}{#3}% + \fi + \else + \ifx \@empty#3\relax \else + \@memsubcaption{#1}{#2}{#3}% + \fi\egroup + #4% \box\@tempboxa + \fi + \end{minipage}% lwarp + \LWR@startpars% lwarp + \egroup +\egroup } -\renewcommand{\subconcluded}{} - -\let\contsubtable\contsubtop -\let\contsubfigure\contsubbottom -\newcommand{\newfloatentry}[4][\@empty]{TODO: newfloatentry} -\newcommand{\newfloatlist}[5][\@empty]{TODO: newfloatlist} -\newcommand{\newfloatenv}[4][\@empty]{TODO: newfloatenv} -\DeclareRobustCommand{\newfloatpagesoff}[1]{} -\DeclareRobustCommand{\newfloatpageson}[1]{} -\newcommand{\setnewfloatindents}[3]{} \newlistof{tableofcontents}{toc}{\contentsname} \newlistof{listoffigures}{lof}{\listfigurename} \newlistof{listoftables}{lot}{\listtablename} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty index 40f6ed7efc7..a4278a215f8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty @@ -26,7 +26,7 @@ \xpatchcmd{\endquoting}{\quo@endtext} {\quo@endtext\end{LWR@blocktextcurrentfont}\LWR@stoppars} {} - {\LWR@patcherror{imakeidx}{endquoting}} + {\LWR@patcherror{quoting}{endquoting}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty index 23561137152..6e2c5acc02e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty @@ -15,14 +15,125 @@ %% 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{realscripts}[2016/02/13] -\let\realsuperscript\textsuperscript -\let\realsubscript\textsubscript +\LWR@ProvidesPackagePass{realscripts}[2016/02/13] +\ExplSyntaxOn -\let\fakesuperscript\textsuperscript -\let\fakesubscript\textsubscript +\DeclareDocumentCommand \LWR@print@realsubscript {m} { + \fontspec_if_fontspec_font:TF { + \fontspec_if_opentype:TF + { \fontspec_if_feature:nTF {+subs} + { {\addfontfeature{VerticalPosition=Inferior}#1} } + { \fontspec_if_feature:nTF {+sinf} + { {\addfontfeature{VerticalPosition=ScientificInferior}#1} } + { \fakesubscript{#1} } + } + } + { \fontspec_if_aat_feature:nnTF {10} {2} + { {\addfontfeature{VerticalPosition=Inferior}#1} } + { \fakesubscript{#1} } + } + } + { \fakesubscript{#1} } +} + +\DeclareDocumentCommand \LWR@HTML@realsubscript {m} { + \LWR@HTML@textsubscript{#1} +} + +\LWR@formatted{realsubscript} + +\DeclareDocumentCommand \LWR@print@realsuperscript {m} { + \fontspec_if_fontspec_font:TF + { + \fontspec_if_opentype:TF + { \fontspec_if_feature:nTF {+sups} + { {\addfontfeature{VerticalPosition=Superior}#1} } + { \fakesuperscript{#1} } + } + { \fontspec_if_aat_feature:nnTF {10} {1} + { {\addfontfeature{VerticalPosition=Superior}#1} } + { \fakesuperscript{#1} } + } + } + { \fakesuperscript{#1} } +} + +\DeclareDocumentCommand \LWR@HTML@realsuperscript {m} { + \LWR@HTML@textsuperscript{#1} +} + +\LWR@formatted{realsuperscript} + +\DeclareDocumentCommand \LWR@print@textsubsuperscript {s O{l} mm} { + \leavevmode + \group_begin: + \IfBooleanTF #1 + { + \hbox_set:Nn \l_tmpa_box {\textsubscript*{#3}} + \hbox_set:Nn \l_tmpb_box {\textsuperscript*{#4}} + } + { + \hbox_set:Nn \l_tmpa_box {\textsubscript{#3}} + \hbox_set:Nn \l_tmpb_box {\textsuperscript{#4}} + } + \hbox_set:Nn \l_tmpa_box + { \box_move_down:nn \subsupersep {\box_use:N \l_tmpa_box} } + \hbox_set:Nn \l_tmpb_box + { \box_move_up:nn \subsupersep {\box_use:N \l_tmpb_box} } + \str_case:nnF {#2} + { + {l}{\use_i:nnn} + {c}{\use_ii:nnn} + {r}{\use_iii:nnn} + } + { + \PackageWarning{realscripts}{ + Unknown~alignment~option~`#2'. \MessageBreak + One~ of~ `l',~ `c',~ `r',~ only + } + \use_i:nnn + } + { + \hbox_overlap_right:n { \box_use:N \l_tmpa_box } + \hbox_overlap_right:n { \box_use:N \l_tmpb_box } + \skip_horizontal:n { + \dim_max:nn {\box_wd:N \l_tmpa_box} {\box_wd:N \l_tmpb_box} + } + } + { + \dim_compare:nTF { \box_wd:N \l_tmpa_box > \box_wd:N \l_tmpb_box } + { + \skip_horizontal:n { + 0.5\box_wd:N \l_tmpa_box-0.5\box_wd:N \l_tmpb_box + } + \box_use:N \l_tmpb_box + \skip_horizontal:n { + -0.5\box_wd:N \l_tmpa_box-0.5\box_wd:N \l_tmpb_box + } + \box_use:N \l_tmpa_box + } + { + \skip_horizontal:n { + 0.5\box_wd:N \l_tmpb_box-0.5\box_wd:N \l_tmpa_box + } + \box_use:N \l_tmpa_box + \skip_horizontal:n { + -0.5\box_wd:N \l_tmpb_box-0.5\box_wd:N \l_tmpa_box + } + \box_use:N \l_tmpb_box + } + } + { + \skip_horizontal:n { + \dim_max:nn {\box_wd:N \l_tmpa_box} {\box_wd:N \l_tmpb_box} + } + \hbox_overlap_left:n { \box_use:N \l_tmpa_box } + \hbox_overlap_left:n { \box_use:N \l_tmpb_box } + } + \group_end: +} -\newlength{\subsupersep} +\ExplSyntaxOff \newcommand*{\LWR@realscriptsalign}{} @@ -40,18 +151,23 @@ }{}% } -\DeclareDocumentCommand \textsubsuperscript {s O{l} mm} {% +\DeclareDocumentCommand \LWR@HTML@textsubsuperscript {s O{l} mm} {% \LWR@setrealscriptsalign{#2}% \InlineClass[\LWR@realscriptsalign]{supsubscript}{% \textsuperscript{#4}\textsubscript{#3}% }% } +\LWR@formatted{textsubsuperscript} -\DeclareDocumentCommand \textsupersubscript {s O{l} mm} {% - \LWR@setrealscriptsalign{#2}% - \InlineClass[\LWR@realscriptsalign]{supsubscript}{% - \textsubscript{#4}\textsuperscript{#3}% - }% +\FilenameNullify{% + \RenewDocumentCommand{\textsuperscript}{s m}{}% + \RenewDocumentCommand{\textsubscript}{s m}{}% + \renewcommand{\fakesubscript}[1]{}% + \renewcommand{\fakesuperscript}[1]{}% + \renewcommand{\realsubscript}[1]{}% + \renewcommand{\realsuperscript}[1]{}% + \renewcommand{\textsubsuperscript}[2]{}% + \renewcommand{\textsupersubscript}[2]{}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty index c845df256f5..11f41888b05 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty @@ -20,6 +20,7 @@ \LWR@ProvidesPackageDrop{rotfloat}[2004/01/04] \RequirePackage{float} +\RequirePackage{rotating} \RenewDocumentCommand{\newfloat}{m m m o}{% \IfValueTF{#4}% {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty index ed2b1cdcf79..d1baaa3444b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.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@ProvidesPackageDrop{scrextend}[2018/03/30] +\LWR@ProvidesPackageDrop{scrextend}[2020/01/24] \DeclareDocumentCommand{\setkomafont}{m m}{} \DeclareDocumentCommand{\addkomafont}{m m}{} \DeclareDocumentCommand{\usekomafont}{m}{} @@ -27,23 +27,79 @@ \DeclareDocumentCommand{\useseriesofkomafont}{m}{} \DeclareDocumentCommand{\useshapeofkomafont}{m}{} +\providecommand*{\coverpagetopmargin}{} +\providecommand*{\coverpagebottommargin}{} +\providecommand*{\coverpageleftmargin}{} +\providecommand*{\coverpagerightmargin}{} + \AtBeginDocument{ \let\LWR@koma@orig@maketitle\maketitle \DeclareDocumentCommand{\maketitle}{o}{\LWR@koma@orig@maketitle} } +\DeclareDocumentCommand{\@maketitle}{}{% + \ifdefvoid{\@titlehead}{}{% + \begin{BlockClass}{titlehead}% + \@titlehead% + \end{BlockClass}% + }% + \ifdefvoid{\@subject}{}{% + \begin{BlockClass}{subject}% + \@subject% + \end{BlockClass}% + }% + \LWR@stoppars% + \LWR@htmltag{\LWR@tagtitle}% + \@title% + \LWR@htmltag{\LWR@tagtitleend}% + \ifdefvoid{\@subtitle}{}{% + \begin{BlockClass}{subtitle}% + \@subtitle% + \end{BlockClass}% + }% + \LWR@startpars% + \begin{BlockClass}{author}% + \renewcommand*{\cr}{}% + \renewcommand*{\crcr}{}% + \renewcommand*{\noalign}{}% + \renewcommand{\and}{% + \end{BlockClass}% + \begin{BlockClass}{oneauthor}% + }% + \begin{BlockClass}{oneauthor}% + \@author% + \end{BlockClass}% + \end{BlockClass}% + \begin{BlockClass}{titledate}% + \@date% + \end{BlockClass}% + \ifdefvoid{\@published}{}{% + \begin{BlockClass}{published}% + \@published% + \end{BlockClass}% + }% +} + +\AddSubtitlePublished + \DeclareDocumentCommand{\extratitle}{m}{} -\DeclareDocumentCommand{\titlehead}{m}{} -\DeclareDocumentCommand{\subject}{m}{} +\DeclareDocumentCommand{\frontispiece}{m}{} + +\def\@titlehead{}% +\DeclareDocumentCommand{\titlehead}{m}{\gdef\@titlehead{#1}}% + +\def\@subject{}% +\DeclareDocumentCommand{\subject}{m}{\gdef\@subject{#1}}% + + \DeclareDocumentCommand{\publishers}{m}{\published{#1}} + \DeclareDocumentCommand{\uppertitleback}{m}{} \DeclareDocumentCommand{\lowertitleback}{m}{} \DeclareDocumentCommand{\dedication}{m}{} \DeclareDocumentCommand{\ifthispageodd}{m m}{#1} -\DeclareDocumentCommand{\titlepagestyle}{}{} - \DeclareDocumentCommand{\cleardoublepageusingstyle}{m}{} \DeclareDocumentCommand{\cleardoubleemptypage}{}{} \DeclareDocumentCommand{\cleardoubleplainpage}{}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty index fd7083aeb0b..c3422db5fa1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty @@ -16,15 +16,15 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{sidenotes} -\RenewDocumentCommand \sidecaption {s o o +m} +\RenewDocumentCommand \sidecaption {s o o m} { \LWR@stoppars \begingroup - \captionsetup{style=sidecaption} + \captionsetup{style=sidecaption}% \IfBooleanTF{#1} { % starred \begin{BlockClass}[border:none ; box-shadow:none]{marginblock} - \caption*{#4} + \caption*{#4}% \end{BlockClass} } { % unstarred @@ -40,11 +40,11 @@ } \NewDocumentEnvironment{KFLTsidenotes@marginfloat}{O{-1.2ex} m} {% start -\LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% -\captionsetup{type=#2}% + \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% + \renewcommand*{\@captype}{#2}% } {% -\endLWR@BlockClassWP% + \endLWR@BlockClassWP% } \RenewDocumentEnvironment{marginfigure}{o} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty index 31ba892b0dd..aee0ee8dedf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty @@ -19,10 +19,8 @@ \newcommand*{\LWR@HTML@noscshape}{} \LWR@formatted{noscshape} -\newcommand*{\LWR@null@noscshape}{} - -\appto{\LWR@nullfonts}{% -\LetLtxMacro\noscshape\LWR@null@noscshape% +\FilenameNullify{% + \LetLtxMacro\noscshape\@empty% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty index eeb5e5b4b3d..7441db77cd8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty @@ -16,19 +16,14 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{subcaption}[2018/05/01] -\ifdef{\subcaption@minipage}{ - \xpatchcmd{\subcaption@minipage} - {\minipage} - {\minipagefullwidth\minipage} - {} - {\LWR@patcherror{subcaption}{subcaption@minipage}} -}{} -\ifdef{\subcaptionbox}{ - \xpretocmd{\subcaptionbox} - {\minipagefullwidth} - {} - {\LWR@patcherror{subcaption}{subcaptionbox}} -}{} +\xpretocmd{\subcaption@iiminipage} + {\minipagefullwidth} + {} + {\LWR@patcherror{subcaption}{subcaption@iiminipage}} +\xpretocmd{\subcaptionbox} + {\minipagefullwidth} + {} + {\LWR@patcherror{subcaption}{subcaptionbox}} \endinput %% %% End of file `lwarp-subcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index 2a18225b24b..9e1c0bc4a2b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -153,7 +153,7 @@ \@nameuse{thesub\@captype}.)}} \renewcommand{\sf@subref}[1]{% -\LWR@subnewref{#1}{sub@#1}% + \LWR@subnewref{#1}{sub@#1}% } \renewcommand{\sf@@subref}[1]{\LWR@orig@pageref{sub@#1}} \LetLtxMacro\LWR@orig@newsubfloat\@newsubfloat diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index e6aa56dc2c7..1e78f0318b7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -97,7 +97,7 @@ \newcommand*{\LWR@HTML@capitalmacron}[1]{#1\HTMLunicode{304}} \newcommand*{\LWR@HTML@capitaldotaccent}[1]{#1\HTMLunicode{307}} \providecommand*{\LWR@HTML@textcircled}[1]{% -\InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% + \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } \LWR@formatted{capitalcedilla} @@ -113,6 +113,7 @@ \LWR@formatted{capitalbreve} \LWR@formatted{capitalmacron} \LWR@formatted{capitaldotaccent} + \LWR@formatted{textcircled} \FilenameNullify{% \renewcommand*{\textdegree}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index dcdd9e24af9..d888bb88030 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -41,21 +41,22 @@ { \end{titlepage} } +\AtBeginDocument{ + \pretitle{} + \posttitle{} -\pretitle{} -\posttitle{} + \preauthor{} + \postauthor{} -\preauthor{} -\postauthor{} - -\predate{} -\postdate{} + \predate{} + \postdate{} +} \renewcommand*{\LWR@maketitlesetup}{% -\def\@makefnmark{\textsuperscript{\@thefnmark}} -\long\def\@makefntext##1{% -\makethanksmark~% -##1% -}% \@makefntext + \def\@makefnmark{\textsuperscript{\@thefnmark}}% + \long\def\@makefntext##1{% + \makethanksmark~% + ##1% + }% \@makefntext } \renewcommand{\thanksfootmark}{% \thanksscript{% @@ -63,13 +64,13 @@ }% } \renewcommand*{\maketitle}{% -\begin{titlepage} -\@bsmarkseries -\LWR@maketitlesetup -\@maketitle -\LWR@stoppars\@thanks\LWR@startpars -\end{titlepage} -\@bscontmark + \begin{titlepage} + \@bsmarkseries + \LWR@maketitlesetup + \@maketitle + \LWR@stoppars\@thanks\LWR@startpars + \end{titlepage} + \@bscontmark } \DeclareDocumentCommand{\@maketitle}{}{% \maketitlehooka diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index d4a87982091..c179276d7b0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -239,21 +239,21 @@ \DeclareDocumentCommand{\newlistof}{o m m m} {% -\IfValueTF{#1} -{\newlistentry[#1]{#2}{#3}{0}} -{\newlistentry{#2}{#3}{0}} -\@namedef{ext@#2}{#3} -\@ifundefined{c@#3depth}{\newcounter{#3depth}}{} -\setcounter{#3depth}{1} -\@namedef{cftmark#3}{} -\@namedef{listof#2}{\listof{#2}{#4}} -\@namedef{@cftmake#3title}{} -\expandafter\newlength\csname cftbefore#3titleskip\endcsname -\expandafter\newlength\csname cftafter#3titleskip\endcsname -\@namedef{cft#3titlefont}{} -\@namedef{cftafter#3title}{} -\@namedef{cft#3prehook}{} -\@namedef{cft#3posthook}{} + \IfValueTF{#1}% + {\newlistentry[#1]{#2}{#3}{0}}% + {\newlistentry{#2}{#3}{0}}% + \@namedef{ext@#2}{#3}% + \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}% + \setcounter{#3depth}{1}% + \@namedef{cftmark#3}{}% + \@namedef{listof#2}{\listof{#2}{#4}}% + \@namedef{@cftmake#3title}{}% + \expandafter\newlength\csname cftbefore#3titleskip\endcsname% + \expandafter\newlength\csname cftafter#3titleskip\endcsname% + \@namedef{cft#3titlefont}{}% + \@namedef{cftafter#3title}{}% + \@namedef{cft#3prehook}{}% + \@namedef{cft#3posthook}{}% } \newcommand{\cftchapterprecis}[1]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index 3174d3856b4..8bfd8b4e3d7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -43,35 +43,35 @@ \NewDocumentEnvironment{wrapfigure}{o m o m} {% -\begin{LWR@setvirtualpage}*% -\LWR@subwrapfigure{#2}{#4}% -\captionsetup{type=figure}% + \begin{LWR@setvirtualpage}*% + \LWR@subwrapfigure{#2}{#4}% + \renewcommand*{\@captype}{figure}% } {% -\endLWR@BlockClassWP% -\end{LWR@setvirtualpage}% + \endLWR@BlockClassWP% + \end{LWR@setvirtualpage}% } \NewDocumentEnvironment{wraptable}{o m o m} {% -\begin{LWR@setvirtualpage}*% -\LWR@subwrapfigure{#2}{#4}% -\captionsetup{type=table}% + \begin{LWR@setvirtualpage}*% + \LWR@subwrapfigure{#2}{#4}% + \renewcommand*{\@captype}{table}% } {% -\endLWR@BlockClassWP% -\end{LWR@setvirtualpage}% + \endLWR@BlockClassWP% + \end{LWR@setvirtualpage}% } \NewDocumentEnvironment{wrapfloat}{m o m o m} {% -\begin{LWR@setvirtualpage}*% -\LWR@subwrapfigure{#3}{#5}% -\captionsetup{type=#1}% + \begin{LWR@setvirtualpage}*% + \LWR@subwrapfigure{#3}{#5}% + \renewcommand*{\@captype}{#1}% } {% -\endLWR@BlockClassWP% -\end{LWR@setvirtualpage}% + \endLWR@BlockClassWP% + \end{LWR@setvirtualpage}% } \newlength{\wrapoverhang} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index fc8e4b1038d..5c1cd0a1473 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -109,7 +109,7 @@ padding:\LWR@printlength{\fboxsep}% } \AtBeginDocument{ -\LWR@formatted{colorbox} + \LWR@formatted{colorbox} } \NewDocumentCommand{\LWR@HTML@colorboxBlock}{O{named} m +m}{% @@ -127,7 +127,7 @@ padding:\LWR@printlength{\fboxsep}% } \AtBeginDocument{ -\LWR@formatted{colorboxBlock} + \LWR@formatted{colorboxBlock} } \NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{named} m +m}{% @@ -151,7 +151,7 @@ padding:\LWR@printlength{\fboxsep}% } \AtBeginDocument{ -\LWR@formatted{fcolorbox} + \LWR@formatted{fcolorbox} } \NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{named} m +m}{% @@ -183,7 +183,7 @@ padding:\LWR@printlength{\fboxsep}% } \AtBeginDocument{ -\LWR@formatted{fcolorboxBlock} + \LWR@formatted{fcolorboxBlock} } \NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty index 33482536cb4..b51db884d00 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty @@ -68,6 +68,8 @@ \ExplSyntaxOff \renewcommand*{\LWR@disablepinyin}{\disablepinyin} + +\FilenameNullify{\LWR@disablepinyin} \endinput %% %% End of file `lwarp-xpinyin.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index a476c088b8c..1b36a974a5c 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} - [2020/03/25 v0.83 Allows LaTeX to directly produce HTML5 output.] + [2020/04/24 v0.84 Allows LaTeX to directly produce HTML5 output.] @@ -50,12 +50,13 @@ {% Package #1,\MessageBreak or one which uses #1,\MessageBreak - must be loaded after lwarp + must be loaded after Lwarp.\MessageBreak + Enter 'H' for possible solutions% } - {Move \detokenize{\usepackage}{#1} after - \detokenize{\usepackage}{lwarp}.\MessageBreak + {Move ``\protect\usepackage{#1}'' after + ``\protect\usepackage{lwarp}''.\MessageBreak Package #1 may also be loaded by something else,\MessageBreak - which must also be moved after lwarp.} + which must also be moved after Lwarp.} } {} } @@ -83,8 +84,11 @@ {} { \PackageError{lwarp} - {Package #1 must be loaded before lwarp} - {Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.} + {% + Package #1 must be loaded before lwarp.\MessageBreak + Enter 'H' for possible solutions% + } + {Move ``\protect\usepackage{#1}'' before ``\protect\usepackage{lwarp}''.} } } @@ -146,7 +150,6 @@ \LWR@earlyloadnever{alg}{algorithm2e, algorithmicx} \LWR@earlyloadnever{algorithmic}{algorithm2e, algorithmicx} \LWR@earlyloadnever{bitfield}{bytefield} -\LWR@earlyloadnever{boxedminipage}{boxedminipage2e} \LWR@earlyloadnever{caption2}{caption} \LWR@earlyloadnever{colortab}{colortbl} \LWR@earlyloadnever{doublespace}{setspace} @@ -225,6 +228,7 @@ \LWR@notmemoirloadafter{booktabs} \LWR@loadafter{bophook} \LWR@loadafter{bounddvi} +\LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{braket} \LWR@loadafter{breakurl} @@ -641,9 +645,12 @@ \LWR@loadafter{xy} \LWR@loadafter{zwpagelayout} \newcommand{\LWR@mdfive}[1]{% -\PackageError{lwarp} -{No MD5 macro was found} -{Lwarp must find the macros pdfmdfivesum or mdfivesum.} + \PackageError{lwarp} + {No MD5 macro was found} + {% + Lwarp must find the macros \protect\pdfmdfivesum\space + or \protect\mdfivesum.% + } } \let\LWR@mdfive\pdfmdfivesum \ifLuaTeX @@ -703,7 +710,8 @@ {% Lwarp requires a vector font.\MessageBreak Install and load cm-super, lmodern, or another\MessageBreak - Type-1 vector font before loading lwarp% + Type-1 vector font before loading lwarp.\MessageBreak + Enter 'H' for possible solutions% } {% Install cm-super or lmodern.\MessageBreak @@ -722,6 +730,10 @@ \ifpTeX \RequirePackage{upquote} \fi +\newlength{\LWR@templengthone} +\newlength{\LWR@templengthtwo} +\newlength{\LWR@templengththree} +\newcounter{LWR@tempcountone} \newcommand*\LWR@providelength[1]{% \ifdeflength{#1}{}{\newlength{#1}}% } @@ -739,9 +751,12 @@ \newcommand*{\LWR@patcherror}[2]{% -\PackageError{lwarp} -{Unable to patch package #1, macro #2} -{Please contact the author of the Lwarp package.} + \PackageError{lwarp}% + {% + Unable to patch package #1, macro #2.\MessageBreak + Lwarp may need to be updated% + }% + {Please contact the maintainer of the Lwarp package.}% } \newcommand{\LWR@isolate}[1]{#1}% @@ -1007,37 +1022,45 @@ \newcommand{\warpHTMLonly}[1]{\ifbool{warpingHTML}{#1}{}} \RequirePackage{comment} -\ifbool{warpingHTML}{ -\def\DefaultCutFileName{\def\CommentCutFile{comment_html.cut}} -}{} +\def\LWR@includecomment + #1#2{\message{Lwarp: Including comment '#1'}% + \csarg\def{After#1Comment}{\CloseAndInputCutFile} + \csarg\def{#1}{\endgroup \message{Including '#1' comment.}% + \def\CommentCutFile{comment_#2.cut} \SetUpCutFile \ProcessComment{#1}}% + \CommentEndDef{#1}} -\ifbool{warpingprint}{ -\def\DefaultCutFileName{\def\CommentCutFile{comment_print.cut}} -}{} +\def\LWR@excludecomment + #1#2{\message{Lwarp: Excluding comment '#1'}% + \csarg\def{#1}{\endgroup \message{Excluding '#1' comment.}% + \begingroup + \def\CommentCutFile{comment_#2.cut} \def\ProcessCutFile{}% + \def\ThisComment####1{}\ProcessComment{#1}}% + \csarg\def{After#1Comment}{\CloseAndInputCutFile \endgroup} + \CommentEndDef{#1}} -\includecomment{warpall} +\LWR@includecomment{warpall}{all} \ifbool{warpingHTML} - {\includecomment{warpHTML}} - {\excludecomment{warpHTML}}% + {\LWR@includecomment{warpHTML}{html}} + {\LWR@excludecomment{warpHTML}{html}} \ifbool{warpingprint} - {\includecomment{warpprint}} - {\excludecomment{warpprint}} + {\LWR@includecomment{warpprint}{print}} + {\LWR@excludecomment{warpprint}{print}} \begin{warpprint} -\excludecomment{warpMathJax} +\LWR@excludecomment{warpMathJax}{mathjax} \end{warpprint} \begin{warpHTML} \ifbool{mathjax} - {\includecomment{warpMathJax}} - {\excludecomment{warpMathJax}} + {\LWR@includecomment{warpMathJax}{mathjax}} + {\LWR@excludecomment{warpMathJax}{mathjax}} \end{warpHTML} \ifbool{LWR@creatinglwarpmk} - {\includecomment{LWR@createlwarpmk}} - {\excludecomment{LWR@createlwarpmk}} + {\LWR@includecomment{LWRcreatelwarpmk}{lwarpmk}} + {\LWR@excludecomment{LWRcreatelwarpmk}{lwarpmk}} \begin{warpHTML} @@ -1245,7 +1268,6 @@ \LWR@checkloadnever{#1}{alg}{algorithm2e, algorithmicx} \LWR@checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx} \LWR@checkloadnever{#1}{bitfield}{bytefield} -\LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e} \LWR@checkloadnever{#1}{caption2}{caption} \LWR@checkloadnever{#1}{ccaption}{caption}% might be preloaded by memoir \LWR@checkloadnever{#1}{colortab}{colortbl} @@ -1367,8 +1389,9 @@ \NewDocumentCommand{\LWR@ProvidesPackagePass}{m o}{ \PackageInfo{lwarp}{% - Using package `#1' and adding lwarp modifications,\MessageBreak - including options,}% + Using package `#1',\MessageBreak + and adding lwarp modifications, including options,\MessageBreak% + }% \IfValueTF{#2}% {\ProvidesPackage{lwarp-#1}[#2]}% {\ProvidesPackage{lwarp-#1}}% @@ -1419,14 +1442,6 @@ \end{warpHTML} -\begin{warpHTML} - -\LWR@origRequirePackage{caption} -\AtBeginDocument{\RequirePackage{lwarp-caption}}% - -\end{warpHTML} - - \begin{warpall} @@ -1721,13 +1736,6 @@ \let\LWR@origsp\sp \let\LWR@origsb\sb -\LetLtxMacro\LWR@origtextsuperscript\textsuperscript -\LetLtxMacro\LWR@orig@textsuperscript\@textsuperscript - -\AtBeginDocument{ -\LetLtxMacro\LWR@origtextsubscript\textsubscript -\LetLtxMacro\LWR@orig@textsubscript\@textsubscript -} \LetLtxMacro\LWR@origunderline\underline \let\LWR@orignewpage\newpage @@ -1770,39 +1778,57 @@ \begin{warpHTML} \AtBeginDocument{ -\LetLtxMacro\LWR@origt\t +\LetLtxMacro\LWR@origtie\t \ifPDFTeX% pdflatex or dvi latex -\LetLtxMacro\LWR@origequalaccent\= +\LetLtxMacro\LWR@origgraveaccent\` +\LetLtxMacro\LWR@origacuteaccent\' +\LetLtxMacro\LWR@origcircumflexaccent\^ +\LetLtxMacro\LWR@origtildeaccent\~ +\LetLtxMacro\LWR@origmacronaccent\= +\LetLtxMacro\LWR@origbreve\u \LetLtxMacro\LWR@origdotaccent\. -\LetLtxMacro\LWR@origu\u -\LetLtxMacro\LWR@origv\v -\LetLtxMacro\LWR@origc\c -\LetLtxMacro\LWR@origd\d -\LetLtxMacro\LWR@origb\b -\renewcommand*{\=}[1]{#1\HTMLunicode{0305}} -\renewcommand*{\.}[1]{#1\HTMLunicode{0307}} +\LetLtxMacro\LWR@origdiaeresisaccent\" +\LetLtxMacro\LWR@origdoubleacuteaccent\H +\LetLtxMacro\LWR@origcaronaccent\v +\LetLtxMacro\LWR@origdotbelowaccent\d +\LetLtxMacro\LWR@origcedillaaccent\c +\LetLtxMacro\LWR@origmacronbelowaccent\b +\renewcommand*{\`}[1]{#1\HTMLunicode{0300}} +\renewcommand*{\'}[1]{#1\HTMLunicode{0301}} +\renewcommand*{\^}[1]{#1\HTMLunicode{0302}} +\renewcommand*{\~}[1]{#1\HTMLunicode{0303}} +\renewcommand*{\=}[1]{#1\HTMLunicode{0304}} \renewcommand*{\u}[1]{#1\HTMLunicode{0306}} +\renewcommand*{\.}[1]{#1\HTMLunicode{0307}} +\renewcommand*{\"}[1]{#1\HTMLunicode{0308}} +\renewcommand*{\H}[1]{#1\HTMLunicode{030B}} \renewcommand*{\v}[1]{#1\HTMLunicode{030C}} -\renewcommand*{\c}[1]{#1\HTMLunicode{0327}} \renewcommand*{\d}[1]{#1\HTMLunicode{0323}} +\renewcommand*{\c}[1]{#1\HTMLunicode{0327}} \renewcommand*{\b}[1]{#1\HTMLunicode{0331}} \fi \def\LWR@t#1#2{#1\HTMLunicode{0361}#2} \renewcommand*{\t}[1]{\LWR@t#1} \ifPDFTeX% pdflatex or dvi latex \newcommand*{\LWR@restoreorigaccents}{% -\LetLtxMacro\=\LWR@origequalaccent% -\LetLtxMacro\.\LWR@origdotaccent% -\LetLtxMacro\u\LWR@origu% -\LetLtxMacro\v\LWR@origu% -\LetLtxMacro\t\LWR@origt% -\LetLtxMacro\c\LWR@origc% -\LetLtxMacro\d\LWR@origd% -\LetLtxMacro\b\LWR@origb% + \LetLtxMacro\`\LWR@origgraveaccent% + \LetLtxMacro\'\LWR@origacuteaccent% + \LetLtxMacro\^\LWR@origcircumflexaccent% + \LetLtxMacro\~\LWR@origtildeaccent% + \LetLtxMacro\=\LWR@origmacronaccent% + \LetLtxMacro\u\LWR@origbreve% + \LetLtxMacro\.\LWR@origdotaccent% + \LetLtxMacro\"\LWR@origdiaeresisaccent% + \LetLtxMacro\H\LWR@origdoubleacuteaccent% + \LetLtxMacro\v\LWR@origcaronaccent% + \LetLtxMacro\t\LWR@origtie% + \LetLtxMacro\d\LWR@origdotbelowaccent% + \LetLtxMacro\c\LWR@origcedillaaccent% + \LetLtxMacro\b\LWR@origmacronbelowaccent% }% \else% XeLaTeX, LuaLaTeX: \newcommand*{\LWR@restoreorigaccents}{% -\LetLtxMacro\t\LWR@origt% + \LetLtxMacro\t\LWR@origtie% }% \fi% }% AtBeginDocument @@ -1811,7 +1837,7 @@ -\excludecomment{LWRwriteconf} +\LWR@excludecomment{LWRwriteconf}{writeconf} \begin{warpprint} \fullexpandarg% \IfSubStr*{\jobname}{-pstool} @@ -1823,7 +1849,7 @@ } { \PackageInfo{lwarp}{Generating lwarp configuration files,}% - \includecomment{LWRwriteconf} + \LWR@includecomment{LWRwriteconf}{writeconf} } \end{warpprint} @@ -1856,9 +1882,12 @@ #1 \jobname#2% } \newcommand*{\LWR@unknownengine}{% - \PackageError{lwarp} - {Unknown LaTeX engine.} - {Lwarp only knows about pdflatex, dvi latex, xelatex, lualatex, and upLateX.} + \PackageError{lwarp}% + {Unknown LaTeX engine}% + {% + Lwarp only knows about pdflatex, dvi latex, + xelatex, lualatex, and upLateX.% + }% } \newcommand*{\LWR@latexmkvar}[2]{% -e @@ -2111,10 +2140,6 @@ span.textit, div.textit { font-style: italic; } span.textmd, div.textmd { font-weight: normal; } -span.texteb { font-weight: bolder; } - -span.textlg { font-weight: lighter; } - span.textup, div.textup { font-style: normal; font-variant: normal; @@ -2143,6 +2168,50 @@ span.textsf, div.textsf { Geneva, Verdana, sans-serif ; } +/* nfssext-cfr lining figures */ +span.textln, div.textln { + font-variant-numeric: lining-nums ; +} + +/* nfssext-cfr proportional figures */ +span.textp, div.textp { + font-variant-numeric: proportional-nums ; +} + +/* nfssext-cfr tabular figures */ +span.textt, div.textt { + font-variant-numeric: tabular-nums ; +} + +/* nfssext-cfr font weights */ +span.textdb, div.textdb { + font-weight: 500 ; +} + +span.textsb, div.textsb { + font-weight: 600 ; +} + +span.texteb, div.texteb { + font-weight: 800 ; +} + +span.textub, div.textub { + font-weight: 900 ; +} + +span.textlg, div.textlg { + font-weight: 300 ; +} + +span.textel, div.textel { + font-weight: 200 ; +} + +span.textul, div.textul { + font-weight: 100 ; +} + span.textcircled { border: 1px solid black ; border-radius: 1ex ; } span.underline { @@ -2183,16 +2252,16 @@ div.diagboxW { .supsubscript sub { position: relative; display: block; - font-size: .5em; + font-size: .7em; line-height: 1; } .supsubscript sup { - top: .5em; + top: .3em; } .supsubscript sub { - top: .5em; + top: .3em; } div.attribution p { @@ -2654,6 +2723,7 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} .minipage, .fminipage, .fcolorminipage { /* display: inline-block ; */ /* Mini pages which follow each other will be tiled. */ + text-align:left; margin: .25em .25em .25em .25em; padding: .25em .25em .25em .25em; display: inline-flex; @@ -3125,6 +3195,26 @@ span.verbatim { "Courier New", monospace; } +div.titlehead +{ + text-align: left ; + font-style: normal ; + font-weight: normal ; + font-style: normal ; + font-size: .8em ; + margin: 1ex 0em 1ex 0em ; +} + +div.subject +{ + text-align: center ; + font-style: normal ; + font-weight: bold ; + font-style: normal ; + font-size: .8em ; + margin: 1ex 0em 1ex 0em ; +} + div.published { text-align: center ; @@ -3215,6 +3305,7 @@ footer { text-align:left ; } +/* for \LinkHome, \LinkPrevious, and \LinkNext: */ a.linkhome { font-weight:bold ; font-size: 1em ;} div.lateximagesource { padding: 0px ; margin: 0px ; display: none; } @@ -3532,6 +3623,7 @@ span.sidetocthetitle { display: none } box-shadow: none ; } span.sidetocthetitle { display: inline } + nav.topnavigation { display:block } nav.botnavigation { display:block } div.bodycontainer { width: 100% } .marginpar { @@ -4191,13 +4283,13 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- -\begin{LWR@createlwarpmk} +\begin{LWRcreatelwarpmk} \begin{filecontents*}[overwrite]{lwarpmk.lua} #!/usr/bin/env texlua -- Copyright 2016-2020 Brian Dunn -printversion = "v0.83" +printversion = "v0.84" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4574,7 +4666,7 @@ function removeaux () -- Remove auxiliary files: -- All .aux files are removed since there may be many bbl*.aux files. -- Also removes sourcename_html.pdf, sourcename_html.html, --- and sourcename_html.sidetoc. +-- and sourcename_html.sidetoc, plus comment_*.cut. -- os.execute ( rmname .. " *.aux " .. sourcename ..".toc " .. sourcename .. "_html.toc " .. @@ -4588,7 +4680,8 @@ os.execute ( rmname .. " *.aux " .. sourcename .. "_html.pdf " .. sourcename .. "_html.html " .. sourcename .. "_html.sidetoc " .. - " *_html_inc.* " + " *_html_inc.* " .. + " comment_*.cut" ) end @@ -5099,7 +5192,7 @@ end end -- not --version \end{filecontents*} -\end{LWR@createlwarpmk} +\end{LWRcreatelwarpmk} \begin{warpHTML} @@ -5293,7 +5386,7 @@ end -- not --version \providecommand*{\HomeHTMLFilename}{\BaseJobname} \newcommand*{\SetHTMLFileNumber}[1]{% -\setcounter{LWR@htmlfilenumber}{#1}% + \setcounter{LWR@htmlfilenumber}{#1}% } \newbool{FileSectionNames} @@ -5303,6 +5396,15 @@ end -- not --version \begin{warpHTML} +\newcounter{LWR@HTMLpagenum} +\setcounter{LWR@HTMLpagenum}{0} + +\newcounter{LWR@htmlseqfilenumber} +\setcounter{LWR@htmlseqfilenumber}{0} + +\newbool{LWR@setseqfilelabel} +\setbool{LWR@setseqfilelabel}{false} + \newcounter{LWR@htmlfilenumber} \setcounter{LWR@htmlfilenumber}{0} @@ -5312,29 +5414,31 @@ end -- not --version \LWR@disablepinyin% \LWR@sanitize{#1}% \LWR@traceinfo{about to compare with ??}% -\ifthenelse{\equal{\LWR@sanitized}{??}}% +\ifdefstring{\LWR@sanitized}{??} {\LWR@traceinfo{found ??}}% {\LWR@traceinfo{not found ??}}% \LWR@traceinfo{about to compare with zero or empty}% -\ifthenelse{% - \equal{\LWR@sanitized}{0}% - \OR \equal{\LWR@sanitized}{}% - \OR \equal{\LWR@sanitized}{??}% -}% +\ifboolexpr{ + test {\ifdefstring{\LWR@sanitized}{0}} or + test {\ifdefstring{\LWR@sanitized}{}} or + test {\ifdefstring{\LWR@sanitized}{??}} +} {% \LWR@traceinfo{LWR@htmlsectionfilename B \HomeHTMLFilename.html}% \HomeHTMLFilename.html% }% {% \LWR@traceinfo{LWR@htmlsectionfilename C \LWR@sanitized}% - \ifthenelse{% - \equal{\HTMLFilename}{} \AND - \equal{\LWR@sanitized}{Index} \OR - \equal{\LWR@sanitized}{index}% + \ifboolexpr{ + test{\ifdefvoid{\HTMLFilename}} and + ( + test{\ifdefstring{\LWR@sanitized}{Index}} or + test{\ifdefstring{\LWR@sanitized}{index}} + ) }% {% - \LWR@traceinfo{Prefixing the index name with an underscore.}% - \_\LWR@sanitized.html% + \LWR@traceinfo{Adding a zero to the index filename.}% + \LWR@sanitized-0.html% }% {% \HTMLFilename\LWR@isolate{\LWR@sanitized}.html% @@ -5345,12 +5449,12 @@ end -- not --version } \newcommand*{\LWR@htmlrefsectionfilename}[1]{% -\LWR@traceinfo{LWR@htmlrefsectionfilename: !\detokenize{#1}!}% -\begingroup% -\LWR@nullfonts% -\LWR@htmlsectionfilename{\LWR@htmlfileref{#1}}% -\endgroup% -\LWR@traceinfo{LWR@htmlrefsectionfilename: done}% + \LWR@traceinfo{LWR@htmlrefsectionfilename: !\detokenize{#1}!}% + \begingroup% + \LWR@nullfonts% + \LWR@htmlsectionfilename{\LWR@htmlfileref{#1}}% + \endgroup% + \LWR@traceinfo{LWR@htmlrefsectionfilename: done}% } \end{warpHTML} @@ -5365,7 +5469,7 @@ end -- not --version \begin{warpHTML} \newcommand*{\LinkHome}{% -\LWR@subhyperrefclass{\HomeHTMLFilename.html}{\linkhomename}{linkhome}% + \LWR@subhyperrefclass{\HomeHTMLFilename.html}{\linkhomename}{linkhome}% } \end{warpHTML} @@ -5390,12 +5494,63 @@ end -- not --version \begin{warpHTML} -\newcommand*{\LWR@topnavigation}{ -\LWR@htmlelementclassline{nav}{topnavigation}{\LinkHome} +\newcommand*{\LWR@topnavigation}{% + \LWR@htmlelementclassline{nav}{topnavigation}{\LinkHome} +} + +\newcommand*{\LWR@botnavigation}{% + \LWR@htmlelementclassline{nav}{botnavigation}{\LinkHome} +} + +\end{warpHTML} + + +\begin{warpall} + +\newcommand*{\linkpreviousname}{Previous} + +\newcommand*{\linknextname}{Next} + +\end{warpall} + +\begin{warpprint} + +\newcommand*{\LinkPrevious}{} + +\newcommand*{\LinkNext}{} + +\end{warpprint} + +\begin{warpHTML} + +\newcommand*{\LinkPrevious}{% + \ifnumless{\value{LWR@htmlseqfilenumber}}{1}{}{% + \setcounter{LWR@tempcountone}{\value{LWR@htmlseqfilenumber}-1}% + \LWR@subhyperrefclass{% + \LWR@htmlrefsectionfilename{% + \BaseJobname-autofile-\arabic{LWR@tempcountone}% + }% + }{\linkpreviousname}{linkhome}% + }% } -\newcommand*{\LWR@botnavigation}{ -\LWR@htmlelementclassline{nav}{botnavigation}{\LinkHome} +\newcommand*{\LinkNext}{% + \ifcsdef{r@\BaseJobname-autofile-last@lwarp}{% + \edef\LWR@tempone{% + \LWR@htmlfileref{\BaseJobname-autofile-\arabic{LWR@htmlseqfilenumber}}% + }% + \edef\LWR@temptwo{% + \LWR@htmlfileref{\BaseJobname-autofile-last}% + }% + \ifdefequal{\LWR@tempone}{\LWR@temptwo}{}{% + \setcounter{LWR@tempcountone}{\value{LWR@htmlseqfilenumber}+1}% + \LWR@subhyperrefclass{% + \LWR@htmlrefsectionfilename{% + \BaseJobname-autofile-\arabic{LWR@tempcountone}% + }% + }{\linknextname}{linkhome}% + }% + }{}% } \end{warpHTML} @@ -5573,6 +5728,24 @@ end -- not --version \endgroup% } +\newcommand*{\LWR@spanwarnformat}[1]{% + \ifnumcomp{\value{LWR@spandepth}}{>}{0}{% + \PackageWarning{lwarp}{% + A #1 is being used inside a span.\MessageBreak + Formatting may be lost,% + }% + }{}% +} + +\newcommand*{\LWR@spanwarninvalid}[1]{% + \ifnumcomp{\value{LWR@spandepth}}{>}{0}{% + \PackageWarning{lwarp}{% + A #1 is being used inside a span.\MessageBreak + This generates invalid HTML,% + }% + }{}% +} + \newcommand*{\LWR@nestspanitem}{% \if@newlist\else{\LWR@htmltagc{br /}}\fi% \LWR@origitem% @@ -5589,10 +5762,15 @@ end -- not --version \LWR@traceinfo{LWR@nestspan: NOT inside a lateximage}% \addtocounter{LWR@spandepth}{1}% \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}% - {\LWR@subhtmlelementclass{span}{inlineminipage}}% - {\LWR@htmltagc{/span}}% - \RenewDocumentEnvironment{BlockClass}{o m}{}{}% - \renewcommand{\BlockClassSingle}[2]{##2}% + {\LWR@spanwarnformat{minipage or \protect\parbox}}% + {}% + \RenewDocumentEnvironment{BlockClass}{o m}% + {\LWR@spanwarnformat{multi-paragraph object}}% + {}% + \renewcommand{\BlockClassSingle}[2]{% + {\LWR@spanwarnformat{multi-paragraph object}}% + ##2% + }% \renewcommand{\LWR@forcenewpage}{}% \renewcommand{\LWR@liststart}{% \let\item\LWR@nestspanitem% @@ -5748,12 +5926,12 @@ end -- not --version \NewDocumentEnvironment{BlockClass}{o m}{}{}% \end{warpprint} \begin{warpHTML} + \NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}% + \NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}% -{% - \LWR@htmldivclass[#1]{#2}% -} -{\LWR@htmldivclassend{#2}} + {\LWR@htmldivclass[#1]{#2}} + {\LWR@htmldivclassend{#2}} \LWR@formattedenv{BlockClass} \end{warpHTML} @@ -5762,7 +5940,7 @@ end -- not --version \end{warpall} \begin{warpHTML} \newcommand{\LWR@HTML@BlockClassSingle}[2]{% -\LWR@htmlelementclassline{div}{#1}{#2}% + \LWR@htmlelementclassline{div}{#1}{#2}% } \LWR@formatted{BlockClassSingle} @@ -5947,7 +6125,10 @@ end -- not --version \newcommand*{\LWR@startpars}% {% -\ifnumcomp{\value{LWR@spandepth}}{>}{0}% +\ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} +}% {}% {% \ifbool{LWR@doingstartpars}% @@ -5964,7 +6145,10 @@ end -- not --version \newcommand*{\LWR@stoppars}% {% -\ifnumcomp{\value{LWR@spandepth}}{>}{0}% +\ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} +}% {}% {% \ifbool{LWR@doingapar}% @@ -5989,8 +6173,8 @@ end -- not --version \begin{warpHTML} \AtBeginDocument{ -\def\@afterindentfalse{\let\if@afterindent\iffalse} -\@afterindentfalse + \def\@afterindentfalse{\let\if@afterindent\iffalse} + \@afterindentfalse } \let\LWR@afterindent@syntaxhighlight\fi% syntax highlighting @@ -6000,11 +6184,15 @@ end -- not --version \begin{warpall} \newcommand{\LWR@firstpagetop}{} % for the home page alone +\newcommand{\LWR@firstpagebottom}{} % for the home page alone \newcommand{\LWR@pagetop}{} % for all other pages \newcommand{\LWR@pagebottom}{} \newcommand{\HTMLFirstPageTop}[1]{% \renewcommand{\LWR@firstpagetop}{#1}% } +\newcommand{\HTMLFirstPageBottom}[1]{% + \renewcommand{\LWR@firstpagebottom}{#1}% +} \newcommand{\HTMLPageTop}[1]{% \renewcommand{\LWR@pagetop}{#1}% } @@ -6158,7 +6346,7 @@ end -- not --version \LWR@traceinfo{@mpfootnotetext: done}% } \AtBeginDocument{ -\def\thempfootnote{\@alph\c@mpfootnote} + \def\thempfootnote{\@alph\c@mpfootnote} } \newcommand*{\LWR@@printpendingfootnotes}[1]{% \expandafter\ifvoid\csname LWR@#1box\endcsname\else @@ -6286,6 +6474,20 @@ end -- not --version }% } +\newcommand*{\LWR@avoiddupfilenames}{% + To avoid duplicate filenames, use the optional\MessageBreak + short Table of Contents entry:\MessageBreak + \space\space\protect\section[Unique name, no math]{Name with math}% + \MessageBreak + or use \protect\texorpdfstring, from the hyperref package:\MessageBreak + \space\space% + \protect\section{\MessageBreak + \space\space\space\space\protect\texorpdfstring\MessageBreak + \space\space\space\space\space\space% + {Name with math}{Unique name, no math}\MessageBreak + \space\space} +} + \newcommand*{\LWR@filenamenoblanks}[1]{% \begingroup \LWR@nullfonts% @@ -6300,6 +6502,27 @@ end -- not --version \LWR@simplifyname{\textless} \LWR@simplifyname{\textgreater} \edef\LWR@thisnewfilename{\detokenize\expandafter{\LWR@thisnewfilename}}% +\ifbool{FileSectionNames}{% + \IfSubStr{\LWR@thisnewfilename}{\LWRdollar}{% + \PackageWarning{lwarp} + {% + This section name:\MessageBreak + \space\space``\detokenize\expandafter{#1}''\MessageBreak + at the line number listed below,\MessageBreak + is using $dollar-delimited math$, + which generates\MessageBreak + complicated file names. It is better to use\MessageBreak + \space\space% + \protect\section{Name with \protect\(parenthesis math\protect\)}% + \MessageBreak + The math then will be removed from the file name.\MessageBreak + \MessageBreak + \LWR@avoiddupfilenames% + \MessageBreak + This section is found before or% + } + }{}% +}{} \LWR@traceinfo{LWR@filenamenoblanks edef: !\LWR@thisnewfilename!}% \fullexpandarg% \LWR@simplifyname*{ } @@ -6351,19 +6574,19 @@ end -- not --version \LWR@simplifyname*{-the-} \LWR@simplifyname*{-THE-} \LWR@simplifycustom% -\LWR@simplifyname*{-----} -\LWR@simplifyname*{----} -\LWR@simplifyname*{---} -\LWR@simplifyname*{--} \ifPDFTeX% pdflatex or dvi latex \ifdefstring{\inputencodingname}{utf8}{% -\LWR@simplifyname*{—} -\LWR@simplifyname*{–} + \LWR@simplifyname*{—} + \LWR@simplifyname*{–} }{}% \else% not PDFTeX -\LWR@simplifyname*{—} -\LWR@simplifyname*{–} + \LWR@simplifyname*{—} + \LWR@simplifyname*{–} \fi% +\LWR@simplifyname*{-----} +\LWR@simplifyname*{----} +\LWR@simplifyname*{---} +\LWR@simplifyname*{--} \IfBeginWith{\LWR@thisnewfilename}{\detokenize{-}}{% \StrGobbleLeft{\LWR@thisnewfilename}{1}[\LWR@thisnewfilename]% }{}% @@ -6470,7 +6693,7 @@ end -- not --version \ifbool{LWR@warnedcustomizemathjax}{}{% \StrLen{\detokenize{#1}}[\LWR@tempone]% \ifnumgreater{\LWR@tempone}{200}{% - \AtBeginDocument{% + \AtEndDocument{% \PackageWarningNoLine{lwarp}{% To ensure faster MathJax compilation, place each\MessageBreak custom macro in its own \protect\CustomizeMathJax.\MessageBreak @@ -6568,6 +6791,26 @@ end -- not --version \begin{warpHTML} +\newcommand*{\LWR@createfooter}{% + \ifnumless{\value{LWR@htmlseqfilenumber}}{1}{% + \ifdefempty{\LWR@firstpagebottom}{}{% + \LWR@htmlelement{footer} + + \LWR@firstpagebottom + + \LWR@htmlelementend{footer} + }% + }{% + \ifdefempty{\LWR@pagebottom}{}{% + \LWR@htmlelement{footer} + + \LWR@pagebottom + + \LWR@htmlelementend{footer} + }% + }% +} + \newcommand*{\LWR@newhtmlfile}[1]{ \LWR@traceinfo{LWR@newhtmlfile} \LWR@htmlelementclassend{section}{textbody} @@ -6576,17 +6819,7 @@ end -- not --version \LWR@printpendingfootnotes -\ifbool{FormatEPUB} -{} -{ - \ifdefempty{\LWR@pagebottom}{}{% - \LWR@htmlelement{footer} - - \LWR@pagebottom - - \LWR@htmlelementend{footer} - } -} +\ifbool{FormatEPUB}{}{\LWR@createfooter} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} {\ifnumcomp{\value{LWR@htmlfilenumber}}{>}{0}{\LWR@botnavigation}{}} @@ -6596,8 +6829,8 @@ end -- not --version \LWR@htmltag{/html}\LWR@orignewline \LWR@traceinfo{LWR@newhtmlfile: about to LWR@orignewpage} \LWR@orignewpage - \addtocounter{LWR@htmlfilenumber}{1}% +\addtocounter{LWR@htmlseqfilenumber}{1}% \ifbool{FileSectionNames}% {% \LWR@filenamenoblanks{#1}% @@ -6605,23 +6838,25 @@ end -- not --version \ifcsundef{LWR@filename\LWR@hashedname}{% \csdef{LWR@filename\LWR@hashedname}{}% }{% - \PackageError{lwarp} + \PackageError{lwarp}% {% - Section name\MessageBreak + The section name:\MessageBreak ``#1'',\MessageBreak at the line number listed below,\MessageBreak generates the filename\MessageBreak ``\LWR@thisfilename'',\MessageBreak - which appears to be a duplicate.\MessageBreak - There is a previous section with an\MessageBreak - identical or similar name% - } + which appears to be a duplicate. There is a\MessageBreak + previous section with an identical or similar name.\MessageBreak + While generating file names, Lwarp sanitizes math,\MessageBreak + most symbols, and a few common short words,\MessageBreak + and this may cause a conflict.\MessageBreak + Enter 'H' for possible solutions% + }% {% - Lwarp sanitizes most symbols and a few common short words - when generating file names, and this may cause a conflict. - } - } -} + \LWR@avoiddupfilenames% + }% + }% +}% {\renewcommand*{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}} \LWR@traceinfo{LWR@newhtmlfile: about to print start file}% \begingroup% @@ -6660,7 +6895,7 @@ end -- not --version \LWR@htmlelementclass{div}{bodycontainer} \LWR@htmlelementclass{section}{textbody} - +\boolfalse{LWR@setseqfilelabel} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}% {}% {% @@ -6741,6 +6976,7 @@ end -- not --version \IfValueTF{#2}% {\LWR@traceinfo{LWR@section: starting #4 #2}}% {\LWR@traceinfo{LWR@section: starting #4 #3}}% + \LWR@spanwarninvalid{section}% \LWR@maybeprintpendingfootnotes{\csuse{LWR@depth#4}}% \LWR@stoppars% \LWR@startnewdepth{#4}% @@ -6876,7 +7112,7 @@ end -- not --version {}% \LWR@traceinfo{LWR@section: finished print section number}% }{}% -}% end of not starred +}% not starred \LWR@traceinfo{LWR@section: about to print the section name}% \LWR@isolate{#3}% \LWR@traceinfo{LWR@section: about to close the heading tag}% @@ -6885,6 +7121,10 @@ end -- not --version \LWR@traceinfo{LWR@section: about to create the LaTeX label}% \setcounter{LWR@latestautopage}{\value{page}}% \LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline% +\ifbool{LWR@setseqfilelabel}{}{% + \label{\BaseJobname-autofile-\arabic{LWR@htmlseqfilenumber}}% + \booltrue{LWR@setseqfilelabel}% +}% \ifthenelse{% \cnttest{\@nameuse{LWR@depth#4}}{<}{\LWR@depthparagraph}% }% @@ -6987,20 +7227,20 @@ end -- not --version \newcommand*{\LWR@currentHTMLLanguage}{en-US} \newcommand*{\HTMLLanguage}[1]{% -\renewcommand*{\LWR@currentHTMLLanguage}{#1}% + \renewcommand*{\LWR@currentHTMLLanguage}{#1}% } \ifPDFTeX% pdflatex or dvi latex \ifdefstring{\inputencodingname}{utf8}{% - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \newcommand*{\theHTMLTitleSeparator}{ —\ }% EMdash }{% - \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + \newcommand*{\theHTMLTitleSeparator}{ -\ }% hyphen }% \else% \ifpTeX - \newcommand*{\theHTMLTitleSeparator}{ - }% hyphen + \newcommand*{\theHTMLTitleSeparator}{ -\ }% hyphen \else - \newcommand*{\theHTMLTitleSeparator}{ — }% EMdash + \newcommand*{\theHTMLTitleSeparator}{ —\ }% EMdash \fi% \fi% @@ -7029,6 +7269,14 @@ end -- not --version \begingroup% \LWR@nullfonts% \edef\theHTMLSection{#1}% +\StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection] +\IfBeginWith{\theHTMLSection}{\detokenize{-}}{% + \StrGobbleLeft{\theHTMLSection}{1}[\theHTMLSection]% +}{}% \LWR@htmltag{!DOCTYPE html}\LWR@orignewline \LWR@htmltag{% html lang=\LWR@orig@textquotedbl\LWR@currentHTMLLanguage\LWR@orig@textquotedbl% @@ -7154,6 +7402,8 @@ end -- not --version \LWR@htmlelementclass{div}{bodycontainer} \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} \LWR@htmlelementclass{section}{textbody} +\booltrue{LWR@setseqfilelabel}% +\label{\BaseJobname-autofile-\arabic{LWR@htmlseqfilenumber}} \LWR@patchlists \catcode`\$=\active \immediate\write\@mainaux{\catcode`\string$\active}% @@ -7185,17 +7435,12 @@ end -- not --version \LWR@stoppars \LWR@closeprevious{finished} +\label{\BaseJobname-autofile-last} \LWR@htmlelementclassend{section}{textbody} \LWR@htmlelementclassend{div}{bodycontainer} \LWR@htmlelementclassend{div}{bodyandsidetoc} \LWR@printpendingfootnotes -\ifdefempty{\LWR@pagebottom}{}{% - \LWR@htmlelement{footer} - - \LWR@pagebottom - - \LWR@htmlelementend{footer} -} +\ifbool{FormatEPUB}{}{\LWR@createfooter} \ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}} {} @@ -7227,13 +7472,15 @@ end -- not --version } {} { - \PackageWarningNoLine{lwarp} - {% - Could not patch \protect\enddocument.\MessageBreak - If labels have changed, be sure to recompile before\MessageBreak - creating lateximages with\MessageBreak - \space\space lwarpmk limages,\MessageBreak - or the images may be corrupt% + \AtEndDocument{ + \PackageWarningNoLine{lwarp} + {% + Could not patch \protect\enddocument.\MessageBreak + If labels have changed, be sure to recompile before\MessageBreak + creating lateximages with\MessageBreak + \space\space lwarpmk limages,\MessageBreak + or the images may be corrupt% + } } } @@ -7274,9 +7521,13 @@ end -- not --version \LWR@printpendingfootnotes } \end{warpHTML} -\begin{warpall} +\begin{warpprint} +\newcommand*{\printthanks}{\@thanks} +\end{warpprint} + +\begin{warpHTML} \newcommand*{\printthanks}{\LWR@stoppars\@thanks\LWR@startpars} -\end{warpall} +\end{warpHTML} \begin{warpHTML} \newcommand*{\printtitle} @@ -7352,10 +7603,19 @@ end -- not --version }% } -\def\@fnsymbol#1{\ifcase#1\or *\or \HTMLentity{dagger}\or \HTMLentity{Dagger}\or - \HTMLentity{sect}\or \HTMLentity{para}\or \text{\HTMLunicode{2016}}\or - **\or \HTMLentity{dagger}\HTMLentity{dagger} \or - \HTMLentity{Dagger}\HTMLentity{Dagger} \else\@ctrerr\fi} +\def\LWR@HTML@@fnsymbol#1{% + \ifcase#1\or *\or + \HTMLentity{dagger}\or + \HTMLentity{Dagger}\or + \HTMLentity{sect}\or + \HTMLentity{para}\or + \HTMLunicode{2016}\or + **\or + \HTMLentity{dagger}\HTMLentity{dagger} \or + \HTMLentity{Dagger}\HTMLentity{Dagger} \else + \@ctrerr\fi% +} +\LWR@formatted{@fnsymbol} \renewcommand*{\maketitle}{% \begin{titlepage} \LWR@maketitlesetup @@ -7433,10 +7693,12 @@ end -- not --version }% }% yes titling package {% no titling package - \newcommand{\published}[1]{}% - \newcommand*{\printpublished}{}% - \newcommand{\subtitle}{}% - \newcommand*{\printsubtitle}% + \def\@published{}% + \DeclareDocumentCommand{\published}{m}{\gdef\@published{##1}}% + \DeclareDocumentCommand{\printpublished}{}{}% + \def\@subtitle{}% + \DeclareDocumentCommand{\subtitle}{m}{\gdef\@subtitle{##1}}% + \DeclareDocumentCommand{\printsubtitle}{}{}% }% no titling package }% \AddSubtitlePublished @@ -7447,55 +7709,60 @@ end -- not --version \providecommand*{\abstractname}{Abstract} \DeclareDocumentEnvironment{abstract}{O{\abstractname}} { -\LWR@forcenewpage -\BlockClass{abstract} -\BlockClassSingle{abstracttitle}{#1} + \LWR@forcenewpage + \BlockClass{abstract} + \BlockClassSingle{abstracttitle}{#1} } { -\endBlockClass + \endBlockClass } \end{warpHTML} +\begin{warpall} +\newcommand{\attribution}[1]{ + \begin{flushright} + \unskip + #1 + \end{flushright}% +} +\end{warpall} \begin{warpHTML} -\newcommand{\attribution}[1]{% +\newcommand{\LWR@HTML@attribution}[1]{% \LWR@stoppars% \begin{BlockClass}{attribution} #1 \end{BlockClass} \LWR@startpars% } +\LWR@formatted{attribution} \end{warpHTML} -\begin{warpprint} -\newcommand{\attribution}[1]{ - \begin{flushright} - \unskip - #1 - \end{flushright}% -} -\end{warpprint} \begin{warpHTML} -\renewenvironment*{quote} +\newenvironment*{LWR@HTML@quote} { \LWR@forcenewpage \LWR@htmlblocktag{blockquote} } {\LWR@htmlblocktag{/blockquote}} -\renewenvironment*{quotation} + +\LWR@formattedenv{quote} +\newenvironment*{LWR@HTML@quotation} { \LWR@forcenewpage \LWR@htmlblocktag{blockquote} } {\LWR@htmlblocktag{/blockquote}} +\LWR@formattedenv{quotation} + \end{warpHTML} \begin{warpHTML} -\renewenvironment{verse} +\newenvironment{LWR@HTML@verse} {\let\\\newline% lwarp \list{}{\itemsep \z@ \itemindent -1.5em% @@ -7504,6 +7771,8 @@ end -- not --version \advance\leftmargin 1.5em}% \item\relax} {\endlist} + +\LWR@formattedenv{verse} \end{warpHTML} \begin{warpall} @@ -7556,30 +7825,45 @@ end -- not --version \LWR@startpars% } -\let\LWRV@origverbatim@input\verbatim@input - -\renewcommand{\verbatim@input}[2]{% -\ifbool{LWR@verbtags}{\LWR@forcenewpage}{}% -\LWR@atbeginverbatim{2.5}{Verbatim}% -\LWRV@origverbatim@input{#1}{#2}% -\LWR@afterendverbatim{1.5}% +\newcommand{\LWR@HTML@verbatim@input}[2]{% + \ifbool{LWR@verbtags}{\LWR@forcenewpage}{}% + \LWR@atbeginverbatim{2.5}{Verbatim}% + \LWR@print@verbatim@input{#1}{#2}% + \LWR@afterendverbatim{1.5}% } +\LWR@formatted{verbatim@input} + \AfterEndPreamble{ \LWR@traceinfo{Patching verbatim.} \AtBeginEnvironment{verbatim}{% -\LWR@forcenewpage% -\LWR@atbeginverbatim{2.5}{verbatim}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@forcenewpage% + \LWR@atbeginverbatim{2.5}{verbatim}% + }% } \AfterEndEnvironment{verbatim}{% - \LWR@afterendverbatim{1}% + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% + {}% + {% + \LWR@afterendverbatim{1}% + }% } } \newcommand*{\LWR@HTML@tabbing}{% -\LWR@forcenewpage% -\LWR@atbeginverbatim{3}{tabbing}% -\LWR@print@tabbing% + \LWR@forcenewpage% + \LWR@atbeginverbatim{3}{tabbing}% + \let\enskip\LWR@origenskip% + \let\quad\LWR@origquad% + \let\qquad\LWR@origqquad% + \let~\LWR@origtilde% + \let\,\LWR@origcomma% + \let\thinspace\LWR@origthinspace% + \let\negthinspace\LWR@orignegthinspace% + \LWR@print@tabbing% } \newcommand*{\LWR@HTML@endtabbing}{% @@ -7787,22 +8071,22 @@ end -- not --version } \newcommand*{\LWR@restoreoriglists}{% -\LWR@traceinfo{LWR@restoreoriglists}% -\LetLtxMacro\item\LWR@origitem% -\LetLtxMacro\@item\LWR@orig@item% -\let\@trivlist\LWR@orig@trivlist% -\let\trivlist\LWR@origtrivlist% -\let\endtrivlist\LWR@origendtrivlist% -\LetLtxMacro\itemize\LWR@origitemize% -\LetLtxMacro\enditemize\LWR@endorigitemize% -\LetLtxMacro\enumerate\LWR@origenumerate% -\LetLtxMacro\endenumerate\LWR@endorigenumerate% -\LetLtxMacro\description\LWR@origdescription% -\LetLtxMacro\enddescription\LWR@endorigdescription% -\let\@mklab\LWR@orig@mklab% -\let\makelabel\LWR@origmakelabel% -\let\@donoparitem\LWR@orig@donoparitem% -\let\@nbitem\LWR@orig@nbitem% + \LWR@traceinfo{LWR@restoreoriglists}% + \LetLtxMacro\item\LWR@origitem% + \LetLtxMacro\@item\LWR@orig@item% + \let\@trivlist\LWR@orig@trivlist% + \let\trivlist\LWR@origtrivlist% + \let\endtrivlist\LWR@origendtrivlist% + \LetLtxMacro\itemize\LWR@origitemize% + \LetLtxMacro\enditemize\LWR@endorigitemize% + \LetLtxMacro\enumerate\LWR@origenumerate% + \LetLtxMacro\endenumerate\LWR@endorigenumerate% + \LetLtxMacro\description\LWR@origdescription% + \LetLtxMacro\enddescription\LWR@endorigdescription% + \let\@mklab\LWR@orig@mklab% + \let\makelabel\LWR@origmakelabel% + \let\@donoparitem\LWR@orig@donoparitem% + \let\@nbitem\LWR@orig@nbitem% } \end{warpHTML} @@ -8606,11 +8890,6 @@ end -- not --version \LWR@subcdashline#1% } -\newlength{\LWR@templengthone} -\newlength{\LWR@templengthtwo} -\newlength{\LWR@templengththree} -\newcounter{LWR@tempcountone} - \newcommand*{\LWR@tdstartstyles}{\boolfalse{LWR@tdhavecellstyle}} \newcommand*{\LWR@tdaddstyle}{% @@ -9019,14 +9298,8 @@ end -- not --version \LWR@htmltag{% td colspan="#4" % \IfValueT{#2}{ % rows? - rowspan="#2" % - \IfValueT{#1}{% vpos? - \ifstrequal{#1}{b}% - {style="\LWR@print@mbox{vertical-align:bottom}" }{}% - \ifstrequal{#1}{t}% - {style="\LWR@print@mbox{vertical-align:top}" }{}% - }% vpos? - }% rows? + rowspan="#2" % + }% class="td% \defcounter{LWR@mcolvertbarsl}{0}% \defcounter{LWR@mcolvertbarsr}{0}% @@ -9055,6 +9328,18 @@ end -- not --version { tvertbarrdoubledash}{}% "% \LWR@tdstartstyles% + \IfValueT{#1}{% vpos? + \ifstrequal{#1}{b}% + {% + \LWR@tdaddstyle% + \LWR@print@mbox{vertical-align:bottom}% + }{}% + \ifstrequal{#1}{t}% + {% + \LWR@tdaddstyle% + \LWR@print@mbox{vertical-align:top}% + }{}% + }% vpos? \LWR@addtabularrowcolor% \LWR@addcmidrulewidth% \LWR@addcdashline% @@ -9412,16 +9697,7 @@ end -- not --version \NewDocumentCommand{\LWR@HTML@@tabular}{d<> o m} {% \LWR@traceinfo{LWR@HTML@@tabular started}% - \ifnumcomp{\value{LWR@spandepth}}{>}{0}{% - \PackageWarning{lwarp}{% - A tabular is being used inside a span such as\MessageBreak - a minipage. Some formatting may not be correct\MessageBreak - in the tabular.\MessageBreak - It is recommended to use \protect\warpprintonly\space or the\MessageBreak - warpprint environment to isolate the span to\MessageBreak - print-only,% - } - }{}% + \LWR@spanwarnformat{tabular}% \addtocounter{LWR@tabulardepth}{1}% \boolfalse{LWR@startedrow}% \defcounter{LWR@hlines}{0}% @@ -9577,7 +9853,7 @@ end -- not --version \begin{warpHTML} -\providecommand*{\@currentlabelname}{} +\def\@currentlabelname{\linkhomename}% \def\LWR@stripperiod#1.\ltx@empty#2\@nil{#1}% \newcommand*{\LWR@setlatestname}[1]{% \GetTitleStringExpand{#1}% @@ -9606,8 +9882,8 @@ end -- not --version \newcommand*{\LWR@lateximagenumberref}[1]{% \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}% } -\newcommand*{\LWR@lwarplabel}[1]{% - \LWR@traceinfo{LWR@lwarplabel !#1!}% +\newcommand*{\LWR@write@lwarplabel}[1]{% + \LWR@traceinfo{LWR@write@lwarplabel !#1!}% \LWR@setlatestname{\@currentlabelname}% \@bsphack% \protected@write\@auxout{}% @@ -9627,8 +9903,8 @@ end -- not --version } -\newcommand*{\LWR@sublabel}[1]{% - \LWR@traceinfo{LWR@sublabel !#1!}% +\newcommand*{\LWR@label@createtag}[1]{% + \LWR@traceinfo{LWR@label@createtag !#1!}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {% not lateximage @@ -9653,10 +9929,10 @@ end -- not --version }% pars not allowed }% not lateximage } -\NewDocumentCommand{\LWR@new@label}{d() m o}{% +\NewDocumentCommand{\LWR@new@label}{m}{% \LWR@traceinfo{LWR@new@label: starting}% - \LWR@traceinfo{LWR@new@label: !#2!}% - \LWR@orig@label{#2}% + \LWR@traceinfo{LWR@new@label: !#1!}% + \LWR@orig@label{#1}% \LWR@traceinfo{% LWR@new@label: filesectionnames is % \ifbool{FileSectionNames}{true}{false}% @@ -9667,8 +9943,8 @@ end -- not --version \LWR@traceinfo{% LWR@new@label: LWR@htmlfilenumber is \arabic{LWR@htmlfilenumber}% }% - \LWR@lwarplabel{#2}% - \LWR@sublabel{#2}% + \LWR@write@lwarplabel{#1}% + \LWR@label@createtag{#1}% % \@esphack% \LWR@traceinfo{LWR@new@label: done}% } @@ -9755,11 +10031,7 @@ end -- not --version \AtBeginDocument{ - -\def\@currentHref{% - autopage-\theLWR@currentautosec% -} - + \def\@currentHref{\BaseJobname-autopage-\theLWR@currentautosec} } \newcommand*{\LWR@linkcatcodes}{% @@ -9878,6 +10150,7 @@ end -- not --version \begin{warpHTML} \NewDocumentCommand{\LWR@floatbegin}{m o}{% + \LWR@spanwarninvalid{float}% \ifbool{FormatWP}{\newline}{}% \LWR@stoppars% \addtocounter{LWR@thisautoid}{1}% @@ -9893,14 +10166,12 @@ end -- not --version \LWR@BlockClassWP{}{}{wp#1}% }{}% \renewcommand*{\@captype}{#1}% - \caption@settype{#1}% \LWR@startpars% \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{% === begin #1 === }{}% - \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% } \AtBeginDocument{ @@ -9913,8 +10184,16 @@ end -- not --version }{}% tocbasic }% AtBeginDocument -\let\@float\LWR@floatbegin -\let\@dblfloat\LWR@floatbegin +\AtBeginDocument{ + \def\@xfloat #1[#2]{% + \LWR@floatbegin{#1}[#2] + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% + } + \def\@xdblfloat #1[#2]{% + \LWR@floatbegin{#1}[#2] + \LWR@futurenonspacelet\LWR@mynexttoken\LWR@floatalignment% + } +} \newcommand*{\LWR@floatend}{% \LWR@endfloatalignment% \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{% @@ -9930,8 +10209,10 @@ end -- not --version \LWR@startpars% \ifbool{FormatWP}{\newline}{}% } -\let\end@float\LWR@floatend -\let\end@dblfloat\LWR@floatend +\AtBeginDocument{ + \let\end@float\LWR@floatend + \let\end@dblfloat\LWR@floatend +} \newcounter{LWR@thisautoid} @@ -9942,8 +10223,10 @@ end -- not --version \newcommand*{\LWR@forcenewautoidanchor}{% \addtocounter{LWR@thisautoid}{1}% + \LWR@stoppars% \LWR@htmltag{a id="\LWR@print@mbox{autoid-\arabic{LWR@thisautoid}}"}% \LWR@htmltag{/a}% + \LWR@startpars% } \newcommand*{\LWR@newautoidanchor}{% @@ -9981,11 +10264,26 @@ end -- not --version \AtBeginDocument{\providecommand*{\CaptionSeparator}{:~}} -\AtBeginDocument{\renewcommand{\@makecaption}[2]{% - \LWR@traceinfo{@makecaption}% - \LWR@isolate{#1}\CaptionSeparator\LWR@isolate{#2}% - \LWR@traceinfo{@makecaption: done}% -}% +\AtBeginDocument{ + \@ifpackageloaded{caption}{}{ + \let\LWR@orig@caption\@caption% + \long\def\@caption#1[#2]{% + \LWR@spanwarnformat{caption}% + \LWR@setlatestname{#2}% + \LWR@orig@caption{#1}[{#2}]% also takes third argument + }% + + \renewcommand{\@makecaption}[2]{% + \LWR@traceinfo{@makecaption}% + \caption@begin{\@captype}% + \LWR@isolate{#1}% + \edef\LWR@tempone{#1}% + \ifdefvoid{\LWR@tempone}{}{\CaptionSeparator}% + \LWR@isolate{#2}% + \caption@end% + \LWR@traceinfo{@makecaption: done}% + }% + } } @@ -10031,27 +10329,38 @@ end -- not --version } \AtBeginDocument{ -\LWR@formatted{caption@begin} -\LWR@formatted{caption@end} + \providecommand{\caption@begin}[1]{} + \LWR@formatted{caption@begin} + + \providecommand{\caption@end}{} + \LWR@formatted{caption@end} } -\let\LWR@origcaptionlistentry\captionlistentry +\AtBeginDocument{% +\@ifpackageloaded{caption}{ + \let\LWR@origcaptionlistentry\captionlistentry -\renewcommand*{\captionlistentry}{% - \LWR@ensuredoingapar% - \LWR@origcaptionlistentry% -} -\def\LWR@LTcaptionlistentry{% - \LWR@ensuredoingapar% - \LWR@forcenewautoidanchor% - \bgroup - \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble * - {\egroup\LWR@LT@captionlistentry}% -}% + \renewcommand*{\captionlistentry}{% + \LWR@ensuredoingapar% + \LWR@origcaptionlistentry% + } + \def\LWR@LTcaptionlistentry{% + \LWR@ensuredoingapar% + \LWR@forcenewautoidanchor% + \bgroup% + \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble * + {\egroup\LWR@LT@captionlistentry}% + }% -\def\LWR@LT@captionlistentry#1{% - \caption@listentry\@firstoftwo[\LTcaptype]{#1}% -}% + \def\LWR@LT@captionlistentry#1{% + \caption@listentry\@firstoftwo[\LTcaptype]{#1}% + }% +}% caption loaded +{% caption not loaded + \newcommand{\captionlistentry}[2][]{}% + \newcommand{\LWR@LT@captionlistentry}[2][]{}% +} +}% AtBeginDocument \let\LWR@origaddcontentsline\addcontentsline @@ -10069,15 +10378,15 @@ end -- not --version }% not TOC \LWR@origaddcontentsline{#1}{#2}{#3}% } -\AtBeginDocument{ - -\let\LWR@origcaptionof\captionof +\RequirePackage{capt-of} -\renewcommand*{\captionof}{% - \LWR@stoppars% - \LWR@origcaptionof% -} +\AtBeginDocument{ + \let\LWR@origcaptionof\captionof + \renewcommand*{\captionof}{% + \LWR@stoppars% + \LWR@origcaptionof% + } }% AtBeginDocument \end{warpHTML} @@ -10191,7 +10500,7 @@ end -- not --version \newcounter{SideTOCDepth} \setcounter{SideTOCDepth}{1} -\AtBeginDocument{% +\AtEndDocument{% \ifnumcomp{\value{SideTOCDepth}}{<}{\value{FileDepth}}{ \PackageWarningNoLine{lwarp} {% @@ -10240,7 +10549,8 @@ end -- not --version \NewDocumentCommand{\hypertoc}{m m +m m}{% \LWR@traceinfo{hypertoc !#1!#2!#3!#4!}% - \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}% + \ifnumcomp{#1}{>}{\value{tocdepth}}% + {}% {% \LWR@startpars% \LWR@subhyperrefclass{% @@ -10250,7 +10560,6 @@ end -- not --version \LWR@maybetocdata% \LWR@stoppars% }% - {}% \LWR@traceinfo{hypertoc done}% } @@ -10265,7 +10574,6 @@ end -- not --version } \newcommand{\hypertocfloat}[5]{% - \LWR@startpars% \@ifundefined{c@#3depth}{% \newcounter{#3depth}% \setcounter{#3depth}{1}% @@ -10484,10 +10792,6 @@ end -- not --version \LetLtxMacro\normalfont\LWR@orignormalfont% \let\sp\LWR@origsp% \let\sb\LWR@origsb% - \LetLtxMacro\textsuperscript\LWR@origtextsuperscript% - \LetLtxMacro\@textsuperscript\LWR@orig@textsuperscript% - \LetLtxMacro\textsubscript\LWR@origtextsubscript% - \LetLtxMacro\@textsubscript\LWR@orig@textsubscript% \LetLtxMacro\underline\LWR@origunderline% \let~\LWR@origtilde% \let\enskip\LWR@origenskip% @@ -10509,6 +10813,140 @@ end -- not --version \LWR@FBcancel% } \end{warpHTML} +\begin{warpHTML} +\newcommand*{\LWR@dash}{-} +\catcode`\$=\active% redefining $ below +\catcode`\_=12% redefining \_ below +\newcommand*{\LWR@nullfonts}{% + \renewcommand*{\$}{-}% + \renewcommand*{\%}{-}% + \renewcommand*{\_}{-}% + \renewcommand*{\}}{-}% + \renewcommand*{\{}{-}% + \renewcommand*{\&}{-}% used to be 'and' + \renewcommand*{\#}{-}% + \renewcommand*{\,}{-}% + \renewcommand*{~}{-}% + \renewcommand*{\`}[1]{##1}% + \renewcommand*{\'}[1]{##1}% + \renewcommand*{\^}[1]{##1}% + \renewcommand*{\~}[1]{##1}% + \renewcommand*{\=}[1]{##1}% + \renewcommand*{\u}[1]{##1}% + \renewcommand*{\.}[1]{##1}% + \renewcommand*{\"}[1]{##1}% + \renewcommand*{\H}[1]{##1}% + \renewcommand*{\v}[1]{##1}% + \renewcommand*{\d}[1]{##1}% + \renewcommand*{\c}[1]{##1}% + \renewcommand*{\b}[1]{##1}% + \renewcommand*{\t}[1]{##1}% + \let\newline\LWR@dash% + \let\textasciicircum\LWR@dash% + \let\textasciitilde\LWR@dash% + \let\textasteriskcentered\LWR@dash% + \let\textbackslash\LWR@dash% + \let\textbar\LWR@dash% + \let\textbardbl\LWR@dash% + \let\textbigcircle\LWR@dash% + \let\textbraceleft\LWR@dash% + \let\textbraceright\LWR@dash% + \let\textbullet\LWR@dash% + \let\textcopyright\LWR@dash% + \let\textdagger\LWR@dash% + \let\textdaggerdbl\LWR@dash% + \let\textdollar\LWR@dash% + \let\textellipsis\LWR@dash% + \let\textemdash\LWR@dash% + \let\textendash\LWR@dash% + \let\textexclamdown\LWR@dash% + \let\textgreater\LWR@dash% + \let\textless\LWR@dash% + \let\textordfeminine\LWR@dash% + \let\textordmasculine\LWR@dash% + \let\textparagraph\LWR@dash% + \let\textperiodcentered\LWR@dash% + \let\textpertenthousand\LWR@dash% + \let\textperthousand\LWR@dash% + \let\textquestiondown\LWR@dash% + \let\textquotedblleft\LWR@dash% + \let\textquotedblright\LWR@dash% + \let\textquoteleft\LWR@dash% + \let\textquoteright\LWR@dash% + \let\textregistered\LWR@dash% + \let\textsection\LWR@dash% + \let\textsterling\LWR@dash% + \let\texttrademark\LWR@dash% + \let\textunderscore\LWR@dash% + \let\textvisiblespace\LWR@dash% + \let\copyright\LWR@dash% + \let\dag\LWR@dash% + \let\ddag\LWR@dash% + \let\dots\LWR@dash% + \let\P\LWR@dash% + \let\pounds\LWR@dash% + \let\S\LWR@dash% + \renewcommand*{\aa}{a}% + \renewcommand*{\AA}{A}% + \renewcommand*{\AE}{AE}% + \renewcommand*{\ae}{ae}% + \renewcommand*{\dh}{d}% + \renewcommand*{\DH}{D}% + \renewcommand*{\DJ}{D}% + \renewcommand*{\dj}{d}% + \renewcommand*{\IJ}{IJ}% + \renewcommand*{\ij}{ij}% + \renewcommand*{\L}{L}% + \renewcommand*{\l}{l}% + \renewcommand*{\NG}{NG}% + \renewcommand*{\ng}{ng}% + \renewcommand*{\O}{O}% + \renewcommand*{\o}{o}% + \renewcommand*{\oe}{oe}% + \renewcommand*{\OE}{OE}% + \renewcommand*{\ss}{ss}% + \renewcommand*{\SS}{SS}% + \renewcommand*{\th}{th}% + \renewcommand*{\TH}{TH}% + \let\guillemotleft\@empty% + \let\guilsinglleft\@empty% + \let\quotedblbase\@empty% + \let\textquotedbl\@empty% + \let\guillemotright\@empty% + \let\guilsinglright\@empty% + \let\quotesinglbase\@empty% + \renewcommand*{\HTMLunicode}[1]{}% + \renewcommand*{\HTMLentity}[1]{}% + \renewcommand{\textsuperscript}[1]{##1}% + \renewcommand{\textsubscript}[1]{##1}% + \renewcommand{\underline}[1]{##1}% + \RenewDocumentCommand{\hspace}{s m}{}% + \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% + \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% + \def\(##1\){}% + \def\[##1\]{}% + \RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}% + \renewcommand*{\TeX}{TeX}% + \renewcommand*{\LaTeX}{LaTeX}% + \renewcommand*{\LaTeXe}{LaTeX2e}% + \renewcommand*{\LuaTeX}{LuaTeX}% + \renewcommand*{\LuaLaTeX}{LuaLaTeX}% + \renewcommand*{\XeTeX}{XeTeX}% + \renewcommand*{\XeLaTeX}{XeLaTeX}% + \renewcommand*{\ConTeXt}{ConTeXt}% + \renewcommand*{\BibTeX}{BibTeX}% + \renewcommand*{\MakeIndex}{MakeIndex}% + \renewcommand*{\AmS}{AmS}% + \renewcommand*{\MiKTeX}{MiKTeX}% + \renewcommand*{\LyX}{LyX}% + \def\texorpdfstring{\expandafter\@secondoftwo}% +} +\catcode`\$=3% +\catcode`\_=8% +\newcommand*{\FilenameNullify}[1]{% + \appto{\LWR@nullfonts}{#1}% +} +\end{warpHTML} \begin{warpall} \newcommand*{\AltTextOpen}{(} @@ -10859,8 +11297,8 @@ end -- not --version } \AtBeginDocument{ -\protected\gdef\(#1\){$#1$} -\protected\gdef\[#1\]{$$#1$$} + \protected\gdef\(#1\){$#1$} + \protected\gdef\[#1\]{$$#1$$} } \endgroup @@ -10992,10 +11430,10 @@ end -- not --version } \AtBeginDocument{ -\let\LWR@origequation\equation -\let\LWR@origendequation\endequation -\csletcs{LWR@origequation*}{equation*} -\csletcs{LWR@origendequation*}{endequation*} + \let\LWR@origequation\equation + \let\LWR@origendequation\endequation + \csletcs{LWR@origequation*}{equation*} + \csletcs{LWR@origendequation*}{endequation*} } \newcommand*{\LWR@doequation}[2]{% @@ -11067,39 +11505,35 @@ end -- not --version \newcommand*{\LWR@syncnotenames}{\LWR@synconenotename{LWRfootnote}{\footnotename}} \AtBeginDocument{ -\let\equation\relax -\let\endequation\relax -\csletcs{equation*}{relax} -\csletcs{endequation*}{relax} + \let\equation\relax + \let\endequation\relax + \csletcs{equation*}{relax} + \csletcs{endequation*}{relax} } \AtBeginDocument{ + \NewEnviron{equation}% + {\LWR@doequation{\BODY}{equation}}% + [\LWR@doendequation{equation}] -\NewEnviron{equation}% - {\LWR@doequation{\BODY}{equation}}% - [\LWR@doendequation{equation}] - -\LetLtxMacro\LWR@equationnormal\equation -\LetLtxMacro\endLWR@equationnormal\endequation - + \LetLtxMacro\LWR@equationnormal\equation + \LetLtxMacro\endLWR@equationnormal\endequation }% AtBeginDocument \AtBeginDocument{ + \NewEnviron{equation*}% + {\LWR@doequation{\BODY}{equation*}}% + [\LWR@doendequation{equation*}] -\NewEnviron{equation*}% - {\LWR@doequation{\BODY}{equation*}}% - [\LWR@doendequation{equation*}] - -\csletcs{LWR@equationnormalstar}{equation*} -\csletcs{LWR@endequationnormalstar}{endequation*} - + \csletcs{LWR@equationnormalstar}{equation*} + \csletcs{LWR@endequationnormalstar}{endequation*} }% AtBeginDocument \AtBeginDocument{ -\LetLtxMacro\LWR@equationless\equation -\LetLtxMacro\endLWR@equationless\endequation -\csletcs{LWR@equationlessstar}{equation*} -\csletcs{LWR@endequationlessstar}{endequation*} + \LetLtxMacro\LWR@equationless\equation + \LetLtxMacro\endLWR@equationless\endequation + \csletcs{LWR@equationlessstar}{equation*} + \csletcs{LWR@endequationlessstar}{endequation*} } \newcommand*{\displaymathnormal}{% @@ -11486,7 +11920,7 @@ end -- not --version \begin{warpHTML} -\renewenvironment*{center} +\newenvironment*{LWR@HTML@center} { \LWR@forcenewpage \ifbool{FormatWP} @@ -11495,7 +11929,9 @@ end -- not --version } {\endBlockClass} -\renewenvironment*{flushright} +\LWR@formattedenv{center} + +\newenvironment*{LWR@HTML@flushright} { \LWR@forcenewpage \ifbool{FormatWP} @@ -11504,7 +11940,9 @@ end -- not --version } {\endBlockClass} -\renewenvironment*{flushleft} +\LWR@formattedenv{flushright} + +\newenvironment*{LWR@HTML@flushleft} { \LWR@forcenewpage \ifbool{FormatWP} @@ -11513,6 +11951,8 @@ end -- not --version } {\endBlockClass} +\LWR@formattedenv{flushleft} + \newcommand*{\LWR@HTML@centering}{% \ifbool{HTMLDebugComments}{% @@ -11749,7 +12189,8 @@ end -- not --version \renewcommand*{\@@setcref}[2]{#1{\ref{#2}}{}{}} }{ \ifdefequal{\@@@setcref}{\LWR@orig@@@setcref}{% as of v0.21 - \renewcommand*{\@@@setcref}[2]{#1{\ref{#2}}{}{}} + \renewcommand*{\@@@setcref}[2]{% + #1{\ref{#2}}{}{}} }{ \PackageWarning{lwarp-cleveref}{ Unknown version of cleveref. @@ -11781,7 +12222,6 @@ end -- not --version } - \newcommand*{\cpagerefFor}{for} \def\LWR@orig@@setcpageref#1#2{% before v0.21 @@ -11839,11 +12279,11 @@ end -- not --version }% AfterEndPreamble -\LetLtxMacro\LWR@orig@label\label -\RenewDocumentCommand{\label}{}{\LWR@new@label} +\LetLtxMacro\LWR@orig@label\label% includes memoir, before cleveref +\LetLtxMacro\label\LWR@new@label \LetLtxMacro\LWR@orig@pageref\pageref -\RenewDocumentCommand{\pageref}{}{\LWR@new@pageref} +\LetLtxMacro\pageref\LWR@new@pageref \end{warpHTML} @@ -12185,8 +12625,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{emph} -\newcommand{\LWR@null@emph}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textmd}[1]{% {% \LWR@HTML@mdseries% @@ -12196,8 +12634,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textmd} -\newcommand{\LWR@null@textmd}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textbf}[1]{% {% \LWR@HTML@bfseries% @@ -12207,8 +12643,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textbf} -\newcommand{\LWR@null@textbf}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@texteb}[1]{% {% \LWR@HTML@ebweight% @@ -12218,8 +12652,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{texteb} -\newcommand{\LWR@null@texteb}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textlg}[1]{% {% \LWR@HTML@lgweight% @@ -12229,8 +12661,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textlg} -\newcommand{\LWR@null@textlg}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textrm}[1]{% {% \LWR@HTML@rmfamily% @@ -12240,8 +12670,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textrm} -\newcommand{\LWR@null@textrm}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textsf}[1]{% {% \LWR@HTML@sffamily% @@ -12251,8 +12679,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textsf} -\newcommand{\LWR@null@textsf}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@texttt}[1]{% {% \LWR@HTML@ttfamily% @@ -12262,8 +12688,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{texttt} -\newcommand{\LWR@null@texttt}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textup}[1]{% {% \LWR@HTML@upshape% @@ -12273,8 +12697,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textup} -\newcommand{\LWR@null@textup}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textit}[1]{% {% \LWR@HTML@itshape% @@ -12284,8 +12706,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textit} -\newcommand{\LWR@null@textit}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textsc}[1]{% {% \LWR@HTML@scshape% @@ -12295,8 +12715,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textsc} -\newcommand{\LWR@null@textsc}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textulc}[1]{% {% \LWR@HTML@ulcshape% @@ -12306,8 +12724,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textulc} -\newcommand{\LWR@null@textulc}[1]{#1} - \@ifundefined{textsi}{ \LetLtxMacro\LWR@print@textsi\LWR@print@textsc }{} @@ -12321,8 +12737,6 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textsi} -\newcommand{\LWR@null@textsi}[1]{#1} - \DeclareRobustCommand{\LWR@HTML@textsl}[1]{% {% \slshape% @@ -12332,174 +12746,30 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{textsl} -\newcommand{\LWR@null@textsl}[1]{#1} +\newrobustcmd{\LWR@HTML@textssc}[1]{\textsc{#1}} +\LWR@formatted{textssc} \DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}} \LWR@formatted{textnormal} -\newcommand{\LWR@null@textnormal}[1]{#1} - -\newcommand{\LWR@null@rmfamily}{} -\newcommand{\LWR@null@sffamily}{} -\newcommand{\LWR@null@ttfamily}{} -\newcommand{\LWR@null@bfseries}{} -\newcommand{\LWR@null@ebweight}{} -\newcommand{\LWR@null@lgweight}{} -\newcommand{\LWR@null@mdseries}{} -\newcommand{\LWR@null@upshape}{} -\newcommand{\LWR@null@slshape}{} -\newcommand{\LWR@null@scshape}{} -\newcommand{\LWR@null@itshape}{} -\newcommand{\LWR@null@normalfont}{} -\newcommand{\LWR@null@em}{} - -\catcode`\$=\active% redefining $ below -\catcode`\_=12% redefining \_ below -\newcommand*{\LWR@nullfonts}{% -\LetLtxMacro\emph\LWR@null@emph% -\LetLtxMacro\textmd\LWR@null@textmd% -\LetLtxMacro\textbf\LWR@null@textbf% -\LetLtxMacro\textrm\LWR@null@textrm% -\LetLtxMacro\textsf\LWR@null@textsf% -\LetLtxMacro\texttt\LWR@null@texttt% -\LetLtxMacro\textup\LWR@null@textup% -\LetLtxMacro\textit\LWR@null@textit% -\LetLtxMacro\textsc\LWR@null@textsc% -\LetLtxMacro\textulc\LWR@null@textulc% -\LetLtxMacro\textsi\LWR@null@textsi% -\LetLtxMacro\textsl\LWR@null@textsl% -\LetLtxMacro\textnormal\LWR@null@textnormal% -\LetLtxMacro\rmfamily\LWR@null@rmfamily% -\LetLtxMacro\sffamily\LWR@null@sffamily% -\LetLtxMacro\ttfamily\LWR@null@ttfamily% -\LetLtxMacro\bfseries\LWR@null@bfseries% -\LetLtxMacro\mdseries\LWR@null@mdseries% -\LetLtxMacro\upshape\LWR@null@upshape% -\LetLtxMacro\slshape\LWR@null@slshape% -\LetLtxMacro\scshape\LWR@null@scshape% -\LetLtxMacro\ulcshape\LWR@null@ulcshape% -\LetLtxMacro\sishape\LWR@null@sishape% -\LetLtxMacro\itshape\LWR@null@itshape% -\LetLtxMacro\normalfont\LWR@null@normalfont% -\LetLtxMacro\em\LWR@null@em% -\renewcommand*{\$}{-}% -\renewcommand*{\%}{-}% -\renewcommand*{\_}{-}% -\renewcommand*{\}}{-}% -\renewcommand*{\{}{-}% -\renewcommand*{\&}{and}% -\renewcommand*{\#}{-}% -\renewcommand*{\,}{-}% -\renewcommand*{~}{-}% -\renewcommand*{\^}[1]{-}% -\renewcommand*{\~}[1]{-}% -\renewcommand*{\newline}{-}% -\renewcommand*{\textasciicircum}{-}% -\renewcommand*{\textasciitilde}{-}% -\renewcommand*{\textasteriskcentered}{-}% -\renewcommand*{\textbackslash}{-}% -\renewcommand*{\textbar}{-}% -\renewcommand*{\textbardbl}{-}% -\renewcommand*{\textbigcircle}{-}% -\renewcommand*{\textbraceleft}{-}% -\renewcommand*{\textbraceright}{-}% -\renewcommand*{\textbullet}{-}% -\renewcommand*{\textcopyright}{-}% -\renewcommand*{\textdagger}{-}% -\renewcommand*{\textdaggerdbl}{-}% -\renewcommand*{\textdollar}{-}% -\renewcommand*{\textellipsis}{-}% -\renewcommand*{\textemdash}{-}% -\renewcommand*{\textendash}{-}% -\renewcommand*{\textexclamdown}{-}% -\renewcommand*{\textgreater}{-}% -\renewcommand*{\textless}{-}% -\renewcommand*{\textordfeminine}{-}% -\renewcommand*{\textordmasculine}{-}% -\renewcommand*{\textparagraph}{-}% -\renewcommand*{\textperiodcentered}{-}% -\renewcommand*{\textpertenthousand}{-}% -\renewcommand*{\textperthousand}{-}% -\renewcommand*{\textquestiondown}{-}% -\renewcommand*{\textquotedblleft}{-}% -\renewcommand*{\textquotedblright}{-}% -\renewcommand*{\textquoteleft}{-}% -\renewcommand*{\textquoteright}{-}% -\renewcommand*{\textregistered}{-}% -\renewcommand*{\textsection}{-}% -\renewcommand*{\textsterling}{-}% -\renewcommand*{\texttrademark}{-}% -\renewcommand*{\textunderscore}{-}% -\renewcommand*{\textvisiblespace}{-}% -\renewcommand*{\copyright}{-}% -\renewcommand*{\dag}{-}% -\renewcommand*{\ddag}{-}% -\renewcommand*{\dots}{-}% -\renewcommand*{\P}{-}% -\renewcommand*{\pounds}{-}% -\renewcommand*{\S}{-}% -\renewcommand*{\aa}{a}% -\renewcommand*{\AA}{A}% -\renewcommand*{\AE}{AE}% -\renewcommand*{\ae}{ae}% -\renewcommand*{\dh}{d}% -\renewcommand*{\DH}{D}% -\renewcommand*{\DJ}{D}% -\renewcommand*{\dj}{d}% -\renewcommand*{\IJ}{IJ}% -\renewcommand*{\ij}{ij}% -\renewcommand*{\L}{L}% -\renewcommand*{\l}{l}% -\renewcommand*{\NG}{NG}% -\renewcommand*{\ng}{ng}% -\renewcommand*{\O}{O}% -\renewcommand*{\o}{o}% -\renewcommand*{\oe}{oe}% -\renewcommand*{\OE}{OE}% -\renewcommand*{\ss}{ss}% -\renewcommand*{\SS}{SS}% -\renewcommand*{\th}{th}% -\renewcommand*{\TH}{TH}% -\renewcommand*{\guillemotleft}{}% -\renewcommand*{\guilsinglleft}{}% -\renewcommand*{\quotedblbase}{}% -\renewcommand*{\textquotedbl}{}% -\renewcommand*{\guillemotright}{}% -\renewcommand*{\guilsinglright}{}% -\renewcommand*{\quotesinglbase}{}% -\renewcommand*{\HTMLunicode}[1]{}% -\renewcommand*{\HTMLentity}[1]{}% -\renewcommand{\textsuperscript}[1]{##1}% -\renewcommand{\textsubscript}[1]{##1}% -\renewcommand{\underline}[1]{##1}% -\RenewDocumentCommand{\hspace}{s m}{}% -\RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% -\DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}% -\def\(##1\){}% -\def\[##1\]{}% -\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}% -\protected\def$##1${}% -\renewcommand*{\TeX}{TeX}% -\renewcommand*{\LaTeX}{LaTeX}% -\renewcommand*{\LaTeXe}{LaTeX2e}% -\renewcommand*{\LuaTeX}{LuaTeX}% -\renewcommand*{\LuaLaTeX}{LuaLaTeX}% -\renewcommand*{\XeTeX}{XeTeX}% -\renewcommand*{\XeLaTeX}{XeLaTeX}% -\renewcommand*{\ConTeXt}{ConTeXt}% -\renewcommand*{\BibTeX}{BibTeX}% -\renewcommand*{\MakeIndex}{MakeIndex}% -\renewcommand*{\AmS}{AmS}% -\renewcommand*{\MiKTeX}{MiKTeX}% -\renewcommand*{\LyX}{LyX}% -\let\texorpdfstring\relax% -\newcommand{\texorpdfstring}[2]{##2}% -} -\catcode`\$=3% -\catcode`\_=8% -\newcommand*{\FilenameNullify}[1]{% - \appto{\LWR@nullfonts}{#1}% +\FilenameNullify{% + \LetLtxMacro\emph\@firstofone% + \LetLtxMacro\textmd\@firstofone% + \LetLtxMacro\textbf\@firstofone% + \LetLtxMacro\texteb\@firstofone% + \LetLtxMacro\textlg\@firstofone% + \LetLtxMacro\textrm\@firstofone% + \LetLtxMacro\textsf\@firstofone% + \LetLtxMacro\texttt\@firstofone% + \LetLtxMacro\textup\@firstofone% + \LetLtxMacro\textit\@firstofone% + \LetLtxMacro\textsc\@firstofone% + \LetLtxMacro\textulc\@firstofone% + \LetLtxMacro\textsi\@firstofone% + \LetLtxMacro\textsl\@firstofone% + \LetLtxMacro\textssc\@firstofone% + \LetLtxMacro\textnormal\@firstofone% } \newcommand*{\LWR@f@family}{rm} @@ -12562,19 +12832,19 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@formatted{ttfamily} \newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}} -\LWR@formatted{upshape} +\AtBeginDocument{\LWR@formatted{upshape}} \newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}} -\LWR@formatted{itshape} +\AtBeginDocument{\LWR@formatted{itshape}} \newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}} -\LWR@formatted{scshape} +\AtBeginDocument{\LWR@formatted{scshape}} \@ifundefined{ulcshape}{ \LetLtxMacro\ulcshape\upshape }{} \newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}} -\LWR@formatted{ulcshape} +\AtBeginDocument{\LWR@formatted{ulcshape}} \@ifundefined{sishape}{ \LetLtxMacro\sishape\scshape @@ -12583,31 +12853,52 @@ color:\LWR@origpound\LWR@tempcolor% \renewcommand*{\LWR@f@shape}{it} \renewcommand*{\LWR@f@shapecaps}{sc}% } -\LWR@formatted{sishape} +\AtBeginDocument{\LWR@formatted{sishape}} \newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}} -\LWR@formatted{slshape} +\AtBeginDocument{\LWR@formatted{slshape}} + +\newrobustcmd{\LWR@HTML@sscshape}{\LWR@HTML@scshape} +\AtBeginDocument{\LWR@formatted{sscshape}} \newrobustcmd*{\LWR@HTML@normalfont}{\rmfamily\mdseries\upshape\ulcshape} \LWR@formatted{normalfont} +\FilenameNullify{% + \LetLtxMacro\rmfamily\@empty% + \LetLtxMacro\sffamily\@empty% + \LetLtxMacro\ttfamily\@empty% + \LetLtxMacro\bfseries\@empty% + \LetLtxMacro\ebweight\@empty% + \LetLtxMacro\lgweight\@empty% + \LetLtxMacro\mdseries\@empty% + \LetLtxMacro\upshape\@empty% + \LetLtxMacro\slshape\@empty% + \LetLtxMacro\sishape\@empty% + \LetLtxMacro\scshape\@empty% + \LetLtxMacro\itshape\@empty% + \LetLtxMacro\ulcshape\@empty% + \LetLtxMacro\sscshape\@empty% + \LetLtxMacro\normalfont\@empty% +} + \renewcommand{\sp}[1]{\text{<sup>#1</sup>}{}} \renewcommand{\sb}[1]{\text{<sub>#1</sub>}{}} -\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{#1}} +\newrobustcmd{\LWR@HTML@textsuperscript}[1]{\LWR@htmlspan{sup}{#1}} +\LWR@formatted{textsuperscript} -\renewcommand{\@textsuperscript}[1]{\LWR@htmlspan{sup}{#1}} +\newcommand{\LWR@HTML@@textsuperscript}[1]{\LWR@htmlspan{sup}{#1}} +\LWR@formatted{@textsuperscript} -\AtBeginDocument{ -\renewrobustcmd{\textsubscript}[1]{\LWR@htmlspan{sub}{#1}} -} + \newrobustcmd{\LWR@HTML@textsubscript}[1]{\LWR@htmlspan{sub}{#1}} + \LWR@formatted{textsubscript} -\AtBeginDocument{ -\renewcommand{\@textsubscript}[1]{\LWR@htmlspan{sub}{#1}} -} + \newcommand{\LWR@HTML@@textsubscript}[1]{\LWR@htmlspan{sub}{#1}} + \LWR@formatted{@textsubscript} \AtBeginDocument{\let\up\textsuperscript} @@ -12721,25 +13012,25 @@ color:\LWR@origpound\LWR@tempcolor% } \newcommand*{\LWR@minipagestartpars}{% -\ifbool{LWR@minipagethispar}{\LWR@startpars}{}% + \ifbool{LWR@minipagethispar}{\LWR@startpars}{}% } \newcommand*{\LWR@minipagestoppars}{% -\ifbool{LWR@minipagethispar}{\LWR@stoppars}{}% + \ifbool{LWR@minipagethispar}{\LWR@stoppars}{}% } \renewrobustcmd*{\quad}{% -\LWR@minipagestoppars% -\HTMLunicode{2003}% -\LWR@minipagestartpars% + \LWR@minipagestoppars% + \HTMLunicode{2003}% + \LWR@minipagestartpars% } \renewrobustcmd*{\qquad}{\quad\quad} \renewrobustcmd*{\enskip}{% -\LWR@minipagestoppars% -\HTMLunicode{2002}% -\LWR@minipagestartpars% + \LWR@minipagestoppars% + \HTMLunicode{2002}% + \LWR@minipagestartpars% } \newlength{\LWR@tempwidth} @@ -12864,30 +13155,41 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpHTML} +\newcounter{LWR@phantomsection} \DeclareDocumentCommand{\phantomsection}{}{% -\begingroup% -\boolfalse{LWR@forcinghtmltoc}% -\section*{}% -\endgroup% + \begingroup% + \boolfalse{LWR@forcinghtmltoc}% + \section*{}% + \endgroup% } \end{warpHTML} \begin{warpall} +\newbool{LWR@warnXe} +\boolfalse{LWR@warnXe} + \newrobustcmd*{\Xe} - {X\hspace{-.1667em}\raisebox{-.5ex}{E}} + {% + X\hspace{-.1667em}\raisebox{-.5ex}{E}% + \global\booltrue{LWR@warnXe}% + } \AtBeginDocument{ -\@ifpackageloaded{graphics}{ - \@ifpackageloaded{metalogo}{}{ - \renewrobustcmd*{\Xe} - {X\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}} - } -}{ - \PackageWarningNoLine{lwarp}{Load graphicx or graphics - for improved XeTeX logo} + \@ifpackageloaded{graphics}{ + \@ifpackageloaded{metalogo}{}{ + \renewrobustcmd*{\Xe} + {X\hspace{-.1667em}\raisebox{-.5ex}{\reflectbox{E}}} + } + }{} } + +\AtEndDocument{ + \ifbool{LWR@warnXe}{ + \PackageWarningNoLine{lwarp}{Load graphicx or graphics + for improved XeTeX logo} + }{} } \providerobustcmd*{\XeTeX}{\mbox{\Xe\hspace{-.125em}\TeX}} @@ -13003,11 +13305,19 @@ color:\LWR@origpound\LWR@tempcolor% \end{warpHTML} \begin{warpHTML} +\RequirePackage{lwarp-textcomp} +\end{warpHTML} + +\begin{warpHTML} \@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} \@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} \@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} \end{warpHTML} +\begin{warpprint} +\@ifclassloaded{memoir}{\LWR@origRequirePackage{xcolor}}{} +\end{warpprint} + \begin{warpHTML} \@ifclassloaded{memoir}{\RequirePackage{lwarp-patch-memoir}}{} \end{warpHTML} |