summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-08 21:41:53 +0000
committerKarl Berry <karl@freefriends.org>2019-06-08 21:41:53 +0000
commitf59eaadd336001e0df9b784bab26f72ea6ae83c3 (patch)
tree1355186465d2b404681366aff13d10065a1829a3 /Master/texmf-dist/tex/latex/lwarp
parent05fdcf5329e9cad9bf82381d8e588fbe86d84326 (diff)
lwarp (8jun19)
git-svn-id: svn://tug.org/texlive/trunk@51346 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty53
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty15
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty45
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty21
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty51
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty436
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty22
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty26
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty29
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty21
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty23
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty32
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty517
18 files changed, 1073 insertions, 241 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
new file mode 100644
index 00000000000..3b9ab2f58c9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
@@ -0,0 +1,53 @@
+%%
+%% This is file `lwarp-backnaur.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `backnaur')
+%% This is a generated file.
+%% Copyright 2016-2019 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{backnaur}[2019/04/14]
+\renewenvironment*{bnf}{%
+ \BlockClass{backnaur}%
+ \LWR@stoppars%
+}{\endBlockClass}
+
+\renewenvironment*{bnf*}{%
+ \BlockClass{backnaur}%
+ \LWR@stoppars%
+}{\endBlockClass}
+
+\renewcommand{\bnfpn}[1]{\HTMLunicode{27e8}#1\HTMLunicode{27e9}}% \langle, rangle
+\renewcommand{\bnfor}{ \HTMLunicode{7c} }% \mid
+\renewcommand{\bnfsp}{ }
+\renewcommand{\bnfes}{\HTMLunicode{3bb}}% \lambda
+\renewcommand{\bnftd}[1]{\textnormal{\textit{#1}}}
+\renewcommand{\bnfsk}{\HTMLunicode{2026} }% \dots, ellipsis
+\renewcommand{\bnfpo}{\HTMLunicode{22a8}}% \models
+
+\renewcommand{\bnfprod}[2]{%
+ \begin{BlockClass}{backnaurprod}\bnfpn{#1} \bnfpo \end{BlockClass}%
+ \begin{BlockClass}{backnaurdesc}#2\end{BlockClass}%
+ \LWR@stoppars%
+}%
+
+\renewcommand{\bnfmore}[1]{%
+ \begin{BlockClass}{backnaurprod}\end{BlockClass}
+ \begin{BlockClass}{backnaurdesc}#1\end{BlockClass}
+ \LWR@stoppars%
+}
+
+\@ifpackagewith{backnaur}{perp}{\renewcommand{\bnfes}{\HTMLunicode{27c2}}}{}% \perp
+\@ifpackagewith{backnaur}{epsilon}{\renewcommand{\bnfes}{\HTMLunicode{3f5}}}{}% \epsilon
+\endinput
+%%
+%% End of file `lwarp-backnaur.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
index 87e0adc92d5..88c9931767d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
@@ -17,16 +17,17 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{boxedminipage2e}[2015/03/09]
+\LWR@ProvidesPackagePass{boxedminipage2e}[2015/03/09]
-\newenvironment{boxedminipage}{%
-\begin{BlockClass}{framebox}%
-\minipage%
+\newenvironment{LWR@HTML@boxedminipage}{%
+ \begin{BlockClass}{framebox}%
+ \minipage%
}
-{
-\endminipage%
-\end{BlockClass}
+{%
+ \endminipage%
+ \end{BlockClass}%
}
+\LWR@formattedenv{boxedminipage}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty
index 817fbcf0cfc..1fe2f83f6c0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty
@@ -20,7 +20,7 @@
\IfSubStr{\Changes@loc@show}{#1}{%
\LWR@startpars%
#2: #3 \qquad
- \nameref{autopage-#4}%
+ \nameref{\BaseJobname-autopage-#4}%
\LWR@stoppars%
}{}%
}
@@ -108,14 +108,18 @@
{%
\ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}%
\ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}%
- \ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}%
+ \ifthenelse{\equal{#1}{replaced}}{%
+ {\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}%
+ }{}%
\ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}%
}
{%
\LWR@textcurrentcolor{%
\ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}%
\ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}%
- \ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}%
+ \ifthenelse{\equal{#1}{replaced}}{%
+ {\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}%
+ }{}%
\ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}%
}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty
new file mode 100644
index 00000000000..785d6acb96d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty
@@ -0,0 +1,45 @@
+%%
+%% This is file `lwarp-fontaxes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `fontaxes')
+%% This is a generated file.
+%% Copyright 2016-2019 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{fontaxes}[2014/03/23]
+\newrobustcmd{\LWR@HTML@sscshape}{\LWR@HTML@scshape}
+\LWR@formatted{sscshape}
+\newcommand*{\LWR@null@sscshape}{}
+
+\newrobustcmd{\LWR@HTML@textssc}[1]{\textsc{#1}}
+\LWR@formatted{textssc}
+\newcommand*{\LWR@null@textssc}[1]{#1}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by nfssext-cfr
+ \newcommand{\LWR@HTML@swshape}{}
+ \LWR@formatted{swshape}
+ \newcommand*{\LWR@null@swshape}{}
+
+ \newcommand{\LWR@HTML@textsw}[1]{#1}
+ \LWR@formatted{textsw}
+ \newcommand*{\LWR@null@textsw}[1]{#1}
+}
+
+\appto{\LWR@nullfonts}{%
+\LetLtxMacro\sscshape\LWR@null@sscshape%
+\LetLtxMacro\textssc\LWR@null@textssc%
+\LetLtxMacro\swshape\LWR@null@swshape%
+\LetLtxMacro\textsw\LWR@null@textsw%
+}
+\endinput
+%%
+%% End of file `lwarp-fontaxes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty
index 593b5477759..5f0a9c87d10 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty
@@ -23,8 +23,8 @@
{\LWR@patcherror{gloss}{gls@gloss@iii}}
\def\gls@page@i#1#2{%
- \endgroup
- \global\@namedef{glsp@#1}{\nameref{autopage-#2}}}
+ \endgroup%
+ \global\@namedef{glsp@#1}{\nameref{\BaseJobname-autopage-#2}}}%
\endinput
%%
%% End of file `lwarp-gloss.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty
new file mode 100644
index 00000000000..f8109d4afcd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-hypbmsec.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `hypbmsec')
+%% This is a generated file.
+%% Copyright 2016-2019 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{hypbmsec}[2016/05/16]
+\endinput
+%%
+%% End of file `lwarp-hypbmsec.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty
new file mode 100644
index 00000000000..45dfc8a53ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty
@@ -0,0 +1,51 @@
+%%
+%% This is file `lwarp-minibox.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `minibox')
+%% This is a generated file.
+%% Copyright 2016-2019 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{minibox}[2013/06/21]
+\ExplSyntaxOn
+\newcommand\LWR@HTML@minibox[2][]{%
+ \LWR@stoppars%
+ \group_begin:
+ \keys_set:nn {minibox} {#1}
+ \bool_if:NTF \l_minibox_frame_bool
+ {
+ \setlength\fboxrule{\l_minibox_rule_dim}
+ \setlength\fboxsep{\l_minibox_pad_dim}
+ \fboxBlock{%
+ \begin{tabular}[\l_minibox_tabular_valign_tl]%
+ {\l_minibox_tabular_preamble_tl}
+ {#2}
+ \end{tabular}
+ }%
+ }
+ {
+ \begin{BlockClass}[display:inline-block]{minibox}
+ \begin{tabular}[\l_minibox_tabular_valign_tl]%
+ {\l_minibox_tabular_preamble_tl}
+ {#2}
+ \end{tabular}
+ \end{BlockClass}
+ }
+ \group_end:
+ \LWR@startpars%
+}
+\ExplSyntaxOff
+
+\LWR@formatted{minibox}
+\endinput
+%%
+%% End of file `lwarp-minibox.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty
new file mode 100644
index 00000000000..50e3e88e6f6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty
@@ -0,0 +1,436 @@
+%%
+%% This is file `lwarp-nfssext-cfr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `nfssext-cfr')
+%% This is a generated file.
+%% Copyright 2016-2019 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{nfssext-cfr}[2017/03/28]
+\newrobustcmd{\LWR@HTML@lnstyle}{}
+\newrobustcmd{\LWR@HTML@osstyle}{}
+\newrobustcmd{\LWR@HTML@instyle}{}
+\newrobustcmd{\LWR@HTML@sustyle}{}
+\newrobustcmd{\LWR@HTML@swstyle}{}
+\newrobustcmd{\LWR@HTML@pstyle}{}
+\newrobustcmd{\LWR@HTML@tistyle}{}
+\newrobustcmd{\LWR@HTML@ostyle}{\LWR@HTML@scshape}
+\newrobustcmd{\LWR@HTML@postyle}{\LWR@HTML@scshape}
+\newrobustcmd{\LWR@HTML@ltstyle}{}
+\newrobustcmd{\LWR@HTML@ofstyle}{}
+\newrobustcmd{\LWR@HTML@altstyle}{}
+\newrobustcmd{\LWR@HTML@regstyle}{}
+\newrobustcmd{\LWR@HTML@embossstyle}{}
+\newrobustcmd{\LWR@HTML@ornamentalstyle}{}
+\newrobustcmd{\LWR@HTML@qtstyle}{}
+\newrobustcmd{\LWR@HTML@shstyle}{}
+\newrobustcmd{\LWR@HTML@swashstyle}{}
+\newrobustcmd{\LWR@HTML@tmstyle}{}
+\newrobustcmd{\LWR@HTML@tvstyle}{\renewcommand*{\LWR@f@family}{tt}}
+\newrobustcmd{\LWR@HTML@tstyle}{}
+\newrobustcmd{\LWR@HTML@lstyle}{}
+\newrobustcmd{\LWR@HTML@tlstyle}{}
+\newrobustcmd{\LWR@HTML@plstyle}{}
+\newrobustcmd{\LWR@HTML@tostyle}{\LWR@HTML@scshape}
+\newrobustcmd{\LWR@HTML@olshape}{}
+\newrobustcmd{\LWR@HTML@scolshape}{}
+\newrobustcmd{\LWR@HTML@ushape}{}
+\newrobustcmd{\LWR@HTML@scushape}{}
+\newrobustcmd{\LWR@HTML@uishape}{\LWR@HTML@itshape}
+\newrobustcmd{\LWR@HTML@rishape}{}
+\newrobustcmd{\LWR@HTML@regwidth}{}
+\newrobustcmd{\LWR@HTML@nwwidth}{}
+\newrobustcmd{\LWR@HTML@cdwidth}{}
+\newrobustcmd{\LWR@HTML@ecwidth}{}
+\newrobustcmd{\LWR@HTML@ucwidth}{}
+\newrobustcmd{\LWR@HTML@etwidth}{}
+\newrobustcmd{\LWR@HTML@epwidth}{}
+\newrobustcmd{\LWR@HTML@exwidth}{}
+\newrobustcmd{\LWR@HTML@uxwidth}{}
+\newrobustcmd{\LWR@HTML@mbweight}{\renewcommand*{\LWR@f@series}{md}}
+\newrobustcmd{\LWR@HTML@dbweight}{\renewcommand*{\LWR@f@series}{bf}}
+\newrobustcmd{\LWR@HTML@sbweight}{\renewcommand*{\LWR@f@series}{bf}}
+\newrobustcmd{\LWR@HTML@ubweight}{\renewcommand*{\LWR@f@series}{eb}}
+\newrobustcmd{\LWR@HTML@elweight}{\renewcommand*{\LWR@f@series}{lg}}
+\newrobustcmd{\LWR@HTML@ulweight}{\renewcommand*{\LWR@f@series}{lg}}
+\newrobustcmd{\LWR@HTML@dfshape}{}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes
+ \newrobustcmd{\LWR@HTML@swshape}{}
+}
+
+\newrobustcmd{\LWR@HTML@ornament}[1]{}
+
+\LWR@formatted{lnstyle}
+\LWR@formatted{osstyle}
+\LWR@formatted{instyle}
+\LWR@formatted{sustyle}
+\LWR@formatted{swstyle}
+\LWR@formatted{pstyle}
+\LWR@formatted{tistyle}
+\LWR@formatted{ostyle}
+\LWR@formatted{postyle}
+\LWR@formatted{ltstyle}
+\LWR@formatted{ofstyle}
+\LWR@formatted{altstyle}
+\LWR@formatted{regstyle}
+\LWR@formatted{embossstyle}
+\LWR@formatted{ornamentalstyle}
+\LWR@formatted{qtstyle}
+\LWR@formatted{shstyle}
+\LWR@formatted{swashstyle}
+\LWR@formatted{tmstyle}
+\LWR@formatted{tvstyle}
+\LWR@formatted{tstyle}
+\LWR@formatted{lstyle}
+\LWR@formatted{tlstyle}
+\LWR@formatted{plstyle}
+\LWR@formatted{tostyle}
+\LWR@formatted{olshape}
+\LWR@formatted{scolshape}
+\LWR@formatted{ushape}
+\LWR@formatted{scushape}
+\LWR@formatted{uishape}
+\LWR@formatted{rishape}
+\LWR@formatted{regwidth}
+\LWR@formatted{nwwidth}
+\LWR@formatted{cdwidth}
+\LWR@formatted{ecwidth}
+\LWR@formatted{ucwidth}
+\LWR@formatted{etwidth}
+\LWR@formatted{epwidth}
+\LWR@formatted{exwidth}
+\LWR@formatted{uxwidth}
+\LWR@formatted{mbweight}
+\LWR@formatted{dbweight}
+\LWR@formatted{sbweight}
+\LWR@formatted{ubweight}
+\LWR@formatted{elweight}
+\LWR@formatted{ulweight}
+\LWR@formatted{dfshape}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes
+ \LWR@formatted{swshape}
+}
+
+\LWR@formatted{ornament}
+
+\newcommand{\LWR@null@lnstyle}{}
+\newcommand{\LWR@null@osstyle}{}
+\newcommand{\LWR@null@instyle}{}
+\newcommand{\LWR@null@sustyle}{}
+\newcommand{\LWR@null@swstyle}{}
+\newcommand{\LWR@null@pstyle}{}
+\newcommand{\LWR@null@tistyle}{}
+\newcommand{\LWR@null@ostyle}{}
+\newcommand{\LWR@null@postyle}{}
+\newcommand{\LWR@null@ltstyle}{}
+\newcommand{\LWR@null@ofstyle}{}
+\newcommand{\LWR@null@altstyle}{}
+\newcommand{\LWR@null@regstyle}{}
+\newcommand{\LWR@null@embossstyle}{}
+\newcommand{\LWR@null@ornamentalstyle}{}
+\newcommand{\LWR@null@qtstyle}{}
+\newcommand{\LWR@null@shstyle}{}
+\newcommand{\LWR@null@swashstyle}{}
+\newcommand{\LWR@null@tmstyle}{}
+\newcommand{\LWR@null@tvstyle}{}
+\newcommand{\LWR@null@tstyle}{}
+\newcommand{\LWR@null@lstyle}{}
+\newcommand{\LWR@null@tlstyle}{}
+\newcommand{\LWR@null@plstyle}{}
+\newcommand{\LWR@null@tostyle}{}
+\newcommand{\LWR@null@olshape}{}
+\newcommand{\LWR@null@scolshape}{}
+\newcommand{\LWR@null@ushape}{}
+\newcommand{\LWR@null@scushape}{}
+\newcommand{\LWR@null@uishape}{}
+\newcommand{\LWR@null@rishape}{}
+\newcommand{\LWR@null@regwidth}{}
+\newcommand{\LWR@null@nwwidth}{}
+\newcommand{\LWR@null@cdwidth}{}
+\newcommand{\LWR@null@ecwidth}{}
+\newcommand{\LWR@null@ucwidth}{}
+\newcommand{\LWR@null@etwidth}{}
+\newcommand{\LWR@null@epwidth}{}
+\newcommand{\LWR@null@exwidth}{}
+\newcommand{\LWR@null@uxwidth}{}
+\newcommand{\LWR@null@mbweight}{}
+\newcommand{\LWR@null@dbweight}{}
+\newcommand{\LWR@null@sbweight}{}
+\newcommand{\LWR@null@ubweight}{}
+\newcommand{\LWR@null@elweight}{}
+\newcommand{\LWR@null@ulweight}{}
+\newcommand{\LWR@null@dfshape}{}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes
+ \newcommand{\LWR@null@swshape}{}
+}
+
+\newcommand{\LWR@null@ornament}[1]{}
+
+\appto{\LWR@nullfonts}{%
+\LetLtxMacro\lnstyle\LWR@null@lnstyle%
+\LetLtxMacro\osstyle\LWR@null@osstyle%
+\LetLtxMacro\instyle\LWR@null@instyle%
+\LetLtxMacro\sustyle\LWR@null@sustyle%
+\LetLtxMacro\swstyle\LWR@null@swstyle%
+\LetLtxMacro\pstyle\LWR@null@pstyle%
+\LetLtxMacro\tistyle\LWR@null@tistyle%
+\LetLtxMacro\ostyle\LWR@null@ostyle%
+\LetLtxMacro\postyle\LWR@null@postyle%
+\LetLtxMacro\ltstyle\LWR@null@ltstyle%
+\LetLtxMacro\ofstyle\LWR@null@ofstyle%
+\LetLtxMacro\altstyle\LWR@null@altstyle%
+\LetLtxMacro\regstyle\LWR@null@regstyle%
+\LetLtxMacro\embossstyle\LWR@null@embossstyle%
+\LetLtxMacro\ornamentalstyle\LWR@null@ornamentalstyle%
+\LetLtxMacro\qtstyle\LWR@null@qtstyle%
+\LetLtxMacro\shstyle\LWR@null@shstyle%
+\LetLtxMacro\swashstyle\LWR@null@swashstyle%
+\LetLtxMacro\tmstyle\LWR@null@tmstyle%
+\LetLtxMacro\tvstyle\LWR@null@tvstyle%
+\LetLtxMacro\tstyle\LWR@null@tstyle%
+\LetLtxMacro\lstyle\LWR@null@lstyle%
+\LetLtxMacro\tlstyle\LWR@null@tlstyle%
+\LetLtxMacro\plstyle\LWR@null@plstyle%
+\LetLtxMacro\tostyle\LWR@null@tostyle%
+\LetLtxMacro\olshape\LWR@null@olshape%
+\LetLtxMacro\scolshape\LWR@null@scolshape%
+\LetLtxMacro\ushape\LWR@null@ushape%
+\LetLtxMacro\scushape\LWR@null@scushape%
+\LetLtxMacro\uishape\LWR@null@uishape%
+\LetLtxMacro\rishape\LWR@null@rishape%
+\LetLtxMacro\regwidth\LWR@null@regwidth%
+\LetLtxMacro\nwwidth\LWR@null@nwwidth%
+\LetLtxMacro\cdwidth\LWR@null@cdwidth%
+\LetLtxMacro\ecwidth\LWR@null@ecwidth%
+\LetLtxMacro\ucwidth\LWR@null@ucwidth%
+\LetLtxMacro\etwidth\LWR@null@etwidth%
+\LetLtxMacro\epwidth\LWR@null@epwidth%
+\LetLtxMacro\exwidth\LWR@null@exwidth%
+\LetLtxMacro\uxwidth\LWR@null@uxwidth%
+\LetLtxMacro\mbweight\LWR@null@mbweight%
+\LetLtxMacro\dbweight\LWR@null@dbweight%
+\LetLtxMacro\sbweight\LWR@null@sbweight%
+\LetLtxMacro\ubweight\LWR@null@ubweight%
+\LetLtxMacro\elweight\LWR@null@elweight%
+\LetLtxMacro\ulweight\LWR@null@ulweight%
+\LetLtxMacro\dfshape\LWR@null@dfshape%
+\LetLtxMacro\swshape\LWR@null@swshape%
+\LetLtxMacro\ornament\LWR@null@ornament%
+}
+
+\newrobustcmd{\LWR@HTML@textln}[1]{#1}
+\newrobustcmd{\LWR@HTML@textos}[1]{\textsc{#1}}
+\newrobustcmd{\LWR@HTML@textin}[1]{#1}
+\newrobustcmd{\LWR@HTML@textsu}[1]{#1}
+\newrobustcmd{\LWR@HTML@textdf}[1]{#1}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes
+ \newrobustcmd{\LWR@HTML@textsw}[1]{#1}
+}
+
+\newrobustcmd{\LWR@HTML@textti}[1]{#1}
+\newrobustcmd{\LWR@HTML@textlt}[1]{#1}
+\newrobustcmd{\LWR@HTML@textof}[1]{#1}
+\newrobustcmd{\LWR@HTML@textalt}[1]{#1}
+\newrobustcmd{\LWR@HTML@textreg}[1]{#1}
+\newrobustcmd{\LWR@HTML@emboss}[1]{#1}
+\newrobustcmd{\LWR@HTML@textorn}[1]{#1}
+\newrobustcmd{\LWR@HTML@textqt}[1]{#1}
+\newrobustcmd{\LWR@HTML@textsh}[1]{#1}
+\newrobustcmd{\LWR@HTML@texttm}[1]{#1}
+\newrobustcmd{\LWR@HTML@texttv}[1]{\texttt{#1}}
+\newrobustcmd{\LWR@HTML@textl}[1]{#1}
+\newrobustcmd{\LWR@HTML@texto}[1]{#1}
+\newrobustcmd{\LWR@HTML@textp}[1]{#1}
+\newrobustcmd{\LWR@HTML@textt}[1]{#1}
+\newrobustcmd{\LWR@HTML@textpl}[1]{#1}
+\newrobustcmd{\LWR@HTML@textpo}[1]{\textsc{#1}}
+\newrobustcmd{\LWR@HTML@texttl}[1]{#1}
+\newrobustcmd{\LWR@HTML@textto}[1]{\textsc{#1}}
+\newrobustcmd{\LWR@HTML@textol}[1]{#1}
+\newrobustcmd{\LWR@HTML@textswash}[1]{#1}
+\newrobustcmd{\LWR@HTML@textu}[1]{#1}
+\newrobustcmd{\LWR@HTML@textscu}[1]{#1}
+\newrobustcmd{\LWR@HTML@textui}[1]{\LWR@HTML@textit{#1}}
+\newrobustcmd{\LWR@HTML@textri}[1]{#1}
+\newrobustcmd{\LWR@HTML@textnw}[1]{#1}
+\newrobustcmd{\LWR@HTML@textcd}[1]{#1}
+\newrobustcmd{\LWR@HTML@textec}[1]{#1}
+\newrobustcmd{\LWR@HTML@textuc}[1]{#1}
+\newrobustcmd{\LWR@HTML@textet}[1]{#1}
+\newrobustcmd{\LWR@HTML@textep}[1]{#1}
+\newrobustcmd{\LWR@HTML@textex}[1]{#1}
+\newrobustcmd{\LWR@HTML@textux}[1]{#1}
+\newrobustcmd{\LWR@HTML@textrw}[1]{#1}
+\newrobustcmd{\LWR@HTML@textmb}[1]{\textmd{#1}}
+\newrobustcmd{\LWR@HTML@textdb}[1]{\textbf{#1}}
+\newrobustcmd{\LWR@HTML@textsb}[1]{\textbf{#1}}
+\newrobustcmd{\LWR@HTML@textub}[1]{\texteb{#1}}
+\newrobustcmd{\LWR@HTML@textel}[1]{\textlg{#1}}
+\newrobustcmd{\LWR@HTML@textul}[1]{\textlg{#1}}
+
+\LWR@formatted{textln}
+\LWR@formatted{textos}
+\LWR@formatted{textin}
+\LWR@formatted{textsu}
+\LWR@formatted{textdf}
+\LWR@formatted{textsw}
+\LWR@formatted{textti}
+\LWR@formatted{textlt}
+\LWR@formatted{textof}
+\LWR@formatted{textalt}
+\LWR@formatted{textreg}
+\LWR@formatted{emboss}
+\LWR@formatted{textorn}
+\LWR@formatted{textqt}
+\LWR@formatted{textsh}
+\LWR@formatted{texttm}
+\LWR@formatted{texttv}
+\LWR@formatted{textl}
+\LWR@formatted{texto}
+\LWR@formatted{textp}
+\LWR@formatted{textt}
+\LWR@formatted{textpl}
+\LWR@formatted{textpo}
+\LWR@formatted{texttl}
+\LWR@formatted{textto}
+\LWR@formatted{textol}
+\LWR@formatted{textswash}
+\LWR@formatted{textu}
+\LWR@formatted{textscu}
+\LWR@formatted{textui}
+\LWR@formatted{textri}
+\LWR@formatted{textnw}
+\LWR@formatted{textcd}
+\LWR@formatted{textec}
+\LWR@formatted{textuc}
+\LWR@formatted{textet}
+\LWR@formatted{textep}
+\LWR@formatted{textex}
+\LWR@formatted{textux}
+\LWR@formatted{textrw}
+\LWR@formatted{textmb}
+\LWR@formatted{textdb}
+\LWR@formatted{textsb}
+\LWR@formatted{textub}
+\LWR@formatted{textel}
+\LWR@formatted{textul}
+
+\newrobustcmd{\LWR@null@textln}[1]{#1}
+\newrobustcmd{\LWR@null@textos}[1]{#1}
+\newrobustcmd{\LWR@null@textin}[1]{#1}
+\newrobustcmd{\LWR@null@textsu}[1]{#1}
+\newrobustcmd{\LWR@null@textdf}[1]{#1}
+
+\ifdef{\LWR@HTML@swshape}{}{% duplicated by fontaxes
+ \newrobustcmd{\LWR@null@textsw}[1]{#1}
+}
+
+\newrobustcmd{\LWR@null@textti}[1]{#1}
+\newrobustcmd{\LWR@null@textlt}[1]{#1}
+\newrobustcmd{\LWR@null@textof}[1]{#1}
+\newrobustcmd{\LWR@null@textalt}[1]{#1}
+\newrobustcmd{\LWR@null@textreg}[1]{#1}
+\newrobustcmd{\LWR@null@emboss}[1]{#1}
+\newrobustcmd{\LWR@null@textorn}[1]{#1}
+\newrobustcmd{\LWR@null@textqt}[1]{#1}
+\newrobustcmd{\LWR@null@textsh}[1]{#1}
+\newrobustcmd{\LWR@null@texttm}[1]{#1}
+\newrobustcmd{\LWR@null@texttv}[1]{#1}
+\newrobustcmd{\LWR@null@textl}[1]{#1}
+\newrobustcmd{\LWR@null@texto}[1]{#1}
+\newrobustcmd{\LWR@null@textp}[1]{#1}
+\newrobustcmd{\LWR@null@textt}[1]{#1}
+\newrobustcmd{\LWR@null@textpl}[1]{#1}
+\newrobustcmd{\LWR@null@textpo}[1]{#1}
+\newrobustcmd{\LWR@null@texttl}[1]{#1}
+\newrobustcmd{\LWR@null@textto}[1]{#1}
+\newrobustcmd{\LWR@null@textol}[1]{#1}
+\newrobustcmd{\LWR@null@textswash}[1]{#1}
+\newrobustcmd{\LWR@null@textu}[1]{#1}
+\newrobustcmd{\LWR@null@textscu}[1]{#1}
+\newrobustcmd{\LWR@null@textui}[1]{#1}
+\newrobustcmd{\LWR@null@textri}[1]{#1}
+\newrobustcmd{\LWR@null@textnw}[1]{#1}
+\newrobustcmd{\LWR@null@textcd}[1]{#1}
+\newrobustcmd{\LWR@null@textec}[1]{#1}
+\newrobustcmd{\LWR@null@textuc}[1]{#1}
+\newrobustcmd{\LWR@null@textet}[1]{#1}
+\newrobustcmd{\LWR@null@textep}[1]{#1}
+\newrobustcmd{\LWR@null@textex}[1]{#1}
+\newrobustcmd{\LWR@null@textux}[1]{#1}
+\newrobustcmd{\LWR@null@textrw}[1]{#1}
+\newrobustcmd{\LWR@null@textmb}[1]{#1}
+\newrobustcmd{\LWR@null@textdb}[1]{#1}
+\newrobustcmd{\LWR@null@textsb}[1]{#1}
+\newrobustcmd{\LWR@null@textub}[1]{#1}
+\newrobustcmd{\LWR@null@textel}[1]{#1}
+\newrobustcmd{\LWR@null@textul}[1]{#1}
+
+\appto{\LWR@nullfonts}{%
+\LetLtxMacro\textln\LWR@null@textln%
+\LetLtxMacro\textos\LWR@null@textos%
+\LetLtxMacro\textin\LWR@null@textin%
+\LetLtxMacro\textsu\LWR@null@textsu%
+\LetLtxMacro\textdf\LWR@null@textdf%
+\LetLtxMacro\textsw\LWR@null@textsw%
+\LetLtxMacro\textti\LWR@null@textti%
+\LetLtxMacro\textlt\LWR@null@textlt%
+\LetLtxMacro\textof\LWR@null@textof%
+\LetLtxMacro\textalt\LWR@null@textalt%
+\LetLtxMacro\textreg\LWR@null@textreg%
+\LetLtxMacro\emboss\LWR@null@emboss%
+\LetLtxMacro\textorn\LWR@null@textorn%
+\LetLtxMacro\textqt\LWR@null@textqt%
+\LetLtxMacro\textsh\LWR@null@textsh%
+\LetLtxMacro\texttm\LWR@null@texttm%
+\LetLtxMacro\texttv\LWR@null@texttv%
+\LetLtxMacro\textl\LWR@null@textl%
+\LetLtxMacro\texto\LWR@null@texto%
+\LetLtxMacro\textp\LWR@null@textp%
+\LetLtxMacro\textt\LWR@null@textt%
+\LetLtxMacro\textpl\LWR@null@textpl%
+\LetLtxMacro\textpo\LWR@null@textpo%
+\LetLtxMacro\texttl\LWR@null@texttl%
+\LetLtxMacro\textto\LWR@null@textto%
+\LetLtxMacro\textol\LWR@null@textol%
+\LetLtxMacro\textswash\LWR@null@textswash%
+\LetLtxMacro\textu\LWR@null@textu%
+\LetLtxMacro\textscu\LWR@null@textscu%
+\LetLtxMacro\textui\LWR@null@textui%
+\LetLtxMacro\textri\LWR@null@textri%
+\LetLtxMacro\textnw\LWR@null@textnw%
+\LetLtxMacro\textcd\LWR@null@textcd%
+\LetLtxMacro\textec\LWR@null@textec%
+\LetLtxMacro\textuc\LWR@null@textuc%
+\LetLtxMacro\textet\LWR@null@textet%
+\LetLtxMacro\textep\LWR@null@textep%
+\LetLtxMacro\textex\LWR@null@textex%
+\LetLtxMacro\textux\LWR@null@textux%
+\LetLtxMacro\textrw\LWR@null@textrw%
+\LetLtxMacro\textmb\LWR@null@textmb%
+\LetLtxMacro\textdb\LWR@null@textdb%
+\LetLtxMacro\textsb\LWR@null@textsb%
+\LetLtxMacro\textub\LWR@null@textub%
+\LetLtxMacro\textel\LWR@null@textel%
+\LetLtxMacro\textul\LWR@null@textul%
+}
+
+\providecommand*{\zeroslash}{0}
+\newrobustcmd*{\LWR@HTML@zeroslash}{0}
+\LWR@formatted{zeroslash}
+\endinput
+%%
+%% End of file `lwarp-nfssext-cfr.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty
index 809844b8c6e..090430fb796 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty
@@ -25,7 +25,7 @@
\endgroup
\@esphack}
-\renewcommand*{\pagedeclaration}[1]{, \nameref{autopage-#1}}
+\renewcommand*{\pagedeclaration}[1]{, \nameref{\BaseJobname-autopage-#1}}%
\endinput
%%
%% End of file `lwarp-nomencl.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty
new file mode 100644
index 00000000000..a20ad43a642
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-pdfcrypt.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcrypt')
+%% This is a generated file.
+%% Copyright 2016-2019 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{pdfcrypt}[2016/05/16]
+\newcommand*{\pdfcryptsetup}[1]{}
+\endinput
+%%
+%% End of file `lwarp-pdfcrypt.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty
new file mode 100644
index 00000000000..96a459aeb81
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-shapepar.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `shapepar')
+%% This is a generated file.
+%% Copyright 2016-2019 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{shapepar}[2013/03/26]
+\newcommand*{\LWR@HTML@shapepar}[2][]{}
+\LWR@formatted{shapepar}
+
+\NewDocumentCommand{\LWR@HTML@cutout}{m d()}{}
+\LWR@formatted{cutout}
+\endinput
+%%
+%% End of file `lwarp-shapepar.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty
new file mode 100644
index 00000000000..b41b2620995
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-slantsc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `slantsc')
+%% This is a generated file.
+%% Copyright 2016-2019 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{slantsc}[2012/01/01]
+\newcommand*{\LWR@HTML@noscshape}{}
+\LWR@formatted{noscshape}
+
+\newcommand*{\LWR@null@noscshape}{}
+
+\appto{\LWR@nullfonts}{%
+\LetLtxMacro\noscshape\LWR@null@noscshape%
+}
+\endinput
+%%
+%% End of file `lwarp-slantsc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
index c862c489ca2..8b03512f853 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
@@ -16,6 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@ProvidesPackageDrop{soulutf8}[2016/05/16]
+\RequirePackage{soul}
\endinput
%%
%% End of file `lwarp-soulutf8.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty
new file mode 100644
index 00000000000..6b9fd9c3704
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-tabfigures.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `tabfigures')
+%% This is a generated file.
+%% Copyright 2016-2019 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{tabfigures}[2012/01/24]
+\endinput
+%%
+%% End of file `lwarp-tabfigures.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty
new file mode 100644
index 00000000000..6ac66ac4bcd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-xr-hyper.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `xr-hyper')
+%% This is a generated file.
+%% Copyright 2016-2019 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{xr-hyper}[2000/03/22]
+
+\LWR@origRequirePackage{lwarp-xr}
+\endinput
+%%
+%% End of file `lwarp-xr-hyper.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty
new file mode 100644
index 00000000000..32bde46918c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty
@@ -0,0 +1,32 @@
+%%
+%% This is file `lwarp-xr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `xr')
+%% This is a generated file.
+%% Copyright 2016-2019 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.
+\ifdef{\externaldocument}{}{
+ \LWR@ProvidesPackagePass{xr}[2019/01/05]
+}
+\LetLtxMacro\LWR@orig@externaldocument\externaldocument
+
+\renewcommand*{\externaldocument}[2][]{%
+ \ifblank{#1}{%
+ \LWR@orig@externaldocument{#2_html}%
+ }{%
+ \LWR@orig@externaldocument[#1]{#2_html}%
+ }%
+}
+\endinput
+%%
+%% End of file `lwarp-xr.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
index 2ea71931be3..f0d3975bf25 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
@@ -15,11 +15,11 @@
%% 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{zhlineskip}[2018/11/30]
+\LWR@ProvidesPackageDrop{zhlineskip}[2019/05/15]
\newcommand*\SetTextEnvironmentSinglespace[1]{}
-\newcommand*\RestoreTextEnvironmentLeading{}
+\newcommand*\RestoreTextEnvironmentLeading[1]{}
\newcommand*\SetMathEnvironmentSinglespace[1]{}
-\newcommand*\RestoreMathEnvironmentLeading{}
+\newcommand*\RestoreMathEnvironmentLeading[1]{}
\endinput
%%
%% End of file `lwarp-zhlineskip.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 72dfd66c253..e9e738fd8a2 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}
- [2019/04/29 v0.71 Allows LaTeX to directly produce HTML5 output.]
+ [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.]
@@ -215,6 +215,7 @@
\LWR@loadafter{autonum}
\LWR@loadafter{axessibility}
\LWR@loadafter{axodraw2}
+\LWR@loadafter{backnaur}
\LWR@loadafter{backref}
\LWR@loadafter{balance}
\LWR@loadafter{bbding}
@@ -348,6 +349,7 @@
\LWR@loadafter{gridset}
\LWR@loadafter{hang}
\LWR@loadafter{hanging}
+\LWR@loadafter{hypbmsec}
\LWR@loadafter{hypcap}
\LWR@loadafter{hypdestopt}
\LWR@loadafter{hypernat}
@@ -399,6 +401,7 @@
\LWR@loadafter{microtype}
\LWR@loadafter{midfloat}
\LWR@loadafter{midpage}
+\LWR@loadafter{minibox}
\LWR@loadafter{minitoc}
\LWR@notmemoirloadafter{moreverb}
\LWR@notmemoirloadafter{movie15}
@@ -436,6 +439,7 @@
\LWR@notmemoirloadafter{parskip}
\LWR@loadafter{pbox}
\LWR@loadafter{pdfcomment}
+\LWR@loadafter{pdfcrypt}
\LWR@loadafter{pdflscape}
\LWR@loadafter{pdfmarginpar}
\LWR@loadafter{pdfpages}
@@ -495,6 +499,7 @@
\LWR@loadafter{semantic-markup}
\LWR@notmemoirloadafter{setspace}
\LWR@loadafter{shadow}
+\LWR@loadafter{shapepar}
\LWR@notmemoirloadafter{showidx}
\LWR@loadafter{showkeys}
\LWR@loadafter{showtags}
@@ -502,6 +507,7 @@
\LWR@loadafter{sidenotes}
\LWR@loadafter{SIunits}
\LWR@loadafter{siunitx}
+\LWR@loadafter{slantsc}
\LWR@loadafter{soul}
\LWR@loadafter{soulpos}
\LWR@loadafter{soulutf8}
@@ -516,6 +522,7 @@
\LWR@loadafter{subfigure}
\LWR@loadafter{supertabular}
\LWR@loadafter{t1inc}
+\LWR@loadafter{tabfigures}
\LWR@loadafter{tabls}
\LWR@loadafter{tablefootnote}
\LWR@notmemoirloadafter{tabularx}
@@ -582,6 +589,8 @@
\LWR@loadafter{xmpincl}
\LWR@loadafter{xpiano}
\LWR@loadafter{xpinyin}
+\LWR@loadafter{xr}
+\LWR@loadafter{xr-hyper}
\LWR@loadafter{xtab}
\LWR@loadafter{xurl}
\LWR@loadafter{xy}
@@ -1104,6 +1113,8 @@
\LWR@checkloadbefore{#1}{fontspec}
\LWR@checkloadbefore{#1}{inputenc}
\LWR@checkloadbefore{#1}{inputenx}
+\LWR@checkloadbefore{#1}{nfssext-cfr}
+\LWR@checkloadbefore{#1}{fontaxes}
\LWR@checkloadbefore{#1}{kotex}
\LWR@checkloadbefore{#1}{luatexja}
\LWR@checkloadbefore{#1}{luatexja-fontspec}
@@ -1380,8 +1391,12 @@
\csletcs{endLWR@print@#1}{end#1}%
}{}%
\DeclareDocumentEnvironment{#1}{}%
- {\@nameuse{LWR@\LWR@formatting @#1}}%
- {\@nameuse{endLWR@\LWR@formatting @#1}}%
+ {%
+ \@nameuse{LWR@\LWR@formatting @#1}%
+ }%
+ {%
+ \@nameuse{endLWR@\LWR@formatting @#1}%
+ }%
}
\newcommand*{\LWR@expandableformattedenv}[1]{%
\ifcsundef{LWR@print@#1}{%
@@ -1390,8 +1405,12 @@
\csletcs{endLWR@print@#1}{end#1}%
}{}%
\DeclareExpandableDocumentEnvironment{#1}{}%
- {\@nameuse{LWR@\LWR@formatting @#1}}%
- {\@nameuse{endLWR@\LWR@formatting @#1}}%
+ {%
+ \@nameuse{LWR@\LWR@formatting @#1}%
+ }%
+ {%
+ \@nameuse{endLWR@\LWR@formatting @#1}%
+ }%
}
\end{warpHTML}
@@ -1509,20 +1528,8 @@
\let\LWR@origtextellipsis\textellipsis
\let\LWR@orig@textquotedbl\textquotedbl
-\LetLtxMacro\LWR@origrmfamily\rmfamily
-\LetLtxMacro\LWR@origsffamily\sffamily
\LetLtxMacro\LWR@origttfamily\ttfamily
-\LetLtxMacro\LWR@origbfseries\bfseries
-\LetLtxMacro\LWR@origmdseries\mdseries
-\LetLtxMacro\LWR@origupshape\upshape
-\LetLtxMacro\LWR@origslshape\slshape
-\LetLtxMacro\LWR@origscshape\scshape
-\@ifundefined{sishape}{
- \LetLtxMacro\LWR@origsishape\scshape
-}{
- \LetLtxMacro\LWR@origsishape\sishape
-}
-\LetLtxMacro\LWR@origitshape\itshape
+
\LetLtxMacro\LWR@origem\em
\LetLtxMacro\LWR@orignormalfont\normalfont
@@ -1848,7 +1855,7 @@
\begin{filecontents*}{lwarp.css}
/*
CSS stylesheet for the LaTeX lwarp package
- Copyright 2016-2018 Brian Dunn — BD Tech Concepts LLC
+ Copyright 2016-2019 Brian Dunn — BD Tech Concepts LLC
*/
/* a fix for older browsers: */
@@ -1920,15 +1927,18 @@ span.textit, div.textit { font-style: italic; }
span.textmd, div.textmd { font-weight: normal; }
+span.texteb { font-weight: bolder; }
+
+span.textlg { font-weight: lighter; }
+
span.textsc, div.textsc {
font-variant: small-caps;
font-variant-numeric: oldstyle-nums ;
}
-span.textsi, div.textsi {
- font-style: italic ;
- font-variant: small-caps;
- font-variant-numeric: oldstyle-nums ;
+span.textulc, div.textulc {
+ font-variant: normal ;
+ font-variant-numeric: normal ;
}
span.textsl, div.textsl { font-style: oblique; }
@@ -3178,6 +3188,26 @@ div.amsthmproof
span.amsthmnoteremark {}
+/* For the backnaur package: */
+div.backnaur {
+ display: block ;
+ margin: 2ex 2em 2ex 2em ;
+}
+
+div.backnaur p {
+ margin: .25ex 0ex .25ex 0ex ;
+}
+
+div.backnaurprod {
+ display: inline-block ;
+ min-width: 8em ;
+ text-align:right ;
+}
+
+div.backnaurdesc {
+ display: inline-block ;
+}
+
/* For the notes package: */
div.notesimportantnote, div.noteswarningnote, div.notesinformationnote {
clear: both ;
@@ -3954,9 +3984,9 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
\begin{filecontents*}{lwarpmk.lua}
#!/usr/bin/env texlua
--- Copyright 2016-2018 Brian Dunn
+-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.71"
+printversion = "v0.72"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4833,6 +4863,7 @@ end -- not --version
\newcommand*{\LWR@depthsubparagraph}{5}
\newcommand*{\LWR@depthlist}{6}
\newcommand*{\LWR@depthlistitem}{7}
+\let\LWR@depthdescitem\LWR@depthlistitem
\newcommand*{\LWR@closeone}{}% top of the stack
@@ -4865,59 +4896,59 @@ end -- not --version
-\NewDocumentCommand{\pushclose}{m m}
-{
-\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}
-{
-\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
+\NewDocumentCommand{\LWR@pushclose}{m}
+{%
+\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\csletcs{LWR@closeone}{LWR@printclose#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\csletcs{LWR@closedepthone}{LWR@depth#1}%
+}
+
+
+\newcommand*{\LWR@popclose}
+{%
+\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}
@@ -5142,18 +5173,21 @@ end -- not --version
\LWR@closeone
-\popclose
+\LWR@popclose
}
\newcommand*{\LWR@closeprevious}[1]{
-\LWR@traceinfo{LWR@closeprevious to depth #1, depths are \LWR@subprintstack}%
+\LWR@traceinfo{%
+ LWR@closeprevious to depth \csuse{LWR@depth#1}, %
+ depths are \LWR@subprintstack%
+}%
\LWR@stoppars%
-\whileboolexpr{test{\ifnumcomp{\LWR@closedepthone}{>}{#1}}}%
+\whileboolexpr{test{\ifnumcomp{\LWR@closedepthone}{>}{\csuse{LWR@depth#1}}}}%
{%
\LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}%
\LWR@closeoneprevious%
}%
-\ifboolexpr{test{\ifnumcomp{\LWR@closedepthone}{=}{#1}}}%
+\ifboolexpr{test{\ifnumcomp{\LWR@closedepthone}{=}{\csuse{LWR@depth#1}}}}%
{%
\LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}%
\LWR@closeoneprevious%
@@ -6075,7 +6109,7 @@ end -- not --version
\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}%
{}% no action if this autopage label has already been defined
{%
- \label{autopage-\arabic{#1}}%
+ \label{\BaseJobname-autopage-\arabic{#1}}%
\setcounter{LWR@previousautopagelabel}{\value{page}}
}%
}
@@ -6272,14 +6306,14 @@ end -- not --version
}%
}
-\NewDocumentCommand{\LWR@pushoneclose}{m m}{%
+\NewDocumentCommand{\LWR@pushoneclose}{m}{%
\LWR@traceinfo{LWR@pushoneclose #1}%
- \pushclose{#2}{#1}%
+ \LWR@pushclose{#1}%
}
-\NewDocumentCommand{\LWR@startnewdepth}{m m}{%
+\NewDocumentCommand{\LWR@startnewdepth}{m}{%
\LWR@closeprevious{#1}%
-\LWR@pushoneclose{#1}{#2}%
+\LWR@pushoneclose{#1}%
}
\newcounter{LWR@prevFileDepth}
\setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph}
@@ -6291,8 +6325,12 @@ end -- not --version
\newcounter{LWR@currentautosec}
\setcounter{LWR@currentautosec}{1}
\DeclareDocumentCommand{\LWR@section}{m m m m}{%
-\LWR@traceinfo{LWR@section: starting}%
+\IfValueTF{#2}%
+ {\LWR@traceinfo{LWR@section: starting #4 #2}}%
+ {\LWR@traceinfo{LWR@section: starting #4 #3}}%
+\LWR@maybeprintpendingfootnotes{\csuse{LWR@depth#4}}%
\LWR@stoppars%
+\LWR@startnewdepth{#4}%
\global\boolfalse{LWR@minipagethispar}%
\LWR@traceinfo{LWR@section: testing whether to start a new HTML file}%
\IfBooleanT{#1}{\LWR@traceinfo{LWR@section: starred}}%
@@ -6481,16 +6519,11 @@ end -- not --version
\newcommand{\part@preamble}{}% for koma-script
-\DeclareDocumentCommand{\part}{s o m}{%
-\LWR@maybeprintpendingfootnotes{\LWR@depthpart}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}%
-
-\LWR@section{#1}{#2}{#3}{part}%
+\DeclareDocumentCommand{\part}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{part}%
-\part@preamble% for koma-script
-\renewcommand{\part@preamble}{}%
+ \part@preamble% for koma-script
+ \renewcommand{\part@preamble}{}%
}
\let\@printcites\relax% for quotchap package
@@ -6500,71 +6533,34 @@ end -- not --version
\@ifundefined{chapter}
{}
{%
-\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}{#4}{chapter}%
+ \DeclareDocumentCommand{\chapter}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{chapter}%
-\@printcites% for quotchap package
+ \@printcites% for quotchap package
-\chapter@preamble% for koma-script
-\renewcommand{\chapter@preamble}{}%
-}
+ \chapter@preamble% for koma-script
+ \renewcommand{\chapter@preamble}{}%
+ }
}
-\DeclareDocumentCommand{\section}{s o o m}{%
-\LWR@traceinfo{section: starting}%
-\LWR@maybeprintpendingfootnotes{\LWR@depthsection}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthsection}{\LWR@printclosesection}%
-
-\LWR@section{#1}{#2}{#4}{section}%
+\DeclareDocumentCommand{\section}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{section}%
}
-\DeclareDocumentCommand{\subsection}{s o m}{%
-\LWR@maybeprintpendingfootnotes{\LWR@depthsubsection}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthsubsection}{\LWR@printclosesubsection}%
-
-\LWR@section{#1}{#2}{#3}{subsection}%
+\DeclareDocumentCommand{\subsection}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{subsection}%
}
-\DeclareDocumentCommand{\subsubsection}{s o m}{%
-\LWR@maybeprintpendingfootnotes{\LWR@depthsubsubsection}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthsubsubsection}%
-{\LWR@printclosesubsubsection}%
-
-\LWR@section{#1}{#2}{#3}{subsubsection}%
+\DeclareDocumentCommand{\subsubsection}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{subsubsection}%
}
-\DeclareDocumentCommand{\paragraph}{s o m}{%
-\LWR@maybeprintpendingfootnotes{\LWR@depthparagraph}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthparagraph}{\LWR@printcloseparagraph}%
-
-\LWR@section{#1}{#2}{#3}{paragraph}%
+\DeclareDocumentCommand{\paragraph}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{paragraph}%
}
-\DeclareDocumentCommand{\subparagraph}{s o m}{%
-\LWR@maybeprintpendingfootnotes{\LWR@depthsubparagraph}%
-\LWR@stoppars%
-
-\LWR@startnewdepth{\LWR@depthsubparagraph}{\LWR@printclosesubparagraph}%
-
-\LWR@section{#1}{#2}{#3}{subparagraph}%
+\DeclareDocumentCommand{\subparagraph}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{subparagraph}%
}
\end{warpHTML}
@@ -6769,7 +6765,7 @@ end -- not --version
\newcommand*{\LWR@LwarpEnd}
{
\LWR@stoppars
-\LWR@closeprevious{\LWR@depthfinished}
+\LWR@closeprevious{finished}
\LWR@htmlelementclassend{section}{textbody}
\LWR@htmlelementclassend{div}{bodycontainer}
@@ -7244,7 +7240,7 @@ end -- not --version
\newcommand*{\LWR@listitem}{%
\LWR@stoppars%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
+\LWR@startnewdepth{listitem}%
\LWR@htmltag{li}%
\LWR@startpars%
\LWR@origitem%
@@ -7262,7 +7258,7 @@ end -- not --version
\newcommand*{\LWR@liststart}{%
\LWR@traceinfo{LWR@liststart}%
\LWR@stoppars%
-\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}%
+\LWR@pushoneclose{list}%
\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline%
\LWR@startpars%
\setlength{\topsep}{0pt}%
@@ -7279,14 +7275,14 @@ end -- not --version
\newcommand*{\LWR@listend}{%
\LWR@traceinfo{LWR@listend}%
\LWR@stoppars%
-\LWR@closeprevious{\LWR@depthlist}%
+\LWR@closeprevious{list}%
\LWR@startpars%
}
\newcommand*{\LWR@itemizeitem}{%
\LWR@stoppars%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
+\LWR@startnewdepth{listitem}%
\LWR@htmltag{li}%
\LWR@startpars%
\LWR@origitem%
@@ -7313,7 +7309,7 @@ end -- not --version
{%
\LWR@stoppars%
\LWR@setlatestname{#1}%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}%
+\LWR@startnewdepth{descitem}%
\LWR@select@html@nohspace%
\LWR@origitem[]%
\LWR@select@html@hspace%
@@ -8463,17 +8459,17 @@ end -- not --version
\addtocounter{LWR@tablemulticolspos}{3}% skip parameters
\LWR@multicoltext%
}{}%
-\IfStrEq{\LWR@strresult}{p}{\LWR@multicolpartext{0}}{}%
-\IfStrEq{\LWR@strresult}{m}{\LWR@multicolpartext{0}}{}%
-\IfStrEq{\LWR@strresult}{b}{\LWR@multicolpartext{0}}{}%
-\IfStrEq{\LWR@strresult}{P}{\LWR@multicolpartext{0}}{}%
-\IfStrEq{\LWR@strresult}{M}{\LWR@multicolpartext{0}}{}%
-\IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext{0}}{}%
+\IfStrEq{\LWR@strresult}{p}{\LWR@multicolpartext{2}}{}%
+\IfStrEq{\LWR@strresult}{m}{\LWR@multicolpartext{2}}{}%
+\IfStrEq{\LWR@strresult}{b}{\LWR@multicolpartext{2}}{}%
+\IfStrEq{\LWR@strresult}{P}{\LWR@multicolpartext{2}}{}%
+\IfStrEq{\LWR@strresult}{M}{\LWR@multicolpartext{2}}{}%
+\IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext{2}}{}%
\IfStrEq{\LWR@strresult}{w}{\LWR@multicolpartext{3}}{}%
\IfStrEq{\LWR@strresult}{W}{\LWR@multicolpartext{3}}{}%
\IfStrEq{\LWR@strresult}{S}{\LWR@multicoltext}{}%
\IfStrEq{\LWR@strresult}{s}{\LWR@multicoltext}{}%
-\IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext{0}}{}%
+\IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext{1}}{}%
\IfStrEq{\LWR@strresult}{|}{\LWR@multicolskip}{}%
\IfStrEq{\LWR@strresult}{:}{\LWR@multicolskip}{}%
\IfStrEq{\LWR@strresult}{;}{%
@@ -9580,8 +9576,8 @@ autopage-\theLWR@currentautosec%
\NewDocumentCommand{\LWR@subtableofcontents}{m m}{%
\@ifundefined{chapter}
-{\LWR@closeprevious{\LWR@depthsection}}
-{\LWR@closeprevious{\LWR@depthchapter}}
+{\LWR@closeprevious{section}}
+{\LWR@closeprevious{chapter}}
\LWR@printpendingfootnotes
\@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}}
\LWR@htmlelementclass{nav}{#1}
@@ -9709,7 +9705,7 @@ autopage-\theLWR@currentautosec%
{%
\LWR@startpars%
\LWR@subhyperrefclass{%
- \LWR@htmlrefsectionfilename{autopage-#4}%
+ \LWR@htmlrefsectionfilename{\BaseJobname-autopage-#4}%
\LWR@origpound\LWR@print@mbox{autosec-#4}%
}{#3}{toc#2}%
\LWR@maybetocdata%
@@ -9740,7 +9736,9 @@ autopage-\theLWR@currentautosec%
{%
\LWR@startpars%
\LWR@subhyperrefclass{%
- \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}%
+ \LWR@htmlrefsectionfilename{%
+ \BaseJobname-autopage-\arabic{LWR@nextautopage}%
+ }%
\LWR@origpound\LWR@print@mbox{autoid-\arabic{LWR@nextautoid}}}%
{#4}{toc#2}%
\LWR@maybetocdata%
@@ -9844,11 +9842,14 @@ autopage-\theLWR@currentautosec%
\newcommand{\LWR@hyperindexrefnullified}{%
\renewrobustcmd{\emph}[1]{\LWR@HTML@emph{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textbf}[1]{\LWR@HTML@textbf{\LWR@doindexentry{##1}}}%
+\renewrobustcmd{\texteb}[1]{\LWR@HTML@texteb{\LWR@doindexentry{##1}}}%
+\renewrobustcmd{\textlg}[1]{\LWR@HTML@textlg{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textrm}[1]{\LWR@HTML@textrm{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsf}[1]{\LWR@HTML@textsf{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}%
+\renewrobustcmd{\textulc}[1]{\LWR@HTML@textulc{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsi}[1]{\LWR@HTML@textsi{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}%
\renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}%
@@ -9930,16 +9931,6 @@ autopage-\theLWR@currentautosec%
\let\textless\LWR@origtextless%
\let\textgreater\LWR@origtextgreater%
\let\&\LWR@origampersand%
-\LetLtxMacro\rmfamily\LWR@origrmfamily%
-\LetLtxMacro\sffamily\LWR@origsffamily%
-\LetLtxMacro\ttfamily\LWR@origttfamily%
-\LetLtxMacro\bfseries\LWR@origbfseries%
-\LetLtxMacro\mdseries\LWR@origmdseries%
-\LetLtxMacro\upshape\LWR@origupshape%
-\LetLtxMacro\slshape\LWR@origslshape%
-\LetLtxMacro\scshape\LWR@origscshape%
-\LetLtxMacro\sishape\LWR@origsishape%
-\LetLtxMacro\itshape\LWR@origitshape%
\LetLtxMacro\em\LWR@origem%
\LetLtxMacro\normalfont\LWR@orignormalfont%
\let\sp\LWR@origsp%
@@ -10073,6 +10064,8 @@ autopage-\theLWR@currentautosec%
\@nameuse{LWR@orig\LWR@f@series series}%
\LWR@traceinfo{Using font shape \LWR@f@shape}%
\@nameuse{LWR@orig\LWR@f@shape shape}%
+ \LWR@traceinfo{Using font caps shape \LWR@f@shapecaps}%
+ \@nameuse{LWR@orig\LWR@f@shapecaps shape}%
\global\advance\c@LWR@lateximagedepth 1\relax%
\ifmmode%
\global\sbox{\LWR@singledollarbox}{#4}%
@@ -10163,6 +10156,7 @@ autopage-\theLWR@currentautosec%
FM\LWR@f@family%
SR\LWR@f@series%
SH\LWR@f@shape%
+ SHC\LWR@f@shapecaps%
CL\LWR@tempcolor%
FB\LWR@tempone% xfakebold
]%
@@ -10909,6 +10903,10 @@ autopage-\theLWR@currentautosec%
\LWR@PreloadedPackage{graphics}
\LWR@PreloadedPackage{graphicx}
+\LWR@PreloadedPackage{fontaxes}
+
+\LWR@PreloadedPackage{nfssext-cfr}
+
\LWR@PreloadedPackage{ulem}
\LWR@PreloadedPackage{xetexko-vertical}
@@ -11515,9 +11513,10 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{em}{#1}%
}%
}
+
\LWR@formatted{emph}
-\DeclareRobustCommand{\LWR@null@emph}[1]{#1}
+\newcommand{\LWR@null@emph}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textmd}[1]{%
{%
@@ -11525,9 +11524,10 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass(font-weight:normal){textmd}{#1}%
}%
}
+
\LWR@formatted{textmd}
-\DeclareRobustCommand{\LWR@null@textmd}[1]{#1}
+\newcommand{\LWR@null@textmd}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textbf}[1]{%
{%
@@ -11535,9 +11535,32 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{b}{#1}%
}%
}
+
\LWR@formatted{textbf}
-\DeclareRobustCommand{\LWR@null@textbf}[1]{#1}
+\newcommand{\LWR@null@textbf}[1]{#1}
+
+\DeclareRobustCommand{\LWR@HTML@texteb}[1]{%
+ {%
+ \ebweight%
+ \InlineClass{texteb}{#1}%
+ }%
+}
+
+\LWR@formatted{texteb}
+
+\newcommand{\LWR@null@texteb}[1]{#1}
+
+\DeclareRobustCommand{\LWR@HTML@textlg}[1]{%
+ {%
+ \lgweight%
+ \InlineClass{textlg}{#1}%
+ }%
+}
+
+\LWR@formatted{textlg}
+
+\newcommand{\LWR@null@textlg}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textrm}[1]{%
{%
@@ -11545,9 +11568,10 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass(font-family:serif){textrm}{#1}%
}%
}
+
\LWR@formatted{textrm}
-\DeclareRobustCommand{\LWR@null@textrm}[1]{#1}
+\newcommand{\LWR@null@textrm}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textsf}[1]{%
{%
@@ -11555,9 +11579,10 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass(font-family:sans){textsf}{#1}%
}%
}
+
\LWR@formatted{textsf}
-\DeclareRobustCommand{\LWR@null@textsf}[1]{#1}
+\newcommand{\LWR@null@textsf}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@texttt}[1]{%
{%
@@ -11565,9 +11590,10 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{kbd}{#1}%
}%
}
+
\LWR@formatted{texttt}
-\DeclareRobustCommand{\LWR@null@texttt}[1]{#1}
+\newcommand{\LWR@null@texttt}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textup}[1]{%
{%
@@ -11575,9 +11601,10 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass(font-style:normal){textup}{#1}%
}%
}
+
\LWR@formatted{textup}
-\DeclareRobustCommand{\LWR@null@textup}[1]{#1}
+\newcommand{\LWR@null@textup}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textit}[1]{%
{%
@@ -11585,22 +11612,32 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{i}{#1}%
}%
}
+
\LWR@formatted{textit}
-\DeclareRobustCommand{\LWR@null@textit}[1]{#1}
+\newcommand{\LWR@null@textit}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textsc}[1]{%
{%
\scshape%
- \InlineClass(
- font-variant: small-caps ;
- font-variant-numeric: oldstyle-nums ;
- ){textsc}{#1}%
+ \InlineClass{textsc}{#1}%
}%
}
+
\LWR@formatted{textsc}
-\DeclareRobustCommand{\LWR@null@textsc}[1]{#1}
+\newcommand{\LWR@null@textsc}[1]{#1}
+
+\DeclareRobustCommand{\LWR@HTML@textulc}[1]{%
+ {%
+ \ulcshape%
+ \InlineClass{textulc}{#1}%
+ }%
+}
+
+\LWR@formatted{textulc}
+
+\newcommand{\LWR@null@textulc}[1]{#1}
\@ifundefined{textsi}{
\LetLtxMacro\LWR@print@textsi\LWR@print@textsc
@@ -11609,16 +11646,13 @@ color:\LWR@origpound\LWR@tempcolor%
\DeclareRobustCommand{\LWR@HTML@textsi}[1]{%
{%
\sishape%
- \InlineClass(
- font-style: italic;
- font-variant: small-caps ;
- font-variant-numeric: oldstyle-nums ;
- ){textsi}{#1}%
+ \textsc{\textit{#1}}%
}%
}
+
\LWR@formatted{textsi}
-\DeclareRobustCommand{\LWR@null@textsi}[1]{#1}
+\newcommand{\LWR@null@textsi}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textsl}[1]{%
{%
@@ -11626,26 +11660,30 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass(font-style:oblique){textsl}{#1}%
}%
}
+
\LWR@formatted{textsl}
-\DeclareRobustCommand{\LWR@null@textsl}[1]{#1}
+\newcommand{\LWR@null@textsl}[1]{#1}
\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}}
-\LWR@formatted{textnormal}
-\DeclareRobustCommand{\LWR@null@textnormal}[1]{#1}
+\LWR@formatted{textnormal}
-\DeclareRobustCommand{\LWR@null@rmfamily}{}
-\DeclareRobustCommand{\LWR@null@sffamily}{}
-\DeclareRobustCommand{\LWR@null@ttfamily}{}
-\DeclareRobustCommand{\LWR@null@bfseries}{}
-\DeclareRobustCommand{\LWR@null@mdseries}{}
-\DeclareRobustCommand{\LWR@null@upshape}{}
-\DeclareRobustCommand{\LWR@null@slshape}{}
-\DeclareRobustCommand{\LWR@null@scshape}{}
-\DeclareRobustCommand{\LWR@null@itshape}{}
-\DeclareRobustCommand{\LWR@null@normalfont}{}
-\DeclareRobustCommand{\LWR@null@em}{}
+\newcommand{\LWR@null@textnormal}[1]{#1}
+
+\newcommand{\LWR@null@rmfamily}{}
+\newcommand{\LWR@null@sffamily}{}
+\newcommand{\LWR@null@ttfamily}{}
+\newcommand{\LWR@null@bfseries}{}
+\newcommand{\LWR@null@ebweight}{}
+\newcommand{\LWR@null@lgweight}{}
+\newcommand{\LWR@null@mdseries}{}
+\newcommand{\LWR@null@upshape}{}
+\newcommand{\LWR@null@slshape}{}
+\newcommand{\LWR@null@scshape}{}
+\newcommand{\LWR@null@itshape}{}
+\newcommand{\LWR@null@normalfont}{}
+\newcommand{\LWR@null@em}{}
\catcode`\$=\active% redefining $ below
\catcode`\_=12% redefining \_ below
@@ -11659,6 +11697,7 @@ color:\LWR@origpound\LWR@tempcolor%
\LetLtxMacro\textup\LWR@null@textup%
\LetLtxMacro\textit\LWR@null@textit%
\LetLtxMacro\textsc\LWR@null@textsc%
+\LetLtxMacro\textulc\LWR@null@textulc%
\LetLtxMacro\textsi\LWR@null@textsi%
\LetLtxMacro\textsl\LWR@null@textsl%
\LetLtxMacro\textnormal\LWR@null@textnormal%
@@ -11670,6 +11709,7 @@ color:\LWR@origpound\LWR@tempcolor%
\LetLtxMacro\upshape\LWR@null@upshape%
\LetLtxMacro\slshape\LWR@null@slshape%
\LetLtxMacro\scshape\LWR@null@scshape%
+\LetLtxMacro\ulcshape\LWR@null@ulcshape%
\LetLtxMacro\sishape\LWR@null@sishape%
\LetLtxMacro\itshape\LWR@null@itshape%
\LetLtxMacro\normalfont\LWR@null@normalfont%
@@ -11795,6 +11835,7 @@ color:\LWR@origpound\LWR@tempcolor%
\newcommand*{\LWR@f@family}{rm}
\newcommand*{\LWR@f@series}{md}
\newcommand*{\LWR@f@shape}{up}
+\newcommand*{\LWR@f@shapecaps}{ulc}
\newcounter{LWR@textcurrentfontdepth}
\setcounter{LWR@textcurrentfontdepth}{0}
@@ -11811,7 +11852,8 @@ color:\LWR@origpound\LWR@tempcolor%
\InlineClass{%
text\LWR@f@family\LWR@origtilde{}%
text\LWR@f@series\LWR@origtilde{}%
- text\LWR@f@shape%
+ text\LWR@f@shape\LWR@origtilde{}%
+ text\LWR@f@shapecaps%
}%
{#1}%
\addtocounter{LWR@textcurrentfontdepth}{-1}%
@@ -11822,35 +11864,60 @@ color:\LWR@origpound\LWR@tempcolor%
\BlockClass{%
text\LWR@f@family\LWR@origtilde{}%
text\LWR@f@series\LWR@origtilde{}%
- text\LWR@f@shape%
+ text\LWR@f@shape\LWR@origtilde{}%
+ text\LWR@f@shapecaps%
}%
}{\endBlockClass}
-\renewrobustcmd*{\mdseries}{\renewcommand*{\LWR@f@series}{md}}
+\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}}
+\LWR@formatted{mdseries}
-\renewrobustcmd*{\bfseries}{\renewcommand*{\LWR@f@series}{bf}}
+\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}}
+\LWR@formatted{bfseries}
-\renewrobustcmd*{\rmfamily}{\renewcommand*{\LWR@f@family}{rm}}
+\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}}
+\LWR@formatted{ebweight}
-\renewrobustcmd*{\sffamily}{\renewcommand*{\LWR@f@family}{sf}}
+\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}}
+\LWR@formatted{lgweight}
-\renewrobustcmd*{\ttfamily}{\renewcommand*{\LWR@f@family}{tt}}
+\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}}
+\LWR@formatted{rmfamily}
-\renewrobustcmd*{\upshape}{\renewcommand*{\LWR@f@shape}{up}}
+\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}}
+\LWR@formatted{sffamily}
-\renewrobustcmd*{\itshape}{\renewcommand*{\LWR@f@shape}{it}}
+\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}}
+\LWR@formatted{ttfamily}
-\renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}}
+\newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}}
+\LWR@formatted{upshape}
+
+\newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}}
+\LWR@formatted{itshape}
+
+\newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}}
+\LWR@formatted{scshape}
+
+\@ifundefined{ulcshape}{
+ \LetLtxMacro\ulcshape\upshape
+}{}
+\newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}}
+\LWR@formatted{ulcshape}
\@ifundefined{sishape}{
- \newrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}}
-}{
- \renewrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}}
+ \LetLtxMacro\sishape\scshape
+}{}
+\newrobustcmd*{\LWR@HTML@sishape}{%
+ \renewcommand*{\LWR@f@shape}{it}
+ \renewcommand*{\LWR@f@shapecaps}{sc}%
}
+\LWR@formatted{sishape}
-\renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}}
+\newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}}
+\LWR@formatted{slshape}
-\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape}
+\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape\ulcshape}
\renewcommand{\sp}[1]{\text{<sup>#1</sup>}{}}