From 8065b9f4ce6618e2a867b384059805a0d56050cb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 8 Aug 2017 20:42:15 +0000 Subject: lwarp (8aug17) git-svn-id: svn://tug.org/texlive/trunk@44988 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-balance.sty | 23 + .../texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty | 13 +- .../tex/latex/lwarp/lwarp-boxedminipage.sty | 21 + .../tex/latex/lwarp/lwarp-boxedminipage2e.sty | 33 + Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty | 23 + .../texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty | 12 +- .../texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty | 33 + .../texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty | 23 + .../texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty | 97 ++ .../texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty | 211 ++++ .../texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty | 29 + Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty | 24 + .../texmf-dist/tex/latex/lwarp/lwarp-flushend.sty | 28 + .../texmf-dist/tex/latex/lwarp/lwarp-footnote.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty | 15 +- .../texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty | 41 + .../texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty | 103 +- .../texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty | 93 ++ .../texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty | 8 +- .../texmf-dist/tex/latex/lwarp/lwarp-paralist.sty | 29 + .../texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty | 24 + .../texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty | 24 + .../texmf-dist/tex/latex/lwarp/lwarp-rotating.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty | 39 + .../texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty | 21 + Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty | 32 + Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty | 3 +- Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty | 27 + .../tex/latex/lwarp/lwarp-threeparttable.sty | 2 + .../texmf-dist/tex/latex/lwarp/lwarp-titleps.sty | 42 +- .../texmf-dist/tex/latex/lwarp/lwarp-titleref.sty | 21 + Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty | 8 +- Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty | 3 +- Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty | 4 +- Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty | 16 +- .../texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty | 22 + Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 1078 ++++++++++++-------- 45 files changed, 1834 insertions(+), 490 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty index a0cd928d430..3153d9d562a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -19,6 +19,7 @@ \LWR@ProvidesPackagePass{alltt} \AfterEndPreamble{ +\LWR@traceinfo{Patching alltt.} \AtBeginEnvironment{alltt}{% \LWR@forcenewpage \LWR@atbeginverbatim{alltt}\unskip\LWR@origvspace*{-\baselineskip}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty new file mode 100644 index 00000000000..15c7ca58dcd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-balance.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `balance') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{balance} +\newcommand*{\balance}{} +\newcommand*{\nobalance}{} +\endinput +%% +%% End of file `lwarp-balance.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index 6e4e0b9fca8..2e624defae3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -17,11 +17,14 @@ %% version 2005/12/01 or later. - -\LWR@ProvidesPackageDrop{booktabs} -\newcommand*{\addlinespace}[1]{} -\newcommand*{\morecmidrules}{} -\newcommand*{\specialrule}[3]{} +\LWR@ProvidesPackagePass{booktabs} +\LetLtxMacro\LWR@origtoprule\toprule +\LetLtxMacro\LWR@origmidrule\midrule +\LetLtxMacro\LWR@origcmidrule\cmidrule +\LetLtxMacro\LWR@origbottomrule\bottomrule +\LetLtxMacro\LWR@origaddlinespace\addlinespace +\LetLtxMacro\LWR@origmorecmidrules\morecmidrules +\LetLtxMacro\LWR@origspecialrule\specialrule \endinput %% 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..7cc99db7ac8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty @@ -0,0 +1,21 @@ +%% +%% 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-2017 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@loadnever{boxedminipage}{boxedminipage2e} +\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 new file mode 100644 index 00000000000..f190ee0e856 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-boxedminipage2e.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `boxedminipage2e') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + +\LWR@ProvidesPackageDrop{boxedminipage2e} + +\newenvironment{boxedminipage}{% +\begin{BlockClass}{framebox}% +\minipage% +} +{ +\endminipage% +\end{BlockClass} +} + +\endinput +%% +%% End of file `lwarp-boxedminipage2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty new file mode 100644 index 00000000000..92882551a24 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-crop.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `crop') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{crop} +\newcommand*{\crop}[1][]{} +\newcommand*{\cropdef}[6][]{} +\endinput +%% +%% End of file `lwarp-crop.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty index 9954399f86c..c15721e63a0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty @@ -16,17 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. - -\LWR@ProvidesPackageDrop{enumerate} - -\def\enit@shl#1{% - \ifnum\enit@type=\tw@ - \enit@toks{#1}% - \else - \def\enit@c{#1}% - \enit@first#1,\@nil\@@nil % Returns enit@toks - \fi} - +\LWR@ProvidesPackagePass{enumerate} \endinput %% %% End of file `lwarp-enumerate.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty new file mode 100644 index 00000000000..69e61d69b38 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-enumitem.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `enumitem') +%% This is a generated file. +%% Copyright 2016-2017 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{enumitem} +\begin{warpHTML} + +\let\LWR@orignewlist\newlist + +\renewcommand*{\newlist}[3]{% +\LWR@orignewlist{#1}{#2}{#3}% +\AtBeginEnvironment{#1}{\csuse{LWR@#2start}}% +\AtEndEnvironment{#1}{\csuse{LWR@#2end}}% +} + +\end{warpHTML} + +\endinput +%% +%% End of file `lwarp-enumitem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty index 111dba611dc..118f31e2ffc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -32,7 +32,7 @@ \newcommand{\AtTextLowerLeft}[1]{} \newcommand{\AtTextCenter}[1]{} \NewDocumentCommand{\AddToShipoutPictureBG}{s +m}{} -\let\AddToShipoutPicture\AddToShipoutPictureBG +\renewcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG} \NewDocumentCommand{\AddToShipoutPictureFG}{s +m}{} \newcommand*{\ClearShipoutPictureBG}{} \newcommand*{\ClearShipoutPicture}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty new file mode 100644 index 00000000000..d20e80cc9dc --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-everyshi.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `everyshi') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{everyshi} +\newcommand*{\EveryShipout}[1]{} +\newcommand*{\AtNextShipout}[1]{} +\endinput +%% +%% End of file `lwarp-everyshi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty new file mode 100644 index 00000000000..58524bb0e56 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -0,0 +1,97 @@ +%% +%% This is file `lwarp-fancybox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fancybox') +%% This is a generated file. +%% Copyright 2016-2017 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. +\begin{warpHTML} +\LWR@ProvidesPackagePass{fancybox} +\renewcommand*{\@shadowbox}[1]{\InlineClass{shadowbox}{#1}} + +\renewcommand*{\@doublebox}[1]{\InlineClass{doublebox}{#1}} + +\renewcommand*{\@ovalbox}[2]{% +\ifthenelse{\isequivalentto{#1}{\thinlines}} +{\InlineClass{ovalbox}{#2}} +{\InlineClass{Ovalbox}{#2}} +} +\let\LWR@origSbox\Sbox + +\def\Sbox{\LWR@origSbox\LWR@nestspan} + +\let\LWR@origendSbox\endSbox + +\def\endSbox{\endLWR@nestspan\LWR@origendSbox} +\RenewEnviron{Beqnarray} +{\LWR@eqnarrayfactor} + +\csgpreto{Beqnarray*}{\boolfalse{LWR@numbereqnarray}} +\renewcommand{\GenericCaption}[1]{% +\LWR@htmlblocktag{figcaption}% +#1% +\LWR@htmlblocktag{/figcaption}% +} +\RenewDocumentEnvironment{Btrivlist}{m o} +{\begin{BlockClass}{Btrivlist}\tabular{#1}} +{\endtabular\end{BlockClass}} +\AtBeginEnvironment{LWR@nestspan}{% +\RenewDocumentEnvironment{Btrivlist}{m o}{}{}% +\RenewDocumentCommand{\LWR@origitem}{d()}{\LWRFB@origitem}% +} +\let\LWRFB@origitemizeitem\LWR@itemizeitem +\let\LWRFB@origdescitem\LWR@descitem +\LetLtxMacro{\LWRFB@origitem}{\LWR@origitem} + +\RenewDocumentCommand{\LWR@itemizeitem}{d()}{\LWRFB@origitemizeitem} +\RenewDocumentCommand{\LWR@descitem}{d()}{\LWRFB@origdescitem} +\renewenvironment{Bitemize}[1][]{\begin{itemize}}{\end{itemize}} +\renewenvironment{Benumerate}[1][]{\begin{enumerate}}{\end{enumerate}} +\renewenvironment{Bdescription}[1][]{\begin{description}}{\end{description}} +\RenewDocumentCommand{\boxput}{s d() m m}{% +\IfBooleanTF{#1}{#3\quad#4}{#4\quad#3}% +} +\RenewDocumentCommand{\fancyput}{s d() m}{} +\RenewDocumentCommand{\thisfancyput}{s d() m}{} + +\RenewDocumentCommand{\fancypage}{m m}{} +\RenewDocumentCommand{\thisfancypage}{m m}{} + +\def\LandScape#1{} +\def\endLandScape{} +\def\@Landscape#1#2#3{} +\def\endLandscape{} +\let\LWRFB@UseVerbatim\UseVerbatim +\renewcommand*{\UseVerbatim}[1]{% +\LWR@atbeginverbatim{Verbatim}\unskip\LWR@origvspace*{-\baselineskip}%% +\LWRFB@UseVerbatim{#1}% +\LWR@afterendverbatim% +} + +\let\LWRFB@LUseVerbatim\LUseVerbatim + +\renewcommand*{\LUseVerbatim}[1]{% +\LWR@atbeginverbatim{LVerbatim}\unskip\LWR@origvspace*{-\baselineskip}%% +\LWRFB@LUseVerbatim{#1}% +\LWR@afterendverbatim% +} + +\def\@BUseVerbatim[#1]#2{% +\LWR@atbeginverbatim{BVerbatim}\unskip\LWR@origvspace*{-\baselineskip}%% +\LWRFB@UseVerbatim{#2}% +\LWR@afterendverbatim% +} +\end{warpHTML} +\endinput +%% +%% End of file `lwarp-fancybox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty new file mode 100644 index 00000000000..20c759d80ad --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -0,0 +1,211 @@ +%% +%% This is file `lwarp-fancyvrb.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fancyvrb') +%% This is a generated file. +%% Copyright 2016-2017 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. +\RequirePackage{xcolor}% for \convertcolorspec +\LWR@ProvidesPackagePass{fancyvrb} + +\begin{warpHTML} + +\fvset{frame=none}% + +\renewcommand{\VerbatimFootnotes}{ +\PackageError{lwarp} +{Verbatim footnotes are not yet supported by lwarp.} +{This may be improved some day.} +} + +\AfterEndPreamble{ +\LWR@traceinfo{Patching Verbatim.} +\let\LWRFV@origVerbatim\Verbatim +\renewcommand*{\Verbatim}{% +\LWR@forcenewpage +\LWRFV@origVerbatim% +} +\newcommand*{\LWR@FVstyle}{} +\newcommand*{\LWR@fvstartnone}{% +\LWR@traceinfo{fvstartnone}% +\hbox to\z@{\LWR@atbeginverbatim[\LWR@FVstyle]{verbatim}}% +} + +\newcommand*{\LWR@fvendnone}{% +\LWR@traceinfo{fvendnone}% +\hbox to\z@{\LWR@afterendverbatim}% +} + +\newcommand*{\LWR@fvstartsingle}{% +\LWR@traceinfo{fvstartsingle}% +\LWR@fvstartnone% +\FV@BeginListFrame@Single% +} + +\newcommand*{\LWR@fvendsingle}{% +\LWR@traceinfo{fvendsingle}% +\FV@EndListFrame@Single% +\LWR@fvendnone% +} + +\newcommand*{\LWR@fvstartline}{% +\LWR@traceinfo{fvstartline}% +\LWR@fvstartnone% +\FV@BeginListFrame@Lines% +} + +\newcommand*{\LWR@fvendline}{% +\LWR@traceinfo{fvendline}% +\FV@EndListFrame@Lines% +\LWR@fvendnone% +} + +\newcommand*{\LWR@FVfindcurrentcolor}{% +\protect\colorlet{LWR@current@color}{.}% +\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% +} + +\newcommand*{\LWR@FVtextstyle}{% +\LWR@FVfindcurrentcolor +\ifdefstring{\LWR@tempcolor}{000000}% +{}% +{color: \#\LWR@tempcolor ; }% +} + +\newcommand*{\LWR@FVfindbordercolor}{% +\FancyVerbRuleColor% +\LWR@FVfindcurrentcolor +\color{black} +} + +\newcommand*{\LWR@FVborderstyle}[1]{% +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; +\LWR@FVfindbordercolor +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; +} + +\def\FV@Frame@none{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle}% +\let\FV@BeginListFrame\LWR@fvstartnone% +\let\FV@LeftListFrame\relax% +\let\FV@RightListFrame\relax% +\let\FV@EndListFrame\LWR@fvendnone} + +\FV@Frame@none% default values + +\def\FV@Frame@single{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{}}% +\let\FV@BeginListFrame\LWR@fvstartsingle% +\let\FV@LeftListFrame\FV@LeftListFrame@Single% +\let\FV@RightListFrame\FV@RightListFrame@Single% +\let\FV@EndListFrame\LWR@fvendsingle} + +\def\FV@Frame@lines{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}}% +\let\FV@BeginListFrame\LWR@fvstartline% +\let\FV@LeftListFrame\relax% +\let\FV@RightListFrame\relax% +\let\FV@EndListFrame\LWR@fvendline} + +\def\FV@Frame@topline{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}}% +\let\FV@BeginListFrame\LWR@fvstartline% +\let\FV@LeftListFrame\relax% +\let\FV@RightListFrame\relax% +\let\FV@EndListFrame\LWR@fvendnone} + +\def\FV@Frame@bottomline{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-bottom}}% +\let\FV@BeginListFrame\LWR@fvstartnone% +\let\FV@LeftListFrame\relax% +\let\FV@RightListFrame\relax% +\let\FV@EndListFrame\LWR@fvendline} + +\def\FV@Frame@leftline{% +\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-left}}% +\ifx\FancyVerbFillColor\relax% +\let\FV@FrameFillLine\relax% +\else% +\@tempdima\FV@FrameRule\relax% +\multiply\@tempdima-\tw@% +\edef\FV@FrameFillLine{% +{\noexpand\FancyVerbFillColor{\vrule\@width\number\@tempdima sp}% +\kern-\number\@tempdima sp}}% +\fi% +\let\FV@BeginListFrame\LWR@fvstartnone% +\let\FV@LeftListFrame\FV@LeftListFrame@Single% +\let\FV@RightListFrame\relax% +\let\FV@EndListFrame\LWR@fvendnone} +\def\FV@SingleFrameLine#1{% + \hbox to\z@{% + \ifnum#1=\z@\relax + \let\FV@Label\FV@LabelBegin + \else + \let\FV@Label\FV@LabelEnd + \fi + \ifx\FV@Label\relax + \else + \ifnum#1=\z@ + \ifx\FV@LabelPositionTopLine\relax +\else +\LWR@FVfindbordercolor + \LWR@htmltagc{div class="fancyvrblabel" style="color: \#\LWR@tempcolor"} +\LWR@origtextrm{\FV@LabelBegin}% \textrm preserves emdash +\LWR@htmltagc{/div} +\fi + \else + \ifx\FV@LabelPositionBottomLine\relax +\else +\LWR@FVfindbordercolor + \LWR@htmltagc{div class="fancyvrblabel" style="color: \#\LWR@tempcolor"} +\LWR@origtextrm{\FV@LabelEnd} +\LWR@htmltagc{/div} +\fi + \fi + + \fi + \hss +} +} +\def\FV@ListProcessLine#1{% + \hbox to \hsize{% + \hbox to \VerbatimHTMLWidth {% + \ifcsvoid{FV@LeftListNumber}{}{\kern 2.5em}% +\FV@LeftListNumber% + \FancyVerbFormatLine{#1}% + \hss% + \FV@RightListNumber% +}% + \hss% required to avoid underfull hboxes +} +} + +\AtBeginEnvironment{BVerbatim} +{ +\LWR@forcenewpage +\LWR@atbeginverbatim{bverbatim} + +} + +\AfterEndEnvironment{BVerbatim} +{ +\leavevmode\par\LWR@origvspace{-\baselineskip} +\LWR@afterendverbatim +} + +} % \AfterEndPreamble + +\end{warpHTML} +\endinput +%% +%% End of file `lwarp-fancyvrb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty new file mode 100644 index 00000000000..d42a23cf6ae --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-figcaps.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `figcaps') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{figcaps} +\newcommand*{\figcapson}{} +\newcommand*{\figcapsoff}{} +\newcommand*{\printfigures}{} +\newcommand*{\figmarkon}{} +\newcommand*{\figmarkoff}{} +\def\figurecapname{Figure Captions} +\def\tablepagename{Tables} +\def\figurepagename{Figures} +\endinput +%% +%% End of file `lwarp-figcaps.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index 8d1b288c74c..6ce7d78b9ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -22,9 +22,7 @@ \NewDocumentCommand{\newfloat}{m m m o}{% \IfValueTF{#4} -{ -\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1} -} +{\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}} {\DeclareFloatingEnvironment[fileext=#3]{#1}} \cslet{listof#1s}\relax \cslet{listof#1es}\relax diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty new file mode 100644 index 00000000000..c3912bcc43a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-floatpag.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `floatpag') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{floatpag} +\newcommand*{\floatpagestyle}[1]{} +\newcommand*{\rotfloatpagestyle}[1]{} +\newcommand*{\thisfloatpagestyle}[1]{} +\endinput +%% +%% End of file `lwarp-floatpag.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty new file mode 100644 index 00000000000..9672ae47b95 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty @@ -0,0 +1,28 @@ +%% +%% This is file `lwarp-flushend.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `flushend') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{flushend} +\newcommand*{\flushend}{} +\newcommand*{\raggedend}{} +\newcommand*{\flushcolsend}{} +\newcommand*{\raggedcolsend}{} +\newcommand*{\atColsBreak}[1]{} +\newcommand*{\atColsEnd}[1]{} +\newcommand*{\showcolsendrule}{} +\endinput +%% +%% End of file `lwarp-flushend.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 8c5cff69c95..a55df951b3b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -34,7 +34,7 @@ \begingroup% \let\@makefntext\@empty% \let\@finalstrut\@gobble% - \let\rule\@gobbletwo% + \LetLtxMacro\rule\@gobbletwo% *8* also the optional argument? \@footnotetext{\unvbox\z@}% \endgroup% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty index 905c723ac16..b78bd31188b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty @@ -17,6 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{framed} +\RequirePackage{xcolor}% for \convertcolorspec \renewenvironment{framed}{% @@ -34,14 +35,14 @@ \renewenvironment{shaded}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass{framed}[background: \#\LWR@tempcolor]% +\BlockClass[background: \#\LWR@tempcolor]{framed}% } {\endBlockClass} \renewenvironment{shaded*}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass{framed}[background: \#\LWR@tempcolor]% +\BlockClass[background: \#\LWR@tempcolor]{framed}% } {\endBlockClass} @@ -56,14 +57,14 @@ \renewenvironment{snugshade}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +\BlockClass[background: \#\LWR@tempcolor]{snugframed}% } {\endBlockClass} \renewenvironment{snugshade*}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +\BlockClass[background: \#\LWR@tempcolor]{snugframed}% } {\endBlockClass} @@ -77,9 +78,9 @@ \renewcommand{\CustomFBox}[7]{% \convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\begin{BlockClass}{framed}[border: 3px solid \#\LWR@tempcolor]% +\begin{BlockClass}[border: 3px solid \#\LWR@tempcolor]{framed}% \ifthenelse{\isempty{#1}}{}{% not empty -\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\begin{BlockClass}[background: \#\LWR@tempcolor]{framedtitle}% \textcolor{TFTitleColor}{\textbf{#1}}% \end{BlockClass} }% not empty @@ -88,7 +89,7 @@ \ifthenelse{\isempty{#2}}{}{% not empty \convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% -\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\begin{BlockClass}[background: \#\LWR@tempcolor]{framedtitle}% \textcolor{TFTitleColor}{\textbf{#2}}% \end{BlockClass} }% not empty diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty new file mode 100644 index 00000000000..bc517f86663 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-fullpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fullpage') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{fullpage} +\endinput +%% +%% End of file `lwarp-fullpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty new file mode 100644 index 00000000000..9fb1ed187c2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-hyperxmp.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `hyperxmp') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{hyperxmp} +\endinput +%% +%% End of file `lwarp-hyperxmp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty new file mode 100644 index 00000000000..dacc218a1b6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty @@ -0,0 +1,41 @@ +%% +%% This is file `lwarp-idxlayout.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `idxlayout') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{idxlayout} +\newcommand{\LWR@indexprenote}{} + +\renewcommand*{\printindex} +{ +\LWR@indexsection +\LWR@startpars + +\LWR@indexprenote + +\LWR@origprintindex +} + +\newcommand{\setindexprenote}[1]{\renewcommand{\LWR@indexprenote}{#1}} +\newcommand*{\noindexprenote}{\renewcommand{\LWR@indexprenote}{}} + +\newcommand{\idxlayout}[1]{} +\newcommand*{\indexfont}{} +\newcommand*{\indexjustific}{} +\newcommand*{\indexsubsdelim}{} +\newcommand*{\indexstheadcase}{} +\endinput +%% +%% End of file `lwarp-idxlayout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty new file mode 100644 index 00000000000..777c939ddc4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-marginfit.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `marginfit') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{marginfit} +\endinput +%% +%% End of file `lwarp-marginfit.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 31138ec11b4..7be342757ea 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -17,6 +17,7 @@ %% version 2005/12/01 or later. +\RequirePackage{xcolor}% for \convertcolorspec \LWR@ProvidesPackageDrop{mdframed} \LWR@origRequirePackage{amsthm} @@ -55,15 +56,15 @@ box-shadow: {box-shadow: none ;} \LWR@orignewline "} -\let\hspace\LWR@orighspace% -\let\rule\LWR@origrule% +\LetLtxMacro{\hspace}{\LWR@orighspace}% +\LetLtxMacro\rule\LWR@origrule% } \newcommand*{\LWR@mdframedend}{ \LWR@htmldivclassend{\LWR@mdthisenv} \gdef\LWR@mdthisenv{mdframed} \LWR@startpars% } -\let\LWR@origmdfframedtitleenv\mdfframedtitleenv +\LetLtxMacro\LWR@origmdfframedtitleenv\mdfframedtitleenv \newlength{\LWR@titleroundcorner} @@ -157,14 +158,94 @@ solid \begin{mdframed}[#1]}% \AfterEndEnvironment{#2}{\end{mdframed}}% } -\let\LWR@origmdtheorem\mdtheorem - -\DeclareDocumentCommand{\LWR@mdtheorem}{O{} m o m o}{% -\LWR@origmdtheorem[#1]{#2}[#3]{#4}[#5]% -\BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% -} - -\let\mdtheorem\LWR@mdtheorem +\DeclareDocumentCommand{\mdtheorem}{ O{} m o m o }% + {\ifcsdef{#2}% + {\mdf@PackageWarning{Environment #2 already exits\MessageBreak}}% + {% + \IfNoValueTF {#3}% + {%#3 not given -- number relationship + \IfNoValueTF {#5}% + {%#3+#5 not given + \@definecounter{#2}% + \expandafter\xdef\csname the#2\endcsname{\@thmcounter{#2}}% + \newenvironment{#2}[1][]{% + \refstepcounter{#2}% + \ifstrempty{##1}% + {\let\@temptitle\relax}% + {% + \def\@temptitle{\mdf@theoremseparator% + \mdf@theoremspace% + \mdf@theoremtitlefont% + ##1}% + \mdf@thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}% + }% + \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname% + \@temptitle}]}% + {\end{mdframed}}% + \newenvironment{#2*}[1][]{% + \ifstrempty{##1}{\let\@temptitle\relax}{\def\@temptitle{:\ ##1}}% + \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}% + {\end{mdframed}}% + }% + {%#5 given -- reset counter + \@definecounter{#2}\@newctr{#2}[#5]% + \expandafter\xdef\csname the#2\endcsname{\@thmcounter{#2}}% + \expandafter\xdef\csname the#2\endcsname{% + \expandafter\noexpand\csname the#5\endcsname \@thmcountersep% + \@thmcounter{#2}}% + \newenvironment{#2}[1][]{% + \refstepcounter{#2}% + \ifstrempty{##1}% + {\let\@temptitle\relax}% + {% + \def\@temptitle{\mdf@theoremseparator% + \mdf@theoremspace% + \mdf@theoremtitlefont% + ##1}% + \mdf@thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}% + } + \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname% + \@temptitle}]}% + {\end{mdframed}}% + \newenvironment{#2*}[1][]{% + \ifstrempty{##1}% + {\let\@temptitle\relax}% + {% + \def\@temptitle{\mdf@theoremseparator% + \mdf@theoremspace% + \mdf@theoremtitlefont% + ##1}% + \mdf@thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}% + }% + \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}% + {\end{mdframed}}% + }% + }% + {%#3 given -- number relationship + \global\@namedef{the#2}{\@nameuse{the#3}}% + \newenvironment{#2}[1][]{% + \refstepcounter{#3}% + \ifstrempty{##1}% + {\let\@temptitle\relax}% + {% + \def\@temptitle{\mdf@theoremseparator% + \mdf@theoremspace% + \mdf@theoremtitlefont% + ##1}% + \mdf@thm@caption{#2}{{#4}{\csname the#2\endcsname}{##1}}% + } + \begin{mdframed}[#1,frametitle={\strut#4\ \csname the#2\endcsname% + \@temptitle}]}% + {\end{mdframed}}% + \newenvironment{#2*}[1][]{% + \ifstrempty{##1}{\let\@temptitle\relax}{\def\@temptitle{:\ ##1}}% + \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}% + {\end{mdframed}}% + }% +\BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new +\BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new + }% + } \DeclareDocumentCommand\newmdtheoremenv{O{} m o m o }{% \ifboolexpr{ test {\IfNoValueTF {#3}} and test {\IfNoValueTF {#5}} }% {\newtheorem{#2}{#4}}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty new file mode 100644 index 00000000000..8816b81c49a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty @@ -0,0 +1,93 @@ +%% +%% This is file `lwarp-moreverb.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `moreverb') +%% This is a generated file. +%% Copyright 2016-2017 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. +\begin{warpHTML} +\LWR@ProvidesPackagePass{moreverb} +\BeforeBeginEnvironment{verbatimtab}{% +\LWR@forcenewpage +\LWR@atbeginverbatim{Verbatim}\unskip\LWR@origvspace*{-\baselineskip}% +} +\AfterEndEnvironment{verbatimtab}{% +\LWR@afterendverbatim% +} + +\LetLtxMacro\LWRMV@orig@verbatimtabinput\@verbatimtabinput + +\renewcommand{\@verbatimtabinput}[2][]{% +\LWR@forcenewpage +\LWR@atbeginverbatim{Verbatim}\unskip\LWR@origvspace*{-\baselineskip}% +\LWRMV@orig@verbatimtabinput[#1]{#2}% +\LWR@afterendverbatim% +} + +\BeforeBeginEnvironment{listing}{% +\LWR@forcenewpage +\LWR@atbeginverbatim{programlisting}\unskip\LWR@origvspace*{-\baselineskip}% +} + +\AfterEndEnvironment{listing}{% +\LWR@afterendverbatim% +} + +\BeforeBeginEnvironment{listingcont}{% +\LWR@forcenewpage +\LWR@atbeginverbatim{programlisting}\unskip\LWR@origvspace*{-\baselineskip}% +} + +\AfterEndEnvironment{listingcont}{% +\LWR@afterendverbatim% +} + +\renewcommand{\listinglabel}[1]{\InlineClass{listinglabel}{\the#1}} + +\def\thelisting@line{% +\@tempcnta=\listing@line% +\divide\@tempcnta\listing@step \multiply\@tempcnta\listing@step% +\ifnum\listing@line=\@ne% +\listinglabel\listing@line% +\else% +\ifnum\@tempcnta=\listing@line% +\listinglabel\listing@line% +\else% +\InlineClass{listinglabel}{}% +\fi% +\fi} + +\LetLtxMacro\LWRMV@@listinginput\@listinginput + +\renewcommand{\@listinginput}[3][]{ +\LWR@forcenewpage +\LWR@atbeginverbatim{programlisting}\unskip\LWR@origvspace*{-\baselineskip}% +\LWRMV@@listinginput[#1]{#2}{#3} +\LWR@afterendverbatim% +} + +\renewenvironment*{boxedverbatim} +{ +\LWR@forcenewpage +\LWR@atbeginverbatim{boxedverbatim}\unskip\LWR@origvspace*{-\baselineskip}% +\verbatim% +} +{ +\endverbatim% +\LWR@afterendverbatim% +} + +\end{warpHTML} +\endinput +%% +%% End of file `lwarp-moreverb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 7a513854931..bbf6f36c34c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -216,7 +216,7 @@ \InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]} \theoremstyle{plainupright} \theorembodyfont{\upshape} -\theoremsymbol{\ensuremath{_\Box}} +\theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box \renewtheorem{Example}{Example} \renewtheorem{example}{Example} \renewtheorem{Beispiel}{Beispiel} @@ -231,12 +231,12 @@ \renewtheorem{definition}{Definition} \theoremstyle{nonumberplainuprightsc} -\theoremsymbol{\ensuremath{_\blacksquare}} +\theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof \renewtheorem{Proof}{Proof} \renewtheorem{proof}{Proof} \renewtheorem{Beweis}{Beweis} \renewtheorem{beweis}{Beweis} -\qedsymbol{\ensuremath{_\blacksquare}} +\qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof \theoremsymbol{} }% not amsthm @@ -375,7 +375,7 @@ \th@proof \def\theorem@headerfont{\itshape}% \normalfont -\theoremsymbol{\ensuremath{_\blacksquare}} +\theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof \@thm{proof}{proof}{#1} }% {\@endtheorem} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty new file mode 100644 index 00000000000..7b38dd79ff0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-paralist.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `paralist') +%% This is a generated file. +%% Copyright 2016-2017 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{paralist} +\AtBeginEnvironment{compactitem}{\LWR@itemizestart} +\AtEndEnvironment{compactitem}{\LWR@itemizeend} +\AtBeginEnvironment{compactenum}{\LWR@enumeratestart} +\AtEndEnvironment{compactenum}{\LWR@enumerateend} +\AtBeginEnvironment{compactdesc}{\LWR@descriptionstart} +\AtEndEnvironment{compactdesc}{\LWR@descriptionend} +\def\paradescriptionlabel#1{{\normalfont\textbf{#1}}} +\endinput +%% +%% End of file `lwarp-paralist.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty new file mode 100644 index 00000000000..77c4bca36fe --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-pdflscape.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdflscape') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pdflscape} +\endinput +%% +%% End of file `lwarp-pdflscape.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty new file mode 100644 index 00000000000..26784207fcd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-pdfsync.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdfsync') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{pdfsync} +\let\pdfsync\relax +\let\pdfsyncstart\relax +\let\pdfsyncstop\relax +\endinput +%% +%% End of file `lwarp-pdfsync.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty new file mode 100644 index 00000000000..59dd4fe10a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-prelim2e.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `prelim2e') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{prelim2e} +\newcommand{\PrelimText}{} +\newcommand{\PrelimTextStyle}{} +\newcommand{\PrelimWords}{} +\endinput +%% +%% End of file `lwarp-prelim2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty index 45f8ad04cf2..94243a77016 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty @@ -19,10 +19,10 @@ \LWR@ProvidesPackageDrop{rotating} -\let\sidewaystable\table +\LetLtxMacro\sidewaystable\table \let\endsidewaystable\endtable -\let\sidewaysfigure\figure +\LetLtxMacro\sidewaysfigure\figure \let\endsidewaysfigure\endfigure \newenvironment*{sideways}{}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty new file mode 100644 index 00000000000..b0f5b711d84 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty @@ -0,0 +1,39 @@ +%% +%% This is file `lwarp-rotfloat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `rotfloat') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + +\LWR@ProvidesPackageDrop{rotfloat} + +\RequirePackage{float} +\RenewDocumentCommand{\newfloat}{m m m o}{% +\IfValueTF{#4} +{ +\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1} +} +{ +\DeclareFloatingEnvironment[fileext=#3]{#1} +\DeclareFloatingEnvironment[fileext=#3]{sideways#1} +} +\csletcs{sideways#1}{#1} +\csletcs{endsideways#1}{end#1} +\cslet{listof#1s}\relax +\cslet{listof#1es}\relax +} +\endinput +%% +%% End of file `lwarp-rotfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty new file mode 100644 index 00000000000..679b6475d00 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-savetrees.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `savetrees') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{savetrees} +\endinput +%% +%% End of file `lwarp-savetrees.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty new file mode 100644 index 00000000000..193a5591035 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-shadow.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `shadow') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + +\LWR@ProvidesPackageDrop{shadow} + +\newdimen\sboxsep +\newdimen\sboxrule +\newdimen\sdim + +\newcommand{\shabox}[1]{% +\InlineClass{shabox}{#1}% +} + +\endinput +%% +%% End of file `lwarp-shadow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index 1561eae959c..aec6a684692 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -16,6 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{soul} +\RequirePackage{xcolor}% for \convertcolorspec \newcommand*{\LWR@soululcolor}{} \newcommand*{\LWR@soulstcolor}{} @@ -29,7 +30,7 @@ \InlineClass{#3}{#1}}% {% \convertcolorspec{named}{\csuse{#2}}{HTML}\LWR@tempcolor% -\InlineClass{#3}[#4: \#\LWR@tempcolor]{#1}% +\InlineClass[#4: \#\LWR@tempcolor]{#3}{#1}% }% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index 70ea534a07a..4d28d79a5e4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -207,7 +207,7 @@ \LWR@subnewref{#1}{sub@#1}% } \renewcommand{\sf@@subref}[1]{\LWR@origpageref{sub@#1}} -\let\LWR@orig@newsubfloat\@newsubfloat +\LetLtxMacro\LWR@orig@newsubfloat\@newsubfloat \def\@newsubfloat[#1]#2{% \LWR@orig@newsubfloat[#1]{#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty new file mode 100644 index 00000000000..8ca59206b5c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-syntonly.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `syntonly') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{syntonly} +\newif\ifsyntax@ +\syntax@false + +\newcommand*{\syntaxonly}{} + +\@onlypreamble\syntaxonly +\endinput +%% +%% End of file `lwarp-syntonly.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty index 89dbaa1364f..9871f1a300b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty @@ -28,7 +28,9 @@ {% \LWR@forcenewpage \BlockClass{tnotes}% +\ltx@ifpackageloaded{enumitem}{% \setlist[description]{format=\LWR@printtablenote}% +}{}% \description% } {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty index e42138dab7d..be307149118 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty @@ -17,42 +17,40 @@ %% version 2005/12/01 or later. - - \LWR@ProvidesPackageDrop{titleps} -\RenewDocumentCommand{\newpagestyle}{m o m}{} -\RenewDocumentCommand{\renewpagestyle}{m o m}{} +\NewDocumentCommand{\newpagestyle}{m o m}{} +\NewDocumentCommand{\renewpagestyle}{m o m}{} -\RenewDocumentCommand{\sethead}{o o o m m m}{} -\RenewDocumentCommand{\setfoot}{o o o m m m}{} +\NewDocumentCommand{\sethead}{o o o m m m}{} +\NewDocumentCommand{\setfoot}{o o o m m m}{} -\RenewDocumentCommand{\settitlemarks}{s m}{} +\NewDocumentCommand{\settitlemarks}{s m}{} -\renewcommand*{\headrule}{} -\renewcommand*{\footrule}{} +\newcommand*{\headrule}{} +\newcommand*{\footrule}{} -\renewcommand*{\setheadrule}[1]{} -\renewcommand*{\setfootrule}[1]{} +\newcommand*{\setheadrule}[1]{} +\newcommand*{\setfootrule}[1]{} \newcommand*{\makeheadrule}{} \newcommand*{\makefootrule}{} -\renewcommand{\setmarkboth}[1]{} +\newcommand{\setmarkboth}[1]{} -\RenewDocumentCommand{\widenhead}{s o o m m}{} +\NewDocumentCommand{\widenhead}{s o o m m}{} -\renewcommand*{\bottitlemarks}{} -\renewcommand*{\toptitlemarks}{} -\renewcommand*{\firsttitlemarks}{} -\renewcommand*{\nexttoptitlemarks}{} -\renewcommand*{\outertitlemarks}{} -\renewcommand*{\innertitlemarks}{} +\newcommand*{\bottitlemarks}{} +\newcommand*{\toptitlemarks}{} +\newcommand*{\firsttitlemarks}{} +\newcommand*{\nexttoptitlemarks}{} +\newcommand*{\outertitlemarks}{} +\newcommand*{\innertitlemarks}{} -\RenewDocumentCommand{\newtitlemark}{s m}{} +\NewDocumentCommand{\newtitlemark}{s m}{} -\RenewDocumentCommand{\pretitlemark}{s m m}{} +\NewDocumentCommand{\pretitlemark}{s m m}{} -\renewcommand{\ifsamemark}[4]{} +\newcommand{\ifsamemark}[4]{} \NewDocumentCommand{\setfloathead}{s o o o m m m m m}{} \NewDocumentCommand{\setfloatfoot}{s o o o m m m m m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty new file mode 100644 index 00000000000..dd8376af42f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-titleref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `titleref') +%% This is a generated file. +%% Copyright 2016-2017 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@loadnever{titleref}{hyperref and nameref} +\endinput +%% +%% End of file `lwarp-titleref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty index 179d8ef91f5..c89139bd40d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -15,8 +15,8 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\let\LWR@ulemorigemph\emph -\let\LWR@ulemorigtextbf\textbf +\LetLtxMacro\LWR@ulemorigemph\emph +\LetLtxMacro\LWR@ulemorigtextbf\textbf \NewDocumentCommand{\uline}{+m}{% \InlineClass{uline}{#1}% } @@ -53,8 +53,8 @@ \ifx\relax#3\relax\else % argumentative command \def#3{#1}\MakeRobust{#3}\fi } -\newcommand*{\normalem}{\let\emph\LWR@ulemorigemph} -\newcommand*{\ULforem}{\let\emph\uline} +\newcommand*{\normalem}{\LetLtxMacro\emph\LWR@ulemorigemph} +\newcommand*{\ULforem}{\LetLtxMacro\emph\uline} \ULforem% default \DeclareOption{normalem}{\normalem} \DeclareOption{ULforem}{\ULforem} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index e2e20c7ccee..3c52cad9193 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -18,6 +18,7 @@ \LWR@ProvidesPackagePass{verse} \AfterEndPreamble{ +\LWR@traceinfo{Patching verse.} \AtBeginEnvironment{verse} {% \ifdef{\vleftskip}{% @@ -40,7 +41,7 @@ } }{} -} +}% AfterEndPreamble \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 1067b8b843c..835bdd0c813 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -65,8 +65,8 @@ \let\textcolor\LWR@textcolor \let\pagecolor\LWR@pagecolor -\let\colorbox\LWR@colorbox -\let\fcolorbox\LWR@fcolorbox +\LetLtxMacro\colorbox\LWR@colorbox +\LetLtxMacro\fcolorbox\LWR@fcolorbox \endinput %% %% End of file `lwarp-xcolor.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index 99f2a58711b..74855e62a64 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -42,37 +42,37 @@ \DeclareInstance{xfrac}{default}{text}{ numerator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend}, denominator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } \DeclareInstance{xfrac}{lmr}{text}{ numerator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend}, denominator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } \DeclareInstance{xfrac}{lmss}{text}{ numerator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend}, denominator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } \DeclareInstance{xfrac}{lmtt}{text}{ numerator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart\textsuperscript{#1}\,\LWR@htmlsmallfontend}, denominator-format = {% -\let\scalebox\LWR@noscalebox% +\LetLtxMacro{\scalebox}{\LWR@noscalebox}% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty new file mode 100644 index 00000000000..3d8faeb3a03 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-xmpincl.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xmpincl') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{xmpincl} +\newcommand*{\includexmp}[1]{} +\endinput +%% +%% End of file `lwarp-xmpincl.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index e50befca6dd..b9e455d5421 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} - [2017/07/10 v0.33 Allows LaTeX to directly produce HTML5 output.] + [2017/08/08 v0.34 Allows LaTeX to directly produce HTML5 output.] @@ -51,6 +51,8 @@ \RequirePackage{comment} \excludecomment{testing} +\RequirePackage{letltxmacro} + \newbool{usingOSWindows} \boolfalse{usingOSWindows} @@ -172,9 +174,11 @@ after lwarp.} \newcommand*{\LWR@loadnever}[2]{% \PackageError{lwarp} -{Package #1 does not work with lwarp's HTML conversion. -Please use the #2 package instead} -{Package #1 conflicts with lwarp in some way, but package #2 probably will work instead.} +{Package #1 is not supported by lwarp's HTML conversion. +Package(s) #2 may be useful instead} +{Package #1 might conflict with lwarp in some way, +or is superceded by another package. +For a possible alternative, see package(s) #2.} } \LWR@loadafter{abstract} @@ -182,28 +186,43 @@ Please use the #2 package instead} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} \LWR@loadafter{amsthm} +\LWR@loadafter{array} +\LWR@loadafter{balance} \LWR@loadafter{bookmark} \LWR@loadafter{booktabs} +\LWR@loadafter{boxedminipage} +\LWR@loadafter{boxedminipage2e} \LWR@loadafter{ccaption} \LWR@loadafter{changepage} +\LWR@loadafter{crop} \LWR@loadafter{cutwin} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} \LWR@loadafter{ellipsis} \LWR@loadafter{emptypage} \LWR@loadafter{enumerate} +\LWR@loadafter{enumitem} \LWR@loadafter{epigraph} \LWR@loadafter{eso-pic} \LWR@loadafter{everypage} +\LWR@loadafter{everyshi} \LWR@loadafter{extramarks} +\LWR@loadafter{fancybox} \LWR@loadafter{fancyhdr} -\LWR@loadafter{floatrow} +\LWR@loadafter{fancyvrb} +\LWR@loadafter{figcaps} \LWR@loadafter{float} \LWR@loadafter{floatflt} +\LWR@loadafter{floatpag} +\LWR@loadafter{floatrow} +\LWR@loadafter{flushend} \LWR@loadafter{ftnright} +\LWR@loadafter{fullpage} \LWR@loadafter{geometry} \LWR@loadafter{glossaries} \LWR@loadafter{hyperref} +\LWR@loadafter{hyperxmp} +\LWR@loadafter{idxlayout} \LWR@loadafter{indentfirst} \LWR@loadafter{keyfloat} \LWR@loadafter{layout} @@ -214,11 +233,13 @@ Please use the #2 package instead} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} +\LWR@loadafter{marginfit} \LWR@loadafter{marginfix} \LWR@loadafter{marginnote} \LWR@loadafter{mcaption} \LWR@loadafter{mdframed} \LWR@loadafter{microtype} +\LWR@loadafter{moreverb} \LWR@loadafter{mparhack} \LWR@loadafter{multirow} \LWR@loadafter{nameref} @@ -228,11 +249,18 @@ Please use the #2 package instead} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{pagenote} +\LWR@loadafter{paralist} \LWR@loadafter{parskip} +\LWR@loadafter{pdflscape} +\LWR@loadafter{pdfsync} \LWR@loadafter{placeins} +\LWR@loadafter{prelim2e} \LWR@loadafter{ragged2e} \LWR@loadafter{rotating} +\LWR@loadafter{rotfloat} +\LWR@loadafter{savetrees} \LWR@loadafter{setspace} +\LWR@loadafter{shadow} \LWR@loadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} @@ -257,6 +285,7 @@ Please use the #2 package instead} \LWR@loadafter{wrapfig} \LWR@loadafter{xcolor} \LWR@loadafter{xfrac} +\LWR@loadafter{xmpincl} @@ -326,7 +355,15 @@ top=1in,bottom=1in,% \begin{warpall} -\RequirePackage{fancyvrb} +\RequirePackage{filecontents} + +\@ifpackagelater{filecontents}{2011/10/09}% +{} +{ +\newwrite\fcwrite +\let\LWR@origfilec@ntents\filec@ntents +\def\filec@ntents{\def\chardef##1\write{\let\reserved@c\fcwrite}\LWR@origfilec@ntents} +} \end{warpall} @@ -336,6 +373,8 @@ top=1in,bottom=1in,% \RequirePackage{xstring} +\RequirePackage{verbatim} + \RequirePackage{makeidx} \makeindex @@ -348,17 +387,14 @@ top=1in,bottom=1in,% \RequirePackage{caption} -\RequirePackage{enumitem} -\setlist[itemize]{leftmargin=0em} -\setlist[enumerate]{leftmargin=0em} -\setlist[description]{leftmargin=0em} - \end{warpHTML} \begin{warpall} \RequirePackage{titling} +\RequirePackage{environ} + \end{warpall} \begin{warpHTML} @@ -368,16 +404,6 @@ top=1in,bottom=1in,% \PassOptionsToPackage{leqno}{amsmath} \RequirePackage{amsmath} -\RequirePackage{environ} - -\RequirePackage[nopatches]{titleps} -\let\LWR@origpagestyle\pagestyle -\renewcommand*{\pagestyle}[1]{} -\let\LWR@origthispagestyle\thispagestyle -\renewcommand*{\thispagestyle}[1]{} -\let\LWR@origpagenumbering\pagenumbering -\renewcommand*{\pagenumbering}[1]{} - \RequirePackage{xfrac} @@ -387,7 +413,7 @@ top=1in,bottom=1in,% \begin{warpHTML} -\let\LWR@origRequirePackage\RequirePackage +\LetLtxMacro{\LWR@origRequirePackage}{\RequirePackage} \newcommand*{\LWR@requirepackagenames}{} @@ -433,7 +459,7 @@ top=1in,bottom=1in,% {\LWR@origRequirePackage{\LWR@requirepackagenames}} } } -\let\usepackage\RequirePackage +\LetLtxMacro{\usepackage}{\RequirePackage} \NewDocumentCommand{\LWR@ProvidesPackagePass}{m o}{ \PackageInfo{lwarp}{Using package `#1' and adding lwarp modifications, including options,}% @@ -495,6 +521,14 @@ top=1in,bottom=1in,% \newbool{HTMLDebugComments} \boolfalse{HTMLDebugComments} +\AfterEndPreamble{ +\LWR@traceinfo{AfterEndPreamble} +} + +\AtBeginDocument{ +\LWR@traceinfo{AtBeginDocument} +} + \newbool{FormatEPUB} \boolfalse{FormatEPUB} \newbool{FormatWordProcessor} @@ -507,16 +541,29 @@ top=1in,bottom=1in,% \begin{warpHTML} -\let\LWR@origtextit\textit -\let\LWR@origtextbf\textbf -\let\LWR@origtexttt\texttt -\let\LWR@origtextsc\textsc -\let\LWR@origtextsf\textsf -\let\LWR@origtextrm\textrm -\let\LWR@origbfseries\bfseries -\let\LWR@origrmfamily\rmfamily -\let\LWR@origttfamily\ttfamily -\let\LWR@orignormalfont\normalfont +\LetLtxMacro{\LWR@origtextrm}{\textrm} +\LetLtxMacro{\LWR@origtextsf}{\textsf} +\LetLtxMacro{\LWR@origtexttt}{\texttt} +\LetLtxMacro{\LWR@origtextnormal}{\textnormal} +\LetLtxMacro{\LWR@origtextbf}{\textbf} +\LetLtxMacro{\LWR@origtextmd}{\textmd} +\LetLtxMacro{\LWR@origtextit}{\textit} +\LetLtxMacro{\LWR@origtextsl}{\textsl} +\LetLtxMacro{\LWR@origtextsc}{\textsc} +\LetLtxMacro{\LWR@origtextup}{\textup} +\LetLtxMacro{\LWR@origemph}{\emph} + +\LetLtxMacro{\LWR@origrmfamily}{\rmfamily} +\LetLtxMacro{\LWR@origsffamily}{\sffamily} +\LetLtxMacro{\LWR@origttfamily}{\ttfamily} +\LetLtxMacro{\LWR@origbfseries}{\bfseries} +\LetLtxMacro{\LWR@origmdseries}{\mdseries} +\LetLtxMacro{\LWR@origupshape}{\upshape} +\LetLtxMacro{\LWR@origslshape}{\slshape} +\LetLtxMacro{\LWR@origscshape}{\scshape} +\LetLtxMacro{\LWR@origitshape}{\itshape} +\LetLtxMacro{\LWR@origem}{\em} +\LetLtxMacro{\LWR@orignormalfont}{\normalfont} \let\LWR@origraggedright\raggedright \let\LWR@origonecolumn\onecolumn @@ -528,16 +575,28 @@ top=1in,bottom=1in,% \let\LWR@orignewpage\newpage -\let\LWR@origminipage\minipage +\let\LWR@origpagestyle\pagestyle +\let\LWR@origthispagestyle\thispagestyle +\let\LWR@origpagenumbering\pagenumbering + +\LetLtxMacro{\LWR@origminipage}{\minipage} \let\LWR@origendminipage\endminipage +\LetLtxMacro{\LWR@origparbox}{\parbox} \let\LWR@orignewline\newline -\let\LWR@origitem\item +\LetLtxMacro{\LWR@origitem}{\item} + +\LetLtxMacro{\LWR@origitemize}{\itemize} +\LetLtxMacro{\LWR@endorigitemize}{\enditemize} +\LetLtxMacro{\LWR@origenumerate}{\enumerate} +\LetLtxMacro{\LWR@endorigenumerate}{\endenumerate} +\LetLtxMacro{\LWR@origdescription}{\description} +\LetLtxMacro{\LWR@endorigdescription}{\enddescription} \let\LWR@origpar\par -\let\LWR@origfootnote\footnote +\LetLtxMacro{\LWR@origfootnote}{\footnote} \let\LWR@orig@mpfootnotetext\@mpfootnotetext \let\LWR@origclearpage\clearpage @@ -623,7 +682,7 @@ homehtmlfilename = "\HomeHTMLFilename"% \begin{warpprint} -\begin{VerbatimOut}{lwarp.css} +\begin{filecontents*}{lwarp.css} /* CSS stylesheet for the LaTeX lwarp package Copyright 2016-2017 Brian Dunn — BD Tech Concepts LLC @@ -680,7 +739,7 @@ span.indexitem {margin-left: 0em} span.indexsubitem {margin-left: 2em} span.indexsubsubitem {margin-left: 4em} -div.hidden { display: none ; } +div.hidden, span.hidden { display: none ; } kbd { font-family: "DejaVu Mono", "Bitstream Vera Mono", "Lucida Console", @@ -689,12 +748,16 @@ kbd { font-size: 100% ; } +pre { padding: 3pt ; } + span.strong { font-weight: bold; } span.textmd { font-weight: normal; } span.textsc { font-variant: small-caps; } +span.textsl { font-style: oblique; } + span.textup { font-variant: normal; } span.textrm { @@ -997,6 +1060,14 @@ border-bottom: 1px solid silver ; overflow-x: auto; } +span.listinglabel { + display: inline-block ; + font-size: 70% ; + width: 4em ; + text-align: right ; + margin-right: 2em ; +} + div.abstract { margin: 2em 5% 2em 5% ; padding: 1ex 1em 1ex 1em ; @@ -1080,13 +1151,38 @@ div.doublespace { line-height: 2 ; } /* Have not yet researched this. */ .minipage p {margin: .75ex 0em .75ex 0em ;} +.shadowbox, .shabox { + border: 1px solid black; + box-shadow: 3px 3px 3px #808080 ; + border-radius: 0px ; + padding: .4ex .3em .4ex .3em ; + margin: 0pt .3ex 0pt .3ex ; + display: inline-block ; +} + +.doublebox { + border: 3px double black; + border-radius: 0px ; + padding: .4ex .3em .4ex .3em ; + margin: 0pt .3ex 0pt .3ex ; + display: inline-block ; +} + +.ovalbox, .Ovalbox { + border: 1px solid black; + border-radius: 1ex ; + padding: .4ex .3em .4ex .3em ; + margin: 0pt .3ex 0pt .3ex ; + display: inline-block ; +} + +.Ovalbox { border-width: 2px ; } + .framebox { - margin: 0ex ; - padding: 0ex ; border: 1px solid black; border-radius: 0px ; padding: .3ex .2em 0ex .2em ; - margin: .1ex ; + margin: 0pt .1ex 0pt .1ex ; display: inline-block ; } @@ -1127,7 +1223,7 @@ div.doublespace { line-height: 2 ; } } /* framed package */ -.framed { +.framed, pre.boxedverbatim { margin: 3ex 0em 3ex 0em ; border: 1px solid black; border-radius: 0px ; @@ -1164,7 +1260,8 @@ dl { } dl dt { - margin-top: 1ex; +margin-top: 1ex; +margin-left: 1em ; font-weight: bold; } @@ -1375,6 +1472,9 @@ div.flushleft table {margin-left:0em ; margin-right:auto;} div.flushright{text-align:right;} div.flushright table {margin-left:auto ; margin-right: 0em ;} +/* Fancybox */ +div.Btrivlist table tr td { padding: .2ex 0em ; } + /* program listing callouts: */ span.callout { font-family: "DejaVu Sans", "Bitstream Vera Sans", @@ -1734,12 +1834,12 @@ nav.botnavigation { display:none; } nav.topnavigation { display:block } nav.botnavigation { display:block } } -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{warpprint} -\begin{VerbatimOut}{lwarp_sagebrush.css} +\begin{filecontents*}{lwarp_sagebrush.css} @import url("lwarp.css") ; A:link {color:#105030 ; text-decoration: none ; } @@ -1955,12 +2055,12 @@ nav.sidetoc a:hover { nav.sidetoc { border-radius: 0 ; } } -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{warpprint} -\begin{VerbatimOut}{lwarp_formal.css} +\begin{filecontents*}{lwarp_formal.css} @import url("lwarp.css") ; A:link {color:#802020 ; text-decoration:none; } @@ -2155,12 +2255,12 @@ nav.botnavigation { background: #dedcd5 ; border-top: 1px solid black ; } -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{warpprint} -\begin{VerbatimOut}{sample_project.css} +\begin{filecontents*}{sample_project.css} /* ( --- Start of project.css --- ) */ /* A sample project-specific CSS file for lwarp --- ) */ @@ -2172,24 +2272,24 @@ nav.botnavigation { /* . . . */ /* ( --- End of project.css --- ) */ -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{warpprint} -\begin{VerbatimOut}{lwarp.xdy} +\begin{filecontents*}{lwarp.xdy} (require "tex/inputenc/latin.xdy") (merge-rule "\\PS *" "Postscript") (require "texindy.xdy") (require "page-ranges.xdy") (require "book-order.xdy") (markup-locref :open "\hyperindexref{" :close "}") -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{warpprint} -\begin{VerbatimOut}{lwarp_mathjax.txt} +\begin{filecontents*}{lwarp_mathjax.txt} @@ -2284,20 +2384,20 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX- --> -\end{VerbatimOut} +\end{filecontents*} \end{warpprint} \begin{LWR@createlwarpmk} -\begin{VerbatimOut}{lwarpmk.lua} +\begin{filecontents*}{lwarpmk.lua} #!/usr/bin/env texlua -- Copyright 2016-2017 Brian Dunn -- Print the usage of the lwarpmk command: -printversion = "v0.33" +printversion = "v0.34" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -2597,7 +2697,7 @@ function compilelatexmk ( fsuffix ) err=os.execute ( "latexmk -pdf -dvi- -ps- -recorder " .. "-e " .. opquote - .. "$makeindex = q/" + .. "$makeindex = q/" -- $ .. xindycmd .. " -M " .. xdyfile .. " -L " .. language .. " /" @@ -2802,7 +2902,7 @@ printhelp () end end -- not --version -\end{VerbatimOut} +\end{filecontents*} \end{LWR@createlwarpmk} @@ -2925,7 +3025,12 @@ end -- not --version \begin{warpHTML} \let\LWR@origampersand\& -\newcommand*{\HTMLentity}[1]{\LWR@origampersand#1;} +\newcommand*{\HTMLentity}[1]{% +\begingroup% +\LWR@FBcancel% +\LWR@origampersand#1;% +\endgroup +} \newcommand*{\HTMLunicode}[1]{\HTMLentity{\#x#1}} \renewcommand*{\&}{\HTMLentity{amp}} @@ -3059,6 +3164,11 @@ end -- not --version \newcommand{\LWR@forcenewpage}{% \LWR@stoppars\LWR@orignewpage\LWR@startpars% } + +\renewcommand*{\pagestyle}[1]{} +\renewcommand*{\thispagestyle}[1]{} +\renewcommand*{\pagenumbering}[1]{} + \end{warpHTML} @@ -3083,20 +3193,72 @@ end -- not --version \newcommand*{\LWR@tagregularparagraph}{p} +\@ifpackagewith{babel}{french}{ +\renewcommand*{\FBcolonspace}{~} +\renewcommand*{\FBthinspace}{\,} +}{} + +\@ifpackagewith{babel}{french}{% +\newcommand{\LWR@FBcancel}{% +\csdef{FBcolonspace}{}% +\csdef{FBthinspace}{}% +} +} +{% not french: +\newcommand{\LWR@FBcancel}{} +}% \newcommand*{\LWR@htmltagc}[1]{% {% -\protect\LWR@origttfamily% +\begingroup% +\LWR@FBcancel% +\ifmmode\else\protect\LWR@origttfamily\fi% \protect\LWR@origtextless#1\protect\LWR@origtextgreater% +\endgroup% }% } +\newcommand*{\LWR@nestspanitem}{% +\if@newlist\else{\LWR@htmltagc{br /}}\fi% +\LWR@origitem% +} + \newenvironment*{LWR@nestspan} {% +\LWR@traceinfo{LWR@nestspan}% +\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +{% +\LWR@traceinfo{LWR@nestspan: inside a lateximage}% +}% +{% not in a lateximage +\LWR@traceinfo{LWR@nestspan: NOT inside a lateximage}% \addtocounter{LWR@spandepth}{1}% \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}% +\RenewDocumentEnvironment{BlockClass}{o m}{}{}% +\renewcommand{\BlockClassSingle}[2]{##2}% +\renewcommand{\LWR@forcenewpage}{}% +\renewcommand{\LWR@itemizestart}{% +\let\item\LWR@nestspanitem% +}% +\renewcommand{\LWR@itemizeend}{}% +\renewcommand{\LWR@enumeratestart}{% +\let\item\LWR@nestspanitem% +}% +\renewcommand{\LWR@enumerateend}{}% +\renewcommand{\LWR@descriptionstart}{% +\let\item\LWR@nestspanitem% }% -{\addtocounter{LWR@spandepth}{-1}} +\renewcommand{\LWR@descriptionend}{}% +}% not in a lateximage +}% +{% +\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +{}% +{\addtocounter{LWR@spandepth}{-1}}% +\LWR@traceinfo{LWR@nestspan: done}% +} + +\AfterEndEnvironment{LWR@nestspan}{\global\let\par\LWR@closeparagraph} \NewDocumentCommand{\LWR@htmlspan}{m +m}{% \LWR@ensuredoingapar% @@ -3107,9 +3269,9 @@ end -- not --version \end{LWR@nestspan}% } -\NewDocumentCommand{\LWR@htmlspanclass}{m o +m}{% +\NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{% \LWR@ensuredoingapar% -\LWR@subhtmlelementclass{span}{#1}[#2]% +\LWR@subhtmlelementclass{span}[#1]{#2}% \begin{LWR@nestspan}% #3% \LWR@htmltagc{/span}% @@ -3129,11 +3291,23 @@ end -- not --version \newcommand*{\LWR@htmlopencomment}{% -{\LWR@origttfamily\LWR@origtextless{}!{-}{-}}% +{% +\begingroup% +\LWR@FBcancel% +\ifmmode\else\protect\LWR@origttfamily\fi% +\LWR@origtextless{}!{-}{-}% +\endgroup% +}% } \newcommand*{\LWR@htmlclosecomment}{% -{\LWR@origttfamily{-}{-}\LWR@origtextgreater{}}% +{% +\begingroup% +\LWR@FBcancel% +\ifmmode\else\protect\LWR@origttfamily\fi% +{-}{-}\LWR@origtextgreater{}% +\endgroup% +}% } \newcommand{\LWR@htmlcomment}[1]{% @@ -3159,19 +3333,19 @@ end -- not --version } -\NewDocumentCommand{\LWR@subhtmlelementclass}{m m o}{% -\IfValueTF{#3}% +\NewDocumentCommand{\LWR@subhtmlelementclass}{m o m}{% +\IfValueTF{#2}% {% option -\ifthenelse{\equal{#3}{}}% -{\LWR@htmltag{#1 class="#2"}}% empty option -{\LWR@htmltag{#1 class="#2" style="#3"}}% non-empty option +\ifthenelse{\equal{#2}{}}% +{\LWR@htmltag{#1 class="#3"}}% empty option +{\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option }% option -{\LWR@htmltag{#1 class="#2"}}% no option +{\LWR@htmltag{#1 class="#3"}}% no option } -\NewDocumentCommand{\LWR@htmlelementclass}{m m o}{% +\NewDocumentCommand{\LWR@htmlelementclass}{m o m}{% \LWR@stoppars% -\LWR@subhtmlelementclass{#1}{#2}[#3]% +\LWR@subhtmlelementclass{#1}[#2]{#3}% \LWR@startpars% } @@ -3184,8 +3358,8 @@ end -- not --version \LWR@startpars% } -\NewDocumentCommand{\LWR@htmldivclass}{m o}{% -\LWR@htmlelementclass{div}{#1}[#2]% +\NewDocumentCommand{\LWR@htmldivclass}{o m}{% +\LWR@htmlelementclass{div}[#1]{#2}% } \newcommand*{\LWR@htmldivclassend}[1]{% @@ -3194,9 +3368,9 @@ end -- not --version -\NewDocumentCommand{\LWR@htmlelementclassline}{m m o +m}{% +\NewDocumentCommand{\LWR@htmlelementclassline}{m o m +m}{% \LWR@stoppars -\LWR@subhtmlelementclass{#1}{#2}[#3]% +\LWR@subhtmlelementclass{#1}[#2]{#3}% #4% \LWR@htmltag{/#1} \LWR@startpars @@ -3219,16 +3393,16 @@ end -- not --version \begin{warpHTML} -\NewDocumentEnvironment{BlockClass}{m o} +\NewDocumentEnvironment{BlockClass}{o m}% { -\LWR@htmldivclass{#1}[#2] +\LWR@htmldivclass[#1]{#2} } { -\LWR@htmldivclassend{#1} +\LWR@htmldivclassend{#2} } \end{warpHTML} \begin{warpprint} -\NewDocumentEnvironment{BlockClass}{m o}{}{} +\NewDocumentEnvironment{BlockClass}{o m}{}{}% \end{warpprint} \begin{warpHTML} \newcommand{\BlockClassSingle}[2]{% @@ -3240,12 +3414,12 @@ end -- not --version \end{warpprint} \begin{warpHTML} -\NewDocumentCommand{\InlineClass}{m o +m}{% -\LWR@htmlspanclass{#1}[#2]{#3}% +\NewDocumentCommand{\InlineClass}{o m +m}{% +\LWR@htmlspanclass[#1]{#2}{#3}% } \end{warpHTML} \begin{warpprint} -\NewDocumentCommand{\InlineClass}{m o +m}{#3} +\NewDocumentCommand{\InlineClass}{o m +m}{#3}% \end{warpprint} @@ -3360,6 +3534,9 @@ end -- not --version \newcommand*{\LWR@startpars}% {% +\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +{}% +{% \ifbool{LWR@doingstartpars}% {}% {% @@ -3369,10 +3546,14 @@ end -- not --version }% an intentionally blank line \global\setbool{LWR@doingstartpars}{true}% \global\boolfalse{LWR@doingapar}% +}% nestspan } \newcommand*{\LWR@stoppars}% {% +\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +{}% +{% \ifbool{LWR@doingapar}% {% \unskip% @@ -3389,6 +3570,7 @@ end -- not --version {}% \global\setbool{LWR@doingstartpars}{false}% \global\boolfalse{LWR@doingapar}% +}% nestspan } \end{warpHTML} @@ -3550,20 +3732,8 @@ end -- not --version \newcommand*{\LWR@filenamenoblanks}[1]{% \begingroup -\renewcommand*{\HTMLunicode}[1]{} -\renewcommand*{\HTMLentity}[1]{##1} -\renewcommand*{\LWR@htmltagc}[1]{} -\DeclareExpandableDocumentCommand{\InlineClass}{m o m}{##3} -\renewcommand*{\&}{and} -\renewcommand{\textit}[1]{##1} -\renewcommand{\textsc}[1]{##1} -\renewcommand{\textsl}[1]{##1} -\renewcommand{\textbf}[1]{##1} -\renewcommand{\texttt}[1]{##1} -\renewcommand{\textsf}[1]{##1} -\renewcommand{\textrm}[1]{##1} -\renewcommand{\textsuperscript}[1]{##1} -\renewcommand{\textsubscript}[1]{##1} +\LWR@nullfonts +\renewcommand*{\LWR@htmltagc}[1]{}% \edef\LWR@thisnewfilename{#1} \fullexpandarg \StrSubstitute{\LWR@thisnewfilename}{ }{-}[\LWR@thisnewfilename] @@ -3916,21 +4086,13 @@ end -- not --version \newcommand*{\LWR@filestart}[1]{ +\LWR@traceinfo{LWR@filestart} \begingroup -\renewcommand{\textit}[1]{##1}% not used in filenames -\renewcommand{\textsc}[1]{##1} -\renewcommand{\textsl}[1]{##1} -\renewcommand{\textbf}[1]{##1} -\renewcommand{\texttt}[1]{##1} -\renewcommand{\textsf}[1]{##1} -\renewcommand{\textrm}[1]{##1} -\renewcommand{\textsuperscript}[1]{##1} -\renewcommand{\textsubscript}[1]{##1} -\renewcommand*{\HTMLunicode}[1]{} -\renewcommand*{\HTMLentity}[1]{} -\RenewDocumentCommand{\LWR@htmlspanclass}{m o +m}{##3} -\DeclareExpandableDocumentCommand{\InlineClass}{m o m}{##3} +\LWR@traceinfo{LWR@filestart: A} +\LWR@nullfonts +\LWR@traceinfo{LWR@filestart: B} \LWR@htmltag{!DOCTYPE html}\LWR@orignewline +\LWR@traceinfo{LWR@filestart: C} \LWR@htmltag{html lang="\LWR@currentHTMLLanguage"{}}\LWR@orignewline \LWR@htmltag{head}\LWR@orignewline \LWR@htmltag{meta charset="UTF-8" /}\LWR@orignewline @@ -3961,7 +4123,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifbool{mathjax}% {% \boolfalse{LWR@verbtags} -\VerbatimInput{lwarp_mathjax.txt}% +\verbatiminput{lwarp_mathjax.txt}% \booltrue{LWR@verbtags} \LWR@stoppars }% end of mathjax @@ -3969,6 +4131,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@htmltag{/head}\LWR@orignewline \LWR@htmltag{body}\LWR@orignewline \endgroup +\LWR@traceinfo{LWR@filestart: done} } \end{warpHTML} @@ -3976,8 +4139,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \begin{warpHTML} +\catcode`\$=\active \newcommand*{\LWR@LwarpStart} {% +\LWR@traceinfo{LWR@lwarpStart} \ifbool{FormatWordProcessor}{% \setcounter{FileDepth}{-5}% \boolfalse{HTMLDebugComments}% @@ -3987,9 +4152,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \edef\LWR@strresult{\HTMLFilename} \edef\HTMLFilename{\detokenize\expandafter{\LWR@strresult}} \LWR@origonecolumn% +\LWR@origpagestyle{empty} \LWR@origscriptsize% \LWR@origraggedright% -\let\\\LWR@endofline% +\LetLtxMacro{\\}{\LWR@endofline}% \linespread{1.3}% \setlength{\parindent}{0pt} \setlength{\parskip}{2ex} @@ -3999,10 +4165,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand*{\centering}{} \renewcommand*{\raggedleft}{} \renewcommand*{\raggedright}{} -\let\LWR@origtabular\tabular -\let\LWR@origendtabular\endtabular -\let\tabular\LWR@tabular -\let\endtabular\endLWR@tabular +\LetLtxMacro{\LWR@origtabular}{\tabular} +\LetLtxMacro{\LWR@origendtabular}{\endtabular} +\LetLtxMacro{\tabular}{\LWR@tabular} +\LetLtxMacro{\endtabular}{\endLWR@tabular} \let\LWR@origcaption\caption \let\LWR@origltx@label\ltx@label \let\ltx@label\LWR@htmlmathlabel @@ -4013,19 +4179,21 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\XeTeX\LWR@XeTeX \let\XeLaTeX\LWR@XeLaTeX \let\ConTeXt\LWR@ConTeXt -\let\rotatebox\LWR@rotatebox -\let\scalebox\LWR@scalebox +\LetLtxMacro{\rotatebox}{\LWR@rotatebox} +\LetLtxMacro{\scalebox}{\LWR@scalebox} \let\reflectbox\LWR@reflectbox \global\boolfalse{LWR@doingapar} \global\boolfalse{LWR@doingstartpars} +\LWR@traceinfo{LWR@lwarpStart: Starting new file.} \LWR@filestart{} +\LWR@traceinfo{LWR@lwarpStart: Generating first header.} \LWR@htmltag{header}\LWR@orignewline \LWR@startpars \LWR@firstpagetop \LWR@stoppars \LWR@htmltag{/header}\LWR@orignewline +\LWR@traceinfo{LWR@lwarpStart: Generating textbody.} \LWR@htmltag{section class="textbody"{}} -\LWR@origpagestyle{empty} \mainmatter \LWR@origpagenumbering{arabic} \if@titlepage @@ -4033,9 +4201,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \else \thanksmarkseries{fnsymbol} \fi -\fvset{frame=none}% +\LWR@patchlists +\catcode`\$=\active \LWR@startpars +\LWR@traceinfo{LWR@lwarpStart: done} } +\catcode`\$=3% math shift until lwarp starts + \end{warpHTML} @@ -4268,7 +4440,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small \let\footnoterule\relax - \let \footnote \thanks + \LetLtxMacro{\footnote}{\thanks} \@bsmarkseries \def\@makefnmark{\rlap{\@textsuperscript{% \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}% @@ -4387,9 +4559,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% } -\def\@fnsymbol#1{\ensuremath{\ifcase#1\or *\or \dagger\or \ddagger\or - \mathsection\or \mathparagraph\or \text{\HTMLunicode{2016}}\or - **\or \dagger\dagger \or \ddagger\ddagger \else\@ctrerr\fi}} +\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} \renewcommand*{\maketitle}{% \begin{titlepage} \LWR@maketitlesetup @@ -4494,18 +4667,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpall} -\begin{warpHTML} - -\AfterEndPreamble{ -\AtBeginEnvironment{verbatim}{% -\LWR@forcenewpage -\LWR@atbeginverbatim{verbatim}\unskip\LWR@origvspace*{-\baselineskip}% -} -\AfterEndEnvironment{verbatim}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim} -} - -\end{warpHTML} - \begin{warpall} \newlength{\VerbatimHTMLWidth} @@ -4513,184 +4674,51 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpall} \begin{warpHTML} + \newbool{LWR@verbtags} \booltrue{LWR@verbtags} -\renewcommand{\VerbatimFootnotes}{ -\PackageError{lwarp} -{Verbatim footnotes are not yet supported by lwarp.} -{This may be improved some day.} -} - -\newcommand*{\LWR@atbeginverbatim}[1] +\newcommand*{\LWR@atbeginverbatim}[2][] {% \setlength{\parskip}{0ex}% \LWR@stoppars% -\ifbool{LWR@verbtags}{\LWR@htmltag{pre class="#1"{}}}{}% +\ifbool{LWR@verbtags}{% +\LWR@htmltag{pre class="#2" +\ifthenelse{\equal{#1}{}}{}{style="#1"}% +}% pre +}{}% +\begingroup% \LWR@origttfamily% -\let\hspace\LWR@orighspace% +\LetLtxMacro{\hspace}{\LWR@orighspace}% } \newcommand*{\LWR@afterendverbatim}{% +\endgroup% \unskip% \ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/pre} }{}% \LWR@startpars% } -\newcommand*{\LWR@Verbatimclass}{fancyvrb} -\NewDocumentEnvironment{VerbatimClass}{m O{}} -{% -\renewcommand*{\LWR@Verbatimclass}{#1}% -\LWR@origVerbatim[#2]% -} -{\endVerbatim} -\AfterEndPreamble{ -\let\LWR@origVerbatim\Verbatim -\renewcommand*{\Verbatim}{% -\LWR@forcenewpage -\renewcommand*{\LWR@Verbatimclass}{fancyvrb}% -\LWR@origVerbatim% -} -\newcommand*{\LWR@fvstartnone}{% -\LWR@traceinfo{fvstartnone}% -\ifbool{LWR@verbtags}{\hbox to\z@{\LWR@htmltagc{div class="\LWR@Verbatimclass"}}}{}% -\hbox to\z@{\LWR@atbeginverbatim{verbatim}}% -} - -\newcommand*{\LWR@fvendnone}{% -\LWR@traceinfo{fvendnone}% -\hbox to\z@{\LWR@afterendverbatim}% -\ifbool{LWR@verbtags}{\hbox to\z@{\LWR@htmltagc{/div}}}{}% -} - -\newcommand*{\LWR@fvstartsingle}{% -\LWR@traceinfo{fvstartsingle}% -\LWR@fvstartnone% -\FV@BeginListFrame@Single% -} - -\newcommand*{\LWR@fvendsingle}{% -\LWR@traceinfo{fvendsingle}% -\FV@EndListFrame@Single% -\LWR@fvendnone% -} - -\newcommand*{\LWR@fvstartline}{% -\LWR@traceinfo{fvstartline}% -\LWR@fvstartnone% -\FV@BeginListFrame@Lines% -} - -\newcommand*{\LWR@fvendline}{% -\LWR@traceinfo{fvendline}% -\FV@EndListFrame@Lines% -\LWR@fvendnone% -} -\def\FV@Frame@none{% -\let\FV@BeginListFrame\LWR@fvstartnone% -\let\FV@LeftListFrame\relax% -\let\FV@RightListFrame\relax% -\let\FV@EndListFrame\LWR@fvendnone} - -\def\FV@Frame@single{% -\let\FV@BeginListFrame\LWR@fvstartsingle% -\let\FV@LeftListFrame\FV@LeftListFrame@Single% -\let\FV@RightListFrame\FV@RightListFrame@Single% -\let\FV@EndListFrame\LWR@fvendsingle} - -\def\FV@Frame@lines{% -\let\FV@BeginListFrame\LWR@fvstartline% -\let\FV@LeftListFrame\relax% -\let\FV@RightListFrame\relax% -\let\FV@EndListFrame\LWR@fvendline} - -\def\FV@Frame@topline{% -\let\FV@BeginListFrame\LWR@fvstartline% -\let\FV@LeftListFrame\relax% -\let\FV@RightListFrame\relax% -\let\FV@EndListFrame\LWR@fvendnone} - -\def\FV@Frame@bottomline{% -\let\FV@BeginListFrame\LWR@fvstartnone% -\let\FV@LeftListFrame\relax% -\let\FV@RightListFrame\relax% -\let\FV@EndListFrame\LWR@fvendline} - -\def\FV@Frame@leftline{% -\ifx\FancyVerbFillColor\relax% -\let\FV@FrameFillLine\relax% -\else% -\@tempdima\FV@FrameRule\relax% -\multiply\@tempdima-\tw@% -\edef\FV@FrameFillLine{% -{\noexpand\FancyVerbFillColor{\vrule\@width\number\@tempdima sp}% -\kern-\number\@tempdima sp}}% -\fi% -\let\FV@BeginListFrame\LWR@fvstartnone% -\let\FV@LeftListFrame\FV@LeftListFrame@Single% -\let\FV@RightListFrame\relax% -\let\FV@EndListFrame\LWR@fvendnone} -\def\FV@SingleFrameLine#1{% - \hbox to\z@{% - \ifnum#1=\z@\relax - \let\FV@Label\FV@LabelBegin - \else - \let\FV@Label\FV@LabelEnd - \fi - \ifx\FV@Label\relax - \else - \ifnum#1=\z@ - \ifx\FV@LabelPositionTopLine\relax -\else - \LWR@htmltagc{div class="fancyvrblabel"} -\LWR@origtextrm{\FV@LabelBegin}% \textrm preserves emdash -\LWR@htmltagc{/div} -\fi - \else - \ifx\FV@LabelPositionBottomLine\relax -\else - \LWR@htmltagc{div class="fancyvrblabel"} -\LWR@origtextrm{\FV@LabelEnd} -\LWR@htmltagc{/div} -\fi - \fi - \fi - \hss -} -} -\def\FV@ListProcessLine#1{% - \hbox to \hsize{% - \hbox to \VerbatimHTMLWidth {% - \ifcsvoid{FV@LeftListNumber}{}{\kern 2.5em}% -\FV@LeftListNumber% - \FancyVerbFormatLine{#1}% - \hss% - \FV@RightListNumber% -}% - \hss% required to avoid underfull hboxes -} +\let\LWRV@origverbatim@input\verbatim@input + +\renewcommand{\verbatim@input}[2]{% +\ifbool{LWR@verbtags}{\LWR@forcenewpage}{}% +\LWR@atbeginverbatim{Verbatim}\unskip\LWR@origvspace*{-\baselineskip}%% +\LWRV@origverbatim@input{#1}{#2}% +\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim% } -\AtBeginEnvironment{BVerbatim} -{ +\AfterEndPreamble{ +\LWR@traceinfo{Patching verbatim.} +\AtBeginEnvironment{verbatim}{% \LWR@forcenewpage -\LWR@atbeginverbatim{bverbatim} - +\LWR@atbeginverbatim{verbatim}\unskip\LWR@origvspace*{-\baselineskip}% } - -\AfterEndEnvironment{BVerbatim} -{ -\leavevmode\par\LWR@origvspace{-\baselineskip} -\LWR@afterendverbatim +\AfterEndEnvironment{verbatim}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim} } - - -} % \AfterEndPreamble - - \end{warpHTML} @@ -4713,11 +4741,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} - \begin{warpHTML} -\let\LWR@origitem\item - \newcommand*{\LWR@itemizeitem}{% \LWR@stoppars% \LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem{}}% @@ -4726,9 +4751,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@origitem% } - -\AtBeginEnvironment{itemize}{\LWR@itemizestart} - \newcommand*{\LWR@itemizestart}{% \LWR@stoppars% \LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% @@ -4737,8 +4759,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\item\LWR@itemizeitem% } -\AtEndEnvironment{itemize}{\LWR@itemizeend} - \newcommand*{\LWR@itemizeend}{% \LWR@stoppars% \LWR@closeprevious{\LWR@depthlistitem}% @@ -4748,8 +4768,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% -\AtBeginEnvironment{enumerate}{\LWR@enumeratestart} - \newcommand*{\LWR@enumeratestart}{% \LWR@stoppars% \LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% @@ -4758,8 +4776,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\item\LWR@itemizeitem% } -\AtEndEnvironment{enumerate}{\LWR@enumerateend} - \newcommand*{\LWR@enumerateend}{% \LWR@stoppars% \LWR@closeprevious{\LWR@depthlistitem}% @@ -4773,7 +4789,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@stoppars% \LWR@setlatestname{#1}% \LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem{}}% +\LetLtxMacro{\hspace}{\LWR@nohspace}% \LWR@origitem[]% +\LetLtxMacro{\hspace}{\LWR@hspace}% \LWR@orighspace{1in} \LWR@htmltag{dt}#1\LWR@htmltag{/dt}% \LWR@orignewline% @@ -4781,8 +4799,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@startpars% } -\AtBeginEnvironment{description}{\LWR@descriptionstart} - \newcommand*{\LWR@descriptionstart}{% \LWR@stoppars% \LWR@pushoneclose{\LWR@depthlist}{\LWR@printclosedescription{}}% @@ -4791,8 +4807,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\item\LWR@descitem% } -\AtEndEnvironment{description}{\LWR@descriptionend} - \newcommand*{\LWR@descriptionend}{% \LWR@stoppars% \LWR@closeprevious{\LWR@depthlistitem}% @@ -4800,12 +4814,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@startpars% } -\let\LWR@orignewlist\newlist - -\renewcommand*{\newlist}[3]{% -\LWR@orignewlist{#1}{#2}{#3}% -\AtBeginEnvironment{#1}{\csuse{LWR@#2start}}% -\AtEndEnvironment{#1}{\csuse{LWR@#2end}}% +\newcommand*{\LWR@patchlists}{% +\LetLtxMacro{\LWR@origitem}{\item} +\AtBeginEnvironment{itemize}{\LWR@itemizestart} +\AtEndEnvironment{itemize}{\LWR@itemizeend} +\AtBeginEnvironment{enumerate}{\LWR@enumeratestart} +\AtEndEnvironment{enumerate}{\LWR@enumerateend} +\AtBeginEnvironment{description}{\LWR@descriptionstart} +\AtEndEnvironment{description}{\LWR@descriptionend} } \end{warpHTML} @@ -4823,11 +4839,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \afterassignment\LWR@fnslone\let\nexttoken= } \def\LWR@fnslone{\expandafter\futurelet\LWR@cs\LWR@fnsltwo} \def\LWR@fnsltwo{% -\expandafter\ifx\LWR@cs\@sptoken\let\next=\@BTfnslthree% +\expandafter\ifx\LWR@cs\@sptoken\let\next=\LWR@fnslthree% \else\let\next=\nexttoken\fi\next} -\def\@BTfnslthree{\afterassignment\LWR@fnslone\let\next= } +\def\LWR@fnslthree{\afterassignment\LWR@fnslone\let\next= } \newcommand*{\LWR@getmynexttoken}{% +\LWR@traceinfo{LWR@getmynexttoken}% \LWR@futurenonspacelet\LWR@mynexttoken\LWR@tabledatacolumntag } @@ -5402,7 +5419,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}% \ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}% "{}} -\begingroup \let\\\LWR@endofline #5 \endgroup +\begingroup \LetLtxMacro{\\}{\LWR@endofline} #5 \endgroup \LWR@stoppars% \global\boolfalse{LWR@intabularmetadata}% }% @@ -5413,8 +5430,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newbool{LWR@exitingtabular} + \newcommand*{\LWR@tabledatacolumntag}% {% +\LWR@traceinfo{LWR@tabledatacolumntag}% \let\mynext\LWR@tabledatasinglecolumntag% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\end}}% {\booltrue{LWR@exitingtabular}}{}% @@ -5434,6 +5453,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cmidrule}}% {\let\mynext\LWR@donothing}{}% +\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\specialrule}}% +{\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cline}}% {\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\bottomrule}}% @@ -5455,7 +5476,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \begin{warpHTML} - +\newcommand*{\LWR@origtoprule}[1]{\hline} +\newcommand*{\LWR@origmidrule}[1]{\hline} +\LetLtxMacro\LWR@origcmidrule\cline +\newcommand*{\LWR@origbottomrule}[1]{\hline} +\newcommand*{\LWR@origaddlinespace}[1][]{} +\newcommand*{\LWR@origmorecmidrules}{} +\newcommand*{\LWR@origspecialrule}[3]{\hline} \StartDefiningTabulars \newenvironment*{LWR@tabular}[2][] @@ -5473,29 +5500,34 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@stoppars% \setcounter{LWR@tablecolspos}{1}% \LWR@clearmidrules% -\let\\\LWR@tabularendofline% +\LetLtxMacro{\\}{\LWR@tabularendofline}% +\LWR@traceinfo{LWR@tabular: redefining macros}% \renewcommand*{\hline}{\LWR@domidrule\LWR@getmynexttoken}% -\newcommand*{\midrule}{\LWR@domidrule\LWR@getmynexttoken}% - -\NewDocumentCommand{\cmidrule}{o d() m}% -{\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% - \RenewDocumentCommand{\cline}{m}% {\LWR@docmidrule{##1}\LWR@getmynexttoken}% -\newcommand*{\toprule}{\LWR@dotbrule\LWR@getmynexttoken}% +\DeclareDocumentCommand{\toprule}{o}{\LWR@dotbrule\LWR@getmynexttoken}% + +\DeclareDocumentCommand{\midrule}{o}{\LWR@domidrule\LWR@getmynexttoken}% -\newcommand*{\bottomrule}{\LWR@dotbrule\LWR@getmynexttoken}% -\let\multicolumn\LWR@tabledatamulticolumntag% -\let\multirow\LWR@tabledatamultirowtag% +\DeclareDocumentCommand{\cmidrule}{o d() m}% +{\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% + +\DeclareDocumentCommand{\bottomrule}{o}{\LWR@dotbrule\LWR@getmynexttoken}% +\DeclareDocumentCommand{\addlinespace}{o}{} +\DeclareDocumentCommand{\morecmidrules}{}{} +\DeclareDocumentCommand{\specialrule}{m m m}{\LWR@domidrule\LWR@getmynexttoken} +\LetLtxMacro{\multicolumn}{\LWR@tabledatamulticolumntag}% +\LetLtxMacro{\multirow}{\LWR@tabledatamultirowtag}% \renewcommand*{\mrowcell}{\global\booltrue{LWR@skippingmrowcell}}% -\let\caption\LWR@longtabledatacaptiontag% +\LetLtxMacro{\caption}{\LWR@longtabledatacaptiontag}% \global\boolfalse{LWR@tableparcell}% \global\boolfalse{LWR@skippingmrowcell}% \global\boolfalse{LWR@skipatbang}% \StartDefiningTabulars% \protected\gdef&{\LWR@tabularampersand}% +\LWR@traceinfo{LWR@tabular: about to LWR@getmynexttoken}% \LWR@getmynexttoken% }% {% @@ -5702,12 +5734,14 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@ensuredoingapar% } -\newcommand{\url}{% +\newcommand{\LWR@urla}{% \LWR@ensuredoingapar% \begingroup\catcode`\_=12 \LWR@urlb% } +\let\url\LWR@urla + \newcommand*{\LWR@subinlineimage}[5][]{% \ifthenelse{\equal{#1}{}}% {\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"{}}}% @@ -6097,13 +6131,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \newcounter{LWR@externalfilecnt} -\let\LWR@origdollar=$ -\let\LWR@secondorigdollar=$% balance for editor syntax highlighting +\LetLtxMacro\LWR@origdollar$ +\LetLtxMacro\LWR@secondorigdollar$% balance for editor syntax highlighting -\let\LWR@origopenparen\( -\let\LWR@origcloseparen\) -\let\LWR@origopenbracket\[ -\let\LWR@origclosebracket\] +\LetLtxMacro\LWR@origopenparen\( +\LetLtxMacro\LWR@origcloseparen\) +\LetLtxMacro\LWR@origopenbracket\[ +\LetLtxMacro\LWR@origclosebracket\] \begingroup \catcode`\$=\active% @@ -6122,7 +6156,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } }% -\gdef\LWR@singledollar#1${% +\gdef\LWR@subsingledollar#1{% \ifbool{mathjax}% {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)} {% not mathjax @@ -6131,13 +6165,25 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@origdollar#1\LWR@origdollar% \end{lateximage}% }% -}% +} + +\gdef\LWR@singledollar#1${% +\LWR@subsingledollar{#1}% +} \gdef\(#1\){$#1$} \gdef\[#1\]{$$#1$$} \endgroup + +\let\LWR@orig@ensuredmath\@ensuredmath + +\newcommand*{\LWR@ensuredmath}[1]{% +\LWR@traceinfo{@ensuredmath: page \thepage: \detokenize{#1}}% +\LWR@subsingledollar{#1}% +} + \let\math\relax \let\endmath\relax \let\displaymath\relax @@ -6146,24 +6192,21 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \NewEnviron{math}{\expandafter\(\BODY\)} \NewEnviron{displaymath}{\expandafter\[\BODY\]\@ignoretrue} -\AtBeginDocument{\catcode`\$=\active} - \newcounter{LWR@nextequation} \newcommand*{\LWR@syncmathjax}{% \ifcsdef{thechapter}{ -\BlockClassSingle{hidden}{ +\InlineClass{hidden}{ \textbackslash( \textbackslash{}seteqsection \{\thechapter\} \textbackslash) } } {}% not using chapters - \ifthenelse{\cnttest{\value{equation}}>0} { \setcounter{LWR@nextequation}{\value{equation}} \addtocounter{LWR@nextequation}{1} -\BlockClassSingle{hidden}{ +\InlineClass{hidden}{ \textbackslash( \textbackslash{}seteqnumber \{\arabic{LWR@nextequation}\} \textbackslash) @@ -6171,16 +6214,32 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% }{}% not eq > 1 } -\newcommand*{\LWR@restoremathlatexformatting}{% -\let\hspace\LWR@orighspace% -\let\rule\LWR@origrule% +\newcommand*{\LWR@restoreorigformatting}{% +\LetLtxMacro{\hspace}{\LWR@orighspace}% +\LetLtxMacro\rule\LWR@origrule% \let\,\LWR@origcomma% disable HTML short unbreakable space -\let\textit\LWR@origtextit% -\let\textbf\LWR@origtextbf% -\let\texttt\LWR@origtexttt% -\let\textsc\LWR@origtextsc% -\let\textsf\LWR@origtextsf% -\let\textrm\LWR@origtextrm% +\LetLtxMacro{\textrm}{\LWR@origtextrm}% +\LetLtxMacro{\textsf}{\LWR@origtextsf}% +\LetLtxMacro{\texttt}{\LWR@origtexttt}% +\LetLtxMacro{\textbf}{\LWR@origtextbf}% +\LetLtxMacro{\textmd}{\LWR@origtextmd}% +\LetLtxMacro{\textit}{\LWR@origtextit}% +\LetLtxMacro{\textsl}{\LWR@origtextsl}% +\LetLtxMacro{\textsc}{\LWR@origtextsc}% +\LetLtxMacro{\textup}{\LWR@origtextup}% +\LetLtxMacro{\textnormal}{\LWR@origtextnormal}% +\LetLtxMacro{\emph}{\LWR@origemph}% +\LetLtxMacro{\rmfamily}{\LWR@origrmfamily}% +\LetLtxMacro{\sffamily}{\LWR@origsffamily}% +\LetLtxMacro{\ttfamily}{\LWR@origttfamily}% +\LetLtxMacro{\bfseries}{\LWR@origbfseries}% +\LetLtxMacro{\mdseries}{\LWR@origmdseries}% +\LetLtxMacro{\upshape}{\LWR@origupshape}% +\LetLtxMacro{\slshape}{\LWR@origslshape}% +\LetLtxMacro{\scshape}{\LWR@origscshape}% +\LetLtxMacro{\itshape}{\LWR@origitshape}% +\LetLtxMacro{\em}{\LWR@origem}% +\LetLtxMacro{\normalfont}{\LWR@orignormalfont}% \renewcommand*{\thefootnote}{\fnsymbol{footnote}}% \let\textsuperscript\LWR@origtextsuperscript% \let\textsubscript\LWR@origtextsubscript% @@ -6188,6 +6247,29 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\enskip\LWR@origenskip% \let\quad\LWR@origquad% \let\qquad\LWR@origqquad% +\LetLtxMacro{\tabular}{\LWR@origtabular}% +\LetLtxMacro{\endtabular}{\LWR@origendtabular}% +\LetLtxMacro\toprule\LWR@origtoprule% +\LetLtxMacro\midrule\LWR@origmidrule% +\LetLtxMacro\cmidrule\LWR@origcmidrule% +\LetLtxMacro\bottomrule\LWR@origbottomrule% +\LetLtxMacro\addlinespace\LWR@origaddlinespace% +\LetLtxMacro\morecmidrules\LWR@origmorecmidrules% +\LetLtxMacro\specialrule\LWR@origspecialrule% +\let\newline\LWR@orignewline% +\LetLtxMacro{\raisebox}{\LWR@origraisebox}% +\LetLtxMacro{\scalebox}{\LWR@origscalebox}% +\LetLtxMacro{\rotatebox}{\LWR@origrotatebox}% +\let\reflectbox\LWR@origreflectbox% +\let\framebox\LWR@origframebox% +\let\makebox\LWR@origmakebox% +\let\fbox\LWR@origfbox% +\let\fboxBlock\LWR@origfbox% +\LetLtxMacro{\fminipage}{\LWR@fminipageprint}% +\LetLtxMacro{\endfminipage}{\endLWR@fminipageprint}% +\LetLtxMacro{\minipage}{\LWR@origminipage}% +\let\endminipage\LWR@endminipage% +\LetLtxMacro{\parbox}{\LWR@origparbox}% } \NewDocumentCommand{\LWR@hidelatexequation}{m +m}{% @@ -6196,7 +6278,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \begingroup \csuse{LWR@orig#1} -\LWR@restoremathlatexformatting +\LWR@restoreorigformatting #2 \csuse{LWR@origend#1} \endgroup @@ -6206,11 +6288,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } \NewDocumentCommand{\LWR@addmathjax}{m +m}{% - +\LWR@origtilde\LWR@orignewline \textbackslash{}begin\{#1\} \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#2}} \textbackslash{}end\{#1\} - +\LWR@orignewline } \let\LWR@origequation\equation @@ -6257,22 +6339,69 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \newcommand*{\LWR@beginhideamsmath}{ \LWR@stoppars - +\LWR@origtilde\LWR@orignewline \LWR@htmlopencomment \begingroup -\LWR@restoremathlatexformatting +\LWR@restoreorigformatting } \newcommand*{\LWR@endhideamsmath}{ \endgroup \LWR@htmlclosecomment - +\LWR@orignewline \LWR@startpars } +\let\LWR@origeqnarray\eqnarray +\let\LWR@origendeqnarray\endeqnarray +\newbool{LWR@numbereqnarray} +\booltrue{LWR@numbereqnarray} +\newcommand{\LWR@eqnarrayfactor}{% +\ifbool{mathjax} +{ +\LWR@syncmathjax +\boolfalse{LWR@amsmultline} +\ifbool{LWR@numbereqnarray} +{ +\LWR@beginhideamsmath +\LWR@origeqnarray +\BODY +\LWR@origendeqnarray +\LWR@endhideamsmath +\LWR@addmathjax{eqnarray}{\BODY} +}{% not LWR@numbereqnarray +\LWR@addmathjax{eqnarray*}{\BODY} +}% LWR@numbereqnarray +}% mathjax +{% not mathjax +\ifbool{LWR@numbereqnarray} +{ +\begin{lateximage}[\LWR@addmathjax{eqnarray}{\BODY}] +\LWR@origeqnarray +\BODY +\LWR@origendeqnarray +\end{lateximage} +}{% not LWR@numbereqnarray +\begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}] +\LWR@origeqnarray +\BODY +\nonumber +\LWR@origendeqnarray +\end{lateximage} +}% LWR@numbereqnarray +}% not mathjax +\booltrue{LWR@numbereqnarray} +} +\RenewEnviron{eqnarray} +{% + +\LWR@eqnarrayfactor + +} +\csgpreto{eqnarray*}{\boolfalse{LWR@numbereqnarray}} \BeforeBeginEnvironment{multline}{ \ifbool{mathjax} @@ -6526,6 +6655,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@strresult% } +\catcode`\$=\active% + \NewDocumentEnvironment{lateximage}{O{image}}{% \LWR@traceinfo{lateximage: starting on page \arabic{page}}% \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% @@ -6543,35 +6674,33 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}% \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" % class="lateximagesource"{}} \LWR@orignewline +\LWR@traceinfo{lateximage: about to write to lateximages.txt}% \immediate\write\LWR@file{|\theLWR@LIpage|\theLWR@externalfilecnt|}% +\LWR@traceinfo{lateximage: about to create open comment}% \LWR@htmlopencomment% \addtocounter{LWR@lateximagedepth}{1}% +\LWR@traceinfo{lateximage: about to create new page}% \LWR@orignewpage% +\LWR@traceinfo{lateximage: about to create minipage}% \LWR@origminipage{6in}% \csuse{LWR@orig\LateximageFontSizeName}% -\let\hspace\LWR@orighspace% -\let\rule\LWR@origrule% -\let\,\LWR@origcomma% disable HTML short unbreakable space -\let\textit\LWR@origtextit% -\let\textbf\LWR@origtextbf% -\let\texttt\LWR@origtexttt% -\let\textsc\LWR@origtextsc% -\let\textsf\LWR@origtextsf% -\let\textrm\LWR@origtextrm% -\renewcommand*{\thefootnote}{\fnsymbol{footnote}}% -\let\textsuperscript\LWR@origtextsuperscript% -\let\textsubscript\LWR@origtextsubscript% -\let~\LWR@origtilde% -\let\enskip\LWR@origenskip% -\let\quad\LWR@origquad% -\let\qquad\LWR@origqquad% -\let\tabular\LWR@origtabular% -\let\endtabular\LWR@origendtabular% -\let\newline\LWR@orignewline% +\LWR@traceinfo{lateximage: about to temporarily restore formatting}% +\LWR@restoreorigformatting% +\LWR@traceinfo{lateximage: about to create label}% \LWR@origlabel{LWRlateximage\arabic{LWR@lateximagenumber}}% +\LWR@traceinfo{lateximage: finished creating the label}% +\LetLtxMacro$\LWR@origdollar% +\catcode`\$=3% math shift +\LetLtxMacro\(\LWR@origopenparen% +\LetLtxMacro\)\LWR@origcloseparen% +\LetLtxMacro\[\LWR@origopenbracket% +\LetLtxMacro\]\LWR@origclosebracket% +\let\@ensuredmath\LWR@orig@ensuredmath% }% end of outer-most lateximage +\LWR@traceinfo{lateximage: finished start of environment}% }% end of \begin{lateximage} {% start of \end{lateximage} +\LWR@traceinfo{lateximage: starting end of environment}% \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{1}}% {% \addtocounter{LWR@lateximagedepth}{-1}% @@ -6603,11 +6732,13 @@ class="lateximagesource"{}} \LWR@orignewline }{}% \addtocounter{LWR@lateximagedepth}{-1}% }% end of outer-most lateximage -\LWR@traceinfo{lateximage: done} +\LWR@traceinfo{lateximage: done}% }% +\catcode`\$=3% math shift \end{warpHTML} + \begin{warpprint} -\newenvironment{lateximage}[1][]{\minipage{\linewidth}}{\endminipage} +\newenvironment{lateximage}[1][]{}{} \end{warpprint} @@ -6890,6 +7021,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \define@key{krotbox}{x}{} \define@key{krotbox}{y}{} \define@key{krotbox}{units}{} +\LetLtxMacro\LWR@origrotatebox\rotatebox + \NewDocumentCommand{\LWR@rotatebox}{O{} m +m}{% \renewcommand*{\LWR@rotboxorigin}{} \setkeys{krotbox}{#1}% @@ -6906,6 +7039,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \end{LWR@nestspan}% } +\LetLtxMacro\LWR@origscalebox\scalebox + \NewDocumentCommand{\LWR@scalebox}{m o m}{% \LWR@htmltagc{span style="display: inline-block; % \LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % @@ -6918,6 +7053,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \end{LWR@nestspan}% } +\let\LWR@origreflectbox\reflectbox + \newcommand{\LWR@reflectbox}[1]{\LWR@scalebox{-1}[1]{#1}} \end{warpHTML} @@ -6937,6 +7074,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \RequirePackage{cleveref} } \AfterEndPreamble{ +\LWR@traceinfo{Patching cleveref.} @@ -6971,10 +7109,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \begin{warpHTML} -\BeforeBeginEnvironment{picture}{% -\lateximage% -\let\makebox\LWR@origmakebox% -} +\BeforeBeginEnvironment{picture}{\lateximage} \AfterEndEnvironment{picture}{\endlateximage} @@ -6989,8 +7124,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \newlength{\LWR@minipagewidth} \newlength{\LWR@minipageheight} -\let\LWR@origminipage\minipage -\let\LWR@origendminipage\endminipage \def\LWR@endminipage{% \par \unskip @@ -7032,7 +7165,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% -\LWR@traceinfo{starting minipage of width #4}% \uselengthunit{in}% \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -7094,46 +7226,178 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline #5 \end{minipage} } -\let\LWR@origmakebox\makebox +\LetLtxMacro\LWR@origmakebox\makebox -\RenewDocumentCommand{\makebox}{o o m}{% -\mbox{#3} +\RenewDocumentCommand{\makebox}{d() o o m}{% +\mbox{#4} } +\LetLtxMacro\LWR@origframebox\framebox + \RenewDocumentCommand{\framebox}{o o m}{% \fbox{#3} } \let\LWR@origfbox\fbox -\renewcommand*{\fbox}[1]{% -\InlineClass{framebox}{#1}% + +\renewcommand{\fbox}[1]{% +\LWR@htmltagc{span class="framebox"}% +\begin{LWR@nestspan}% +#1 +\LWR@htmltagc{/span}% +\end{LWR@nestspan}% +} + +\newcommand{\fboxBlock}[1]{% +\begin{BlockClass}{framed} +#1 +\end{BlockClass} } + +\NewDocumentEnvironment{fminipage}{O{t} o O{t} m} +{% +\setlength{\LWR@tempwidth}{#4} +\begin{BlockClass}[width:\rndprintlength{\LWR@tempwidth};]{framed}% +} +{\end{BlockClass}} +\LetLtxMacro{\LWR@origraisebox}{\raisebox} + \RenewDocumentCommand{\raisebox}{m o o m}{% #4% } \end{warpHTML} +\begin{warpall} -\begin{warpHTML} +\newsavebox{\LWR@fminipagebox} -\renewcommand{\emph}[1]{\LWR@htmlspan{em}{#1}} +\NewDocumentEnvironment{LWR@fminipageprint}{O{t} o O{t} m} +{% +\IfValueTF{#2}% +{\minipage[#1][#2][#3]{#4}}% +{\minipage[#3]{#4}}% +\begin{lrbox}{\LWR@fminipagebox}% +\IfValueTF{#2}% +{\minipage[#1][#2][#3]{\linewidth-2\fboxsep-2\fboxrule}}% +{\minipage[#3]{\linewidth-2\fboxsep-2\fboxrule}}% +} +{% +\endminipage% +\end{lrbox}% +\fbox{\usebox{\LWR@fminipagebox}}% +\endminipage% +} -\renewcommand{\textmd}[1]{\LWR@htmlspan{textmd}{#1}} +\end{warpall} -\renewcommand{\textbf}[1]{\LWR@htmlspan{b}{#1}} +\begin{warpprint} -\renewcommand{\textrm}[1]{\InlineClass{textrm}{#1}} +\let\fboxBlock\fbox -\renewcommand{\textsf}[1]{\InlineClass{textsf}{#1}} +\LetLtxMacro{\fminipage}{\LWR@fminipageprint} +\LetLtxMacro{\endfminipage}{\endLWR@fminipageprint} -\renewcommand{\texttt}[1]{\LWR@htmlspan{kbd}{#1}} +\end{warpprint} -\renewcommand{\textup}[1]{\InlineClass{textup}{#1}} -\renewcommand{\textit}[1]{\LWR@htmlspan{i}{#1}} +\begin{warpHTML} -\renewcommand{\textsc}[1]{\InlineClass{textsc}{#1}} -\renewcommand{\textnormal}[1]{\textmd{\textrm{\textup{#1}}}} +\DeclareRobustCommand{\LWR@HTMLemph}[1]{\LWR@htmlspan{em}{#1}} +\DeclareRobustCommand{\LWR@nullemph}[1]{#1} +\LetLtxMacro{\emph}{\LWR@HTMLemph} + +\DeclareRobustCommand{\LWR@HTMLtextmd}[1]{\LWR@htmlspan{textmd}{#1}} +\DeclareRobustCommand{\LWR@nulltextmd}[1]{#1} +\LetLtxMacro{\textmd}{\LWR@HTMLtextmd} + +\DeclareRobustCommand{\LWR@HTMLtextbf}[1]{\LWR@htmlspan{b}{#1}} +\DeclareRobustCommand{\LWR@nulltextbf}[1]{#1} +\LetLtxMacro{\textbf}{\LWR@HTMLtextbf} + +\DeclareRobustCommand{\LWR@HTMLtextrm}[1]{\LWR@htmlspan{textrm}{#1}} +\DeclareRobustCommand{\LWR@nulltextrm}[1]{#1} +\LetLtxMacro{\textrm}{\LWR@HTMLtextrm} + +\DeclareRobustCommand{\LWR@HTMLtextsf}[1]{\LWR@htmlspan{textsf}{#1}} +\DeclareRobustCommand{\LWR@nulltextsf}[1]{#1} +\LetLtxMacro{\textsf}{\LWR@HTMLtextsf} + +\DeclareRobustCommand{\LWR@HTMLtexttt}[1]{\LWR@htmlspan{kbd}{#1}} +\DeclareRobustCommand{\LWR@nulltexttt}[1]{#1} +\LetLtxMacro{\texttt}{\LWR@HTMLtexttt} + +\DeclareRobustCommand{\LWR@HTMLtextup}[1]{\LWR@htmlspan{textup}{#1}} +\DeclareRobustCommand{\LWR@nulltextup}[1]{#1} +\LetLtxMacro{\textup}{\LWR@HTMLtextup} + +\DeclareRobustCommand{\LWR@HTMLtextit}[1]{\LWR@htmlspan{i}{#1}} +\DeclareRobustCommand{\LWR@nulltextit}[1]{#1} +\LetLtxMacro{\textit}{\LWR@HTMLtextit} + +\DeclareRobustCommand{\LWR@HTMLtextsc}[1]{\LWR@htmlspan{textsc}{#1}} +\DeclareRobustCommand{\LWR@nulltextsc}[1]{#1} +\LetLtxMacro{\textsc}{\LWR@HTMLtextsc} + +\DeclareRobustCommand{\LWR@HTMLtextsl}[1]{\LWR@htmlspan{testsl}{#1}} +\DeclareRobustCommand{\LWR@nulltextsl}[1]{#1} +\LetLtxMacro{\textsl}{\LWR@HTMLtextsl} + +\DeclareRobustCommand{\LWR@HTMLtextnormal}[1]{\textmd{\textrm{\textup{#1}}}} +\DeclareRobustCommand{\LWR@nulltextnormal}[1]{#1} +\LetLtxMacro{\textnormal}{\LWR@HTMLtextnormal} + +\DeclareRobustCommand{\LWR@HTMLrmfamily}[1]{} +\DeclareRobustCommand{\LWR@HTMLsffamily}[1]{} +\DeclareRobustCommand{\LWR@HTMLttfamily}[1]{} +\DeclareRobustCommand{\LWR@HTMLbfseries}[1]{} +\DeclareRobustCommand{\LWR@HTMLmdseries}[1]{} +\DeclareRobustCommand{\LWR@HTMLupshape}[1]{} +\DeclareRobustCommand{\LWR@HTMLslshape}[1]{} +\DeclareRobustCommand{\LWR@HTMLscshape}[1]{} +\DeclareRobustCommand{\LWR@HTMLitshape}[1]{} +\DeclareRobustCommand{\LWR@HTMLem}[1]{} +\DeclareRobustCommand{\LWR@nullrmfamily}[1]{} +\DeclareRobustCommand{\LWR@nullsffamily}[1]{} +\DeclareRobustCommand{\LWR@nullttfamily}[1]{} +\DeclareRobustCommand{\LWR@nullbfseries}[1]{} +\DeclareRobustCommand{\LWR@nullmdseries}[1]{} +\DeclareRobustCommand{\LWR@nullupshape}[1]{} +\DeclareRobustCommand{\LWR@nullslshape}[1]{} +\DeclareRobustCommand{\LWR@nullscshape}[1]{} +\DeclareRobustCommand{\LWR@nullitshape}[1]{} +\DeclareRobustCommand{\LWR@nullem}[1]{} + +\newcommand*{\LWR@nullfonts}{% +\LetLtxMacro{\emph}{\LWR@nullemph}% +\LetLtxMacro{\textmd}{\LWR@nulltextmd}% +\LetLtxMacro{\textbf}{\LWR@nulltextbf}% +\LetLtxMacro{\textrm}{\LWR@nulltextrm}% +\LetLtxMacro{\textsf}{\LWR@nulltextsf}% +\LetLtxMacro{\texttt}{\LWR@nulltexttt}% +\LetLtxMacro{\textup}{\LWR@nulltextup}% +\LetLtxMacro{\textit}{\LWR@nulltextit}% +\LetLtxMacro{\textsc}{\LWR@nulltextsc}% +\LetLtxMacro{\textsl}{\LWR@nulltextsl}% +\LetLtxMacro{\textnormal}{\LWR@nulltextnormal}% +\LetLtxMacro{\rmfamily}{\LWR@nullrmfamily}% +\LetLtxMacro{\sffamily}{\LWR@nullsffamily}% +\LetLtxMacro{\ttfamily}{\LWR@nullttfamily}% +\LetLtxMacro{\bfseries}{\LWR@nullbfseries}% +\LetLtxMacro{\mdseries}{\LWR@nullmdseries}% +\LetLtxMacro{\upshape}{\LWR@nullupshape}% +\LetLtxMacro{\slshape}{\LWR@nullslshape}% +\LetLtxMacro{\scshape}{\LWR@nullscshape}% +\LetLtxMacro{\itshape}{\LWR@nullitshape}% +\LetLtxMacro{\em}{\LWR@nullem}% +\LetLtxMacro{\normalfont}{\LWR@nullnormalfont}% +\renewcommand*{\HTMLunicode}[1]{}% +\renewcommand*{\HTMLentity}[1]{}% +\renewcommand*{\&}{and}% +\renewcommand{\textsuperscript}[1]{##1}% +\renewcommand{\textsubscript}[1]{##1}% +\RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% +\DeclareExpandableDocumentCommand{\InlineClass}{o m +m}{##3}% +} \renewcommand*{\mdseries}{} @@ -7223,7 +7487,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \newcommand*{\LWR@newlinebr}{\unskip\LWR@htmltag{br /}\LWR@orignewline}% \let\newline\LWR@newlinebr -\let\LWR@origendofline\\ +\LetLtxMacro\LWR@origendofline\\ \NewDocumentCommand{\LWR@endofline}{s o} {% \newline% @@ -7282,7 +7546,9 @@ span style="width:\printlength{\LWR@tempwidth}; display:inline-block;"% \LWR@minipagestartpars% }% } -\let\hspace\LWR@hspace +\NewDocumentCommand{\LWR@nohspace}{s m}{} + +\LetLtxMacro{\hspace}{\LWR@hspace} \NewDocumentCommand{\LWR@vspace}{s m}{} \let\vspace\LWR@vspace @@ -7337,7 +7603,7 @@ display:inline-block;"% \LWR@minipagestartpars% }% non-zero width } -\let\rule\LWR@rule +\renewcommand{\rule}{\LWR@rule} \end{warpHTML} -- cgit v1.2.3