diff options
| author | Karl Berry <karl@freefriends.org> | 2018-01-23 22:34:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-01-23 22:34:45 +0000 |
| commit | ce07f5180b54e0229abae4d10288940c610afe31 (patch) | |
| tree | feef3d1dc42bedb22d5648026a39b03388027167 /Master/texmf-dist/tex/latex/lwarp | |
| parent | 607588e2b8c554ec8bfbe11f1391622768fe79c8 (diff) | |
lwarp (23jan18)
git-svn-id: svn://tug.org/texlive/trunk@46416 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
51 files changed, 2791 insertions, 727 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index d5f78b8c505..4d899d4076e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -15,6 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. +\ProvideDocumentEnvironment{abstract}{}{}{} \LWR@ProvidesPackagePass{abstract} \AtBeginDocument{ @@ -32,6 +33,33 @@ \@bslabeldelim}% } +\@ifclassloaded{memoir} +{ + \renewenvironment{abstract}{% + \null\vfil + \@beginparpenalty\@lowpenalty + \if@bsrunin + \else + \if@bsstyle + \abstitlestyle{\BlockClassSingle{abstracttitle}{\abstractname}} + \else + \ifnumber@bs + \num@bs + \else + \begin{\absnamepos}% + \abstractnamefont \BlockClassSingle{abstracttitle}{\abstractname} + \@endparpenalty\@M + \end\absnamepos% +%% \vspace{\abstitleskip}% + \fi + \fi + \vspace{\abstitleskip}% + \fi + \put@bsintoc% + \begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}% + {\par\end{@bstr@ctlist}\vfil\null%\endtitlepage + } +}{% not memoir \if@titlepage \renewenvironment{abstract}{% \null\vfil @@ -79,7 +107,7 @@ \begin{@bstr@ctlist}\if@bsrunin\@bsrunintitle\fi\abstracttextfont}% {\par\end{@bstr@ctlist}} \fi - +}% not memoir \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index 6d2b70ba793..b411574059f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -66,10 +66,7 @@ \LWR@haveamsthmnumber \LWR@haveamsthmnote \def\@begintheorem#1#2[#3]{% -\LWR@forcenewpage% new - \BlockClass{amsthmbody\LWR@thisthmstyle}% new - \deferred@thm@head{ - \the\thm@headfont \thm@indent + \item[ \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new @@ -77,9 +74,58 @@ \the\thm@headpunct~ \thmheadnl % possibly a newline. \hskip\thm@headsep - }% + ] \ignorespaces} -\def\@endtheorem{\endBlockClass\endtrivlist\@endpefalse } +\def\@thm#1#2#3{% + \ifhmode\unskip\unskip\par\fi + \normalfont + \LWR@forcenewpage% new + \BlockClass{amsthmbody\LWR@thisthmstyle}% new + \trivlist + \let\thmheadnl\relax + \let\thm@swap\@gobble + \thm@notefont{\fontseries\mddefault\upshape}% + \thm@headpunct{.}% add period after heading + \thm@headsep 5\p@ plus\p@ minus\p@\relax + \thm@space@setup + #1% style overrides + \@topsep \thm@preskip % used by thm head + \@topsepadd \thm@postskip % used by \@endparenv + \def\@tempa{#2}\ifx\@empty\@tempa + \def\@tempa{\@oparg{\@begintheorem{#3}{}}[]}% + \else + \refstepcounter{#2}% + \def\@tempa{\@oparg{\@begintheorem{#3}{\csname the#2\endcsname}}[]}% + \fi + \@tempa +} +\AtBeginDocument{ +\def\cref@thmoptarg[#1]#2#3#4{% + \ifhmode\unskip\unskip\par\fi% + \normalfont% + \LWR@forcenewpage% new + \BlockClass{amsthmbody\LWR@thisthmstyle}% new + \trivlist% + \let\thmheadnl\relax% + \let\thm@swap\@gobble% + \thm@notefont{\fontseries\mddefault\upshape}% + \thm@headpunct{.}% add period after heading + \thm@headsep 5\p@ plus\p@ minus\p@\relax% + \thm@space@setup% + #2% style overrides + \@topsep \thm@preskip % used by thm head + \@topsepadd \thm@postskip % used by \@endparenv + \def\@tempa{#3}\ifx\@empty\@tempa% + \def\@tempa{\@oparg{\@begintheorem{#4}{}}[]}% + \else% + \refstepcounter[#1]{#3}% <<< cleveref modification + \def\@tempa{\@oparg{\@begintheorem{#4}{\csname the#3\endcsname}}[]}% + \fi% + \@tempa +}% +}% AtBeginDocument + +\def\@endtheorem{\endtrivlist\endBlockClass\@endpefalse } \AtBeginDocument{ \def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box \def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof @@ -91,7 +137,7 @@ \pushQED{\qed}% \normalfont \topsep6\p@\@plus6\p@\relax \trivlist - \item[\hskip\labelsep + \item[ \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes }{% \InlineClass{theoremendmark}{\popQED}\endtrivlist% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty new file mode 100644 index 00000000000..a3998ec7356 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty @@ -0,0 +1,31 @@ +%% +%% This is file `lwarp-array.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `array') +%% 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{array} +\let\LWR@origfirsthline\firsthline +\let\LWR@origlasthline\lasthline + +\appto{\LWR@restoreorigformatting}{% +\let\firsthline\LWR@origfirsthline% +\let\lasthline\LWR@origlasthline% +} + +\renewcommand*{\firsthline}{\LWR@hline}% +\renewcommand*{\lasthline}{\LWR@hline}% +\endinput +%% +%% End of file `lwarp-array.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty new file mode 100644 index 00000000000..26ef59c8a4d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-backref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `backref') +%% 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{backref} + +\def\backref{}\let\backrefxxx\hyper@section@backref + +\endinput +%% +%% End of file `lwarp-backref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty index 0e2ea60d61a..4dbc5689393 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty @@ -18,18 +18,16 @@ \LWR@ProvidesPackageDrop{breakurl} \LetLtxMacro\burl\url -\NewDocumentCommand{\LWR@burlaltb}{O{} +m m}{% -\LWR@subhyperref{#3}{#2}% order reversed from \href -\endgroup% +\NewDocumentCommand{\burlalt}{O{} +m m}{% \LWR@ensuredoingapar% -} - -\DeclareRobustCommand*{\burlalt}{% +\def\LWR@templink{#2}% +\@onelevel@sanitize\LWR@templink% +\def\LWR@templinktwo{#3}% +\@onelevel@sanitize\LWR@templinktwo% +\LWR@subhyperref{\LWR@templink}{\LWR@templinktwo}% \LWR@ensuredoingapar% -\begingroup% -\catcode`\_=12 -\LWR@burlaltb% } + \LetLtxMacro\urlalt\burlalt \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty new file mode 100644 index 00000000000..c298ef3c677 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty @@ -0,0 +1,31 @@ +%% +%% This is file `lwarp-changebar.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `changebar') +%% 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{changebar} +\newcommand*{\cbstart}{} +\newcommand*{\cbend}{} +\newenvironment*{\changebar}{}{} +\newcommand*{\cbdelete}{} +\newcommand*{\nochnagebars}{} +\newcommand*{\cbcolor}[1]{} +\newlength{\changebarwidth} +\newlength{\deletebarwidth} +\newlength{\changebarsep} +\newcounter{changebargrey} +\endinput +%% +%% End of file `lwarp-changebar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty index cd1be1bf28c..c055a02b86d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty @@ -23,11 +23,17 @@ \DeclareRobustCommand{\checkoddpage}{\oddpagetrue} \DeclareRobustCommand{\changetext}[5]{} \DeclareRobustCommand{\changepage}[9]{} + +\@ifundefined{adjustwidth}{ \newenvironment{adjustwidth}[2]{}{} \newenvironment{adjustwidth*}[2]{}{} +}{ +\renewenvironment{adjustwidth}[2]{}{} +\renewenvironment{adjustwidth*}[2]{}{} +} -\newcommand*{\strictpagecheck}{} -\newcommand*{\easypagecheck}{} +\DeclareDocumentCommand{\strictpagecheck}{} +\DeclareDocumentCommand{\easypagecheck}{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty new file mode 100644 index 00000000000..6681dd37091 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty @@ -0,0 +1,34 @@ +%% +%% This is file `lwarp-cite.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `cite') +%% 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{cite} + +\def\LWRCT@biblabel#1{\@citess{#1}\kern-\labelsep\,} + +\ifdefstrequal{\@biblabel}{\LWRCT@biblabel} +{ + \def\@biblabel#1{\@citess{#1}} +}{} + +\def\@citess#1{\textsuperscript{#1}} + +\DeclareDocumentCommand\citepunct{}{,\,\relax} + +\endinput +%% +%% End of file `lwarp-cite.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty new file mode 100644 index 00000000000..80721c9dbd1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty @@ -0,0 +1,28 @@ +%% +%% This is file `lwarp-continue.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `continue') +%% 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{continue} +\newcommand*{\flagcont}{} +\newcommand*{\flagend}{} +\newcommand*{\flagword}{} +\newcommand*{\preflagword}{} +\newcommand*{\postflagword}{} +\newlength\contsep +\newlength\contdrop +\endinput +%% +%% End of file `lwarp-continue.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty new file mode 100644 index 00000000000..97f39e23d8f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-endfloat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `endfloat') +%% 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{endfloat} +\newcommand\figureplace{} +\newcommand\tableplace{} +\newcommand\floatplace[1]{} +\newcounter{posttable} +\newcounter{postfigure} +\newcommand*{\theposttbl}{} +\newcommand*{\thepostfig}{} +\newcommand{\AtBeginFigures}[1]{} +\newcommand{\AtBeginTables}[1]{} +\newcommand{\AtBeginDelayedFloats}[1]{} +\newcommand*{\processdelayedfloats}{} +\newcommand*{\efloatseparator}{} +\endinput +%% +%% End of file `lwarp-endfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index a1378fd3f2c..df4cd6d0f67 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -20,7 +20,7 @@ \LWR@ProvidesPackageDrop{epigraph} -\newcommand{\qitem}[2] +\DeclareDocumentCommand{\qitem}{m m} { \begin{BlockClass}{qitem} #1 @@ -32,22 +32,29 @@ \end{BlockClass} } -\newcommand{\epigraph}[2] +\DeclareDocumentCommand{\epigraph}{m m} { \begin{LWR@BlockClassWP}{text-align:right}{}{epigraph} \qitem{#1}{#2} \end{LWR@BlockClassWP} } -\newenvironment*{epigraphs} +\DeclareDocumentEnvironment{epigraphs}{} {\LWR@BlockClassWP{text-align:right}{}{epigraph}} {\endLWR@BlockClassWP} +\newenvironment*{flushepinormal}{}{} +\@ifclassloaded{memoir}{ +\setlength{\epigraphwidth}{.5\linewidth} +\renewcommand{\textflush}{flushepinormal} +\renewcommand{\epigraphhead}[2][0]{#2} +\renewcommand{\dropchapter}[1]{} +\renewcommand*{\undodrop}{} +}{% not memoir \newlength{\epigraphwidth} \setlength{\epigraphwidth}{.5\linewidth} -\newenvironment*{flushepinormal}{}{} -\newcommand{\textflush}[1]{flushepinormal} -\newcommand{\epigraphflush}[1]{flushright} -\newcommand{\sourceflush}[1]{flushright} +\newcommand{\textflush}{flushepinormal} +\newcommand{\epigraphflush}{flushright} +\newcommand{\sourceflush}{flushright} \newcommand*{\epigraphsize}{\small} \newlength{\epigraphrule} \newlength{\beforeepigraphskip} @@ -55,6 +62,9 @@ \newcommand{\epigraphhead}[2][0]{#2} \newcommand{\dropchapter}[1]{} \newcommand*{\undodrop}{} +}% not memoir + +\let\cleartoevenpage\relax% also in nextpage \newcommand{\cleartoevenpage}[1][]{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index ecb8727ca62..4a70cda4dd0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. \RequirePackage{xcolor}% for \convertcolorspec \LWR@ProvidesPackagePass{fancyvrb} - \begin{warpHTML} \fvset{frame=none}% @@ -30,20 +29,40 @@ \AfterEndPreamble{ \LWR@traceinfo{Patching Verbatim.} -\let\LWRFV@origVerbatim\Verbatim -\renewcommand*{\Verbatim}{% -\LWR@forcenewpage -\LWRFV@origVerbatim% +\preto\FVB@Verbatim{\LWR@forcenewpage} +\preto\FVB@LVerbatim{\LWR@forcenewpage} +\def\FV@BeginListFrame@Single{% + \FV@SingleFrameLine{\z@}% +} + +\def\FV@EndListFrame@Single{% + \FV@SingleFrameLine{\@ne}% +} + +\def\FV@BeginListFrame@Lines{% + \FV@SingleFrameLine{\z@}% +} + +\def\FV@EndListFrame@Lines{% + \FV@SingleFrameLine{\@ne}% } + +\renewcommand*{\FV@SingleFrameSep}{} +\def\FV@BUseVerbatim#1{% + \LWR@atbeginverbatim[\LWR@FVstyle]{verbatim}% + \FV@BVerbatimBegin#1\FV@BVerbatimEnd% + \LWR@afterendverbatim% +} + \newcommand*{\LWR@FVstyle}{} \newcommand*{\LWR@fvstartnone}{% \LWR@traceinfo{fvstartnone}% -\hbox to\z@{\LWR@atbeginverbatim[\LWR@FVstyle]{verbatim}}% +\LWR@atbeginverbatim[\LWR@FVstyle]{verbatim}% } \newcommand*{\LWR@fvendnone}{% \LWR@traceinfo{fvendnone}% -\hbox to\z@{\LWR@afterendverbatim}% +\LWR@afterendverbatim% } \newcommand*{\LWR@fvstartsingle}{% @@ -136,7 +155,6 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \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 @@ -156,15 +174,13 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \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{% @@ -180,16 +196,15 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor } \AtBeginEnvironment{BVerbatim} -{ -\LWR@forcenewpage -\LWR@atbeginverbatim{bverbatim} - +{% +\LWR@forcenewpage% instead of \preto +\LWR@atbeginverbatim{bverbatim}% } \AfterEndEnvironment{BVerbatim} -{ -\leavevmode\par\LWR@origvspace{-\baselineskip} -\LWR@afterendverbatim +{% +\leavevmode\par\LWR@origvspace{-\baselineskip}% +\LWR@afterendverbatim% } } % \AfterEndPreamble diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty new file mode 100644 index 00000000000..25a6c34b70c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-flafter.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `flafter') +%% 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{flafter} +\providecommand\fl@trace[1]{} +\endinput +%% +%% End of file `lwarp-flafter.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index 6ce7d78b9ca..c9ac7efb6a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -21,11 +21,11 @@ \NewDocumentCommand{\newfloat}{m m m o}{% -\IfValueTF{#4} -{\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}} -{\DeclareFloatingEnvironment[fileext=#3]{#1}} -\cslet{listof#1s}\relax -\cslet{listof#1es}\relax +\IfValueTF{#4}% +{\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}}% +{\DeclareFloatingEnvironment[fileext=#3]{#1}}% +\cslet{listof#1s}\relax% +\cslet{listof#1es}\relax% } \NewDocumentCommand{\floatname}{m +m}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index efdf831f078..6eac63bcabd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -120,29 +120,29 @@ \define@key{frowkeys}{relatedcapstyle}{}% \newcommand*{\DeclareNewFloatType}[2]{% -\renewcommand*{\LWR@frowkeyplacement}{} -\renewcommand*{\LWR@frowkeyname}{} -\renewcommand*{\LWR@frowkeyfileext}{} -\renewcommand*{\LWR@frowkeywithin}{} -\renewcommand*{\LWR@frowkeycapstyle}{} +\renewcommand*{\LWR@frowkeyplacement}{}% +\renewcommand*{\LWR@frowkeyname}{}% +\renewcommand*{\LWR@frowkeyfileext}{}% +\renewcommand*{\LWR@frowkeywithin}{}% +\renewcommand*{\LWR@frowkeycapstyle}{}% \LWR@traceinfo{about to setkeys frowkeys}% \setkeys{frowkeys}{#2}% \LWR@traceinfo{finished setkeys frowkeys}% -\ifthenelse{\equal{\LWR@frowkeywithin}{}} -{ - \LWR@traceinfo{about to newfloat #1 \LWR@frowkeyplacement\ +\ifthenelse{\equal{\LWR@frowkeywithin}{}}% +{% + \LWR@traceinfo{about to newfloat #1 \LWR@frowkeyplacement\ % \LWR@frowkeyfileext}% - \newfloat{#1}{\LWR@frowkeyplacement}{\LWR@frowkeyfileext} + \newfloat{#1}{\LWR@frowkeyplacement}{\LWR@frowkeyfileext}% }% {% - \LWR@traceinfo{about to newfloat #1\ \LWR@frowkeyplacement\ + \LWR@traceinfo{about to newfloat #1\ \LWR@frowkeyplacement\ % \LWR@frowkeyfileext\ \LWR@frowkeywithin}% \newfloat{#1}{\LWR@frowkeyplacement}% {\LWR@frowkeyfileext}[\LWR@frowkeywithin]% - \LWR@traceinfo{finished newfloat #1} + \LWR@traceinfo{finished newfloat #1}% }% -\ifthenelse{\equal{\LWR@frowkeyname}{}} -{} +\ifthenelse{\equal{\LWR@frowkeyname}{}}% +{}% {\floatname{#1}{\LWR@frowkeyname}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty new file mode 100644 index 00000000000..b41219370d1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-fltrace.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fltrace') +%% 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{fltrace} +\def\tracefloats{} +\def\tracefloatsoff{} +\def\tracefloatvals{} +\endinput +%% +%% End of file `lwarp-fltrace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 9da839dd532..cb86afd25fe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -20,7 +20,7 @@ \protected@edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}% } -\newcommand*{\fn@endnote}{% +\def\fn@endnote{% \LWR@htmltagc{/\LWR@tagregularparagraph}% \LWR@orignewline% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty new file mode 100644 index 00000000000..c9cb7e00c97 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-footnpag.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `footnpag') +%% 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{footnpag} +\endinput +%% +%% End of file `lwarp-footnpag.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty index 50218d3d4ae..2382f8affa5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty @@ -35,14 +35,14 @@ \renewenvironment{shaded}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass[background: \#\LWR@tempcolor]{framed}% +\BlockClass[background: \#\LWR@tempcolor]{shaded}% } {\endBlockClass} \renewenvironment{shaded*}{% \convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% \LWR@forcenewpage -\BlockClass[background: \#\LWR@tempcolor]{framed}% +\BlockClass[background: \#\LWR@tempcolor]{shaded}% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty new file mode 100644 index 00000000000..2e23840efe8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-fwlw.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fwlw') +%% 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{fwlw} +\newbox\FirstWordBox \global\setbox\FirstWordBox\hbox{} +\newbox\NextWordBox \global\setbox\NextWordBox\hbox{} +\newbox\LastWordBox \global\setbox\LastWordBox\hbox{} +\def\ps@fwlwhead{} +\def\ps@NextWordFoot{} +\endinput +%% +%% End of file `lwarp-fwlw.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 04c1b770d86..febcad9a763 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -159,6 +159,7 @@ \Ginclude@graphics{\detokenize\expandafter{#4}}% \endgroup% \filename@parse{\LWR@parsedfilename}% +\LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}% \large% \setlength{\LWR@igwidth}{0pt}% \setlength{\LWR@igheight}{0pt}% @@ -219,8 +220,9 @@ {% start of href \LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% \LWR@htmltag{% start of image tags -img src="\LWR@parsedfilename" \LWR@orignewline% -\LWR@origtilde{} alt="[\filename@base]" \LWR@orignewline% +img src="% +\begingroup\@sanitize\LWR@parsedfilename\endgroup% +" \LWR@orignewline% \ifthenelse{ \NOT\equal{\LWR@igwidthstyle}{} \OR \NOT\equal{\LWR@igheightstyle}{} \OR @@ -254,7 +256,6 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% }% end of image tags }% end of href -\endgroup \LWR@origscriptsize \LWR@traceinfo{LWR@includegraphicsb done}% } @@ -271,10 +272,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \renewcommand*{\includegraphics} {% -\LWR@traceinfo{includegraphics} +\LWR@traceinfo{includegraphics}% \LWR@ensuredoingapar% -\begingroup% -\catcode`\_=12 \LWR@includegraphicsb% }% includegraphics }% AtBeginDocument @@ -312,7 +311,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \LWR@rotstyle{-ms-}{#2} % \LWR@rotstyle{-webkit-}{#2} % \LWR@rotstyle{}{#2} % -"{}}\LWR@orignewline% +"}\LWR@orignewline% \begin{LWR@nestspan}% #3% \LWR@htmltagc{/span}% @@ -328,7 +327,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % \LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % \LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -"{}}% +"}% \begin{LWR@nestspan}% #3% \LWR@htmltagc{/span}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty new file mode 100644 index 00000000000..27babf27838 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty @@ -0,0 +1,46 @@ +%% +%% This is file `lwarp-hanging.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `hanging') +%% 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{hanging} +\@ifclassloaded{memoir}{ +\let\hangpara\relax +\let\hangparas\relax +\let\endhangparas\relax +\let\hangpunct\relax +\let\endhangpunct\relax +}{} +\newcommand*{\hangpara}[2]{} + +\newenvironment*{hangparas}[2] +{% + \uselengthunit{PT}% + \BlockClass[% + margin-left:\rndprintlength{#1}; % + text-indent:-\rndprintlength{#1}% + ]% + {hangingpar}% +} +{\endBlockClass} +\newenvironment*{hangpunct} +{\BlockClass{hangpunct}} +{\endBlockClass} +\newcommand{\nhpt}{.} +\newcommand{\nhlq}{‘} +\newcommand{\nhrq}{’} +\endinput +%% +%% End of file `lwarp-hanging.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index e59293feab1..9a3dbe39609 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -27,39 +27,40 @@ \newcommand*{\hypersetup}[1]{} \newcommand*{\hyperbaseurl}[1]{} -\NewDocumentCommand{\LWR@hyperimageb}{m +m}{% -\LWR@htmltag{img src="#1" alt="#2" class="hyperimage"{}}% -\endgroup% +\NewDocumentCommand{\hyperimage}{m +m}{% \LWR@ensuredoingapar% -} - -\DeclareRobustCommand*{\hyperimage}{% +\def\LWR@templink{#1}% +\@onelevel@sanitize\LWR@templink% +\LWR@htmltag{img src="\LWR@templink" alt="#2" class="hyperimage"}% \LWR@ensuredoingapar% -\begingroup\catcode`\_=12 -\LWR@hyperimageb% } \NewDocumentCommand{\hyperdef}{m m +m}{% \LWR@ensuredoingapar% -\LWR@subsublabel{#1.#2}% +\LWR@sublabel{#1.#2}% #3% } \NewDocumentCommand{\LWR@hyperrefb}{m m m +m}{% -\LWR@htmltag{a href="#1\LWR@hashmark#2.#3"}% +\def\LWR@templink{#1}% +\@onelevel@sanitize\LWR@templink% +\def\LWR@templinktwo{#2}% +\@onelevel@sanitize\LWR@templinktwo% +\def\LWR@templinkthree{#3}% +\@onelevel@sanitize\LWR@templinkthree% +\LWR@htmltag{a href="\LWR@templink\LWR@hashmark% + \LWR@templinktwo.\LWR@templinkthree"% +}% #4% \LWR@htmltag{/a}% -\endgroup% } \NewDocumentCommand{\LWR@hyperrefc}{O{label} +m}{ \LWR@startref{#1}% #2% \LWR@htmltag{/a}% -\endgroup% } \DeclareRobustCommand*{\hyperref}{% \LWR@ensuredoingapar% -\begingroup\catcode`\_=12 \@ifnextchar[\LWR@hyperrefc\LWR@hyperrefb% } @@ -68,7 +69,7 @@ #2% } -\NewDocumentCommand{\hyperlink}{m +m}{% +\DeclareDocumentCommand{\hyperlink}{m +m}{% \hyperref[#1]{#2}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index bad9212e236..2c32ff0f9d3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -21,6 +21,19 @@ \LWR@ProvidesPackageDrop{mdframed} \LWR@origRequirePackage{amsthm} \LWR@origRequirePackage[framemethod=none]{mdframed} +\AtBeginDocument{ +\def\mdf@trivlist#1{% + \edef\mdf@temp{% + }% + \let\@itemlabel\@empty% + \def\makelabel##1{##1}% +} + +\renewcommand*{\endmdf@trivlist}{% +\LWR@traceinfo{endmdf@trivlist}% +\LWR@listend% +} +}% AtBeginDocument \mdfsetup{ startcode={\LWR@mdframedstart\LWR@origraggedright}, endcode={\LWR@mdframedend}, @@ -36,6 +49,7 @@ endinnercode={\LWR@stoppars}, \rndprintlength{\csuse{mdf@#1@length}} } \newcommand*{\LWR@mdframedstart}{% +\LWR@traceinfo{LWR@mdframedstart start}% \LWR@stoppars% \uselengthunit{PT}% \LWR@htmltagc{div class="\LWR@mdthisenv" \LWR@orignewline @@ -57,18 +71,57 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \LetLtxMacro{\hspace}{\LWR@orighspace}% \LetLtxMacro\rule\LWR@origrule% \LetLtxMacro\makebox\LWR@origmakebox% +\LWR@startpars% +\LWR@traceinfo{LWR@mdframedstart done}% } \newcommand*{\LWR@mdframedend}{ +\LWR@traceinfo{LWR@mdframedend start}% \LWR@htmldivclassend{\LWR@mdthisenv} \gdef\LWR@mdthisenv{mdframed} \LWR@startpars% +\LWR@traceinfo{LWR@mdframedend done}% +} +\renewenvironment{mdframed}[1][]{% + \color@begingroup% + \mdfsetup{userdefinedwidth=\linewidth,#1}% + \mdf@startcode% + \mdf@preenvsetting% + \ifdefempty{\mdf@firstframetitle}{}% + {\let\mdf@frametitlesave\mdf@frametitle% + \let\mdf@frametitle\mdf@firstframetitle% + }% + \ifvmode\nointerlineskip\fi% + \ifdefempty{\mdf@frametitle}{}% + {\mdfframedtitleenv{\mdf@frametitle}% + }% + \mdf@trivlist{\mdf@skipabove@length}%% + \mdf@settings% + }% + {% + \par% + \ifmdf@footnoteinside% + \def\mdf@reserveda{% + \mdf@footnoteoutput% + }% + \else% + \def\mdf@reserveda{% + \mdf@footnoteoutput% + }% + \fi% + \mdf@reserveda% + \aftergroup\endmdf@trivlist% + \color@endgroup% + \mdf@endcode% +} +\renewrobustcmd*\mdf@footnoteoutput{% + \LWR@printpendingmpfootnotes% } \LetLtxMacro\LWR@origmdfframedtitleenv\mdfframedtitleenv \newlength{\LWR@titleroundcorner} \renewrobustcmd\mdfframedtitleenv[1]{% -\LWR@origmdfframedtitleenv{% +\LWR@traceinfo{LWR@mdframedtitleenv start}% \uselengthunit{PT}% \LWR@htmltagc{span class="mdframedtitle" \LWR@orignewline style=" \LWR@orignewline @@ -95,11 +148,12 @@ border-radius: #1% \LWR@htmltagc{/span}% \end{LWR@nestspan}% -} +\LWR@traceinfo{LWR@mdframedtitleenv end}% } \NewDocumentCommand{\LWR@mdfsubtitlecommon}{m o m} {% the following empty line is required +\LWR@traceinfo{LWR@mdframedsubtitlecommon start}% \let\par\LWR@origpar% \LWR@htmltagc{span class="mdframed#1title" style=" \LWR@orignewline @@ -128,15 +182,12 @@ background: \LWR@htmltagc{/span}% the following empty line is required \end{LWR@nestspan}% must follow the /span or an extra <p> appears +\LWR@traceinfo{LWR@mdframedsubtitlecommon end}% } -\let\LWR@origmdfsubtitle\mdfsubtitle - \newcommand*{\LWR@mdfsubtitle}{% \LWR@mdfsubtitlecommon{sub}% } \let\mdfsubtitle\LWR@mdfsubtitle -\let\LWR@origmdfsubsubtitle\mdfsubsubtitle - \newcommand*{\LWR@mdfsubsubtitle}{% \LWR@mdfsubtitlecommon{subsub}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty new file mode 100644 index 00000000000..0d797ec70d9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-memhfixc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `memhfixc') +%% 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{memhfixc} +\endinput +%% +%% End of file `lwarp-memhfixc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty new file mode 100644 index 00000000000..be0793d58fd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-midpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `midpage') +%% 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{midpage} +\newenvironment{midpage} +{\begin{BlockClass}[margin-top:6ex ; margin-bottom:6ex]{midpage}} +{\end{BlockClass}} +\endinput +%% +%% End of file `lwarp-midpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty index 9c512389964..1cdc23f4ff3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty @@ -65,11 +65,12 @@ \renewenvironment*{boxedverbatim} { \LWR@forcenewpage -\LWR@atbeginverbatim{boxedverbatim}\unskip\LWR@origvspace*{-\baselineskip}% +\LWR@atbeginverbatim{boxedverbatim}\unskip\LWR@origvspace*{-2\baselineskip}% \verbatim% } { \endverbatim% +\unskip% \LWR@afterendverbatim% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index 60435db9a66..cb12114ef03 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -22,7 +22,7 @@ \newcommand{\LWR@multirowborder}{} \RenewDocumentCommand{\multirow}{O{c} m o m o +m}% {% -\LWR@traceinfo{*** multirow #1 #2 #4} +\LWR@traceinfo{*** multirow #1 #2 #4}% \LWR@maybenewtablerow% \LWR@tabularleftedge% \LWR@htmltag{td rowspan="#2" % diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty new file mode 100644 index 00000000000..ec0e9d85218 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty @@ -0,0 +1,38 @@ +%% +%% This is file `lwarp-natbib.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `natbib') +%% 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{natbib} +\newcommand{\LWRNB@NAT@open}{$<$} +\newcommand{\LWRNB@patchnatbibopenclose}{ +\ifdefstrequal{\NAT@open}{\LWRNB@NAT@open} +{ + \renewcommand{\NAT@open}{\textless} + \renewcommand{\NAT@close}{\textgreater} +}{} +} +\LWRNB@patchnatbibopenclose +\let\LWRNB@origsetcitestyle\setcitestyle + +\renewcommand{\setcitestyle}[1]{% +\LWRNB@origsetcitestyle{#1}% +\LWRNB@patchnatbibopenclose% +} + +\endinput +%% +%% End of file `lwarp-natbib.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty index d207716e39c..c3ef6ca79b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty @@ -19,7 +19,7 @@ \LWR@ProvidesPackageDrop{needspace} -\newcommand*{\needspace}[1]{} +\DeclareDocumentCommand{\needspace}{m}{} \DeclareDocumentCommand{\Needspace}{s m}{} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty index 0dcffdf7d0f..0d770048bc3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty @@ -19,10 +19,10 @@ \LWR@ProvidesPackageDrop{nextpage} -\newcommand{\cleartoevenpage}[1][]{} -\newcommand{\movetoevenpage}[1][]{} -\newcommand{\cleartooddpage}[1][]{} -\newcommand{\movetooddpage}[1][]{} +\DeclareDocumentCommand{\cleartoevenpage}{o}{} +\DeclareDocumentCommand{\movetoevenpage}{o}{} +\DeclareDocumentCommand{\cleartooddpage}{o}{} +\DeclareDocumentCommand{\movetooddpage}{o}{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 768fa0d3fdc..48259f312e3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -36,6 +36,81 @@ \LWR@ProvidesPackagePass{ntheorem} \newcommand{\LWR@newtheoremstyle}{plain} +\AtBeginDocument{ +\@ifpackageloaded{cleveref}{ +\gdef\@thm#1#2#3{% + \if@thmmarks + \stepcounter{end\InTheoType ctr}% + \fi + \renewcommand{\InTheoType}{#1}% + \if@thmmarks + \stepcounter{curr#1ctr}% + \setcounter{end#1ctr}{0}% + \fi + \refstepcounter[#1]{#2}% <<< cleveref modification + \theorem@prework + \LWR@forcenewpage% new + \BlockClass{theorembody#1}%\LWR@thisthmstyle% new + \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged + \ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist + \ifthm@inframe + \thm@topsep\theoreminframepreskipamount + \thm@topsepadd\theoreminframepostskipamount + \else + \thm@topsep\theorempreskipamount + \thm@topsepadd\theorempostskipamount + \fi + \else% oldframeskips + \thm@topsep\theorempreskipamount + \thm@topsepadd \theorempostskipamount + \ifvmode\advance\thm@topsepadd\partopsep\fi + \fi + \@topsep\thm@topsep + \@topsepadd\thm@topsepadd + \advance\linewidth -\theorem@indent + \advance\linewidth -\theorem@rightindent + \advance\@totalleftmargin \theorem@indent + \parshape \@ne \@totalleftmargin \linewidth + \@ifnextchar[{\@ythm{#1}{#2}{#3}}{\@xthm{#1}{#2}{#3}} +} +}{% not @ifpackageloaded{cleveref} +\gdef\@thm#1#2#3{% + \if@thmmarks + \stepcounter{end\InTheoType ctr}% + \fi + \renewcommand{\InTheoType}{#1}% + \if@thmmarks + \stepcounter{curr#1ctr}% + \setcounter{end#1ctr}{0}% + \fi + \refstepcounter{#2}% + \theorem@prework + \LWR@forcenewpage% new + \BlockClass{theorembody#1}%\LWR@thisthmstyle% new + \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged + \ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist + \ifthm@inframe + \thm@topsep\theoreminframepreskipamount + \thm@topsepadd\theoreminframepostskipamount + \else + \thm@topsep\theorempreskipamount + \thm@topsepadd\theorempostskipamount + \fi + \else% oldframeskips + \thm@topsep\theorempreskipamount + \thm@topsepadd \theorempostskipamount + \ifvmode\advance\thm@topsepadd\partopsep\fi + \fi + \@topsep\thm@topsep + \@topsepadd\thm@topsepadd + \advance\linewidth -\theorem@indent + \advance\linewidth -\theorem@rightindent + \advance\@totalleftmargin \theorem@indent + \parshape \@ne \@totalleftmargin \linewidth + \@ifnextchar[{\@ythm{#1}{#2}{#3}}{\@xthm{#1}{#2}{#3}} +} +} +}% AtBeginDocument \gdef\theoremstyle#1{% \@ifundefined{th@#1}{\@warning {Unknown theoremstyle `#1'. Using `plain'}% @@ -105,120 +180,127 @@ \newcommand{\LWR@inctheorem}{% \addtocounter{LWR@thisautoid}{1}% \LWR@stoppars% -\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}% \LWR@startpars% } \gdef\newtheoremstyle#1#2#3{% \expandafter\@ifundefined{th@#1}% {\expandafter\gdef\csname th@#1\endcsname{% \def\@begintheorem####1####2{% -\LWR@forcenewpage% new -\BlockClass{theorembody#1}%\LWR@thisthmstyle% new -\LWR@inctheorem% new -#2}% + \LWR@inctheorem% new + #2}% \def\@opargbegintheorem####1####2####3{% -\LWR@forcenewpage% new -\BlockClass{theorembody#1}%\LWR@thisthmstyle% new -\LWR@inctheorem% new -#3}% + \LWR@inctheorem% new + #3}% }% }% {\PackageError{\basename}{Theorem style #1 already defined}\@eha} } \renewtheoremstyle{plain}% - {\item[\hskip\labelsep \theorem@headerfont + {\item[ \InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% - {\item[\hskip\labelsep \theorem@headerfont + {\item[ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} \renewtheoremstyle{break}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderbreak}{##1\ ##2\theorem@separator}\newline ]}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderbreak}% {##1\ ##2\ (##3)\theorem@separator}\newline ]} \renewtheoremstyle{change}% - {\item[\hskip\labelsep - \theorem@headerfont + {\item[ \InlineClass{theoremheaderchange}{##2\ ##1\theorem@separator}]}% - {\item[\hskip\labelsep - \theorem@headerfont + {\item[ \InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem@separator}]} \renewtheoremstyle{changebreak}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderchangebreak}% {##2\ ##1\theorem@separator}\newline ]}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderchangebreak}% {##2\ ##1\ (##3)\theorem@separator}\newline ]} \renewtheoremstyle{margin}% - {\item[\hskip\labelsep\theorem@headerfont + {\item[ \InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem@separator} ]}% - {\item[\hskip\labelsep\theorem@headerfont + {\item[ \InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem@separator} ]} \renewtheoremstyle{marginbreak}% - {\item[\hskip\labelsep\theorem@headerfont + {\item[ \InlineClass{theoremheadermarginbreak}% {##2 \qquad ##1\theorem@separator}\newline ]}% - {\item[\hskip\labelsep\theorem@headerfont + {\item[ \InlineClass{theoremheadermarginbreak}% {##2 \qquad ##1\ (##3)\theorem@separator}\newline ]} \renewtheoremstyle{nonumberplain}% - {\item[\theorem@headerfont\hskip\labelsep + {\item[ \InlineClass{theoremheaderplain}{##1\theorem@separator}]}% - {\item[\theorem@headerfont\hskip \labelsep + {\item[ \InlineClass{theoremheaderplain}{##1\ (##3)\theorem@separator}]} \renewtheoremstyle{nonumberbreak}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderbreak}{##1\theorem@separator}\newline ]}% {\item[ - \hskip\labelsep \theorem@headerfont \InlineClass{theoremheaderbreak}{##1\ (##3)\theorem@separator}\newline ]} \renewtheoremstyle{empty}% {\item[]}% - {\item[\theorem@headerfont \hskip\labelsep\relax + {\item[ \InlineClass{theoremheaderplain}{##3}]} \renewtheoremstyle{emptybreak}% {\item[]}% - {\item[\theorem@headerfont \hskip\labelsep\relax + {\item[ \InlineClass{theoremheaderplain}{##3}] \ \newline} \ifbool{LWR@ntheoremamsthm}{}{% \newtheoremstyle{plainupright}% - {\item[\hskip\labelsep \theorem@headerfont + {\item[ \InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% - {\item[\hskip\labelsep \theorem@headerfont + {\item[ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} - \newtheoremstyle{nonumberplainuprightsc}% - {\item[\theorem@headerfont\hskip\labelsep + {\item[ \InlineClass{theoremheadersc}{##1\theorem@separator}]}% - {\item[\theorem@headerfont\hskip \labelsep + {\item[ \InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]} }% not amsthm \ifbool{LWR@ntheoremamsthm}{}{% + \theoremnumbering{arabic} + \theoremstyle{plain} + \RequirePackage{latexsym} + \theoremsymbol{\Box} + \theorembodyfont{\itshape} + \theoremheaderfont{\normalfont\bfseries} + \theoremseparator{} + \renewtheorem{Theorem}{Theorem} + \renewtheorem{theorem}{Theorem} + \renewtheorem{Satz}{Satz} + \renewtheorem{satz}{Satz} + \renewtheorem{Proposition}{Proposition} + \renewtheorem{proposition}{Proposition} + \renewtheorem{Lemma}{Lemma} + \renewtheorem{lemma}{Lemma} + \renewtheorem{Korollar}{Korollar} + \renewtheorem{korollar}{Korollar} + \renewtheorem{Corollary}{Corollary} + \renewtheorem{corollary}{Corollary} + \theoremstyle{plainupright} \theorembodyfont{\upshape} \theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box @@ -250,119 +332,91 @@ \gdef\th@plain{% \def\theorem@headerfont{\normalfont\bfseries}\itshape% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodyplain}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderplain}{##1\ ##2.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodyplain}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3).} ]}} \gdef\th@nonumberplain{% \def\theorem@headerfont{\normalfont\bfseries}\itshape% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodyplain}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderplain}{##1.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodyplain}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderplain}{##1\ (##3).} ]}} \gdef\th@definition{% \def\theorem@headerfont{\normalfont\bfseries}\normalfont% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodydefinition}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderdefinition}{##1\ ##2.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodydefinition}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).} ]}} \gdef\th@nonumberdefinition{% \def\theorem@headerfont{\normalfont\bfseries}\normalfont% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodydefinition}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderdefinition}{##1.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodydefinition}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderdefinition}{##1\ (##3).} ]}} \gdef\th@remark{% \def\theorem@headerfont{\itshape}\normalfont% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodyremark}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderremark}{##1\ ##2.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodyremark}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderremark}{##1\ ##2\ (##3).} ]}} \gdef\th@nonumberremark{% \def\theorem@headerfont{\itshape}\normalfont% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodyremark}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderremark}{##1.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodyremark}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderremark}{##1\ (##3).} ]}} \gdef\th@proof{% \def\theorem@headerfont{\normalfont\bfseries}\itshape% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembodyproof}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderproof}{##1.} ]}% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembodyroof}% new \LWR@inctheorem% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheaderproof}{##1\ (##3).} ]}} @@ -394,7 +448,7 @@ \setendmarkfalse% \fi% }{}% -\LWR@origendtheorem% +\LWR@origendtheorem% also does \@endtrivlist \ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}% \endBlockClass% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty new file mode 100644 index 00000000000..bbc134dd980 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-pagesel.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pagesel') +%% 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{pagesel} +\endinput +%% +%% End of file `lwarp-pagesel.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty new file mode 100644 index 00000000000..b4137e1a4da --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -0,0 +1,1055 @@ +%% +%% This is file `lwarp-patch-memoir.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `patch-memoir') +%% 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. +\ProvidesPackage{lwarp-patch-memoir} +\RequirePackage{lwarp-abstract}% req'd +\RequirePackage{lwarp-array}% req'd +\RequirePackage{lwarp-booktabs}% req'd +\RequirePackage{lwarp-changepage}% req'd +\RequirePackage{lwarp-crop} +\RequirePackage{lwarp-dcolumn}% req'd +\RequirePackage{lwarp-enumerate}% req'd +\RequirePackage{lwarp-epigraph}% req'd +\RequirePackage{lwarp-fancyvrb}% req'd +\RequirePackage{lwarp-footmisc}% req'd +\RequirePackage{lwarp-framed}% req'd +\RequirePackage{lwarp-hanging}% req'd +\DisemulatePackage{moreverb} +\RequirePackage{lwarp-moreverb} +\RequirePackage{lwarp-mparhack} +\RequirePackage{lwarp-needspace}% req'd +\RequirePackage{lwarp-nextpage}% req'd +\RequirePackage{lwarp-pagenote}% req'd +\RequirePackage{lwarp-parskip} +\RequirePackage{lwarp-setspace}% req'd +\RequirePackage{lwarp-showidx} +\RequirePackage{lwarp-subfigure}% red'q +\LetLtxMacro\LWR@memorignewsubfloat\newsubfloat +\RenewDocumentCommand{\newsubfloat}{O{} m}{% + \@ifundefined{c@sub#2}{% + \LWR@memorignewsubfloat[#1]{#2}% + }{}% +} + +\RequirePackage{lwarp-tabularx}% req'd +\RequirePackage{lwarp-titling}% req'd +\RequirePackage{lwarp-tocloft}% req'd +\RequirePackage{lwarp-verse}% req'd +\LetLtxMacro\LWR@origlabel\@mem@old@label + +\AtBeginDocument{ + \def\@@wrindexhyp#1||\\{% + \addtocounter{LWR@autoindex}{1}% + \LWR@newlabel{LWRindex-\arabic{LWR@autoindex}}% + \ifshowindexmark\@showidx{#1}\fi + \protected@write\@auxout{}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + \endgroup + \@esphack}% +} + +\setstocksize{190in}{20in} +\setlrmarginsandblock{2in}{2in}{*} +\setulmarginsandblock{1in}{1in}{*} +\renewcommand*{\stockavi}{} +\renewcommand*{\stockav}{} +\renewcommand*{\stockaiv}{} +\renewcommand*{\stockaiii}{} +\renewcommand*{\stockbvi}{} +\renewcommand*{\stockbv}{} +\renewcommand*{\stockbiv}{} +\renewcommand*{\stockbiii}{} +\renewcommand*{\stockmlargecrownvo}{} +\renewcommand*{\stockmdemyvo}{} +\renewcommand*{\stockmsmallroyalvo}{} +\renewcommand*{\pageavi}{} +\renewcommand*{\pageav}{} +\renewcommand*{\pageaiv}{} +\renewcommand*{\pageaiii}{} +\renewcommand*{\pagebvi}{} +\renewcommand*{\pagebv}{} +\renewcommand*{\pagebiv}{} +\renewcommand*{\pagebiii}{} +\renewcommand*{\pagemlargecrownvo}{} +\renewcommand*{\pagemdemyvo}{} +\renewcommand*{\pagemsmallroyalvo}{} + +\renewcommand*{\stockdbill}{} +\renewcommand*{\stockstatement}{} +\renewcommand*{\stockexecutive}{} +\renewcommand*{\stockletter}{} +\renewcommand*{\stockold}{} +\renewcommand*{\stocklegal}{} +\renewcommand*{\stockledger}{} +\renewcommand*{\stockbroadsheet}{} +\renewcommand*{\pagedbill}{} +\renewcommand*{\pagestatement}{} +\renewcommand*{\pageexecutive}{} +\renewcommand*{\pageletter}{} +\renewcommand*{\pageold}{} +\renewcommand*{\pagelegal}{} +\renewcommand*{\pageledger}{} +\renewcommand*{\pagebroadsheet}{} + +\renewcommand*{\stockpottvo}{} +\renewcommand*{\stockfoolscapvo}{} +\renewcommand*{\stockcrownvo}{} +\renewcommand*{\stockpostvo}{} +\renewcommand*{\stocklargecrownvo}{} +\renewcommand*{\stocklargepostvo}{} +\renewcommand*{\stocksmalldemyvo}{} +\renewcommand*{\stockdemyvo}{} +\renewcommand*{\stockmediumvo}{} +\renewcommand*{\stocksmallroyalvo}{} +\renewcommand*{\stockroyalvo}{} +\renewcommand*{\stocksuperroyalvo}{} +\renewcommand*{\stockimperialvo}{} +\renewcommand*{\pagepottvo}{} +\renewcommand*{\pagefoolscapvo}{} +\renewcommand*{\pagecrownvo}{} +\renewcommand*{\pagepostvo}{} +\renewcommand*{\pagelargecrownvo}{} +\renewcommand*{\pagelargepostvo}{} +\renewcommand*{\pagesmalldemyvo}{} +\renewcommand*{\pagedemyvo}{} +\renewcommand*{\pagemediumvo}{} +\renewcommand*{\pagesmallroyalvo}{} +\renewcommand*{\pageroyalvo}{} +\renewcommand*{\pagesuperroyalvo}{} +\renewcommand*{\pageimperialvo}{} + +\renewcommand*{\memfontfamily}{} +\renewcommand*{\memfontenc}{} +\renewcommand*{\memfontpack}{} + +\renewcommand*{\anyptfilebase}{} +\renewcommand*{\anyptsize}{10} + +\renewcommand*{\setstocksize}[2]{} +\renewcommand*{\settrimmedsize}[3]{} +\renewcommand*{\settrims}[2]{} + +\renewcommand*{\setxlvchars}[1]{} +\renewcommand*{\setlxvchars}[1]{} + +\renewcommand*{\settypeblocksize}[3]{} +\renewcommand*{\setlrmargins}[3]{} +\renewcommand*{\setlrmarginsandblock}[3]{} +\renewcommand*{\setbinding}[1]{} +\renewcommand*{\setulmargins}[3]{} +\renewcommand*{\setulmarginsandblock}[3]{} +\renewcommand*{\setcolsepandrule}[2]{} + +\renewcommand*{\setheadfoot}[2]{} +\renewcommand*{\setheaderspaces}[3]{} +\renewcommand*{\setmarginnotes}[3]{} +\renewcommand*{\setfootins}[2]{} +\renewcommand*{\checkandfixthelayout}[1][]{} +\renewcommand*{\checkthelayout}[1]{} +\renewcommand*{\fixthelayout}{} +\renewcommand*{\typeoutlayout}{} +\renewcommand*{\typeoutstandardlayout}{} +\renewcommand*{\settypeoutlayoutunit}[1]{} +\renewcommand*{\fixpdflayout}{} +\renewcommand*{\fixdvipslayout}{} + +\renewcommand*{\medievalpage}[1][]{} +\renewcommand*{\isopage}[1][]{} +\renewcommand*{\semiisopage}[1][]{} + +\renewcommand{\setpagebl}[3]{} +\renewcommand{\setpageml}[3]{} +\renewcommand{\setpagetl}[3]{} +\renewcommand{\setpagetm}[3]{} +\renewcommand{\setpagetr}[3]{} +\renewcommand{\setpagemr}[3]{} +\renewcommand{\setpagebr}[3]{} +\renewcommand{\setpagebm}[3]{} +\renewcommand{\setpagecc}[3]{} +\let\miniscule\tiny +\let\HUGE\Huge + +\renewcommand*{\abnormalparskip}[1]{} +\renewcommand*{\nonzeroparskip}{} +\renewcommand*{\traditionalparskip}{} + +\let\onelineskip\baselineskip + +\let\OnehalfSpacing\onehalfspacing +\let\DoubleSpacing\doublespacing +\renewcommand*{\setPagenoteSpacing}[1]{} +\renewcommand*{\setFloatSpacing}[1]{} +\let\SingleSpacing\singlespacing +\let\setSingleSpace\SetSinglespace +\let\SingleSpace\singlespace +\let\endSingleSpace\endsinglespace +\let\Spacing\spacing +\let\endSpacing\endspacing +\let\OnehalfSpace\onehalfspace +\let\endOnehalfSpace\endonehalfspace +\csletcs{OnehalfSpace*}{onehalfspace} +\csletcs{endOnehalfSpace*}{endonehalfspace} +\let\DoubleSpace\doublespace +\let\endDoubleSpace\enddoublespace +\csletcs{DoubleSpace*}{doublespace} +\csletcs{endDoubleSpace*}{enddoublespace} +\renewcommand*{\setDisplayskipStretch}[1]{} +\renewcommand*{\memdskipstretch}{} +\renewcommand*{\noDisplayskipStretch}{} +\renewcommand*{\memdskips}{} + +\renewcommand*{\midsloppy}{} +\renewenvironment*{midsloppypar}{}{} + +\renewcommand*{\sloppybottom}{} +\csletcs{titlingpage*}{titlingpage} +\csletcs{endtitlingpage*}{endtitlingpage} +\let\andnext\and +\renewcommand*{\thanksmarkstyle}[1]{} +\renewcommand{\thanksfootmark}{% +\thanksscript{\tamark}% +} + +\renewcommand*{\abstractcol}{} +\renewcommand*{\abstractintoc}{} +\renewcommand*{\abstractnum}{} +\renewcommand*{\abstractrunin}{} + +\def\@apppage{% + \part*{\appendixpagename} +} +\renewcommand\mempreaddapppagetotochook{} +\renewcommand\mempostaddapppagetotochook{} + +\def\@sapppage{% + \part*{\appendixpagename} +} + +\csletcs{frontmatter*}{frontmatter} +\csletcs{mainmatter*}{mainmatter} +\renewcommand*{\raggedbottomsection}{} +\renewcommand*{\normalbottomsection}{} +\renewcommand*{\bottomsectionskip}{} +\renewcommand*{\bottomsectionpenalty}{} +\csletcs{appendixpage*}{appendixpage} +\renewcommand*{\namedsubappendices}{} +\renewcommand*{\unnamedsubappendices}{} +\renewcommand*{\setsecnumdepth}[1]{}% todo tocvsec2 +\renewcommand*{\maxsecnumdepth}[1]{}% todo tocvsec2 +\renewcommand*{\beforebookskip}{} +\renewcommand*{\afterbookskip}{} +\renewcommand*{\beforepartskip}{} +\renewcommand*{\afterpartskip}{} +\renewcommand*{\midbookskip}{} +\renewcommand*{\midpartskip}{} +\renewcommand*{\printbookname}{} +\renewcommand*{\booknamefont}{} +\renewcommand*{\booknamenum}{} +\renewcommand*{\printbooknum}{} +\renewcommand*{\booknumfont}{} +\renewcommand*{\printpartname}{} +\renewcommand*{\partnamefont}{} +\renewcommand*{\partnamenum}{} +\renewcommand*{\printpartnum}{} +\renewcommand*{\partnumfont}{} +\renewcommand*{\printbooktitle}[1]{} +\renewcommand*{\booktitlefont}{} +\renewcommand{\printparttitle}[1]{} +\renewcommand*{\parttitlefont}{} +\renewcommand*{\bookpageend}{} +\renewcommand*{\bookblankpage}{} +\renewcommand*{\nobookblankpage}{} +\renewcommand*{\partpageend}{} +\renewcommand*{\partblankpage}{} +\renewcommand*{\nopartblankpage}{} +\RenewDocumentCommand{\newleadpage}{s o m m}{}% todo +\RenewDocumentCommand{\renewleadpage}{s o m m}{}% todo +\renewcommand*{\leadpagetoclevel}{chapter} + +\renewcommand*{\openright}{} +\renewcommand*{\openleft}{} +\renewcommand*{\openany}{} +\renewcommand*{\clearforchapter}{} +\renewcommand*{\memendofchapterhook}{} +\renewcommand*{\chapterheadstart}{} +\renewcommand*{\afterchapternum}{} +\renewcommand*{\afterchaptertitle}{} +\renewcommand*{\printchaptername}{} +\renewcommand*{\chapnamefont}{} +\renewcommand*{\chapternamenum}{} +\renewcommand*{\printchapternum}{} +\renewcommand*{\chapnumfont}{} +\renewcommand{\printchaptertitle}[1]{} +\renewcommand*{\chaptitlefont}{} +\renewcommand*{\printchapternonum}{} +\renewcommand*{\indentafterchapter}{} +\renewcommand*{\noindentafterchapter}{} +\renewcommand*{\insertchapterspace}{} + +\renewcommand*{\chapterstyle}[1]{} +\renewcommand{\makechapterstyle}[2]{} +\renewcommand*{\chapindent}{} +\let\chapterprecis\cftchapterprecis +\let\chapterprecishere\cftchapterprecishere +\let\chapterprecistoc\cftchapterprecistoc +\renewcommand*{\precisfont}{} +\renewcommand*{\prechapterprecis}{} +\renewcommand*{\postchapterprecis}{} +\renewcommand{\precistoctext}[1]{} +\renewcommand*{\precistocfont}{} +\renewcommand*{\precistocformat}{} + +\renewcommand*{\setbeforesecskip}[1]{} +\renewcommand*{\setaftersecskip}[1]{} +\renewcommand*{\setsecindent}[1]{} +\renewcommand*{\setsecheadstyle}[1]{} +\renewcommand*{\setbeforesubsecskip}[1]{} +\renewcommand*{\setaftersubsecskip}[1]{} +\renewcommand*{\setsubsecindent}[1]{} +\renewcommand*{\setsubsecheadstyle}[1]{} +\renewcommand*{\setbeforesubsubsecskip}[1]{} +\renewcommand*{\setaftersubsubsecskip}[1]{} +\renewcommand*{\setsubsubsecindent}[1]{} +\renewcommand*{\setsubsubsecheadstyle}[1]{} +\renewcommand*{\setbeforeparaskip}[1]{} +\renewcommand*{\setafterparaskip}[1]{} +\renewcommand*{\setparaindent}[1]{} +\renewcommand*{\setparaheadstyle}[1]{} +\renewcommand*{\setbeforesubparaskip}[1]{} +\renewcommand*{\setaftersubparaskip}[1]{} +\renewcommand*{\setsubparaindent}[1]{} +\renewcommand*{\setsubparaheadstyle}[1]{} +\renewcommand{\@hangfrom}[1]{#1} +\renewcommand{\sethangfrom}[1]{} +\renewcommand{\setsecnumformat}[1]{} + +\renewcommand*{\hangsecnum}{} +\renewcommand*{\defaultsecnum}{} + +\renewcommand*{\sechook}{} +\renewcommand{\setsechook}[1]{} +\renewcommand*{\subsechook}{} +\renewcommand{\setsubsechook}[1]{} +\renewcommand*{\subsubsechook}{} +\renewcommand{\setsubsubsechook}[1]{} +\renewcommand*{\parahook}{} +\renewcommand{\setparahook}[1]{} +\renewcommand*{\subparahook}{} +\renewcommand{\setsubparahook}[1]{} + +\RenewDocumentCommand{\plainbreak}{s m}{\begin{center}~\end{center}} + +\RenewDocumentCommand{\fancybreak}{s +m}{% +\begin{center}#2\end{center}% +} + +\RenewDocumentCommand{\plainfancybreak}{s m m +m}{% +\begin{center}#4\end{center}% +} + +\RenewDocumentCommand{\pfbreak}{s}{% +\begin{center} +\pfbreakdisplay +\end{center} +} + +\renewcommand{\pfbreakdisplay}{*\quad*\quad*} + +\renewcommand{\makeheadstyles}[2]{} +\renewcommand*{\headstyles}[1]{} +\renewcommand*{\savepagenumber}{} +\renewcommand*{\restorepagenumber}{} +\renewcommand*{\uppercaseheads}{} +\renewcommand*{\nouppercaseheads}{} + +\renewcommand*{\bookpagemark}[1]{} +\renewcommand*{\partmark}[1]{} +\renewcommand*{\bibmark}{} +\renewcommand*{\indexmark}{} +\renewcommand*{\glossarymark}{} + +\LWR@origpagestyle{empty} +\renewcommand*{\ps@empty}{} +\renewcommand*{\makepagestyle}[1]{} +\renewcommand*{\emptypshook}{}% +\renewcommand*{\@oddhead}{} +\renewcommand*{\@oddfoot}{} +\renewcommand*{\@evenhead}{} +\renewcommand*{\@evenfoot}{} +\renewcommand*{\aliaspagestyle}[2]{} +\renewcommand*{\copypagestyle}[2]{} + +\renewcommand*{\makeevenhead}[4]{} +\renewcommand*{\makeoddhead}[4]{} +\renewcommand*{\makeevenfoot}[4]{} +\renewcommand*{\makeoddfoot}[4]{} +\renewcommand*{\makerunningwidth}[3]{} +\renewcommand*{\makeheadrule}[3]{} +\renewcommand*{\makefootrule}[3]{} +\renewcommand*{\makeheadfootruleprefix}[3]{} +\renewcommand*{\makeheadposition}[5]{} +\renewcommand{\makepsmarks}[2]{} +\renewcommand*{\makeheadfootstrut}[3]{} + +\renewcommand{\createplainmark}[3]{} +\renewcommand{\memUChead}[1]{} +\renewcommand{\createmark}[5]{} +\renewcommand*{\clearplainmark}[1]{} +\renewcommand*{\clearmark}[1]{} +\renewcommand{\addtopsmarks}[3]{} +\renewcommand{\ifonlyfloats}[2]{#2} +\renewcommand*{\mergepagefloatstyle}[3]{} + +\renewcommand*{\framepichead}{} +\renewcommand*{\framepictextfoot}{} +\renewcommand*{\framepichook}{} +\renewcommand*{\showheadfootlocoff}{} +\renewcommand*{\showtextblocklocoff}{} +\renewcommand{\hangfrom}[1]{#1} +\let\centerfloat\centering +\renewcommand*{\raggedyright}[1][]{} +\renewcommand{\sourceatright}[2][]{\attribution{#2}} +\let\memorigdbs\LWR@endofline +\let\memorigpar\par +\let\atcentercr\LWR@endofline +\renewcommand*{\flushleftright}{} +\renewcommand*{\linenottooshort}[1][]{} +\renewcommand*{\russianpar}{} +\renewcommand*{\lastlinerulefill}{} +\renewcommand*{\lastlineparrule}{} +\renewcommand*{\justlastraggedleft}{} +\renewcommand*{\raggedrightthenleft}{} +\renewcommand*{\leftcenterright}{} + +\renewcommand{\leftspringright}[4]{% +\begin{minipage}{#1\linewidth}#3\end{minipage}\qquad% +\begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}% +} + +\renewenvironment*{blockdescription} +{\LWR@descriptionstart\LWR@origdescription} +{\enddescription} +\renewcommand*{\blockdescriptionlabel}[1]{\textbf{#1}} +\renewenvironment*{labelled}[1]{\begin{description}}{\end{description}} +\renewenvironment*{flexlabelled}[6]{\begin{description}}{\end{description}} +\renewcommand*{\tightlists}{} +\renewcommand*{\defaultlists}{} +\RenewDocumentCommand{\firmlists}{s}{} +\renewcommand*{\firmlist}{} +\renewcommand*{\tightlist}{} +\renewcommand*{\zerotrivseps}{} +\renewcommand*{\savetrivseps}{} +\renewcommand*{\restoretrivseps}{} +\csletcs{tableofcontents*}{tableofcontents} +\csletcs{listoffigures*}{listoffigures} +\csletcs{listoftables*}{listoftables} +\renewenvironment{KeepFromToc}{}{} +\renewcommand*{\onecoltocetc}{} +\renewcommand*{\twocoltocetc}{} +\renewcommand*{\ensureonecol}{} +\renewcommand*{\restorefromonecol}{} +\renewcommand*{\doccoltocetc}{} +\renewcommand*{\maxtocdepth}[1]{}% tocvsec2 +\renewcommand*{\settocdepth}[1]{}% tocvsec2 + +\renewcommand{\tocheadstart}{} +\renewcommand{\printtoctitle}[1]{} +\renewcommand{\tocmark}{} +\renewcommand{\aftertoctitle}{} +\renewcommand{\lofheadstart}{} +\renewcommand{\printloftitle}[1]{} +\renewcommand{\lofmark}{} +\renewcommand{\afterloftitle}{} +\renewcommand{\lotheadstart}{} +\renewcommand{\printlottitle}[1]{} +\renewcommand{\lotmark}{} +\renewcommand{\afterlottitle}{} + +\renewcommand*{\setpnumwidth}[1]{} +\renewcommand*{\setrmarg}[1]{} +\renewcommand*{\cftbookbreak}{} +\renewcommand*{\cftpartbreak}{} +\renewcommand*{\cftchapterbreak}{} + +\renewcommand*{\cftbookfont}{} +\renewcommand*{\cftbookname}{} +\renewcommand*{\cftbookpresnum}{} +\renewcommand*{\cftbookaftersnum}{} +\renewcommand*{\cftbookaftersnumb}{} +\renewcommand*{\cftbookleader}{} +\renewcommand*{\cftbookdotsep}{1} +\renewcommand*{\cftbookpagefont}{} +\renewcommand*{\cftbookafterpnum}{} +\renewcommand*{\cftbookformatpnum}[1]{} +\renewcommand*{\cftbookformatpnumhook}[1]{} +\renewcommand*{\cftchapterfont}{} +\renewcommand*{\cftchaptername}{} +\renewcommand*{\cftchapterpresnum}{} +\renewcommand*{\cftchapteraftersnum}{} +\renewcommand*{\cftchapteraftersnumb}{} +\renewcommand*{\cftchapterleader}{} +\renewcommand*{\cftchapterdotsep}{1} +\renewcommand*{\cftchapterpagefont}{} +\renewcommand*{\cftchapterafterpnum}{} +\renewcommand*{\cftchapterformatpnum}[1]{} +\renewcommand*{\cftchapterformatpnumhook}[1]{} +\renewcommand*{\cftsectionfont}{} +\renewcommand*{\cftsectionname}{} +\renewcommand*{\cftsectionpresnum}{} +\renewcommand*{\cftsectionaftersnum}{} +\renewcommand*{\cftsectionaftersnumb}{} +\renewcommand*{\cftsectionleader}{} +\renewcommand*{\cftsectiondotsep}{1} +\renewcommand*{\cftsectionpagefont}{} +\renewcommand*{\cftsectionafterpnum}{} +\renewcommand*{\cftsectionformatpnum}[1]{} +\renewcommand*{\cftsectionformatpnumhook}[1]{} + +\renewcommand*{\cftsubsectionfont}{} +\renewcommand*{\cftsubsectionname}{} +\renewcommand*{\cftsubsectionpresnum}{} +\renewcommand*{\cftsubsectionaftersnum}{} +\renewcommand*{\cftsubsectionaftersnumb}{} +\renewcommand*{\cftsubsectionleader}{} +\renewcommand*{\cftsubsectiondotsep}{1} +\renewcommand*{\cftsubsectionpagefont}{} +\renewcommand*{\cftsubsectionafterpnum}{} +\renewcommand*{\cftsubsectionformatpnum}[1]{} +\renewcommand*{\cftsubsectionformatpnumhook}[1]{} + +\renewcommand*{\cftsubsubsectionfont}{} +\renewcommand*{\cftsubsubsectionname}{} +\renewcommand*{\cftsubsubsectionpresnum}{} +\renewcommand*{\cftsubsubsectionaftersnum}{} +\renewcommand*{\cftsubsubsectionaftersnumb}{} +\renewcommand*{\cftsubsubsectionleader}{} +\renewcommand*{\cftsubsubsectiondotsep}{1} +\renewcommand*{\cftsubsubsectionpagefont}{} +\renewcommand*{\cftsubsubsectionafterpnum}{} +\renewcommand*{\cftsubsubsectionformatpnum}[1]{} +\renewcommand*{\cftsubsubsectionformatpnumhook}[1]{} + +\renewcommand*{\cftparagraphfont}{} +\renewcommand*{\cftparagraphname}{} +\renewcommand*{\cftparagraphpresnum}{} +\renewcommand*{\cftparagraphaftersnum}{} +\renewcommand*{\cftparagraphaftersnumb}{} +\renewcommand*{\cftparagraphleader}{} +\renewcommand*{\cftparagraphdotsep}{1} +\renewcommand*{\cftparagraphpagefont}{} +\renewcommand*{\cftparagraphafterpnum}{} +\renewcommand*{\cftparagraphformatpnum}[1]{} +\renewcommand*{\cftparagraphformatpnumhook}[1]{} + +\renewcommand*{\cftsubparagraphfont}{} +\renewcommand*{\cftsubparagraphname}{} +\renewcommand*{\cftsubparagraphpresnum}{} +\renewcommand*{\cftsubparagraphaftersnum}{} +\renewcommand*{\cftsubparagraphaftersnumb}{} +\renewcommand*{\cftsubparagraphleader}{} +\renewcommand*{\cftsubparagraphdotsep}{1} +\renewcommand*{\cftsubparagraphpagefont}{} +\renewcommand*{\cftsubparagraphafterpnum}{} +\renewcommand*{\cftsubparagraphformatpnum}[1]{} +\renewcommand*{\cftsubparagraphformatpnumhook}[1]{} + +\renewcommand*{\cftfigurefont}{} +\renewcommand*{\cftfigurename}{} +\renewcommand*{\cftfigurepresnum}{} +\renewcommand*{\cftfigureaftersnum}{} +\renewcommand*{\cftfigureaftersnumb}{} +\renewcommand*{\cftfigureleader}{} +\renewcommand*{\cftfiguredotsep}{1} +\renewcommand*{\cftfigurepagefont}{} +\renewcommand*{\cftfigureafterpnum}{} +\renewcommand*{\cftfigureformatpnum}[1]{} +\renewcommand*{\cftfigureformatpnumhook}[1]{} + +\newcommand*{\cftsubfigurefont}{} +\newcommand*{\cftsubfigurename}{} +\newcommand*{\cftsubfigurepresnum}{} +\newcommand*{\cftsubfigureaftersnum}{} +\newcommand*{\cftsubfigureaftersnumb}{} +\newcommand*{\cftsubfigureleader}{} +\newcommand*{\cftsubfiguredotsep}{1} +\newcommand*{\cftsubfigurepagefont}{} +\newcommand*{\cftsubfigureafterpnum}{} +\newcommand*{\cftsubfigureformatpnum}[1]{} +\newcommand*{\cftsubfigureformatpnumhook}[1]{} + +\renewcommand*{\cfttablefont}{} +\renewcommand*{\cfttablename}{} +\renewcommand*{\cfttablepresnum}{} +\renewcommand*{\cfttableaftersnum}{} +\renewcommand*{\cfttableaftersnumb}{} +\renewcommand*{\cfttableleader}{} +\renewcommand*{\cfttabledotsep}{1} +\renewcommand*{\cfttablepagefont}{} +\renewcommand*{\cfttableafterpnum}{} +\renewcommand*{\cfttableformatpnum}[1]{} +\renewcommand*{\cfttableformatpnumhook}[1]{} + +\newcommand*{\cftsubtablefont}{} +\newcommand*{\cftsubtablename}{} +\newcommand*{\cftsubtablepresnum}{} +\newcommand*{\cftsubtableaftersnum}{} +\newcommand*{\cftsubtableaftersnumb}{} +\newcommand*{\cftsubtableleader}{} +\newcommand*{\cftsubtabledotsep}{1} +\newcommand*{\cftsubtablepagefont}{} +\newcommand*{\cftsubtableafterpnum}{} +\newcommand*{\cftsubtableformatpnum}[1]{} +\newcommand*{\cftsubtableformatpnumhook}[1]{} +\renewcommand*{\booknumberline}[1]{} +\renewcommand*{\partnumberline}[1]{} +\renewcommand*{\chapternumberline}[1]{} +\renewcommand*{\numberlinehook}[1]{} +\renewcommand*{\booknumberlinehook}[1]{} +\renewcommand*{\partnumberlinehook}[1]{} +\renewcommand*{\chapternumberlinehook}[1]{} +\renewcommand{\numberlinebox}[2]{} +\renewcommand{\booknumberlinebox}[2]{} +\renewcommand{\partnumberlinebox}[2]{} +\renewcommand{\chapternumberlinebox}[2]{} +\renewcommand*{\cftpagenumbersoff}[1]{} +\renewcommand*{\cftpagenumberson}[1]{} +\renewcommand*{\cftlocalchange}[3]{} +\renewcommand*{\cftaddtitleline}[4]{} +\renewcommand*{\cftaddnumtitleline}[4]{} +\renewcommand{\cftinsertcode}[2]{} +\renewcommand{\cftinserthook}[2]{} +\renewcommand{\settocpreprocessor}[2]{} +\DeclareRobustCommand{\cftpagenumbersoff}[1]{} +\DeclareRobustCommand{\cftpagenumberson}[1]{} +\RenewDocumentCommand{\newfloat}{o m m m}{% +\IfValueTF{#1}% +{\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}% +{\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}% +\cslet{listof#2s}\relax% +\cslet{listof#2es}\relax% +} +\RenewDocumentCommand{\newlistof}{o m m m} +{% +\IfValueTF{#1} +{\newlistentry[#1]{#2}{#3}{0}} +{\newlistentry{#2}{#3}{0}} +\@namedef{ext@#2}{#3}% +\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}% +\setcounter{#3depth}{1}% +\@namedef{#3mark}{}% +\@namedef{#2}{\listof{#2}{#4}} +\@namedef{@cftmake#3title}{} +\@ifundefined{cftbefore#3titleskip}{ + \expandafter\newlength\csname cftbefore#3titleskip\endcsname + \expandafter\newlength\csname cftafter#3titleskip\endcsname +}{} +\@namedef{cft#3titlefont}{} +\@namedef{cftafter#3title}{} +\@namedef{cft#3prehook}{} +\@namedef{cft#3posthook}{} +} +\renewcommand{\setfloatadjustment}[2]{} +\NewDocumentEnvironment{KFLTmemoir@marginfloat}{O{-1.2ex} m} +{% start +\LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% +\captionsetup{type=#2}% +} +{% +\endLWR@BlockClassWP% +} + +\DeclareDocumentEnvironment{marginfigure}{o} + {\begin{KFLTmemoir@marginfloat}{figure}} + {\end{KFLTmemoir@marginfloat}} + +\DeclareDocumentEnvironment{margintable}{o} + {\begin{KFLTmemoir@marginfloat}{table}} + {\end{KFLTmemoir@marginfloat}} +\renewcommand{\setmarginfloatcaptionadjustment}[2]{} +\renewcommand{\setmpjustification}[2]{} +\renewcommand*{\mpjustification}{} +\renewcommand*{\setfloatlocations}[2]{} +\DeclareDocumentCommand{\suppressfloats}{o}{} +\renewcommand*{\FloatBlock}{} +\renewcommand*{\FloatBlockAllowAbove}{} +\renewcommand*{\FloatBlockAllowBelow}{} +\renewcommand*{\setFloatBlockFor}{} +\renewcommand*{\captiondelim}[1]{\renewcommand*{\CaptionSeparator}{#1}} +\renewcommand*{\captionnamefont}[1]{} +\renewcommand*{\captiontitlefont}[1]{} +\renewcommand*{\captionstyle}[2][]{} +\renewcommand*{\centerlastline}{} +\renewcommand*{\hangcaption}{} +\renewcommand*{\indentcaption}[1]{} +\renewcommand*{\normalcaption}{} +\renewcommand*{\changecaptionwidth}{} +\DeclareDocumentCommand{\captionwidth}{m}{} +\renewcommand*{\normalcaptionwidth}{} +\renewcommand{\precaption}[1]{} +\renewcommand{\captiontitlefinal}[1]{} +\renewcommand{\postcaption}[1]{} + +\renewcommand{\contcaption}[1]{% +\begin{LWR@figcaption}% later becomes \caption* +\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1 +\end{LWR@figcaption} +} +\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}} + +\renewcommand{\namedlegend}[2][]{ +\begin{center} +\csuse{fleg\@captype}\CaptionSeparator#2\\ +\end{center} +\csuse{flegtoc\@captype}{#1} +} + +\renewcommand{\flegtable}{\tablename} +\renewcommand{\flegfigure}{\figurename} +\renewcommand{\flegtoctable}{} +\renewcommand{\flegtocfigure}{} + +\renewcommand{\newfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\renewfixedcaption}[3][\caption]{% + \renewcommand{#2}{\def\@captype{#3}#1}} +\renewcommand{\providefixedcaption}[3][\caption]{% + \providecommand{#2}{\def\@captype{#3}#1}} + +\renewcommand{\bitwonumcaption}[6][]{% +\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% +\addtocounter{\@captype}{-1}% +\begingroup% +\csdef{\@captype name}{#4}% +\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}% +\endgroup% +\ifblank{#1}{}{\label{#1}}% +} + +\LetLtxMacro\bionenumcaption\bitwonumcaption% todo + +\renewcommand{\bicaption}[5][]{% +\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}% +\begin{LWR@figcaption}% later becomes \caption* +#4 \thechapter.\the\value{\@captype}\CaptionSeparator #5 +\end{LWR@figcaption} +\ifblank{#1}{}{\label{#1}}% +} + +\renewcommand{\bicontcaption}[3]{% +\contcaption{#1}% +\begingroup% +\csdef{\@captype name}{#2}% +\contcaption{#3}% +\endgroup% +} + +\renewcommand{\midbicaption}[1]{} + +\renewcommand{\subcaption}[2][]{% +\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}% +} + +\RenewDocumentCommand{\subtop}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\RenewDocumentCommand{\subbottom}{O{} O{} m}{% +\subfloat[#1][#2]{#3}% +} + +\renewcommand{\contsubcaption}{\ContinuedFloat\subcaption} + +\renewcommand{\contsubtop}{% +\ContinuedFloat\addtocounter{\@captype}{1}% +\subtop} + +\renewcommand{\contsubbottom}{% +\ContinuedFloat\addtocounter{\@captype}{1}% +\subbottom} + +\renewcommand{\subconcluded}{} + +\LetLtxMacro\subcaptionref\subref + +\renewcommand*{\tightsubcaptions}{} +\renewcommand*{\loosesubcaptions}{} + +\renewcommand*{\subcaptionsize}[1]{} +\renewcommand*{\subcaptionlabelfont}[1]{} +\renewcommand*{\subcaptionfont}[1]{} +\renewcommand*{\subcaptionstyle}[1]{} + +\renewcommand*{\hangsubcaption}{} +\renewcommand*{\shortsubcaption}{} +\renewcommand*{\normalsubcaption}{} + +\RenewDocumentEnvironment{sidecaption}{o m o} +{} +{ +\IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}% +\IfValueT{#3}{\label{#3}}% +} + +\renewcommand*{\setsidecaps}[2]{} +\renewcommand*{\sidecapmargin}[1]{} +\scapmargleftfalse +\renewcommand*{\setsidecappos}[1]{} + +\RenewDocumentEnvironment{sidecontcaption}{m o} +{} +{% +\ContinuedFloat% +\caption{#1}% +\IfValueT{#2}{\label[\@captype]{#2}}% +} +\renewenvironment{sidenamedlegend}[2][]{ +\begin{center} +\csuse{\@captype name}\CaptionSeparator#2 +\end{center} +} +{} + +\renewenvironment{sidelegend}[1] +{\begin{center} +#1 + +} +{\end{center}} + +\renewcommand*{\sidecapstyle}{} +\renewcommand*{\overridescapmargin}[1]{} +\renewcommand*{\sidecapfloatwidth}{\linewidth} + +\LetLtxMacro\ctabular\tabular +\LetLtxMacro\endctabular\endtabular + +\renewcommand{\autorows}[5][]{% +#5 +} + +\renewcommand{\autocols}[5][]{% +#5 +} +\renewcommand*{\feetabovefloat}{} +\renewcommand*{\feetbelowfloat}{} +\renewcommand*{\feetatbottom}{} + +\renewcommand*{\verbfootnote}[2][]{ +\PackageError{lwarp,memoir} +{Verbatim footnotes are not yet supported by lwarp.} +{This may be improved some day.} +} + +\renewcommand*{\plainfootnotes}{} +\renewcommand*{\twocolumnfootnotes}{} +\renewcommand*{\threecolumnfootnotes}{} +\renewcommand*{\paragraphfootnotes}{} +\renewcommand*{\footfudgefiddle}{} + +\renewcommand*{\newfootnoteseries}[1]{ +\PackageError{lwarp,memoir} +{Memoir footnote series are not yet supported by lwarp.} +{This may be improved some day.} +} + +\renewcommand*{\plainfootstyle}[1]{} +\renewcommand*{\twocolumnfootstyle}[1]{} +\renewcommand*{\threecolumnfootstyle}[1]{} +\renewcommand*{\paragraphfootstyle}[1]{} + +\renewcommand*{\footfootmark}{} +\renewcommand*{\footmarkstyle}[1]{} + + +\renewcommand*{\foottextfont}{} + +\renewcommand*{\marginparmargin}[1]{} +\renewcommand*{\sideparmargin}[1]{} + +\LetLtxMacro\sidepar\marginpar +\renewcommand*{\sideparfont}{} +\renewcommand*{\sideparform}{} +\LWR@providelength{\sideparvshift} + +\renewcommand*{\parnopar}{} + +\renewcommand{\sidebar}[1]{\begin{quote}#1\end{quote}} +\renewcommand*{\sidebarmargin}[1]{} +\renewcommand*{\sidebarfont}{} +\renewcommand*{\sidebarform}{} +\renewcommand{\setsidebarheight}[1]{} +\renewcommand*{\setsidebars}[6]{} +\renewcommand*{\footnotesatfoot}{} +\renewcommand*{\footnotesinmargin}{} + +\LetLtxMacro\sidefootnote\footnote +\LetLtxMacro\sidefootnotemark\footnotemark +\LetLtxMacro\sidefootnotetext\footnotetext + +\renewcommand*{\sidefootmargin}[1]{} +\renewcommand*{\setsidefootheight}[1]{} +\renewcommand*{\setsidefeet}[6]{} +\renewcommand*{\sidefootmarkstyle}[1]{} +\renewcommand*{\sidefoottextfont}{} +\renewcommand*{\sidefootform}{} + +\renewcommand*{\continuousnotenums}{\pncontopttrue}% from pagenote +\renewcommand*{\notepageref}{} +\renewcommand*{\prenotetext}{} +\renewcommand*{\postnotetext}{} +\renewcommand*{\idtextinnotes}[1]{} +\renewcommand*{\printpageinnotes}[1]{} +\renewcommand*{\printpageinnoteshyperref}[1]{} +\renewcommand*{\foottopagenote}{} +\renewcommand*{\pagetofootnote}{} +\renewcommand*{\epigraphposition}[1]{} +\renewcommand*{\epigraphtextposition}[1]{} +\renewcommand*{\epigraphsourceposition}[1]{} +\renewcommand*{\epigraphfontsize}[1]{} +\renewcommand*{\epigraphforheader}[2][]{} +\renewcommand*{\epigraphpicture}{} +\renewcommand*{\vinphantom}{} +\renewcommand*{\vleftofline}[1]{#1} + +\DeclareDocumentCommand{\PoemTitle}{s o o m}{% +\IfValueTF{#2}% +{\poemtitle[#2]{#4}}% +{\poemtitle{#4}}% +} + +\renewcommand*{\NumberPoemTitle}{} +\renewcommand*{\PlainPoemTitle}{} +\renewcommand*{\poemtitlepstyle}{} +\renewcommand*{\poemtitlestarmark}[1]{} +\renewcommand*{\poemtitlestarpstyle}{} +\renewcommand*{\PoemTitleheadstart}{} +\renewcommand*{\printPoemTitlenonum}{} +\renewcommand*{\printPoemTitlenum}{} +\renewcommand*{\afterPoemTitlenum}{} +\renewcommand*{\printPoemTitletitle}[1]{} +\renewcommand*{\afterPoemTitle}{} +\newlength{\midpoemtitleskip} +\renewcommand*{\PoemTitlenumfont}{} +\renewcommand*{\PoemTitlefont}{} +\renewenvironment{qframe}{\framed}{\endframed} +\renewenvironment{qshade}{\shaded}{\endshaded} +\renewcommand*{\commentsoff}[1]{\includecomment{#1}} +\renewcommand*{\commentson}[1]{\excludecomment{#1}} +\LetLtxMacro\renewcomment\commentson + +\renewcommand*{\setverbatimfont}[1]{} +\renewcommand*{\tabson}[1]{} +\renewcommand*{\tabsoff}{} +\renewcommand*{\wrappingon}{} +\renewcommand*{\wrappingoff}{} +\renewcommand*{\verbatimindent}{} +\renewcommand*{\verbatimbreakchar}[1]{} +\DefineVerbatimEnvironment{fboxverbatim}{Verbatim}{frame=single} +\renewcommand*{\bvbox}{} +\renewcommand*{\bvtopandtail}{} +\renewcommand*{\bvsides}{} +\renewcommand*{\nobvbox}{} +\renewcommand*{\bvtoprulehook}{} +\renewcommand*{\bvtopmidhook}{} +\renewcommand*{\bvendrulehook}{} +\renewcommand*{\bvleftsidehook}{} +\renewcommand*{\bvrightsidehook}{} +\renewcommand*{\bvperpagetrue}{} +\renewcommand*{\bvperpagefalse}{} +\renewcommand{\bvtopofpage}[1]{} +\renewcommand{\bvendofpage}[1]{} +\renewcommand*{\linenumberfrequency}[1]{} +\renewcommand*{\resetbvlinenumber}{} +\renewcommand*{\setbvlinenums}[2]{} +\renewcommand*{\linenumberfont}[1]{} +\renewcommand*{\bvnumbersinside}{} +\renewcommand*{\bvnumbersoutside}{} +\renewcommand*{\fref}[1]{\cref{#1}} +\renewcommand*{\tref}[1]{\cref{#1}} +\renewcommand*{\pref}[1]{\cpageref{#1}} +\renewcommand*{\Aref}[1]{\cref{#1}} +\renewcommand*{\Bref}[1]{\cref{#1}} +\renewcommand*{\Pref}[1]{\cref{#1}} +\renewcommand*{\Sref}[1]{\cref{#1}} +\renewcommand*{\figurerefname}{Figure} +\renewcommand*{\tablerefname}{Table} +\renewcommand*{\pagerefname}{page} +\renewcommand*{\bookrefname}{Book~} +\renewcommand*{\partrefname}{Part~} +\renewcommand*{\chapterrefname}{Chapter~} +\renewcommand*{\sectionrefname}{\S} +\renewcommand*{\appendixrefname}{Appendix~} +\LetLtxMacro\titleref\nameref +\renewcommand*{\headnameref}{} +\renewcommand*{\tocnameref}{} + +\providecounter{LWR@currenttitle} + +\renewcommand*{\currenttitle}{% + \addtocounter{LWR@currenttitle}{1}% + \label{currenttitle\arabic{LWR@currenttitle}}% + \nameref{currenttitle\arabic{LWR@currenttitle}}% +} + +\renewcommand*{\theTitleReference}[2]{} +\renewcommand*{\namerefon}{} +\renewcommand*{\namerefoff}{} +\DeclareDocumentCommand{\newblock}{}{} +\renewcommand*{\showindexmarks}{} +\renewcommand*{\hideindexmarks}{} + +\renewcommand*{\xindyindex}{} +\renewcommand*{\changemarks}{} +\renewcommand*{\nochangemarks}{} +\renewcommand*{\added}[1]{} +\renewcommand*{\deleted}[1]{} +\renewcommand*{\changed}[1]{} + +\renewcommand*{\showtrimsoff}{} +\renewcommand*{\showtrimson}{} +\renewcommand*{\trimXmarks}{} +\renewcommand*{\trimLmarks}{} +\renewcommand*{\trimFrame}{} +\renewcommand*{\trimNone}{} +\renewcommand*\trimmarkscolor{} +\renewcommand*{\trimmarks}{} +\renewcommand*{\tmarktl}{} +\renewcommand*{\tmarktr}{} +\renewcommand*{\tmarkbr}{} +\renewcommand*{\tmarkbl}{} +\renewcommand*{\tmarktm}{} +\renewcommand*{\tmarkmr}{} +\renewcommand*{\tmarkbm}{} +\renewcommand*{\tmarkml}{} +\renewcommand*{\trimmark}{} +\renewcommand*{\quarkmarks}{} +\renewcommand*{\registrationColour}[1]{} + +\renewcommand*{\leavespergathering}[1]{} + +\renewcommand*{\noprelistbreak}{} + +\renewcommand*{\cleartorecto}{} +\renewcommand*{\cleartoverso}{} + +\renewenvironment{vplace}[1][]{}{} +\newlistof{tableofcontents}{toc}{\contentsname} +\newlistof{listoffigures}{lof}{\listfigurename} +\newlistof{listoftables}{lot}{\listtablename} +\endinput +%% +%% End of file `lwarp-patch-memoir.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty new file mode 100644 index 00000000000..169c4f82724 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-prettyref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `prettyref') +%% 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{prettyref} + +\newrefformat{fig}{Figure \ref{#1}} +\newrefformat{tab}{Table \ref{#1}} + +\endinput +%% +%% End of file `lwarp-prettyref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty index 011ab6d59a3..33d30c5224a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty @@ -21,18 +21,18 @@ \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 +\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 %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index 0af502a7753..efb1a16c8ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -46,24 +46,19 @@ \ifdim\dimen@>\FBso@max \global\FBso@max\dimen@ \fi}% - \vtop\bgroup - \vbox\bgroup + \bgroup + \bgroup \ifcase\@tempcnta \@minipagefalse \or - \vskip\sf@top \or \ifdim \lastskip=\z@ \else - \@tempskipb\sf@top\relax\@xaddvskip \fi \fi \sf@ifpositiontop{% \ifx \@empty#3\relax \else \sf@subcaption{#1}{#2}{#3}% - \vskip\sf@capskip - \vskip\sf@captopadj \fi\egroup - \hrule width0pt height0pt depth0pt \LWR@startpars% new #4 \LWR@stoppars% new @@ -81,12 +76,9 @@ \LWR@stoppars% new \egroup \ifx \@empty#3\relax \else - \vskip\sf@capskip - \hrule width0pt height0pt depth0pt \sf@subcaption{#1}{#2}{#3}% \fi }% - \vskip\sf@bottom \egroup \@ifundefined{FBsc@max}{}% {\addtocounter{FRobj}{-1}% @@ -124,7 +116,7 @@ {\@nameuse{sub\@captype name}}% {\@nameuse{thesub\@captype}}% {#3} - \LWR@figcaption% new + \endLWR@figcaption% new \LWR@traceinfo{sfsubcap B2}% new }% {\dimen@\ht0% @@ -140,7 +132,6 @@ \def\next{ }% \fi - \vbox{% \LWR@traceinfo{sfsubcap C1}% new \caption@make @@ -149,7 +140,6 @@ {#3} \LWR@traceinfo{sfsubcap C1}% new - } }% \egroup \LWR@startpars% new @@ -165,7 +155,7 @@ \let\caption@lsep\@empty \let\caption@tfmt\@firstofone }% -\renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new + \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new \caption@applyfont \caption@fmt {\ifcaption@star\else @@ -194,6 +184,13 @@ \LWR@stoppars% new } +\renewcommand{\caption@@make@}[2]{% + \caption@stepthecounter + \caption@beginhook + \caption@@@make{#1}{#2}% + \caption@endhook +} + \def\subfloat@label{% \LWR@ensuredoingapar% new \@ifnextchar(% %) match left parenthesis @@ -211,11 +208,10 @@ \def\@newsubfloat[#1]#2{% \LWR@orig@newsubfloat[#1]{#2}% -\renewcommand{\l@sub#2}[2]{\hypertocfloat{2}{sub#2}{\ext@sub#2}{##1}{##2}} +\renewcommand{\l@sub#2}[2]{\hypertocfloat{2}{sub#2}{\ext@sub#2}{##1}{##2}}% } \renewcommand{\l@subfigure}[2]{\hypertocfloat{2}{subfigure}{lof}{#1}{#2}} \renewcommand{\l@subtable}[2]{\hypertocfloat{2}{subtable}{lot}{#1}{#2}} - \endinput %% %% End of file `lwarp-subfig.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty new file mode 100644 index 00000000000..82a09cc4dbc --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty @@ -0,0 +1,41 @@ +%% +%% This is file `lwarp-subfigure.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `subfigure') +%% 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{subfigure} +\RequirePackage{subfig} +\LetLtxMacro\subfigure\subfloat +\LetLtxMacro\subtable\subfloat +\LetLtxMacro\Subref\subref +\@ifundefined{figuretopcaptrue}{\newif\iffiguretopcap}{} +\newif\ifsubfiguretopcap +\newif\ifsubcaphang +\newif\ifsubcapcenter +\newif\ifsubcapcenterlast +\newif\ifsubcapnooneline +\newif\ifsubcapraggedright +\newskip\subfigtopskip +\newskip\subfigcapskip +\newdimen\subfigcaptopadj +\newskip\subfigbottomskip +\newdimen\subfigcapmargin +\newskip\subfiglabelskip +\newcommand*{\subcapsize}{} +\newcommand*{\subcaplabelfont}{} +\newcommand*{\subcapfont}{} +\endinput +%% +%% End of file `lwarp-subfigure.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty index 3d1a075ea57..a146d307b88 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -45,15 +45,15 @@ \newcommand*{\shrinkheight}[1]{} \NewDocumentEnvironment{supertabular}{s o m} -{ -\LWR@traceinfo{supertabular} -\table -\LWRST@caption -\begin{tabular}{#3} +{% +\LWR@traceinfo{supertabular}% +\table% +\LWRST@caption% +\begin{tabular}{#3}% \TabularMacro\ifdefvoid{\LWRST@firsthead}% {\LWR@getmynexttoken}% {\expandafter\LWR@getmynexttoken\LWRST@firsthead}% -} +}% {% \ifdefvoid{\LWRST@lasttail}% {}% @@ -61,9 +61,9 @@ \TabularMacro\ResumeTabular% \LWRST@lasttail% }% -\end{tabular} -\endtable -\LWR@traceinfo{supertabular done} +\end{tabular}% +\endtable% +\LWR@traceinfo{supertabular done}% } \NewDocumentEnvironment{mpsupertabular}{s o m} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index 3b1d41eb8a3..fab7370755b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -19,11 +19,11 @@ \LWR@ProvidesPackageDrop{tabularx} -\NewDocumentEnvironment{tabularx}{m o m} +\DeclareDocumentEnvironment{tabularx}{m o m} {\tabular{#3}} {\endtabular} -\NewDocumentEnvironment{tabularx*}{m o m} +\DeclareDocumentEnvironment{tabularx*}{m o m} {\tabular{#3}} {\endtabular} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty new file mode 100644 index 00000000000..0865fc742e1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty @@ -0,0 +1,43 @@ +%% +%% This is file `lwarp-textfit.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `textfit') +%% 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{textfit} +\newsavebox{\LWR@textfitbox} + +\newcommand*{\LWR@textfitscale}[2]{% +\uselengthunit{PT}% +\setlength{\LWR@templengthone}{#1}% +\setlength{\LWR@templengthone}{% + 1em*\ratio{\LWR@templengthone}{\LWR@templengthtwo}% +}% +\InlineClass[font-size:\rndprintlength{\LWR@templengthone}]{textfit}{#2}% +} + +\newcommand*{\scaletowidth}[2]{% +\sbox{\LWR@textfitbox}{#2}% +\settowidth{\LWR@templengthtwo}{\usebox{\LWR@textfitbox}}% +\LWR@textfitscale{#1}{#2}% +} + +\newcommand*{\scaletoheight}[2]{% +\sbox{\LWR@textfitbox}{#2}% +\settoheight{\LWR@templengthtwo}{\usebox{\LWR@textfitbox}}% +\LWR@textfitscale{#1}{#2}% +} +\endinput +%% +%% End of file `lwarp-textfit.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty index 8bf5db0c1e0..c0bad5e4b7f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty @@ -81,98 +81,99 @@ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new }% \fi} -\gdef\th@plain{%\normalfont\itshape +\gdef\th@plain{% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##1\ ##2} - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##1\ ##2\ (##3)} - ]} + ] + } } -\gdef\th@break{%\normalfont\slshape +\gdef\th@break{% \def\@begintheorem##1##2{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip \labelsep + \item[ \InlineClass{theoremheader}{##1\ ##2}\newline% - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip \labelsep + \item[ \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline - ]} + ] + } } -\gdef\th@marginbreak{%\normalfont\slshape +\gdef\th@marginbreak{% \def\@begintheorem##1##2{ -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep % + \item[ \InlineClass{theoremheader}{##2 \qquad ##1}\newline - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep % + \item[ \InlineClass{theoremheader}{##2 \qquad ##1\ % (##3)}\newline - ]} + ] + } } -\gdef\th@changebreak{%\normalfont\slshape +\gdef\th@changebreak{% \def\@begintheorem##1##2{ -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##2\ ##1}\newline - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{ ##2\ ##1\ % (##3)}\newline - ]} + ] + } } -\gdef\th@change{%\normalfont\slshape +\gdef\th@change{% \def\@begintheorem##1##2{ -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##2\ ##1} - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##2\ ##1\ (##3)} - ]} + ] + } } -\gdef\th@margin{%\normalfont\slshape +\gdef\th@margin{% \def\@begintheorem##1##2{ -\LWR@forcenewpage% new - \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep + \item[ \InlineClass{theoremheader}{##2 \qquad ##1} - ]}% + ] + }% \def\@opargbegintheorem##1##2##3{% + \item[ + \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)} + ] + } +} +\gdef\@thm#1#2{\refstepcounter{#1}% \LWR@forcenewpage% new \BlockClass{theorembody\LWR@thisthmstyle}% new - \item[\hskip\labelsep - \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)} - ]} + \trivlist + \@topsep \theorempreskipamount % used by first \item + \@topsepadd \theorempostskipamount % used by \@endparenv + \@ifnextchar [% + {\@ythm{#1}{#2}}% + {\@begintheorem{#2}{\csname the#1\endcsname}\ignorespaces}} + +\gdef\@endtheorem{% +\endtrivlist +\endBlockClass } -\gdef\@endtheorem{\endBlockClass\endtrivlist} \endinput %% %% End of file `lwarp-theorem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 0f9c437c774..caca518a2c8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -19,8 +19,6 @@ \LWR@ProvidesPackagePass{tikz} -\begin{warpHTML} - \newboolean{LWR@tikzbabel} \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 @@ -41,8 +39,6 @@ {\catcode`\$=\active}% } -\end{warpHTML} - \endinput %% %% End of file `lwarp-tikz.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty index dd8376af42f..8e9892773a1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty @@ -15,7 +15,19 @@ %% 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} +\LWR@ProvidesPackageDrop{titleref} + +\LetLtxMacro\titleref\nameref + +\providecounter{LWR@currenttitle} + +\newcommand*{\currenttitle}{% + \addtocounter{LWR@currenttitle}{1}% + \label{currenttitle\arabic{LWR@currenttitle}}% + \nameref{currenttitle\arabic{LWR@currenttitle}}% +} + +\newcommand*{\theTitleReference}[2]{} \endinput %% %% End of file `lwarp-titleref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 68103bddc69..7da04f1da90 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -53,7 +53,7 @@ \renewcommand*{\LWR@maketitlesetup}{% \def\@makefnmark{\textsuperscript{\@thefnmark}} \long\def\@makefntext##1{% -\makethanksmark \LWR@orighspace{1in} +\makethanksmark~% ##1% }% } @@ -104,11 +104,15 @@ \renewcommand{\thanksmarkseries}[1]{% \def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}% } +\@ifclassloaded{memoir}{ + \thanksmarkseries{arabic} +}{% not memoir \if@titlepage \thanksmarkseries{arabic} \else \thanksmarkseries{fnsymbol} \fi +}% not memoir \endinput %% %% End of file `lwarp-titling.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty index 2b8e3c55ead..1481bcf32ec 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty @@ -49,13 +49,13 @@ \let\subitem\LWR@indexsubitem% \let\subsubitem\LWR@indexsubsubitem% }{} -\renewcommand{\simplechapter}[1][\@empty]{% +\DeclareDocumentCommand{\simplechapter}{O{\@empty}}{% \def\@chapcntformat##1{% #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% }% } -\renewcommand{\restorechapter}{% +\DeclareDocumentCommand{\restorechapter}{}{% \let\@chapcntformat\@seccntformat% } \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 1fe9a61bf71..b93eddf47e1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -49,37 +49,36 @@ \newlength{\cftbeforelottitleskip} \newlength{\cftafterlottitleskip} -\newcommand*{\cftdot}{.} +\providecommand*{\cftdot}{.} \providecommand*{\cftdotsep}{1} -\newcommand*{\cftnodots}{5000} +\providecommand*{\cftnodots}{5000} \providecommand{\cftdotfill}[1]{} -\newcommand*{\cftsetpnumwidth}[1]{} +\DeclareDocumentCommand{\cftsetpnumwidth}{m}{} -\newcommand*{\cftsetrmarg}[1]{} +\DeclareDocumentCommand{\cftsetrmarg}{m}{} -\newcommand*{\cftpnumalign}[1]{} +\DeclareDocumentCommand{\cftpnumalign}{m}{} -\newlength{\cftparskip} +\LWR@providelength{\cftparskip} -\newlength{\cftbeforepartskip} -\newlength{\cftpartindent} -\newlength{\cftpartnumwidth} -\newcommand*{\cftpartfont}{} -\newcommand*{\cftpartpresnum}{} -\newcommand*{\cftpartaftersnum}{} -\newcommand*{\cftpartaftersnumb}{} -\newcommand*{\cftpartleader}{} -\newcommand*{\cftpartdotsep}{1} -\newcommand*{\cftpartpagefont}{} -\newcommand*{\cftpartafterpnum}{} - -\newlength{\cftbeforechapskip} -\newlength{\cftchapindent} -\newlength{\cftchapnumwidth} +\LWR@providelength{\cftbeforepartskip} +\LWR@providelength{\cftpartindent} +\LWR@providelength{\cftpartnumwidth} +\providecommand*{\cftpartfont}{} +\providecommand*{\cftpartpresnum}{} +\providecommand*{\cftpartaftersnum}{} +\providecommand*{\cftpartaftersnumb}{} +\providecommand*{\cftpartleader}{} +\providecommand*{\cftpartdotsep}{1} +\providecommand*{\cftpartpagefont}{} +\providecommand*{\cftpartafterpnum}{} +\LWR@providelength{\cftbeforechapskip} +\LWR@providelength{\cftchapindent} +\LWR@providelength{\cftchapnumwidth} \newcommand*{\cftchapfont}{} \newcommand*{\cftchappresnum}{} \newcommand*{\cftchapaftersnum}{} @@ -88,10 +87,9 @@ \newcommand*{\cftchapdotsep}{1} \newcommand*{\cftchappagefont}{} \newcommand*{\cftchapafterpnum}{} - -\newlength{\cftbeforesecskip} -\newlength{\cftsecindent} -\newlength{\cftsecnumwidth} +\LWR@providelength{\cftbeforesecskip} +\LWR@providelength{\cftsecindent} +\LWR@providelength{\cftsecnumwidth} \newcommand*{\cftsecfont}{} \newcommand*{\cftsecpresnum}{} \newcommand*{\cftsecaftersnum}{} @@ -101,9 +99,9 @@ \newcommand*{\cftsecpagefont}{} \newcommand*{\cftsecafterpnum}{} -\newlength{\cftbeforesubsecskip} -\newlength{\cftsubsecindent} -\newlength{\cftsubsecnumwidth} +\LWR@providelength{\cftbeforesubsecskip} +\LWR@providelength{\cftsubsecindent} +\LWR@providelength{\cftsubsecnumwidth} \newcommand*{\cftsubsecfont}{} \newcommand*{\cftsubsecpresnum}{} \newcommand*{\cftsubsecaftersnum}{} @@ -113,9 +111,9 @@ \newcommand*{\cftsubsecpagefont}{} \newcommand*{\cftsubsecafterpnum}{} -\newlength{\cftbeforesubsubsecskip} -\newlength{\cftsubsubsecindent} -\newlength{\cftsubsubsecnumwidth} +\LWR@providelength{\cftbeforesubsubsecskip} +\LWR@providelength{\cftsubsubsecindent} +\LWR@providelength{\cftsubsubsecnumwidth} \newcommand*{\cftsubsubsecfont}{} \newcommand*{\cftsubsubsecpresnum}{} \newcommand*{\cftsubsubsecaftersnum}{} @@ -125,9 +123,9 @@ \newcommand*{\cftsubsubsecpagefont}{} \newcommand*{\cftsubsubsecafterpnum}{} -\newlength{\cftbeforeparaskip} -\newlength{\cftparaindent} -\newlength{\cftparanumwidth} +\LWR@providelength{\cftbeforeparaskip} +\LWR@providelength{\cftparaindent} +\LWR@providelength{\cftparanumwidth} \newcommand*{\cftparafont}{} \newcommand*{\cftparapresnum}{} \newcommand*{\cftparaaftersnum}{} @@ -137,9 +135,9 @@ \newcommand*{\cftparapagefont}{} \newcommand*{\cftparaafterpnum}{} -\newlength{\cftbeforesubparaskip} -\newlength{\cftsubparaindent} -\newlength{\cftsubparanumwidth} +\LWR@providelength{\cftbeforesubparaskip} +\LWR@providelength{\cftsubparaindent} +\LWR@providelength{\cftsubparanumwidth} \newcommand*{\cftsubparafont}{} \newcommand*{\cftsubparapresnum}{} \newcommand*{\cftsubparaaftersnum}{} @@ -149,9 +147,9 @@ \newcommand*{\cftsubparapagefont}{} \newcommand*{\cftsubparaafterpnum}{} -\newlength{\cftbeforefigskip} -\newlength{\cftfigindent} -\newlength{\cftfignumwidth} +\LWR@providelength{\cftbeforefigskip} +\LWR@providelength{\cftfigindent} +\LWR@providelength{\cftfignumwidth} \newcommand*{\cftfigfont}{} \newcommand*{\cftfigpresnum}{} \newcommand*{\cftfigaftersnum}{} @@ -161,9 +159,9 @@ \newcommand*{\cftfigpagefont}{} \newcommand*{\cftfigafterpnum}{} -\newlength{\cftbeforesubfigskip} -\newlength{\cftsubfigindent} -\newlength{\cftsubfignumwidth} +\LWR@providelength{\cftbeforesubfigskip} +\LWR@providelength{\cftsubfigindent} +\LWR@providelength{\cftsubfignumwidth} \newcommand*{\cftsubfigfont}{} \newcommand*{\cftsubfigpresnum}{} \newcommand*{\cftsubfigaftersnum}{} @@ -173,9 +171,9 @@ \newcommand*{\cftsubfigpagefont}{} \newcommand*{\cftsubfigafterpnum}{} -\newlength{\cftbeforetabskip} -\newlength{\cfttabindent} -\newlength{\cfttabnumwidth} +\LWR@providelength{\cftbeforetabskip} +\LWR@providelength{\cfttabindent} +\LWR@providelength{\cfttabnumwidth} \newcommand*{\cfttabfont}{} \newcommand*{\cfttabpresnum}{} \newcommand*{\cfttabaftersnum}{} @@ -185,9 +183,9 @@ \newcommand*{\cfttabpagefont}{} \newcommand*{\cfttabafterpnum}{} -\newlength{\cftbeforesubtabskip} -\newlength{\cftsubtabindent} -\newlength{\cftsubtabnumwidth} +\LWR@providelength{\cftbeforesubtabskip} +\LWR@providelength{\cftsubtabindent} +\LWR@providelength{\cftsubtabnumwidth} \newcommand*{\cftsubtabfont}{} \newcommand*{\cftsubtabpresnum}{} \newcommand*{\cftsubtabaftersnum}{} @@ -197,44 +195,55 @@ \newcommand*{\cftsubtabpagefont}{} \newcommand*{\cftsubtabafterpnum}{} -\newcommand{\cftsetindents}[3]{} +\DeclareDocumentCommand{\cftsetindents}{m m m}{} \newcommand{\pagenumbersoff}[1]{} \newcommand{\pagenumberson}[1]{} -\NewDocumentCommand{\newlistentry}{o m m m} -{ -\IfValueTF{#1} -{ - \newcounter{#2}[#1] - \expandafter\edef\csname the#2\endcsname{ - \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2} - } -} -{\newcounter{#2}} -\@namedef{l@#2}##1##2{\hypertocfloat{1}{#2}{#3}{##1}{##2}} -\expandafter\newlength\csname cftbefore#2skip\endcsname -\expandafter\newlength\csname cft#2indent\endcsname -\expandafter\newlength\csname cft#2numwidth\endcsname -\@namedef{cft#2font}{} -\@namedef{cft#2presnum}{} -\@namedef{cft#2aftersnum}{} -\@namedef{cft#2aftersnumb}{} -\@namedef{cft#2leader}{} -\@namedef{cft#2dotsep}{1} -\@namedef{cft#2pagefont}{} -\@namedef{cft#2afterpnum}{} -\@namedef{toclevel@#2}{#4} -\@namedef{cft#2fillnum}##1{} +\DeclareDocumentCommand{\newlistentry}{o m m m} +{% +\LWR@traceinfo{newlistentry #2 #3 #4}% +\IfValueTF{#1}% +{% + \@ifundefined{c@#2}{% + \newcounter{#2}[#1]% + \expandafter\edef\csname the#2\endcsname{% + \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2}% + }% + }{}% +}% +{% + \@ifundefined{c@#2}{% + \newcounter{#2}% + }{}% +}% +\@namedef{l@#2}##1##2{% + \hypertocfloat{1}{#2}{#3}{##1}{##2}% + \def\cftwhatismyname{#2}% from memoir +}% +\expandafter\newlength\csname cftbefore#2skip\endcsname% +\expandafter\newlength\csname cft#2indent\endcsname% +\expandafter\newlength\csname cft#2numwidth\endcsname% +\@namedef{cft#2font}{}% +\@namedef{cft#2presnum}{}% +\@namedef{cft#2aftersnum}{}% +\@namedef{cft#2aftersnumb}{}% +\@namedef{cft#2leader}{}% +\@namedef{cft#2dotsep}{1}% +\@namedef{cft#2pagefont}{}% +\@namedef{cft#2afterpnum}{}% +\@namedef{toclevel@#2}{#4}% +\@namedef{cft#2fillnum}##1{}% +\LWR@traceinfo{newlistentry done}% } -\NewDocumentCommand{\newlistof}{o m m m} +\DeclareDocumentCommand{\newlistof}{o m m m} {% \IfValueTF{#1} {\newlistentry[#1]{#2}{#3}{0}} {\newlistentry{#2}{#3}{0}} \@namedef{ext@#2}{#3} -\newcounter{#3depth} +\@ifundefined{c@#3depth}{\newcounter{#3depth}}{} \setcounter{#3depth}{1} \@namedef{cftmark#3}{} \@namedef{listof#2}{\listof{#2}{#4}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty new file mode 100644 index 00000000000..2e99d817407 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-turnthepage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `turnthepage') +%% 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{turnthepage} +\newcommand{\turnthepage}{} +\endinput +%% +%% End of file `lwarp-turnthepage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index 8c9ccc12762..c5092c059df 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -30,7 +30,7 @@ \begin{warpHTML} \newcommand*{\LWR@htmlsmallfontstart}{% -\LWR@htmltagc{span style="font-size:\xfracHTMLfontsize"{}}% +\LWR@htmltagc{span style="font-size:\xfracHTMLfontsize"}% \LWR@nestspan% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty index 72f6e84aae5..5a850ed5391 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -52,15 +52,15 @@ \newcommand*{\xentrystretch}[1]{} \NewDocumentEnvironment{xtabular}{s o m} -{ -\LWR@traceinfo{xtabular} -\table -\LWRXT@caption -\begin{tabular}{#3} +{% +\LWR@traceinfo{xtabular}% +\table% +\LWRXT@caption% +\begin{tabular}{#3}% \TabularMacro\ifdefvoid{\LWRXT@firsthead}% {\LWR@getmynexttoken}% {\expandafter\LWR@getmynexttoken\LWRXT@firsthead}% -} +}% {% \ifdefvoid{\LWRXT@lasttail}% {}% @@ -68,9 +68,9 @@ \TabularMacro\ResumeTabular% \LWRXT@lasttail% }% -\end{tabular} -\endtable -\LWR@traceinfo{xtabular done} +\end{tabular}% +\endtable% +\LWR@traceinfo{xtabular done}% } \NewDocumentEnvironment{mpxtabular}{s o m} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index a0ac4d906f1..bd8ecd191dd 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/11/22 v0.44 Allows LaTeX to directly produce HTML5 output.] + [2018/01/23 v0.46 Allows LaTeX to directly produce HTML5 output.] @@ -48,7 +48,9 @@ \RequirePackage{upquote} \else \fi - +\newcommand*\LWR@providelength[1]{% + \ifdeflength{#1}{}{\newlength{#1}}% +} \RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc. \RequirePackage{xpatch} @@ -168,7 +170,6 @@ {\includecomment{LWR@createlwarpmk}} {\excludecomment{LWR@createlwarpmk}} - \newcommand*{\LWR@loadafter}[1]{% \@ifpackageloaded{#1} { @@ -181,6 +182,10 @@ after lwarp.} {} } +\@ifclassloaded{memoir} +{\newcommand*{\LWR@notmemoirloadafter}[1]{}} +{\LetLtxMacro\LWR@notmemoirloadafter\LWR@loadafter} + \newcommand*{\LWR@loadbefore}[1]{% \@ifpackageloaded{#1} {} @@ -199,11 +204,10 @@ Package(s) #2 may be useful instead} or is superceded by another package. For a possible alternative, see package(s) #2.} } - \LWR@loadafter{a4} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} -\LWR@loadafter{abstract} +\LWR@notmemoirloadafter{abstract} \LWR@loadafter{adjmulticol} \LWR@loadafter{addlines} \LWR@loadafter{afterpage} @@ -213,38 +217,44 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{amsthm} \LWR@loadafter{anonchap} \LWR@loadafter{anysize} -\LWR@loadafter{appendix} +\LWR@notmemoirloadafter{appendix} \LWR@loadafter{arabicfront} -\LWR@loadafter{array} +\LWR@notmemoirloadafter{array} \LWR@loadafter{atbegshi} \LWR@loadafter{authblk} +\LWR@loadafter{backref} \LWR@loadafter{balance} \LWR@loadafter{bigdelim} \LWR@loadafter{bigstrut} \LWR@loadafter{bookmark} -\LWR@loadafter{booktabs} +\LWR@notmemoirloadafter{booktabs} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} \LWR@loadafter{cancel} -\LWR@loadafter{ccaption} -\LWR@loadafter{changepage} -\LWR@loadafter{chngpage} +\LWR@notmemoirloadafter{ccaption} +\LWR@loadafter{changebar} +\LWR@notmemoirloadafter{changepage} +\LWR@notmemoirloadafter{chngpage} \LWR@loadafter{chappg} +\LWR@loadafter{cite} \LWR@loadafter{color} -\LWR@loadafter{crop} +\LWR@loadafter{continue} +\LWR@notmemoirloadafter{crop} \LWR@loadafter{cuted} \LWR@loadafter{cutwin} \LWR@loadafter{dblfnote} -\LWR@loadafter{dcolumn} +\LWR@notmemoirloadafter{dcolumn} \LWR@loadafter{draftwatermark} \LWR@loadafter{easy-todo} \LWR@loadafter{ebook} \LWR@loadafter{ellipsis} \LWR@loadafter{emptypage} -\LWR@loadafter{enumerate} +\LWR@loadafter{endfloat} +\LWR@loadafter{endnotes} +\LWR@notmemoirloadafter{enumerate} \LWR@loadafter{enumitem} -\LWR@loadafter{epigraph} +\LWR@notmemoirloadafter{epigraph} \LWR@loadafter{eso-pic} \LWR@loadafter{everypage} \LWR@loadafter{everyshi} @@ -257,20 +267,29 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fix2col} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} +\LWR@loadafter{flafter} \LWR@loadafter{float} \LWR@loadafter{floatflt} \LWR@loadafter{floatpag} \LWR@loadafter{floatrow} +\LWR@loadafter{fltrace} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} \LWR@loadafter{fnpos} +\LWR@loadafter{footmisc} +\LWR@loadafter{footnote} +\LWR@loadafter{footnotehyper} +\LWR@loadafter{footnpag} +\LWR@loadafter{framed} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} +\LWR@loadafter{fwlw} \LWR@loadafter{geometry} \LWR@loadafter{glossaries} \LWR@loadafter{grffile} \LWR@loadafter{hang} +\LWR@loadafter{hanging} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} \LWR@loadafter{idxlayout} @@ -292,29 +311,34 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{marginnote} \LWR@loadafter{mcaption} \LWR@loadafter{mdframed} +\LWR@loadafter{memhfixc} \LWR@loadafter{metalogo} \LWR@loadafter{microtype} \LWR@loadafter{midfloat} -\LWR@loadafter{moreverb} -\LWR@loadafter{mparhack} +\LWR@loadafter{midpage} +\LWR@notmemoirloadafter{moreverb} +\LWR@notmemoirloadafter{mparhack} \LWR@loadafter{multirow} \LWR@loadafter{nameref} -\LWR@loadafter{needspace} +\LWR@loadafter{natbib} +\LWR@notmemoirloadafter{needspace} \LWR@loadafter{newtxmath} -\LWR@loadafter{nextpage} +\LWR@notmemoirloadafter{nextpage} \LWR@loadafter{nonumonpart} \LWR@loadafter{nopageno} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{overpic} -\LWR@loadafter{pagenote} +\LWR@notmemoirloadafter{pagenote} +\LWR@loadafter{pagesel} \LWR@loadafter{paralist} -\LWR@loadafter{parskip} +\LWR@notmemoirloadafter{parskip} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} +\LWR@loadafter{prettyref} \LWR@loadafter{preview} \LWR@loadafter{quotchap} \LWR@loadafter{ragged2e} @@ -332,9 +356,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{scrlayer-scrpage} \LWR@loadafter{section} \LWR@loadafter{sectsty} -\LWR@loadafter{setspace} +\LWR@notmemoirloadafter{setspace} \LWR@loadafter{shadow} -\LWR@loadafter{showidx} +\LWR@notmemoirloadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} \LWR@loadafter{sidenotes} @@ -344,11 +368,13 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{soulutf8} \LWR@loadafter{stabular} \LWR@loadafter{subfig} +\LWR@loadafter{subfigure} \LWR@loadafter{supertabular} \LWR@loadafter{tabls} -\LWR@loadafter{tabularx} +\LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} \LWR@loadafter{textarea} +\LWR@loadafter{textfit} \LWR@loadafter{textpos} \LWR@loadafter{theorem} \LWR@loadafter{threeparttable} @@ -356,18 +382,19 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{titleps} \LWR@loadafter{titlesec} \LWR@loadafter{titletoc} -\LWR@loadafter{titling} -\LWR@loadafter{tocbibind} -\LWR@loadafter{tocloft} +\LWR@notmemoirloadafter{titling} +\LWR@notmemoirloadafter{tocbibind} +\LWR@notmemoirloadafter{tocloft} \LWR@loadafter{tocstyle} \LWR@loadafter{todo} \LWR@loadafter{todonotes} \LWR@loadafter{transparent} \LWR@loadafter{trivfloat} +\LWR@loadafter{turnthepage} \LWR@loadafter{ulem} \LWR@loadafter{upref} \LWR@loadafter{varioref} -\LWR@loadafter{verse} +\LWR@notmemoirloadafter{verse} \LWR@loadafter{wallpaper} \LWR@loadafter{watermark} \LWR@loadafter{wrapfig} @@ -514,7 +541,9 @@ top=1in,bottom=1in,% } \newcommand*{\LWR@lookforpackagename}[1]{% \LWR@findword{\LWR@requirepackagenames}{#1}[\LWR@strresult]% +\LWR@traceinfo{LWR@lookforpackagename with blanks: !\LWR@strresult!}% \StrSubstitute[100]{\LWR@strresult}{ }{}[\LWR@strresulttwo]% +\LWR@traceinfo{LWR@lookforpackagename without blanks: !\LWR@strresulttwo!}% \IfStrEq{\LWR@strresulttwo}{}% {}% no filename {% yes filename @@ -525,7 +554,12 @@ top=1in,bottom=1in,% {\LWR@strresult}% {lwarp-\LWR@strresulttwo}[\LWR@requirepackagenames]% }% -{}% no lwarp-* file +{ + \StrSubstitute% + {\LWR@requirepackagenames}% + {\LWR@strresult}% + {\LWR@strresulttwo}[\LWR@requirepackagenames]% +}% no lwarp-* file }% yes filename } \RenewDocumentCommand{\RequirePackage}{o m o}{% @@ -637,15 +671,22 @@ top=1in,bottom=1in,% \newread\LWR@copyinfile % open the file to read from \newcommand*{\LWR@copyfile}[2]{% +\LWR@traceinfo{LWR@copyfile: copying #1 to #2} + \immediate\openout\LWR@copyoutfile=#2 \openin\LWR@copyinfile=#1 \begingroup\endlinechar=-1 \makeatletter + +\LWR@traceinfo{LWR@copyfile: about to loop} + \loop\unless\ifeof\LWR@copyinfile + \LWR@traceinfo{LWR@copyfile: one line} \read\LWR@copyinfile to\LWR@fileline % Read one line and store it into \LWR@fileline \immediate\write\LWR@copyoutfile{\unexpanded\expandafter{\LWR@fileline}}% \repeat -\closeout\LWR@copyoutfile +\immediate\closeout\LWR@copyoutfile +\LWR@traceinfo{LWR@copyfile: done} \endgroup } @@ -678,12 +719,6 @@ top=1in,bottom=1in,% \end{warpall} -\begin{warpHTML} -\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} -\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} -\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} -\end{warpHTML} - \begin{warpall} \newbool{FormatEPUB} \boolfalse{FormatEPUB} @@ -726,7 +761,7 @@ top=1in,bottom=1in,% \renewcommand*{\LWR@tagsubsubsectionend}{/h5} \renewcommand*{\LWR@tagparagraph}{h6} \renewcommand*{\LWR@tagparagraphend}{/h6} -\renewcommand*{\LWR@tagsubparagraph}{span class="subparagraph"{}} +\renewcommand*{\LWR@tagsubparagraph}{span class="subparagraph"} \renewcommand*{\LWR@tagsubparagraphend}{/span} }% WPTitleHeading {% not WPTitleHeading, part and section starting at h1 @@ -763,7 +798,7 @@ top=1in,bottom=1in,% \renewcommand*{\LWR@tagsubsubsectionend}{/h5} \renewcommand*{\LWR@tagparagraph}{h6} \renewcommand*{\LWR@tagparagraphend}{/h6} -\renewcommand*{\LWR@tagsubparagraph}{span class="subparagraph"{}} +\renewcommand*{\LWR@tagsubparagraph}{span class="subparagraph"} \renewcommand*{\LWR@tagsubparagraphend}{/span} }% not WPTitleHeading }% chapter defined @@ -818,7 +853,7 @@ top=1in,bottom=1in,% \let\LWR@origpagestyle\pagestyle \let\LWR@origthispagestyle\thispagestyle -\let\LWR@origpagenumbering\pagenumbering +\LetLtxMacro\LWR@origpagenumbering\pagenumbering \LetLtxMacro{\LWR@origminipage}{\minipage} \let\LWR@origendminipage\endminipage @@ -965,7 +1000,7 @@ homehtmlfilename = "\HomeHTMLFilename"% \begin{filecontents*}{lwarp.css} /* CSS stylesheet for the LaTeX lwarp package - Copyright 2016-2017 Brian Dunn — BD Tech Concepts LLC + Copyright 2016-2018 Brian Dunn — BD Tech Concepts LLC */ /* a fix for older browsers: */ @@ -1010,6 +1045,7 @@ body { } p {margin: 1.5ex 0em 1.5ex 0em ;} +table p {margin: .5ex 0em .5ex 0em ;} /* Holds a section number to add space between it and the name */ span.sectionnumber { margin-right: 0em } @@ -1380,7 +1416,7 @@ ol { } ul, body dir, body menu { - margin: 1ex 1em 1ex 0em; + margin: 3ex 1em 3ex 0em; line-height: 1.2; } @@ -1570,7 +1606,8 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} .mdframedtitle { padding: .5em ; display: block ; - font-size: 130% + font-size: 130% ; + margin-bottom: 1ex ; } .mdframedsubtitle { @@ -1599,6 +1636,12 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} display: block ; } +.shaded { + margin: 3ex 0em 3ex 0em ; + padding: .3ex 1em .3ex 1em ; + display: block ; +} + .snugframed { margin: 3ex 0em 3ex 0em ; border: 1px solid black; @@ -2676,7 +2719,17 @@ nav.botnavigation { (require "texindy.xdy") (require "page-ranges.xdy") (require "book-order.xdy") +(require "page-ranges.xdy") (markup-locref :open "\hyperindexref{" :close "}") +(define-location-class "arabic-page-numbers" + ("arabic-numbers") :min-range-length 1) +(define-location-class-order ("roman-page-numbers" + "arabic-page-numbers" + "alpha-page-numbers" + "Roman-page-numbers" + "Alpha-page-numbers" + "see" + "seealso")) \end{filecontents*} \end{warpprint} @@ -2750,7 +2803,10 @@ MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function () { MathJax.Hub.Config({ extensions: ["tex2jax.js","[siunitx]/siunitx.js"], jax: ["input/TeX","output/HTML-CSS"], - tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}, + tex2jax: { + inlineMath: [["$","$"],["\\(","\\)"]] , + processClass: "tabbing|verse" + }, TeX: {extensions: ["AMSmath.js","AMSsymbols.js", "sinuitx.js"]} }); MathJax.Ajax.config.path['siunitx'] = 'http://rawgit.com/burnpanck/MathJax-siunitx/master/'; @@ -2787,11 +2843,11 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- \begin{filecontents*}{lwarpmk.lua} #!/usr/bin/env texlua --- Copyright 2016-2017 Brian Dunn +-- Copyright 2016-2018 Brian Dunn -- Print the usage of the lwarpmk command: -printversion = "v0.44" +printversion = "v0.46" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -3366,57 +3422,57 @@ end -- not --version \NewDocumentCommand{\pushclose}{m m} { -\let\LWR@closetwelve\LWR@closeeleven -\let\LWR@closeeleven\LWR@closeten -\let\LWR@closeten\LWR@closenine -\let\LWR@closenine\LWR@closeeight -\let\LWR@closeeight\LWR@closeseven -\let\LWR@closeseven\LWR@closesix -\let\LWR@closesix\LWR@closefive -\let\LWR@closefive\LWR@closefour -\let\LWR@closefour\LWR@closethree -\let\LWR@closethree\LWR@closetwo -\let\LWR@closetwo\LWR@closeone -\let\LWR@closeone#1 -\let\LWR@closedepthtwelve\LWR@closedeptheleven -\let\LWR@closedepthelevel\LWR@closedepthten -\let\LWR@closedepthten\LWR@closedepthnine -\let\LWR@closedepthnine\LWR@closedeptheight -\let\LWR@closedeptheight\LWR@closedepthseven -\let\LWR@closedepthseven\LWR@closedepthsix -\let\LWR@closedepthsix\LWR@closedepthfive -\let\LWR@closedepthfive\LWR@closedepthfour -\let\LWR@closedepthfour\LWR@closedepththree -\let\LWR@closedepththree\LWR@closedepthtwo -\let\LWR@closedepthtwo\LWR@closedepthone -\let\LWR@closedepthone#2 +\global\let\LWR@closetwelve\LWR@closeeleven +\global\let\LWR@closeeleven\LWR@closeten +\global\let\LWR@closeten\LWR@closenine +\global\let\LWR@closenine\LWR@closeeight +\global\let\LWR@closeeight\LWR@closeseven +\global\let\LWR@closeseven\LWR@closesix +\global\let\LWR@closesix\LWR@closefive +\global\let\LWR@closefive\LWR@closefour +\global\let\LWR@closefour\LWR@closethree +\global\let\LWR@closethree\LWR@closetwo +\global\let\LWR@closetwo\LWR@closeone +\global\let\LWR@closeone#1 +\global\let\LWR@closedepthtwelve\LWR@closedeptheleven +\global\let\LWR@closedeptheleven\LWR@closedepthten +\global\let\LWR@closedepthten\LWR@closedepthnine +\global\let\LWR@closedepthnine\LWR@closedeptheight +\global\let\LWR@closedeptheight\LWR@closedepthseven +\global\let\LWR@closedepthseven\LWR@closedepthsix +\global\let\LWR@closedepthsix\LWR@closedepthfive +\global\let\LWR@closedepthfive\LWR@closedepthfour +\global\let\LWR@closedepthfour\LWR@closedepththree +\global\let\LWR@closedepththree\LWR@closedepthtwo +\global\let\LWR@closedepthtwo\LWR@closedepthone +\global\let\LWR@closedepthone#2 } \newcommand*{\popclose} { -\let\LWR@closeone\LWR@closetwo -\let\LWR@closetwo\LWR@closethree -\let\LWR@closethree\LWR@closefour -\let\LWR@closefour\LWR@closefive -\let\LWR@closefive\LWR@closesix -\let\LWR@closesix\LWR@closeseven -\let\LWR@closeseven\LWR@closeeight -\let\LWR@closeeight\LWR@closenine -\let\LWR@closenine\LWR@closeten -\let\LWR@closeten\LWR@closeeleven -\let\LWR@closeeleven\LWR@closetwelve -\let\LWR@closedepthone\LWR@closedepthtwo -\let\LWR@closedepthtwo\LWR@closedepththree -\let\LWR@closedepththree\LWR@closedepthfour -\let\LWR@closedepthfour\LWR@closedepthfive -\let\LWR@closedepthfive\LWR@closedepthsix -\let\LWR@closedepthsix\LWR@closedepthseven -\let\LWR@closedepthseven\LWR@closedeptheight -\let\LWR@closedeptheight\LWR@closedepthnine -\let\LWR@closedepthnine\LWR@closedepthten -\let\LWR@closedepthten\LWR@closedeptheleven -\let\LWR@closedeptheleven\LWR@closedepthtwelve +\global\let\LWR@closeone\LWR@closetwo +\global\let\LWR@closetwo\LWR@closethree +\global\let\LWR@closethree\LWR@closefour +\global\let\LWR@closefour\LWR@closefive +\global\let\LWR@closefive\LWR@closesix +\global\let\LWR@closesix\LWR@closeseven +\global\let\LWR@closeseven\LWR@closeeight +\global\let\LWR@closeeight\LWR@closenine +\global\let\LWR@closenine\LWR@closeten +\global\let\LWR@closeten\LWR@closeeleven +\global\let\LWR@closeeleven\LWR@closetwelve +\global\let\LWR@closedepthone\LWR@closedepthtwo +\global\let\LWR@closedepthtwo\LWR@closedepththree +\global\let\LWR@closedepththree\LWR@closedepthfour +\global\let\LWR@closedepthfour\LWR@closedepthfive +\global\let\LWR@closedepthfive\LWR@closedepthsix +\global\let\LWR@closedepthsix\LWR@closedepthseven +\global\let\LWR@closedepthseven\LWR@closedeptheight +\global\let\LWR@closedeptheight\LWR@closedepthnine +\global\let\LWR@closedepthnine\LWR@closedepthten +\global\let\LWR@closedepthten\LWR@closedeptheleven +\global\let\LWR@closedeptheleven\LWR@closedepthtwelve } \end{warpHTML} @@ -3434,6 +3490,21 @@ end -- not --version \begin{warpHTML} +\newcommand*{\LWR@sanitized}{} + +\newcommand*{\LWR@sanitize}[1]{% +\LWR@traceinfo{LWR@sanitize: !#1!}% +\edef\LWR@sanitized{#1}% +\LWR@traceinfo{LWR@sanitize expanded: !\LWR@sanitized!}% +\edef\LWR@sanitized{\detokenize\expandafter{\LWR@sanitized}}% +\LWR@traceinfo{LWR@sanitize result: !\LWR@sanitized!}% +} + +\end{warpHTML} + + +\begin{warpHTML} + \let\LWR@origampersand\& \newcommand*{\HTMLentity}[1]{% \begingroup% @@ -3443,7 +3514,7 @@ end -- not --version } \newcommand*{\HTMLunicode}[1]{\HTMLentity{\#x#1}} -\renewcommand*{\&}{\HTMLentity{amp}} +\renewrobustcmd*{\&}{\HTMLentity{amp}} \let\LWR@origtextless\textless \renewcommand*{\textless}{\HTMLentity{lt}} @@ -3477,8 +3548,7 @@ end -- not --version \setcounter{LWR@htmlfilenumber}{0} \newcommand*{\LWR@htmlsectionfilename}[1]{% -\LWR@traceinfo{LWR@htmlsectionfilename A}% -\LWR@traceinfo{about to assign temp}% +\LWR@traceinfo{LWR@htmlsectionfilename A !\detokenize{#1}!}% \edef\LWR@tempone{#1}% \LWR@traceinfo{about to compare with ??}% \ifthenelse{\equal{\LWR@tempone}{??}}% @@ -3511,9 +3581,9 @@ end -- not --version } \newcommand*{\LWR@htmlrefsectionfilename}[1]{% -\LWR@traceinfo{LWR@htmlrefsectionfilename A: !#1!}% +\LWR@traceinfo{LWR@htmlrefsectionfilename: !\detokenize{#1}!}% \LWR@htmlsectionfilename{\LWR@htmlfileref{#1}}% -\LWR@traceinfo{LWR@htmlrefsectionfilename B}% +\LWR@traceinfo{LWR@htmlrefsectionfilename: done}% } \end{warpHTML} @@ -3541,16 +3611,26 @@ end -- not --version \begin{warpHTML} -\newcommand*{\PrintStack}{ +\newcommand*{\LWR@subprintstack}{ +\LWR@closedepthone\ \LWR@closedepthtwo\ \LWR@closedepththree\ +\LWR@closedepthfour\ \LWR@closedepthfive\ \LWR@closedepthsix\ +\LWR@closedepthseven\ \LWR@closedeptheight\ \LWR@closedepthnine\ +\LWR@closedepthten\ \LWR@closedeptheleven\ \LWR@closedepthtwelve\ +} + +\newcommand*{\LWRPrintStack}{ \LWR@startpars -\LWR@closedepthone{} \LWR@closedepthtwo{} \LWR@closedepththree{} -\LWR@closedepthfour{} \LWR@closedepthfive{} \LWR@closedepthsix{} -\LWR@closedepthseven{} \LWR@closedeptheight{} \LWR@closedepthnine{} -\LWR@closedepthten{} \LWR@closedeptheleven{} \LWR@closedepthtwelve{} +\LWR@subprintstack } \end{warpHTML} +\begin{warpprint} + +\newcommand*{\LWRPrintStack}{} + +\end{warpprint} + \begin{warpHTML} @@ -3562,9 +3642,19 @@ end -- not --version } \newcommand*{\LWR@closeprevious}[1]{ -\LWR@stoppars -\whileboolexpr{not test{\ifnumcomp{\LWR@closedepthone}{<}{#1}}}% - {\LWR@closeoneprevious} +\LWR@traceinfo{LWR@closeprevious to depth #1, depths are \LWR@subprintstack}% +\LWR@stoppars% +\whileboolexpr{test{\ifnumcomp{\LWR@closedepthone}{>}{#1}}}% +{% + \LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}% + \LWR@closeoneprevious% +}% +\ifboolexpr{test{\ifnumcomp{\LWR@closedepthone}{=}{#1}}}% +{% + \LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}% + \LWR@closeoneprevious% +}{}% +\LWR@traceinfo{LWR@closeprevious: done, depths are \LWR@subprintstack}% } \end{warpHTML} @@ -3574,7 +3664,9 @@ end -- not --version \begin{warpHTML} \newcommand{\LWR@forcenewpage}{% +\ifinner\else% \LWR@stoppars\LWR@orignewpage\LWR@startpars% +\fi% } \renewcommand*{\pagestyle}[1]{} \renewcommand*{\thispagestyle}[1]{} @@ -3584,7 +3676,7 @@ end -- not --version \renewcommand*{\flushbottom}{} \renewcommand*{\sloppy}{} \renewcommand*{\fussy}{} -\renewcommand*{\pagenumbering}[1]{} +\RenewDocumentCommand{\pagenumbering}{s m}{} \end{warpHTML} @@ -3603,9 +3695,9 @@ end -- not --version \newcommand*{\LWR@tagsubsectionend}{/h5} \newcommand*{\LWR@tagsubsubsection}{h6} \newcommand*{\LWR@tagsubsubsectionend}{/h6} -\newcommand*{\LWR@tagparagraph}{span class="paragraph"{}} +\newcommand*{\LWR@tagparagraph}{span class="paragraph"} \newcommand*{\LWR@tagparagraphend}{/span} -\newcommand*{\LWR@tagsubparagraph}{span class="subparagraph"{}} +\newcommand*{\LWR@tagsubparagraph}{span class="subparagraph"} \newcommand*{\LWR@tagsubparagraphend}{/span} \newcommand*{\LWR@tagregularparagraph}{p} @@ -3619,19 +3711,19 @@ end -- not --version {% \frenchbsetup{FrenchFootnotes=false}% \LetLtxMacro\LWR@FBcancel\NoAutoSpacing% - \renewcommand*{\FBcolonspace}{% + \renewrobustcmd*{\FBcolonspace}{% \begingroup% \LWR@FBcancel% \LWR@origampersand{}nbsp;% \endgroup% }% - \renewcommand*{\FBthinspace}{% + \renewrobustcmd*{\FBthinspace}{% \begingroup% \LWR@FBcancel% \LWR@origampersand\#x202f;% \, \endgroup% }% - \renewcommand*{\FBguillspace}{% + \renewrobustcmd*{\FBguillspace}{% \begingroup% \LWR@FBcancel% \LWR@origampersand{}nbsp;% ~, for \og xyz \fg{} @@ -3649,7 +3741,7 @@ end -- not --version \LWR@origampersand{}nbsp;% ~ \endgroup% }% - \renewcommand*{~}{\HTMLentity{nbsp}}% was overwritten by babel-french + \renewrobustcmd*{~}{\HTMLentity{nbsp}}% was overwritten by babel-french \ifFBunicode% \else% \DeclareTextSymbol{\FBtextellipsis}{LY1}{133}% @@ -3661,10 +3753,13 @@ end -- not --version \newcommand*{\LWR@htmltagc}[1]{% {% +\LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@FBcancel% \ifmmode\else\protect\LWR@origttfamily\fi% -\protect\LWR@origtextless#1\protect\LWR@origtextgreater% +\protect\LWR@origtextless% +#1% +\protect\LWR@origtextgreater% \endgroup% }% } @@ -3676,7 +3771,7 @@ end -- not --version \newenvironment*{LWR@nestspan} {% -\LWR@traceinfo{LWR@nestspan}% +\LWR@traceinfo{LWR@nestspan starting}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {% \LWR@traceinfo{LWR@nestspan: inside a lateximage}% @@ -3693,12 +3788,14 @@ end -- not --version }% \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% }% not in a lateximage +\LWR@traceinfo{LWR@nestspan starting: done}% }% starting env {% ending env +\LWR@traceinfo{LWR@nestspan ending}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {\addtocounter{LWR@spandepth}{-1}}% -\LWR@traceinfo{LWR@nestspan: done}% +\LWR@traceinfo{LWR@nestspan ending: done}% } \AfterEndEnvironment{LWR@nestspan}{\global\let\par\LWR@closeparagraph} @@ -3724,14 +3821,8 @@ end -- not --version } -\newcommand*{\LWR@htmltagb}[1]{% +\newcommand*{\LWR@htmltag}[1]{% \LWR@htmltagc{#1}% -\endgroup% -} - -\newcommand*{\LWR@htmltag}{% -\begingroup\catcode`\_=12 -\LWR@htmltagb% } @@ -3762,14 +3853,8 @@ end -- not --version #1% }% \LWR@htmlclosecomment{}} -\newcommand{\LWR@htmlblockcommentb}[1] -{\LWR@stoppars\LWR@htmlcomment{#1}\LWR@startpars\endgroup} - -\newcommand{\LWR@htmlblockcomment} -{% -\begingroup\catcode`\_=12 -\LWR@htmlblockcommentb% -} +\newcommand{\LWR@htmlblockcomment}[1] +{\LWR@stoppars\LWR@htmlcomment{#1}\LWR@startpars} \newcommand*{\LWR@htmlblocktag}[1]{% \LWR@stoppars% @@ -3835,12 +3920,8 @@ end -- not --version \begin{warpHTML} \NewDocumentEnvironment{BlockClass}{o m}% -{ -\LWR@htmldivclass[#1]{#2} -} -{ -\LWR@htmldivclassend{#2} -} +{\LWR@htmldivclass[#1]{#2}} +{\LWR@htmldivclassend{#2}} \end{warpHTML} \begin{warpprint} \NewDocumentEnvironment{BlockClass}{o m}{}{}% @@ -3869,10 +3950,10 @@ end -- not --version \LWR@stoppars% \ifbool{FormatWP}% {% - \LWR@maybeincthisautoid% + \addtocounter{LWR@thisautoidWP}{1}% \LWR@htmltag{% div class="#3" % - id="autoid-\arabic{LWR@thisautoid}"% + id="autoidWP-\arabic{LWR@thisautoidWP}"% \ifblank{#1}{}{ style="#1"}% }% }% FormatWP @@ -3950,11 +4031,6 @@ end -- not --version {}% no nested par tags {% yes nest par tags \LWR@htmltagc{\LWR@tagregularparagraph}% - \ifnumcomp{\@listdepth}{>}{0}% - {% - \LWR@orighspace{1in}% - }% - {}% \global\booltrue{LWR@doingapar}% \let\par\LWR@closeparagraph% }% end of yes nest par tags @@ -3991,7 +4067,21 @@ end -- not --version {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}% {}% }% not handling pars -\LWR@origpar% +\ifboolexpr{% + not bool {LWR@doingapar} and + test {\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}} and + test { + \ifnumcomp{\value{LWR@tabulardepth}}{=}{\value{LWR@tabularpardepth}} + } and + bool {LWR@intabularmetadata} and + not bool {LWR@tableparcell} and + test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} +}% +{% + \LWR@getmynexttoken% +}{% + \LWR@origpar% +}% } \end{warpHTML} @@ -4001,6 +4091,7 @@ end -- not --version \newcommand*{\LWR@startpars}% {% +\LWR@traceinfo{LWR@startpars}% \ifnumcomp{\value{LWR@spandepth}}{>}{0}% {}% {% @@ -4014,6 +4105,7 @@ end -- not --version \global\setbool{LWR@doingstartpars}{true}% \global\boolfalse{LWR@doingapar}% }% nestspan +\LWR@traceinfo{LWR@startpars: done}% } \newcommand*{\LWR@stoppars}% @@ -4047,30 +4139,14 @@ end -- not --version \newcommand{\LWR@firstpagetop}{} % for the home page alone \newcommand{\LWR@pagetop}{} % for all other pages \newcommand{\LWR@pagebottom}{} - -\newcommand{\LWR@setfirstpagetopb}[1]{% -\renewcommand{\LWR@firstpagetop}{#1} -\catcode`\_=8 +\newcommand{\HTMLFirstPageTop}[1]{% + \renewcommand{\LWR@firstpagetop}{#1}% } -\newcommand{\HTMLFirstPageTop}{% -\catcode`\_=12 -\LWR@setfirstpagetopb +\newcommand{\HTMLPageTop}[1]{% + \renewcommand{\LWR@pagetop}{#1}% } -\newcommand{\LWR@setpagetopb}[1]{% -\renewcommand{\LWR@pagetop}{#1} -\catcode`\_=8 -} -\newcommand{\HTMLPageTop}{% -\catcode`\_=12 -\LWR@setpagetopb -} -\newcommand{\LWR@setpagebottomb}[1]{% -\renewcommand{\LWR@pagebottom}{#1} -\catcode`\_=8 -} -\newcommand{\HTMLPageBottom}{% -\catcode`\_=12 -\LWR@setpagebottomb +\newcommand{\HTMLPageBottom}[1]{% + \renewcommand{\LWR@pagebottom}{#1}% } \end{warpall} @@ -4081,15 +4157,11 @@ end -- not --version \newcommand*{\LWR@currentcss}{lwarp.css} -\newcommand*{\LWR@newcssb}[1]{% -\renewcommand*{\LWR@currentcss}{#1} -\catcode`\_=8 +\newcommand*{\CSSFilename}[1]{% +\renewcommand*{\LWR@currentcss}{#1}% +\@onelevel@sanitize\LWR@currentcss% } -\newcommand*{\CSSFilename}{ -\catcode`\_=12 -\LWR@newcssb -} \end{warpHTML} \begin{warpprint} \newcommand*{\CSSFilename}[1]{} @@ -4137,7 +4209,7 @@ end -- not --version \begin{warpHTML} \newbox\LWR@footnotes -\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1} +\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1} \def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}} \long\def\LWR@footnotetext#1{% \LWR@traceinfo{LWR@footnotetext}% @@ -4169,9 +4241,10 @@ end -- not --version }% \let\@footnotetext\LWR@footnotetext +\newbox\LWR@mpfootnotes \long\def\@mpfootnotetext#1{% -\global\setbox\@mpfootins\vbox{% - \unvbox\@mpfootins +\global\setbox\LWR@mpfootnotes\vbox{% + \unvbox\LWR@mpfootnotes \reset@font\footnotesize \hsize\columnwidth \@parboxrestore @@ -4216,6 +4289,17 @@ end -- not --version {}% } +\newcommand*{\LWR@printpendingmpfootnotes}{% +\ifvoid\LWR@mpfootnotes\else + \LWR@forcenewpage + \begin{BlockClass}{footnotes} + \LWR@origvspace*{\baselineskip} + \unvbox\LWR@mpfootnotes + \setbox\LWR@mpfootnotes=\vbox{} + \end{BlockClass} +\fi +} + \end{warpHTML} \begin{warpHTML} @@ -4244,7 +4328,8 @@ end -- not --version \end{BlockClass} }% } - +\renewcommand*{\reversemarginpar}{} +\renewcommand*{\normalmarginpar}{} \end{warpHTML} \begin{warpprint} @@ -4271,10 +4356,12 @@ end -- not --version \newcommand*{\LWR@filenamenoblanks}[1]{% \begingroup -\LWR@nullfonts +\LWR@nullfonts% \renewcommand*{\LWR@htmltagc}[1]{}% -\edef\LWR@thisnewfilename{#1} -\fullexpandarg +\LWR@traceinfo{LWR@filenamenoblanks \#1: !#1!}% +\edef\LWR@thisnewfilename{#1}% +\LWR@traceinfo{LWR@filenamenoblanks edef: !\LWR@thisnewfilename!}% +\fullexpandarg% \StrSubstitute{\LWR@thisnewfilename}{ }{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{'}{-}[\LWR@thisnewfilename] @@ -4294,6 +4381,8 @@ end -- not --version \StrSubstitute{\LWR@thisnewfilename}% {\textgreater}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\#}{-}[\LWR@thisnewfilename] +\StrSubstitute{\LWR@thisnewfilename}{\_}{-}[\LWR@thisnewfilename] +\StrSubstitute{\LWR@thisnewfilename}{\ }{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\%}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\{}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{\}}{-}[\LWR@thisnewfilename] @@ -4301,6 +4390,7 @@ end -- not --version \StrSubstitute{\LWR@thisnewfilename}% {\textbackslash}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{^}{-}[\LWR@thisnewfilename] +\StrSubstitute{\LWR@thisnewfilename}{~}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{~{}}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{[}{-}[\LWR@thisnewfilename] \StrSubstitute{\LWR@thisnewfilename}{]}{-}[\LWR@thisnewfilename] @@ -4334,6 +4424,7 @@ end -- not --version } \newcommand*{\LWR@newhtmlfile}[1]{ +\LWR@traceinfo{LWR@newhtmlfile: !#1!} \LWR@htmlelementclassend{section}{textbody} @@ -4364,6 +4455,7 @@ end -- not --version {\LWR@filenamenoblanks{#1}} {\renewcommand*{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}} +\LWR@traceinfo{LWR@newhtmlfile: about to print start file}% \LWR@htmlblockcomment{% |Start file|% \LWR@htmlsectionfilename{\LWR@thisfilename}|% @@ -4400,6 +4492,7 @@ end -- not --version \LWR@stoppars \setcounter{LWR@latestautopage}{\value{page}} +\LWR@traceinfo{LWR@newhtmlfile: done} } \end{warpHTML} @@ -4441,10 +4534,13 @@ end -- not --version } \newcommand*{\LWR@createautosec}[1]{% -\LWR@htmltag{#1 id="autosec-\thepage"{}}% +\LWR@htmltag{#1 id="autosec-\arabic{page}"}% } -\NewDocumentCommand{\LWR@pushoneclose}{m m}{\pushclose{#2}{#1}} +\NewDocumentCommand{\LWR@pushoneclose}{m m}{% +\LWR@traceinfo{LWR@pushoneclose #1}% + \pushclose{#2}{#1}% +} \NewDocumentCommand{\LWR@startnewdepth}{m m}{% \LWR@closeprevious{#1}% @@ -4462,7 +4558,7 @@ end -- not --version \LWR@stoppars% \global\boolfalse{LWR@minipagethispar}% \LWR@traceinfo{LWR@section: testing whether to start a new HTML file}% -\IfBooleanTF{#1}{\LWR@traceinfo{LWR@section: starred}}{}% +\IfBooleanT{#1}{\LWR@traceinfo{LWR@section: starred}}% \ifbool{LWR@forcinghtmlpage}{\LWR@traceinfo{LWR@section: forcinghtmlpage}}{}% \ifthenelse{% \(% @@ -4478,7 +4574,11 @@ end -- not --version \cnttest{\csuse{LWR@depth#4}}{<=}{\value{LWR@prevFileDepth}}% \)% \AND% - \NOT\isempty{#3}% phantomsection + \(% phantomsection + \NOT\isempty{#3}% + \OR% + \(\NOT\equal{#1}{\BooleanTrue}\)% + \)% }% {% new file \LWR@traceinfo{LWR@section: new HTML file}% @@ -4487,7 +4587,7 @@ end -- not --version {\LWR@newhtmlfile{#2}}% }% new file {% not new file - \LWR@traceinfo{LWR@section: not a new HTML file}% + \LWR@traceinfo{LWR@section: not a new HTML file, about to LWR@orignewpage}% \LWR@orignewpage% }% not new file @@ -4508,10 +4608,12 @@ end -- not --version }% {\LWR@startpars}% {}% +\LWR@traceinfo{LWR@section: about to LWR@createautosec}% \LWR@createautosec{\csuse{LWR@tag#4}}% \setcounter{LWR@currentautosec}{\value{page}} \IfBooleanTF{#1}% {% +\LWR@traceinfo{LWR@section: starred}% \ifbool{LWR@forcinghtmltoc}% {\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}}% {}% @@ -4564,8 +4666,11 @@ end -- not --version \LWR@traceinfo{LWR@section: finished print section number}% }{}% }% end of not starred +\LWR@traceinfo{LWR@section: about to print the section name}% #3% +\LWR@traceinfo{LWR@section: about to close the heading tag}% \LWR@htmltag{\csuse{LWR@tag#4end}}% +\LWR@traceinfo{LWR@section: about to create the LaTeX label}% \label{autopage-\theLWR@currentautosec}% \ifthenelse{% \cnttest{\csuse{LWR@depth#4}}{<}{\LWR@depthparagraph}% @@ -4611,14 +4716,18 @@ end -- not --version \@ifundefined{chapter} {} {% -\DeclareDocumentCommand{\chapter}{s o m}{% -\LWR@traceinfo{chapter #3}% +\DeclareDocumentCommand{\chapter}{s o o m}{% +\IfValueTF{#2}{ +\LWR@traceinfo{chapter #2}% +}{ +\LWR@traceinfo{chapter #4}% +} \LWR@maybeprintpendingfootnotes{\LWR@depthchapter}% \LWR@stoppars% \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% -\LWR@section{#1}{#2}{#3}{chapter}% +\LWR@section{#1}{#2}{#4}{chapter}% \@printcites% for quotchap package @@ -4627,13 +4736,18 @@ end -- not --version } } -\DeclareDocumentCommand{\section}{s o m}{% +\DeclareDocumentCommand{\section}{s o o m}{% +\IfValueTF{#2}{ +\LWR@traceinfo{section #2}% +}{ +\LWR@traceinfo{section #4}% +} \LWR@maybeprintpendingfootnotes{\LWR@depthsection}% \LWR@stoppars% \LWR@startnewdepth{\LWR@depthsection}{\LWR@printclosesection}% -\LWR@section{#1}{#2}{#3}{section}% +\LWR@section{#1}{#2}{#4}{section}% } \DeclareDocumentCommand{\subsection}{s o m}{% @@ -4697,7 +4811,7 @@ end -- not --version \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{html lang="\LWR@currentHTMLLanguage"}\LWR@orignewline \LWR@htmltag{head}\LWR@orignewline \LWR@htmltag{meta charset="UTF-8" /}\LWR@orignewline \ifthenelse{\equal{\theHTMLAuthor}{}}% @@ -4715,7 +4829,7 @@ content="width=device-width, initial-scale=1.0" /}% \LWR@orignewline \LWR@htmltag{!{-}{-}[if lt IE 9]}\LWR@orignewline \LWR@htmltag{% -script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"{}}% +script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"}% \LWR@htmltag{/script}\LWR@orignewline \LWR@htmltag{![endif]{-}{-}}\LWR@orignewline \ifthenelse{\equal{\theHTMLTitle}{}}% @@ -4759,7 +4873,7 @@ 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@origpagestyle{empty}% \LWR@origscriptsize% \LWR@origraggedright% \LetLtxMacro{\\}{\LWR@endofline}% @@ -4788,6 +4902,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\ConTeXt\LWR@ConTeXt \global\boolfalse{LWR@doingapar} \global\boolfalse{LWR@doingstartpars} +\mainmatter +\LWR@origpagenumbering{arabic} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} \LWR@filestart{} \LWR@traceinfo{LWR@lwarpStart: Generating first header.} @@ -4797,9 +4913,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@stoppars \LWR@htmltag{/header}\LWR@orignewline \LWR@traceinfo{LWR@lwarpStart: Generating textbody.} -\LWR@htmltag{section class="textbody"{}} -\mainmatter -\LWR@origpagenumbering{arabic} +\LWR@htmltag{section class="textbody"} \LWR@patchlists \catcode`\$=\active \LWR@startpars @@ -4865,7 +4979,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% AtBeginDocument \end{warpprint} \begin{warpHTML} -\renewenvironment*{titlepage} +\DeclareDocumentEnvironment{titlepage}{} { \renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}} \LWR@printpendingfootnotes @@ -4930,6 +5044,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\printdate}{{\small\textit{\@date}}} \end{warpprint} \begin{warpHTML} +\@ifclassloaded{memoir} +{ +\newcommand{\LWR@setfootnoteseries}{% + \renewcommand\thefootnote{\@arabic\c@footnote}% +} +}{% not memoir \if@titlepage \newcommand{\LWR@setfootnoteseries}{% \renewcommand\thefootnote{\@arabic\c@footnote}% @@ -4939,11 +5059,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand\thefootnote{\@fnsymbol\c@footnote}% } \fi +}% not memoir \newcommand*{\LWR@maketitlesetup}{% \LWR@setfootnoteseries% \def\@makefnmark{\textsuperscript{\thefootnote}} \long\def\@makefntext##1{% -\textsuperscript{\@thefnmark} \LWR@orighspace{1in} +\textsuperscript{\@thefnmark}~% ##1% }% } @@ -5118,7 +5239,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifbool{LWR@verbtags}{% \LWR@htmltag{pre class="#2" \ifthenelse{\equal{#1}{}}{}{style="#1"}% -}% pre +}\LWR@orignewline% pre }{}% \begingroup% \LWR@origttfamily% @@ -5128,8 +5249,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@afterendverbatim}{% + \endgroup% -\unskip% \ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/pre} }{}% @@ -5148,8 +5269,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \AfterEndPreamble{ \LWR@traceinfo{Patching verbatim.} \AtBeginEnvironment{verbatim}{% -\LWR@forcenewpage -\LWR@atbeginverbatim{verbatim}\unskip\LWR@origvspace*{-\baselineskip}% +\LWR@forcenewpage% +\LWR@atbeginverbatim{verbatim}\unskip\LWR@origvspace*{-2\baselineskip}% } \AfterEndEnvironment{verbatim}{% \unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim% @@ -5175,14 +5296,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand{\@begintheorem}[2]{% \LWR@forcenewpage \BlockClass{theoremcontents} -\InlineClass{theoremlabel}{#1\ #2\ } +\trivlist +\item[\InlineClass{theoremlabel}{#1\ #2\ }]\itshape } \renewcommand{\@opargbegintheorem}[3]{% \LWR@forcenewpage \BlockClass{theoremcontents} -\InlineClass{theoremlabel}{#1\ #2\ (#3)\ } +\trivlist +\item[\InlineClass{theoremlabel}{#1\ #2\ (#3)\ }]\itshape } \renewcommand*{\@endtheorem}{% +\endtrivlist \endBlockClass% theoremcontents } @@ -5193,6 +5317,45 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} \newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} + +\def\@mklab#1{% + #1} + +\def\@donoparitem{% + \@noparitemfalse +} +\def\@item[#1]{% + \if@noparitem + \@donoparitem + \else + \par + \ifhmode + \par + \fi + \if@newlist + \if@nobreak + \@nbitem + \else + \fi + \else + \fi + \global\@inlabeltrue + \fi + \@minipagefalse + \global\@newlistfalse + \if@noitemarg + \@noitemargfalse + \if@nmbrlist + \refstepcounter\@listctr + \fi + \fi + #1 + \ignorespaces% +} + +\def\@nbitem{% +} + \newcommand*{\LWR@listitem}{% \LWR@stoppars% \LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% @@ -5202,6 +5365,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@liststart}{% +\LWR@traceinfo{LWR@liststart}% \LWR@stoppars% \LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}% \LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% @@ -5216,11 +5380,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \setlength{\itemindent}{0pt}% \setlength{\labelsep}{1em}% } - \newcommand*{\LWR@listend}{% +\LWR@traceinfo{LWR@listend}% \LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious% +\LWR@closeprevious{\LWR@depthlist}% \LWR@startpars% } @@ -5256,7 +5419,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LetLtxMacro{\hspace}{\LWR@nohspace}% \LWR@origitem[]% \LetLtxMacro{\hspace}{\LWR@hspace}% -\LWR@orighspace{1in} \LWR@htmltag{dt}#1\LWR@htmltag{/dt}% \LWR@orignewline% \LWR@htmltag{dd}% @@ -5277,11 +5439,18 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@patchlists}{% \let\item\LWR@listitem% \renewcommand*{\@trivlist}{% + \LWR@traceinfo{@trivlist start}% \LWR@liststart% \LWR@orig@trivlist% + \LWR@traceinfo{@trivlist done}% + }% + \renewcommand*{\endtrivlist}{% + \LWR@traceinfo{endtrivlist start}% + \LWR@origendtrivlist\LWR@listend% + \LWR@traceinfo{endtrivlist done}% }% - \renewcommand*{\endtrivlist}{\LWR@origendtrivlist\LWR@listend}% \renewcommand*{\trivlist}{% + \LWR@traceinfo{trivlist}% \LWR@origtrivlist% \def\makelabel####1{\LWR@orighspace{3em}####1}% }% @@ -5356,6 +5525,33 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newbool{LWR@intabularmetadata} \boolfalse{LWR@intabularmetadata} +\newcounter{LWR@tabulardepth} +\setcounter{LWR@tabulardepth}{0} +\newcounter{LWR@tabularpardepth} +\setcounter{LWR@tabularpardepth}{0} +\newcommand*{\LWR@colsresult}{}%temp storage for column format results +\newcommand*{\LWR@pposition}{} +\newcommand*{\LWR@pleft}{} +\newcommand*{\LWR@pright}{} + +\newcommand*{\LWR@tablecolspec}{} + +\providecommand*{\LWR@strresult}{} +\providecommand*{\LWR@strresulttwo}{} + +\newcommand*{\LWR@origcolspec}{} + +\newcounter{LWR@tablecolspecwidth} + +\newcounter{LWR@tablecolspecindex} + +\newcounter{LWR@tablecolindex} + +\newcounter{LWR@tabletotalcols} + +\newcounter{LWR@tabletotalcolsnext} + + \newcommand*{\LWR@insertatbangcols}{% \ifbool{LWR@skipatbang}% @@ -5396,20 +5592,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@skippingmcolrowcell}% \global\boolfalse{LWR@skipatbang}% } - -\newcounter{LWR@tabulardepth} -\setcounter{LWR@tabulardepth}{0} - \let\LWR@origampmacro& \end{warpHTML} \begin{warpall} \newcommand{\StartDefiningTabulars}{% -\LWR@traceinfo{StartDefiningTabulars} +\LWR@traceinfo{StartDefiningTabulars}% \warpHTMLonly{\catcode`\&=\active}% } \newcommand{\EndDefiningTabulars}{% -\LWR@traceinfo{EndDefiningTabulars} +\LWR@traceinfo{EndDefiningTabulars}% \warpHTMLonly{\catcode`\&=4}% } @@ -5487,30 +5679,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@getmynexttoken% } - -\newcommand*{\LWR@colsresult}{}%temp storage for column format results -\newcommand*{\LWR@pposition}{} -\newcommand*{\LWR@pleft}{} -\newcommand*{\LWR@pright}{} - -\newcommand*{\LWR@tablecolspec}{} - -\providecommand*{\LWR@strresult}{} -\providecommand*{\LWR@strresulttwo}{} - -\newcommand*{\LWR@origcolspec}{} - -\newcounter{LWR@tablecolspecwidth} - -\newcounter{LWR@tablecolspecindex} - -\newcounter{LWR@tablecolindex} - -\newcounter{LWR@tabletotalcols} - -\newcounter{LWR@tabletotalcolsnext} - - \newcommand*{\LWR@colparameter}{} \newcommand*{\LWR@parseatcolumn}{% \LWR@traceinfo{at column}% @@ -5710,12 +5878,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@printbartag}[1]{% +\LWR@traceinfo{LWR@printbartag !#1!}% \ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}% {}% muting or empty {% not muting \edef\LWR@tempone{\LWR@getexparray{LWR@colbarspec}{#1}}% \ifdefempty{\LWR@tempone}{}{ \LWR@tempone}% }% not muting +\LWR@traceinfo{LWR@printbartag done}% } @@ -5762,6 +5932,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@tabledatasinglecolumntag}% {% +\LWR@traceinfo{LWR@tabledatasinglecolumntag}% \LWR@maybenewtablerow% \ifbool{LWR@intabularmetadata}% {% @@ -5769,6 +5940,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% not exiting tabular \LWR@tabularleftedge% \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]% +\LWR@traceinfo{LWR@tabledatasinglecolumntag: about to print td tag}% \LWR@htmltag{td class="td% \LWR@strresult% \LWR@addcmidruletrim% @@ -5781,6 +5953,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@addformatwpalignment{\LWR@thiscolspec}% \LWR@tdendstyles% }% +\LWR@traceinfo{LWR@tabledatasinglecolumntag: done printing td tag}% \ifboolexpr{% test{ \ifdefstring{\LWR@strresult}{p} } or test{ \ifdefstring{\LWR@strresult}{m} } or @@ -5791,8 +5964,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% test{ \ifdefstring{\LWR@strresult}{X} } }% {% allow pars - \LWR@startpars% + \LWR@traceinfo{LWR@tabledatasinglecolumntag: about to LWR@startpars}% \global\booltrue{LWR@tableparcell}% + \LWR@startpars% + \LWR@traceinfo{LWR@tabledatasinglecolumntag: done with LWR@startpars}% }% allow pars {}% no pars \ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}% @@ -5803,6 +5978,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@intabularmetadata}% }% not exiting tabular }{}% in tabular metadata +\LWR@traceinfo{LWR@tabledatasinglecolumntag: done}% }% @@ -6272,6 +6448,10 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\hline}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\firsthline}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\lasthline}% + {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\toprule}% {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\midrule}% @@ -6292,7 +6472,11 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\rdelim}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\par}% + {\let\mynext\LWR@donothing}{}% +\LWR@traceinfo{LWR@tabledatacolumntag: about to do mynext}% \mynext% +\LWR@traceinfo{LWR@tabledatacolumntag: done}% } \end{warpHTML} @@ -6432,11 +6616,13 @@ rowspan="#2" % \global\boolfalse{LWR@emptyatbang}% \StartDefiningTabulars% \protected\gdef&{\LWR@tabularampersand}% +\addtocounter{LWR@tabularpardepth}{1}% \LWR@traceinfo{LWR@tabular: about to LWR@getmynexttoken}% \LWR@getmynexttoken% }% {% \LWR@traceinfo{LWR@tabular ending}% +\addtocounter{LWR@tabularpardepth}{-1}% \ifboolexpr{% test {% \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} @@ -6469,8 +6655,6 @@ rowspan="#2" % \end{warpHTML} - - \begin{warpHTML} @@ -6498,7 +6682,8 @@ rowspan="#2" % \zref@addprop{special}{zLWR@lateximagedepth} \zref@addprop{special}{zLWR@lateximagenumber} \newcommand*{\LWR@spref}[2]{% -\zref@extractdefault{#1}{#2}{??}} +\zref@extractdefault{#1}{#2}{??}% +} \newcommand*{\LWR@nameref}[1]{% \LWR@spref{#1}{zLWR@name}% } @@ -6512,40 +6697,44 @@ rowspan="#2" % \LWR@spref{#1}{zLWR@lateximagenumber}% } \newcommand*{\LWR@splabel}[1]{% +\LWR@traceinfo{LWR@splabel !#1!}% \LWR@setlatestname{\@currentlabelname}% -\zref@labelbylist{#1}{special}} +\zref@labelbylist{#1}{special}% +} -\newcommand*{\LWR@subsublabel}[1]{% +\newcommand*{\LWR@sublabel}[1]{% +\LWR@traceinfo{LWR@sublabel !#1!}% \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {% not lateximage + \LWR@sanitize{#1}% \ifbool{LWR@doingstartpars}% {% pars allowed - \ifbool{LWR@doingapar} + \ifbool{LWR@doingapar}% {% par started - \LWR@htmltag{a id="#1"{}}\LWR@htmltag{/a}% + \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}% }% par started {% par not started \LWR@stoppars% - \LWR@htmltag{a id="#1"{}}\LWR@htmltag{/a}% + \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}% \LWR@startpars% }% par not started }% pars allowed {% pars not allowed - \LWR@htmltag{a id="#1"{}}\LWR@htmltag{/a}% + \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}% }% pars not allowed }% not lateximage } -\NewDocumentCommand{\LWR@newlabel}{m o}{% +\NewDocumentCommand{\LWR@newlabel}{d() m o}{% \LWR@traceinfo{LWR@newlabel: starting}% -\LWR@traceinfo{LWR@newlabel: !#1!}% -\LWR@origlabel{#1}% +\LWR@traceinfo{LWR@newlabel: !#2!}% +\LWR@origlabel{#2}% \LWR@traceinfo{LWR@newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}% \LWR@traceinfo{LWR@newlabel: LWR@thisfilename is !\LWR@thisfilename!}% \LWR@traceinfo{LWR@newlabel: LWR@htmlfilenumber is \arabic{LWR@htmlfilenumber}}% -\LWR@splabel{#1}% -\LWR@subsublabel{#1}% +\LWR@splabel{#2}% +\LWR@sublabel{#2}% \LWR@traceinfo{LWR@newlabel: done}% } @@ -6553,6 +6742,7 @@ rowspan="#2" % \newcommand*{\LWR@startref}[1] {% \edef\LWR@lidref{\LWR@lateximagedepthref{#1}}% +\LWR@sanitize{#1}% \LWR@traceinfo{LWR@startref A: !#1!}% \LWR@htmltag{a href="% \LWR@traceinfo{LWR@startref B}% @@ -6574,11 +6764,11 @@ rowspan="#2" % }% {% \LWR@traceinfo{LWR@startref D3}% - #1% + \LWR@sanitized% }% }% \LWR@traceinfo{LWR@startref E}% -"{}}% +"}% \LWR@traceinfo{LWR@startref F}% } @@ -6590,7 +6780,7 @@ rowspan="#2" % } \NewDocumentCommand{\LWR@newref}{s m}{% -\LWR@traceinfo{LWR@newref #2}% +\LWR@traceinfo{LWR@newref !#2!}% \IfBooleanTF{#1}% {\LWR@origref{#2}}% {\LWR@subnewref{#2}{#2}}% @@ -6613,59 +6803,65 @@ rowspan="#2" % \LWR@traceinfo{nameref D}% } -\let\Nameref\nameref +\LetLtxMacro\Nameref\nameref +\AtBeginDocument{ +\def\@currentHref{% +autopage-\theLWR@currentautosec% +} +} + \NewDocumentCommand{\LWR@subhyperref}{m +m}{% -\LWR@htmltag{a href="{#1}" target="\_{}blank"\LWR@orignewline}#2\LWR@htmltag{/a}% +\LWR@traceinfo{LWR@subhyperref !#1!}% +\LWR@sanitize{#1}% +\LWR@htmltag{% + a href="\LWR@sanitized" % + target="\_{}blank"\LWR@orignewline% +}% +#2% +\LWR@htmltag{/a}% \LWR@ensuredoingapar% } \NewDocumentCommand{\LWR@subhyperrefclass}{m +m m}{% -\LWR@htmltag{a href="{#1}" -class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% -\LWR@ensuredoingapar% -} - -\NewDocumentCommand{\LWR@hrefb}{O{} m +m}{% -\LWR@subhyperref{#2}{#3}% -\endgroup% +\LWR@htmltag{% + a href="% + \begingroup\@sanitize#1\endgroup% + " % + class="#3"\LWR@orignewline% +}% +#2% +\LWR@htmltag{/a}% \LWR@ensuredoingapar% } -\DeclareRobustCommand*{\href}{% +\NewDocumentCommand{\href}{O{} m +m}{% \LWR@ensuredoingapar% -\begingroup% -\catcode`\_=12 -\LWR@hrefb% +\LWR@subhyperref{#2}{#3}% } -\newcommand*{\LWR@nolinkurlb}[1]{#1\endgroup\LWR@ensuredoingapar} - -\DeclareRobustCommand*{\nolinkurl}{% +\newcommand*{\nolinkurl}[1]{% \LWR@ensuredoingapar% -\begingroup\catcode`\_=12 -\LWR@nolinkurlb% +\def\LWR@templink{#1}% +\@onelevel@sanitize\LWR@templink% +\LWR@templink% } -\NewDocumentCommand{\LWR@urlb}{m}{% -\LWR@hrefb{#1}{#1}% -} - -\DeclareRobustCommand*{\url}{% +\NewDocumentCommand{\url}{m}{% \LWR@ensuredoingapar% -\begingroup\catcode`\_=12 -\LWR@urlb% +\def\LWR@templink{#1}% +\@onelevel@sanitize\LWR@templink% +\href{\LWR@templink}{\LWR@templink}% } - \newcommand*{\LWR@subinlineimage}[5][]{% \ifblank{#1}% -{\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"{}}}% -{\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"{}}}% +{\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"}}% +{\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"}}% } \end{warpHTML} @@ -6719,16 +6915,16 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \newcounter{LWR@thisautoid} +\newcounter{LWR@thisautoidWP} + \newbool{LWR@freezethisautoid} \boolfalse{LWR@freezethisautoid} -\newcommand*{\LWR@maybeincthisautoid}{% -\ifbool{LWR@freezethisautoid}{}{\addtocounter{LWR@thisautoid}{1}}% -} - \newcommand*{\LWR@newautoidanchor}{% -\LWR@maybeincthisautoid% -\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% +\ifbool{LWR@freezethisautoid}{}{% + \addtocounter{LWR@thisautoid}{1}% + \LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}% +}% } \newcommand*{\@captype}{} @@ -6800,7 +6996,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \def\LWR@LTcaptionlistentry{% \LWR@ensuredoingapar% -\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}% \bgroup \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble * {\egroup\LWR@LT@captionlistentry}}% @@ -6821,7 +7017,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% }% not TOC \LWR@origaddcontentsline{#1}{#2}{#3}% } - \AtBeginDocument{ \let\LWR@origcaptionof\captionof @@ -6837,16 +7032,18 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \begin{warpHTML} - -\newcommand*{\LWR@myshorttoc}[1]{ -\LWR@ensuredoingapar -\IfFileExists{\jobname.#1}{ -\begingroup -\makeatletter -\@input{\jobname.#1} -\endgroup +\newcommand*{\LWR@myshorttoc}[1]{% +\LWR@traceinfo{LWR@myshorttoc: #1}% +\LWR@ensuredoingapar% +\IfFileExists{\jobname.#1}{% +\LWR@traceinfo{LWR@myshorttoc: loading}% +\begingroup% +\makeatletter% +\@input{\jobname.#1}% +\endgroup% }% {}% +\LWR@traceinfo{LWR@myshorttoc: done}% } \NewDocumentCommand{\LWR@subtableofcontents}{m m}{% @@ -6867,6 +7064,9 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@orig@starttoc{#1} \LWR@htmlelementclassend{nav}{#1} } +\newbool{LWR@copiedsidetoc} +\boolfalse{LWR@copiedsidetoc} +\AtBeginDocument{ \let\LWR@origtableofcontents\tableofcontents \renewcommand*{\tableofcontents}{% @@ -6876,11 +7076,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } { - \LWR@copyfile{\jobname.toc}{\jobname.sidetoc}% + \ifbool{LWR@copiedsidetoc}{}{% + \LWR@copyfile{\jobname.toc}{\jobname.sidetoc}% + \booltrue{LWR@copiedsidetoc}% + }% \LWR@printpendingfootnotes \LWR@origtableofcontents } -} +}% \tableofcontents +}% AtBeginDocument \let\LWR@origlistoffigures\listoffigures @@ -6960,20 +7164,27 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro\numberline\LWR@numberline \NewDocumentCommand{\hypertoc}{m m +m m}{% +\LWR@traceinfo{hypertoc !#1!#2!#3!#4!}% \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{% \LWR@startpars% \LWR@subhyperrefclass{% - \LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}% + \LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4% + }{#3}{toc#2}% \LWR@stoppars% } {} +\LWR@traceinfo{hypertoc done}% } +\@ifclassloaded{memoir}{}{ \newcounter{lofdepth} \setcounter{lofdepth}{1} +} +\@ifclassloaded{memoir}{}{ \newcounter{lotdepth} \setcounter{lotdepth}{1} +} \newcommand{\hypertocfloat}[5]{% \LWR@startpars @@ -7053,9 +7264,9 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \def\LWR@wrindex#1{% \addtocounter{LWR@autoindex}{1}% -\LWR@newlabel{LWRindex-\theLWR@autoindex}% +\LWR@newlabel{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% -{\string\indexentry{#1}{\theLWR@autoindex}}% +{\string\indexentry{#1}{\arabic{LWR@autoindex}}}% \endgroup \@esphack} @@ -7080,7 +7291,29 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \begin{warpall} \providecommand{\glo@name}{} \end{warpall} +\begin{warpHTML} +\AtBeginDocument{ +\AtBeginEnvironment{thebibliography}{ +\providecommand*{\LWR@newem}[1]{\textit{#1}} + +\renewrobustcmd{\em}{% + \begingroup + \gdef\LWR@em@after{\LWR@em@finish\LWR@newem}% + \afterassignment\LWR@em@after + \toks@\bgroup +} +\def\LWR@em@finish#1{% + \xdef\LWR@em@after{\noexpand#1{\the\toks@}}% + \endgroup + \LWR@em@after\egroup +} +}% \AtBeginEnvironment{thebibliography} +}% \AtBeginDocument + +\end{warpHTML} + +\begin{warpHTML} \newcommand*{\LWR@restoreorigformatting}{% \LWR@traceinfo{LWR@restoreorigformatting}% \linespread{1}% @@ -7150,7 +7383,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro{\fminipage}{\LWRprint@fminipage}% \LetLtxMacro{\endfminipage}{\endLWRprint@fminipage}% \LetLtxMacro{\minipage}{\LWR@origminipage}% -\let\endminipage\LWR@endminipage% +\let\endminipage\LWR@origendminipage% \LetLtxMacro{\parbox}{\LWR@origparbox}% \let\TeX\LWR@origTeX% \let\LaTeX\LWR@origLaTeX% @@ -7163,7 +7396,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@restoreoriglists% \LWR@FBcancel% } - +\end{warpHTML} \begin{warpHTML} \let\LWR@origtextdollar\$ @@ -7332,7 +7565,7 @@ $#1$} \boolfalse{LWR@amsmultline} \newcommand*{\LWR@htmlmathlabel}[1]{% -\LWR@traceinfo{LWR@htmlmathlabel #1}% +\LWR@traceinfo{LWR@htmlmathlabelb #1}% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% \text{ @@ -7747,7 +7980,7 @@ $#1$} \NewDocumentEnvironment{lateximage}{O{image}} {% -\LWR@traceinfo{lateximage: starting on page \arabic{page}}% +\LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}% \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% {% \addtocounter{LWR@lateximagedepth}{1}% @@ -7767,9 +8000,9 @@ $#1$} \setcounterpageref{LWR@LIpage}{LWRlateximage\arabic{LWR@lateximagenumber}}% \LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}% \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" % - class="lateximagesource"{}} \LWR@orignewline + class="lateximagesource"} \LWR@orignewline \LWR@traceinfo{lateximage: about to write to lateximages.txt}% - \immediate\write\LWR@lateximagesfile{|\theLWR@LIpage|\theLWR@externalfilecnt|}% + \immediate\write\LWR@lateximagesfile{|\arabic{LWR@LIpage}|\arabic{LWR@externalfilecnt}|}% \LWR@traceinfo{lateximage: about to create open comment}% \LWR@htmlopencomment% \addtocounter{LWR@lateximagedepth}{1}% @@ -7803,6 +8036,7 @@ $#1$} \LWR@origendminipage% \LWR@orignewpage% \LWR@origscriptsize% + \LWR@origvspace*{.5\baselineskip}% \LWR@htmlclosecomment{}\LWR@orignewline% \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}% \LWR@subinlineimage[#1]{lateximage}% @@ -8059,35 +8293,6 @@ $#1$} \newlength{\LWR@minipagewidth} \newlength{\LWR@minipageheight} -\def\LWR@endminipage{% - \par - \unskip - \ifvoid\@mpfootins\else - \vskip\skip\@mpfootins - \normalcolor - \LWR@htmldivclass{mpfootnotes} - \LWR@origmedskip - \unvbox\@mpfootins - \LWR@htmldivclassend{mpfootnotes} - \fi - \@minipagefalse - \color@endgroup - \egroup - \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}} - -\newcommand*{\LWR@subminipage}{% -\LWR@stoppars -\LWR@origminipage{6in} -\LWR@origraggedright% -\LWR@startpars% -} - -\newcommand*{\LWR@endsubminipage}{% -\LWR@stoppars% -\LWR@endminipage% The following empty line is required: - -} - \newbool{LWR@minipagefullwidth} \boolfalse{LWR@minipagefullwidth} \newcommand*{\minipagefullwidth}{\booltrue{LWR@minipagefullwidth}} @@ -8101,14 +8306,16 @@ $#1$} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% \uselengthunit{PT}% +\begingroup \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% + \LWR@orignewpage% \addtolength{\LWR@minipagewidth}{3em}% room for frames \setlength{\linewidth}{6in}% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% -\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}} +\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified \IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% \addtocounter{LWR@minipagedepth}{1}% @@ -8116,13 +8323,11 @@ $#1$} \LWR@stoppars% \ifbool{FormatWP}{% -\addtocounter{LWR@thisautoid}{1}% -\booltrue{LWR@freezethisautoid}% -\LWR@htmltag{div id="autoid-\arabic{LWR@thisautoid}" class="wpminipage"}% +\addtocounter{LWR@thisautoidWP}{1}% +\LWR@htmltag{div id="autoidWP-\arabic{LWR@thisautoidWP}" class="wpminipage"}% }{}% \LWR@traceinfo{minipage: creating div class}% -\LWR@orignewpage% \LWR@htmltag{div class="minipage" style="% \ifthenelse{\equal{#1}{t}}{vertical-align:bottom ; }{}% \ifthenelse{\equal{#1}{c}}{vertical-align:middle ; }{}% @@ -8142,13 +8347,15 @@ $#1$} }% \LWR@traceinfo{minipage: about to print the height}% \IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% -"{}}% +"}% -\LWR@origminipage{6in}% The preceding empty line is required. \setlength{\linewidth}{#4}% the original width \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% \LWR@origraggedright% +\def\@mpfn{mpfootnote}% +\def\thempfn{\thempfootnote}\c@mpfootnote\z@% +\let\@footnotetext\@mpfootnotetext% \LWR@startpars% \ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{% @@ -8156,20 +8363,20 @@ $#1$} }{}% \LWR@traceinfo{minipage: finished starting the minipage}% -} -{% +}% finished \minipage +{% \endminipage +\LWR@printpendingmpfootnotes% \ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{% === end minipage === }{}% \LWR@stoppars% -\LWR@endminipage% The following empty line is required: +\endgroup% \ifbool{FormatWP}{% \LWR@htmlelementend{div}% -\boolfalse{LWR@freezethisautoid}% }{}% \LWR@htmldivclassend{minipage}% @@ -8183,9 +8390,9 @@ $#1$} \RenewDocumentCommand{\parbox}{O{t} o O{t} m +m} { \LWR@traceinfo{parbox of width #4}% -\begin{minipage}[#1][#2][#3]{#4} +\begin{minipage}[#1][#2][#3]{#4}% #5 -\end{minipage} +\end{minipage}% } \LetLtxMacro\LWR@origmakebox\makebox @@ -8205,10 +8412,10 @@ $#1$} width:\rndprintlength{\LWR@tempwidth}% ]% {makebox}% - {\mbox{#4}}% + {#4}% }% scope }% -{\mbox{#4}}% +{#4}% no width } \LetLtxMacro\LWR@origframebox\framebox @@ -8234,7 +8441,7 @@ padding:\rndprintlength{\fboxsep}% } \let\LWRprint@fbox\fbox \newcommand{\LWRhtml@fbox}[1]{% -\LWR@traceinfo{HTML fbox} +\LWR@traceinfo{HTML fbox}% \LWR@forceminwidth{\fboxrule}% \InlineClass[% \LWR@blackborderpadding% @@ -8419,8 +8626,11 @@ width:\rndprintlength{\LWR@tempwidth}% \LetLtxMacro{\itshape}{\LWR@nullitshape}% \LetLtxMacro{\em}{\LWR@nullem}% \LetLtxMacro{\normalfont}{\LWR@nullnormalfont}% -\renewcommand*{\HTMLunicode}[1]{}% -\renewcommand*{\HTMLentity}[1]{}% +\renewcommand*{\,}{-}% +\renewcommand*{~}{-}% +\renewcommand*{\textellipsis}{-}% +\renewcommand*{\HTMLunicode}[1]{-}% +\renewcommand*{\HTMLentity}[1]{-}% \renewcommand*{\&}{and}% \renewcommand{\textsuperscript}[1]{##1}% \renewcommand{\textsubscript}[1]{##1}% @@ -8497,13 +8707,14 @@ width:\rndprintlength{\LWR@tempwidth}% \let\LWR@origvspace\vspace \let\LWR@origrule\rule \let\LWR@origmedskip\medskip +\let\LWR@origbigskip\bigskip \let\LWR@origtextellipsis\textellipsis -\renewcommand*{\,}{\HTMLunicode{202f}} % HTML thin non-breakable space +\renewrobustcmd*{\,}{\HTMLunicode{202f}} % HTML thin non-breakable space -\renewcommand*{~}{\HTMLentity{nbsp}} +\renewrobustcmd*{~}{\HTMLentity{nbsp}} -\renewcommand*{\textellipsis}{\HTMLunicode{2026}} +\renewrobustcmd*{\textellipsis}{\HTMLunicode{2026}} \let\LWR@orignormalsize\normalsize \let\LWR@origsmall\small \let\LWR@origfootnotesize\footnotesize @@ -8533,6 +8744,10 @@ width:\rndprintlength{\LWR@tempwidth}% } +\renewcommand*{\newpage}{ + +} + \newcommand*{\LWR@newlinebr}{\unskip\LWR@htmltag{br /}\LWR@orignewline}% \let\newline\LWR@newlinebr @@ -8674,7 +8889,7 @@ width:\rndprintlength{\LWR@tempwidth}% \begin{warpHTML} -\newcommand*{\phantomsection}{% +\DeclareDocumentCommand{\phantomsection}{}{% \section*{}% } @@ -8757,6 +8972,16 @@ width:\rndprintlength{\LWR@tempwidth}% \end{warpHTML} +\begin{warpHTML} +\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} +\end{warpHTML} + +\begin{warpHTML} +\@ifclassloaded{memoir}{\RequirePackage{lwarp-patch-memoir}}{} +\end{warpHTML} + \endinput %% |