summaryrefslogtreecommitdiff
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
parent05fdcf5329e9cad9bf82381d8e588fbe86d84326 (diff)
lwarp (8jun19)
git-svn-id: svn://tug.org/texlive/trunk@51346 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua4
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl15
-rw-r--r--Master/texmf-dist/doc/latex/lwarp/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/lwarp/lwarp.pdfbin2440566 -> 2463249 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/lwarp/lwarpmk.lua4
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.dtx2174
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.ins13
-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
25 files changed, 2756 insertions, 770 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index 6a88ea8d90d..c65a9fd7354 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -1,8 +1,8 @@
#!/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 ()
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index d1cfe6c5df2..40dd22ef003 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 50442 2019-03-18 11:35:23Z hironobu $
+# $Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -14,7 +14,7 @@
# the original versions were licensed under the following agreement:
# Anyone may freely use, modify, and/or distribute this file, without
-my $svnid = '$Id: updmap.pl 50442 2019-03-18 11:35:23Z hironobu $';
+my $svnid = '$Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $';
my $TEXMFROOT;
BEGIN {
@@ -27,10 +27,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2019-03-18 12:35:23 +0100 (Mon, 18 Mar 2019) $';
+my $lastchdate = '$Date: 2019-06-07 18:36:59 +0200 (Fri, 07 Jun 2019) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 50442 $';
+my $svnrev = '$Revision: 51338 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -2075,7 +2075,12 @@ sub read_map_files {
my @fullpath = `kpsewhich --format=map @maps`;
chomp @fullpath;
foreach my $map (@maps) {
- my ($ff) = grep /\/$map(\.map)?$/, @fullpath;
+ # in case they give an absolute path (not needed/desired, but ...);
+ # Windows not supported.
+ my $dirsep = ($map =~ m!^/!) ? "" : "/";
+ # quotemeta the map string to avoid perl regexp warning, e.g.,
+ # if map name contains "\Users", the "\U" should be literal.
+ my ($ff) = grep /$dirsep\Q$map\E(\.map)?$/, @fullpath;
if ($ff) {
$alldata->{'maps'}{$map}{'fullpath'} = $ff;
} else {
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index 7c5d709fa29..f74a0eb0fa7 100644
--- a/Master/texmf-dist/doc/latex/lwarp/README.txt
+++ b/Master/texmf-dist/doc/latex/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.71 README.txt
+LaTeX lwarp package v0.72 README.txt
Files included are:
diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
index 28bfc6a7b6c..53cdb67eedc 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
index 6a88ea8d90d..c65a9fd7354 100755
--- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
+++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
@@ -1,8 +1,8 @@
#!/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 ()
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
index e7b98b48d85..a573bac8f6b 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2019/04/29 v0.71 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -30,7 +30,7 @@
% \usepackage{cabin}
% \usepackage[tabular,semibold]{sourcesanspro}
-
+%
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
@@ -286,7 +286,32 @@ Keywords={LaTeX, HTML, conversion}%
\newcommand{\textred}[1]{\textcolor{red}{#1}}
\newcommand{\textgreen}[1]{\textcolor{green!50!black}{#1}}
+\newcommand{\textcyan}[1]{\textcolor{cyan!70!black}{#1}}
\newcommand{\textblue}[1]{\textcolor{blue!70!black}{#1}}
+\newcommand{\textgray}[1]{\textcolor{white!30!black}{#1}}
+
+
+% \newcommand{\spkg}[1]{\textcolor{green!30!gray}{\pkg{#1}}}% package supported as-is
+% \newcommand{\mpkg}[1]{\textcolor{cyan!30!gray}{\pkg{#1}}}% package modified for HTML
+% \newcommand{\epkg}[1]{\textcolor{blue!30!gray}{\pkg{#1}}}% package emulated for HTML
+% \newcommand{\ipkg}[1]{\textcolor{magenta!30!gray}{\pkg{#1}}}% package ignored
+% \newcommand{\wpkg}[1]{\textcolor{red!30!gray}{\pkg{#1}}}% package warning special case
+
+% green/blue/magenta/gray
+\newcommand{\spkg}[1]{\textcolor[Hsb]{120,1,.4}{\pkg{#1}}}% package supported as-is
+\newcommand{\mpkg}[1]{\textcolor[Hsb]{240,1,.4}{\pkg{#1}}}% package modified for HTML
+\newcommand{\epkg}[1]{\textcolor[Hsb]{300,1,.5}{\pkg{#1}}}% package emulated for HTML
+\newcommand{\ipkg}[1]{\textcolor[Hsb]{0,0,.5}{\pkg{#1}}}% package ignored
+\newcommand{\wpkg}[1]{\textcolor[Hsb]{0,1,.5}{\pkg{#1}}}% package warning special case
+
+% green/cyan/blue/magenta
+% \newcommand{\spkg}[1]{\textcolor[Hsb]{120,1,.4}{\pkg{#1}}}% package supported as-is
+% \newcommand{\mpkg}[1]{\textcolor[Hsb]{180,1,.4}{\pkg{#1}}}% package modified for HTML
+% \newcommand{\epkg}[1]{\textcolor[Hsb]{240,1,.5}{\pkg{#1}}}% package emulated for HTML
+% \newcommand{\ipkg}[1]{\textcolor[Hsb]{300,1,.5}{\pkg{#1}}}% package ignored
+% \newcommand{\wpkg}[1]{\textcolor[Hsb]{0,1,.5}{\pkg{#1}}}% package warning special case
+
+
\newcommand{\pdflatexonly}{
\textred{Only pre-loaded if \prog{pdflatex} is being used.}
@@ -2615,7 +2640,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{31686}
+% \CheckSum{32736}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -2729,6 +2754,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.69}{2019/03/21}{\ 2019/03/21}
% \changes{v0.70}{2019/04/03}{\ 2019/04/03}
% \changes{v0.71}{2019/04/29}{\ 2019/04/29}
+% \changes{v0.72}{2019/06/08}{\ 2019/06/08}
@@ -2949,6 +2975,29 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.72:] Font control, \cs{multicolumn}, \pkg{xr} and \pkg{xr-hyper}.
+% \begin{itemize}
+% \item Due to internal changes, images for inline \SVG\ math and \env{lateximage}s
+% \watchout[images]
+% will have new hash values, and will have to be regenerated using
+% \userentry{lwarpmk cleanlimages} and
+% \userentry{lwarpmk limages}
+% \item Docs: Color-codes package names in the table of supported packages
+% and features, \cref{tab:supported}, according to each package's level
+% of support by \pkg{lwarp}.
+% \item \cs{multicolumn}: Fix for paragraph columns.
+% \item \pkg{xr}, \pkg{xr-hyper}: Fixes for references, \cs{externaldocument}.
+% \margintag{packages}
+% \item \pkg{soulutf8}: Fix: Loads \pkg{soul} for emulation.
+% \item \pkg{boxedminipage2e}: Added support for \env{lateximage}s.
+% \item \pkg{zhlineskip}: Updated to v1.0e.
+% \item Added \pkg{fontaxes}, \pkg{slantsc}, \pkg{tabfigures}.
+% \item Added \pkg{nfssext-cfr}, thus supporting \pkg{cfr-lm} and
+% several other font packages.
+% \item Added \pkg{backnaur}, \pkg{hypbmsec}, \pkg{minibox}, \pkg{pdfcrypt},
+% \pkg{shapepar}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.71:] Error handling, multimedia, \env{tabular}.
% \begin{itemize}
% \item \env{tabular}: Added support for `\texttt{*}' columns.
@@ -2970,7 +3019,7 @@ This boolean may be tested by the user for later use.
% \item[v0.70:] Error handling, \brand{MathJax}, \pkg{mathtools}.
% \begin{itemize}
% \item Error handling for ``Label(s) changed.''
-% Refuse to \cmds{lwarpmk limages} until recompile first.
+% Refuses to \cmds{lwarpmk limages} until recompile first.
% \item Fix: If Computer Modern font is used, ensures \pkg{cm-super} or \pkg{lmodern}
% is used.
% \item Fixes for \cs{makebox}.
@@ -3445,7 +3494,8 @@ This boolean may be tested by the user for later use.
% \item Added \pkg{parnotes}, \pkg{quoting}, \pkg{lua-check-hyphen},
% \pkg{tocenter}, \pkg{underscore}.
% \margintag{packages}
-% \item Tested to work as-is with \pkg{babelbib}, \pkg{bibunits}, \pkg{bodegraph},
+% \item Added \pkg{bibunits}.
+% \item Tested to work as-is with \pkg{babelbib}, \pkg{bodegraph},
% \pkg{fast-diagram}, \pkg{nicematrix}, \pkg{structmech}.
% \end{itemize}
% \needspace{2\baselineskip}
@@ -4489,11 +4539,15 @@ This boolean may be tested by the user for later use.
%
% \Cref{tab:supported} lists some of the various \LaTeX{} features and packages
% which may be used.
-% Many are tested to work as-is,
-% some are patches for the original packages, and some are emulations written
-% for source-level compatibility.
-% Many are nullified as being irrelevent to \HTML\ output.
%
+% Package names are colored according to their support level:
+% \begin{description}
+% \item[\spkg{name}:] Supported as-is.
+% \item[\mpkg{name}:] Modifed to work with \HTML\ output, and also
+% as print output in \SVG\ math or \env{lateximage} environments.
+% \item[\epkg{name}:] Emulated for \HTML\ output.
+% \item[\ipkg{name}:] Ignored for \HTML\ output, but provides source-level compatibility.
+% \end{description}
%
% \renewcommand{\arraystretch}{1.5}
%
@@ -4516,7 +4570,7 @@ This boolean may be tested by the user for later use.
%
% Engines: & \DVI\ \LaTeX, pdf\LaTeX, \XeLaTeX, \LuaLaTeX, up\LaTeX \\
%
-% Compiling: & \pkg{latexmk}, \pkg{perltex}, \pkg{pythontex}, \prog{make}, etc. \\
+% Compiling: & \prog{latexmk}, \prog{perltex}, \prog{pythontex}, \prog{make}, etc. \\
%
% \midrule
%
@@ -4524,187 +4578,186 @@ This boolean may be tested by the user for later use.
% \pkg{scrartcl}, \pkg{scrbook}, \pkg{scrreprt}, \pkg{memoir},
% CJK-related as listed below. \\
%
-% Koma-script: & \pkg{scrextend}, \pkg{scrhack}, \pkg{scrlayer}.
+% Koma-script: & \epkg{scrextend}, \ipkg{scrhack}, \epkg{scrlayer}.
% Others as listed below. \\
%
-% Memoir: & \pkg{memhfixc} \\
+% Memoir: & \ipkg{memhfixc} \\
%
% \midrule
%
-% Languages: & \pkg{babel}, \pkg{polyglossia}.
-% \pkg{cjkpunct}, \pkg{xeCJK}.\\
+% Languages: & \spkg{babel}, \spkg{polyglossia}.
+% \spkg{cjkpunct}, \spkg{xeCJK}.\\
%
-% Chinese: & C\TeX, \pkg{ctex},
-% \pkg{upzhkinsoku},
-% \pkg{xpinyin}, \pkg{zhlineskip}, \pkg{zhspacing}. \\
+% Chinese: & C\TeX, \spkg{ctex},
+% \spkg{upzhkinsoku},
+% \mpkg{xpinyin}, \ipkg{zhlineskip}, \spkg{zhspacing}. \\
%
-% Japanese: & up\LaTeX, Lua\TeX-ja, \pkg{gentombow}, \pkg{lltjext},
-% \pkg{plarray}, \pkg{plarydshln}, \pkg{plautopatch},
-% \pkg{plext}, \pkg{plextarray}, \pkg{plextarydshln},
-% \pkg{plextcolortbl}, \pkg{plextdelarray}, \pkg{pxatbegshi},
-% \pkg{pxeveryshi}, \pkg{pxftnright}, \pkg{pxgentombow},
-% \pkg{pxjahyper}, \pkg{pxpdfpages}, \pkg{pxpgfrcs}, \pkg{pxpgfmark},
-% \pkg{tascmac}, \pkg{zxjatype}.
-% \pkg{bxjsarticle} and related,
-% \pkg{ltjsarticle} and related,
-% \pkg{luatexja}, \pkg{luatexja-fontspec},
-% \pkg{ujarticle} and related,
-% \pkg{utarticle} and related. \\
+% Japanese: & up\LaTeX, Lua\TeX-ja, \ipkg{gentombow}, \mpkg{lltjext},
+% \spkg{plarray}, \epkg{plarydshln}, \spkg{plautopatch},
+% \mpkg{plext}, \spkg{plextarray}, \epkg{plextarydshln},
+% \epkg{plextcolortbl}, \spkg{plextdelarray}, \ipkg{pxatbegshi},
+% \ipkg{pxeveryshi}, \ipkg{pxftnright}, \spkg{pxgentombow},
+% \ipkg{pxjahyper}, \spkg{pxpdfpages}, \spkg{pxpgfrcs}, \spkg{pxpgfmark},
+% \epkg{tascmac}, \spkg{zxjatype}.
+% \spkg{bxjsarticle} and related,
+% \spkg{ltjsarticle} and related,
+% \spkg{luatexja}, \spkg{luatexja-fontspec},
+% \spkg{ujarticle} and related,
+% \spkg{utarticle} and related. \\
%
-% Korean: & \pkg{kotex}, \pkg{luatexko}, \pkg{xetexko}. \\
+% Korean: & \spkg{kotex}, \spkg{luatexko}, \spkg{xetexko}. \\
%
% \midrule
%
-% Page layout: & \pkg{2in1}, \pkg{2up}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
-% \pkg{addlines}, \pkg{anysize}, \pkg{atbegshi},
-% \pkg{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bounddvi}, \pkg{bxpapersize},
-% \pkg{canoniclayout}, \pkg{changelayout},
-% \pkg{changepage}, \pkg{chngpage}, \pkg{clrdblpg},
-% \pkg{continue}, \pkg{draftcopy}, \pkg{draftfigure}, \pkg{draftwatermark},
-% \pkg{ebook}, \pkg{everyshi},
-% \pkg{fancyhdr}, \pkg{fancytabs}, \pkg{flippdf},
-% \pkg{fullminipage}, \pkg{fullpage},
-% \pkg{fwlw}, \pkg{geometry}, \pkg{gmeometric},
-% \pkg{grid}, \pkg{grid-system}, \pkg{gridset},
-% \pkg{layaureo}, \pkg{layout}, \pkg{layouts}, \pkg{leading},
-% \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{nowidow},
-% \pkg{pagegrid}, \pkg{pdfprivacy}, \pkg{pagesel},
-% \pkg{preview}, \pkg{rmpage},
-% \pkg{scrlayer-scrpage}, \pkg{scrpage2}, \pkg{textarea}, \pkg{threadcol},
-% \pkg{thumb}, \pkg{thumbs}, \pkg{titleps}, \pkg{tocenter},
-% \pkg{turnthepage}, \pkg{twoup}, \pkg{typearea}, \pkg{vmargin},
-% \pkg{watermark}, \pkg{widows-and-orphans}, \pkg{zwpagelayout}.
-%
-% Tested to work as-is: \pkg{underlin}.\\
+% Page layout: & \ipkg{2in1}, \ipkg{2up}, \ipkg{a4}, \ipkg{a4wide}, \ipkg{a5comb},
+% \ipkg{addlines}, \ipkg{anysize}, \mpkg{atbegshi},
+% \ipkg{blowup}, \ipkg{booklet}, \ipkg{bophook}, \ipkg{bounddvi}, \ipkg{bxpapersize},
+% \ipkg{canoniclayout}, \mpkg{changelayout},
+% \epkg{changepage}, \ipkg{chngpage}, \ipkg{clrdblpg},
+% \ipkg{continue}, \ipkg{draftcopy}, \ipkg{draftfigure}, \ipkg{draftwatermark},
+% \ipkg{ebook}, \ipkg{everyshi},
+% \mpkg{fancyhdr}, \ipkg{fancytabs}, \ipkg{flippdf},
+% \ipkg{fullminipage}, \ipkg{fullpage},
+% \ipkg{fwlw}, \ipkg{geometry}, \ipkg{gmeometric},
+% \ipkg{grid}, \mpkg{grid-system}, \ipkg{gridset},
+% \ipkg{layaureo}, \ipkg{layout}, \ipkg{layouts}, \ipkg{leading},
+% \ipkg{ltxgrid}, \ipkg{nccfancyhdr}, \ipkg{notespages}, \ipkg{nowidow},
+% \ipkg{pagegrid}, \ipkg{pagesel}, \ipkg{pdfcrypt}, \ipkg{pdfprivacy},
+% \ipkg{preview}, \epkg{ragged2e}, \ipkg{rmpage},
+% \epkg{scrlayer-scrpage}, \epkg{scrpage2}, \epkg{setspace},
+% \ipkg{textarea}, \ipkg{threadcol},
+% \ipkg{thumb}, \ipkg{thumbs}, \ipkg{titleps}, \ipkg{tocenter},
+% \ipkg{turnthepage}, \ipkg{twoup}, \ipkg{typearea},
+% \ipkg{underlin}, \ipkg{vmargin},
+% \ipkg{watermark}, \ipkg{widows-and-orphans}, \ipkg{zwpagelayout}.
+% \\
%
% \midrule
%
% Sectioning: & Adds \progcode{FileDepth} for splitting the \HTML\ output.
% Files may be numbered sequentially or named according to section name.
% Common short words and punctuation are removed from the filenames.
-% \pkg{anonchap}, \pkg{bsheaders}, \pkg{fncychap}, \pkg{indentfirst}, \pkg{quotchap},
-% \pkg{section}, \pkg{sectionbreak}, \pkg{sectsty}, \pkg{titlesec}.
-%
-% Tested to work as-is: \pkg{secdot}.\\
+% \epkg{anonchap}, \ipkg{bsheaders}, \ipkg{fncychap}, \epkg{hypbmsec},
+% \epkg{indentfirst}, \epkg{quotchap},
+% \ipkg{section}, \mpkg{sectionbreak}, \spkg{secdot}, \ipkg{sectsty}, \ipkg{titlesec}.
+% \\
%
% Table of contents, figures, tables: & Supported, with hyperlinks.
-% \pkg{minitoc}, \pkg{multitoc}, \pkg{shorttoc}, \pkg{titletoc},
-% \pkg{tocbasic}, \pkg{tocbibind}, \pkg{tocdata},
-% \pkg{tocloft}, \pkg{tocstyle}. \\
+% \ipkg{minitoc}, \ipkg{multitoc}, \spkg{shorttoc}, \ipkg{titletoc},
+% \ipkg{tocbasic}, \mpkg{tocbibind}, \mpkg{tocdata},
+% \ipkg{tocloft}, \ipkg{tocstyle}. \\
%
-% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{authblk}, \pkg{titling}. \\
+% Title page: & \cs{maketitle}, \env{titlepage}, \mpkg{authblk}, \mpkg{titling}. \\
%
-% Front \&\ back matter: & \pkg{abstract}, \pkg{appendix}. \\
+% Front \&\ back matter: & \mpkg{abstract}, \mpkg{appendix}. \\
%
% Indexing: & \prog{makeindex} and \prog{xindy} are supported, with hyperlinks.
%
-% \pkg{idxlayout}, \pkg{imakeidx}, \pkg{index}, \pkg{makeidx}, \pkg{repeatindex}, \pkg{splitidx}.
-%
-% Tested to work as-is: \pkg{hvindex}. \\
+% \spkg{hvindex}, \epkg{idxlayout}, \mpkg{imakeidx}, \epkg{index}, \mpkg{makeidx},
+% \epkg{repeatindex}, \mpkg{splitidx}.
+% \\
%
-% Glossary: & \pkg{gloss}, \pkg{glossaries} and \prog{xindy}, \pkg{nomencl}.\\
+% Glossary: & \mpkg{gloss}, \mpkg{glossaries} and \prog{xindy}, \mpkg{nomencl}.\\
%
-% Bibliography: & \pkg{babelbib}, \pkg{backref}, \pkg{biblatex}, \pkg{bibunits},
-% \pkg{chapterbib}, \pkg{cite}, \pkg{hypernat}, \pkg{natbib}, \pkg{showtags}.
+% Bibliography: & \spkg{babelbib}, \mpkg{backref}, \mpkg{biblatex}, \mpkg{bibunits},
+% \mpkg{chapterbib}, \mpkg{cite}, \ipkg{hypernat}, \mpkg{natbib},
+% \spkg{notes2bib}, \ipkg{showtags}.
%
-% Tested to work as-is: \pkg{notes2bib}. \\
+% \\
%
% \midrule
%
% Cross-references: &
-% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref},
-% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{perpage}, \pkg{prettyref},
-% \pkg{titleref}, \pkg{url}, \pkg{varioref}, \pkg{xr}, \pkg{xr-hyper}, \pkg{xurl}. \\
+% \ipkg{bookmark}, \epkg{breakurl}, \spkg{cleveref}, \epkg{fancyref},
+% \ipkg{hypdestopt}, \epkg{hyperref}, \epkg{perpage}, \mpkg{prettyref},
+% \epkg{titleref}, \mpkg{url}, \spkg{varioref}, \mpkg{xr}, \mpkg{xr-hyper},
+% \ipkg{xurl}. \\
%
% \midrule
%
-% Margin notes: & \pkg{marginal}, \pkg{marginfit}, \pkg{marginfix},
-% \pkg{scrlayer-notecolumn}, \pkg{versonotes}. \\
+% Margin notes: & \ipkg{marginal}, \ipkg{marginfit}, \ipkg{marginfix},
+% \epkg{scrlayer-notecolumn}, \epkg{versonotes}. \\
%
% Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks.
-% \pkg{bigfoot}, \pkg{dblfnote},
-% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpara}, \pkg{fnpos},
-% \pkg{footmisc}, \pkg{footnote}, \pkg{footnotebackref},
-% \pkg{footnoterange}, \pkg{footnpag}, \pkg{manyfoot},
-% \pkg{marginnote}, \pkg{pagenote},
-% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}, \pkg{tablefootnote}.
-%
-% Tested to work as-is: \pkg{fixfoot}, \pkg{nccfoots}, \pkg{sepfootnotes}. \\
+% \epkg{bigfoot}, \ipkg{dblfnote},
+% \ipkg{endheads}, \mpkg{endnotes}, \spkg{fixfoot},
+% \ipkg{fnbreak}, \ipkg{fnpara}, \ipkg{fnpos},
+% \epkg{footmisc}, \mpkg{footnote}, \ipkg{footnotebackref},
+% \mpkg{footnoterange}, \ipkg{footnpag}, \epkg{manyfoot},
+% \epkg{marginnote}, \spkg{nccfoots}, \spkg{pagenote},
+% \mpkg{parnotes}, \ipkg{pfnote}, \spkg{sepfootnotes},
+% \mpkg{sidenotes}, \ipkg{tablefootnote}.
+% \\
%
% \midrule
%
% Math: & Converted to \SVG\ images with \HTML\ \element{alt} tags containing the
% \LaTeX\ source for the math expression.
% \brand{MathJax} supported as an alternative.
-% \pkg{amsmath}: \AmS\ environments are supported.
+% \mpkg{amsmath}: \AmS\ environments are supported.
% User-defined macros are available during converson,
% due to native \LaTeX\ processing.\\
%
% Theorems: & Native \LaTeX\ theorems,
-% \pkg{amsthm}, \pkg{ntheorem}, \pkg{theorem}. \\
+% \mpkg{amsthm}, \mpkg{ntheorem}, \mpkg{theorem}. \\
%
% Additional math: & Math fonts via \SVG\ images,
-% \pkg{breqn}, \pkg{cases}, \pkg{mathtools}, \pkg{resizegather},
-% \pkg{autonum} (ignored), \pkg{xfakebold}, \pkg{xy}.
-%
-% Tested to work as-is:
-% \pkg{amscd}, \pkg{bm}, \pkg{braket}, \pkg{delarray}, \pkg{guass}, \pkg{nicematrix},
-% \pkg{pb-diagram}, \pkg{tikz-cd}, etc. \\
+% \spkg{amscd}, \ipkg{autonum}, \mpkg{backnaur}, \spkg{bm}, \spkg{braket},
+% \mpkg{breqn}, \mpkg{cases}, \spkg{delarray}, \spkg{guass}, \spkg{jkmath},
+% \mpkg{mathtools}, \spkg{nicematrix}, \spkg{pb-diagram}, \ipkg{resizegather},
+% \mpkg{xfakebold}, \mpkg{xy}.
+% Many others work as-is. \\
%
% Display math with \cs{displaymathother}: & %
-% Complicated math objects in display math, such as \pkg{tikz-cd}, etc. \\
+% Complicated math objects in display math, such as \spkg{tikz-cd}, etc. \\
%
% \midrule
%
% Units and fractions: &
-% \pkg{nicefrac}, \pkg{SIunits}, \pkg{siunitx},
-% \pkg{units}, \pkg{unitsdef}, \pkg{xfrac}.
-%
-% Tested to work as-is: \pkg{SIunits}. \\
+% \mpkg{nicefrac}, \mpkg{SIunits}, \mpkg{siunitx},
+% \mpkg{units}, \mpkg{unitsdef}, \mpkg{xfrac}. \\
%
% \midrule
%
% Floats: & Appear where declared.
-% \pkg{capt-of}, \pkg{caption}, \pkg{cutwin},
-% \pkg{dblfloatfix}, \pkg{endfloat}, \pkg{fix2col}, \pkg{flafter},
-% \pkg{float}, \pkg{floatflt}, \pkg{floatrow}, \pkg{fltrace}, \pkg{ftcap},
-% \pkg{hypcap}, \pkg{keyfloat}, \pkg{morefloats}, \pkg{multicap}, \pkg{newfloat},
-% \pkg{nonfloat}, \pkg{placeins}, \pkg{rotfloat}, \pkg{stfloats},
-% \pkg{subcaption}, \pkg{subfig}, \pkg{subfigure}, \pkg{subfloat},
-% \pkg{topcapt}, \pkg{trivfloat}, \pkg{wrapfig}. \\
+% \spkg{capt-of}, \mpkg{caption}, \epkg{cutwin},
+% \ipkg{dblfloatfix}, \ipkg{endfloat}, \ipkg{fix2col}, \ipkg{flafter},
+% \epkg{float}, \epkg{floatflt}, \epkg{floatrow}, \ipkg{fltrace}, \ipkg{ftcap},
+% \ipkg{hypcap}, \mpkg{keyfloat}, \ipkg{morefloats}, \ipkg{multicap}, \spkg{newfloat},
+% \epkg{nonfloat}, \ipkg{placeins}, \epkg{rotfloat}, \ipkg{stfloats},
+% \mpkg{subcaption}, \mpkg{subfig}, \epkg{subfigure}, \spkg{subfloat},
+% \epkg{topcapt}, \epkg{trivfloat}, \epkg{wrapfig}. \\
%
% \midrule
%
% Tabular: &
-% \env{tabular} environment, \pkg{array}, \pkg{arydshln},
-% \pkg{bigdelim}, \pkg{booktabs},
-% \pkg{colortbl}, \pkg{ctable}, \pkg{diagbox}, \pkg{longtable},
-% \pkg{ltablex}, \pkg{ltxtable},
-% \pkg{multirow}, \pkg{supertabular}, \pkg{tabularx}, \pkg{tabulary},
-% \pkg{threeparttable}, \pkg{threeparttablex}, \pkg{xltabular}, \pkg{xtab}. \\
+% \env{tabular} environment, \mpkg{array}, \epkg{arydshln},
+% \mpkg{bigdelim}, \mpkg{booktabs},
+% \mpkg{colortbl}, \mpkg{ctable}, \mpkg{diagbox}, \epkg{longtable},
+% \epkg{ltablex}, \epkg{ltxtable},
+% \mpkg{multirow}, \epkg{supertabular}, \epkg{tabularx}, \epkg{tabulary},
+% \epkg{threeparttable}, \mpkg{threeparttablex}, \epkg{xltabular}, \epkg{xtab}. \\
%
% \midrule
%
-% Graphics: & \pkg{graphics} and \pkg{graphicx}.
+% Graphics: & \mpkg{graphics} and \epkg{graphicx}.
% \cs{includegraphics} supports \optn{width}, \optn{height},
% \optn{origin}, \optn{angle}, and \optn{scale} tags, and adds \optn{class}.
% References to \PDF\ files are changed to \SVG, other image types
% are accepted as well.
% \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle.
-% \pkg{rotating} is emulated but all objects are unrotated.
-% \pkg{picture}, \pkg{tikz}, and \pkg{xy} are converted to an \SVG\ image.
+% \epkg{rotating} is emulated but all objects are unrotated.
+% \env{picture}, \mpkg{tikz}, and \mpkg{xy} are converted to an \SVG\ image.
%
-% \pkg{asymptote}, \pkg{epsfig}, \pkg{epstopdf}, \pkg{figsize}, \pkg{fitbox},
-% \pkg{grffile}, \pkg{media9}, \pkg{movie15}, \pkg{multimedia}, \pkg{overpic},
-% \pkg{psfrag}, \pkg{psfragx}, \pkg{pst-eps}, \pkg{pstool}, \pkg{pstricks},
-% \pkg{rviewport}.
-%
-% Tested to work as-is:
-% \pkg{curves}, \pkg{eepic}, \pkg{tikz-3dplot}. \\
+% \mpkg{asymptote}, \spkg{curves}, \spkg{eepic}, \epkg{epsfig}, \spkg{epstopdf},
+% \epkg{figsize}, \ipkg{fitbox},
+% \spkg{grffile}, \epkg{media9}, \epkg{movie15}, \epkg{multimedia}, \mpkg{overpic},
+% \mpkg{psfrag}, \mpkg{psfragx}, \mpkg{pst-eps}, \mpkg{pstool}, \mpkg{pstricks},
+% \spkg{rviewport}, \spkg{tikz-3dplot}. \\
%
% \midrule
%
-% \pkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models,
+% \mpkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models,
% and \textcolor{Goldenrod}{mixing}.
% \textcolor{Maroon}{\cs{textcolor}},
% \colorbox{LightSteelBlue}{\cs{colorbox}},
@@ -4714,48 +4767,50 @@ This boolean may be tested by the user for later use.
% \midrule
%
% Lists: & Standard \LaTeX\ environments,
-% \pkg{enumerate}, \pkg{enumitem}, \pkg{eqlist}, \pkg{hang},
-% \pkg{listliketab}, \pkg{paralist}.\\
+% \spkg{enumerate}, \mpkg{enumitem}, \epkg{eqlist}, \epkg{hang},
+% \ipkg{listliketab}, \mpkg{paralist}.\\
%
% \midrule
%
% Environments: & Standard \LaTeX{} environments. \\
%
% \env{minipage}, \cs{parbox}: & Some \HTMLfive-imposed limitations.
-% Nested minipages are supported. \pkg{eqparbox}, \pkg{pbox}.\\
+% Nested minipages are supported. \mpkg{eqparbox}, \mpkg{minibox}, \epkg{pbox},
+% \ipkg{shapepar}. \\
%
-% Quotations: & \pkg{copyrightbox}, \pkg{csquotes}, \pkg{epigraph},
-% \pkg{quoting}, \pkg{verse}. \\
+% Quotations: & \epkg{copyrightbox}, \spkg{csquotes}, \epkg{epigraph},
+% \mpkg{quoting}, \mpkg{verse}. \\
%
% Verbatim: &
-% \pkg{fancyvrb}, \pkg{moreverb}, \pkg{shortvrb}, \pkg{verbatim}. \\
+% \mpkg{fancyvrb}, \mpkg{moreverb}, \spkg{shortvrb}, \mpkg{verbatim}. \\
%
-% Frames: & \pkg{boxedminipage2e}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed},
-% \pkg{niceframe}, \pkg{shadow}, \pkg{vertbars}. \\
+% Frames: & \mpkg{boxedminipage2e}, \mpkg{fancybox}, \mpkg{framed}, \mpkg{mdframed},
+% \epkg{niceframe}, \epkg{shadow}, \epkg{vertbars}. \\
%
-% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{multicolrule}, \pkg{vwcol}. \\
+% Multi-columns: & \epkg{adjmulticol}, \epkg{multicol},
+% \ipkg{multicolrule}, \mpkg{vwcol}. \\
%
-% Margins: & \pkg{fullwidth}, \pkg{hanging}, \pkg{midpage}. \\
+% Margins: & \epkg{fullwidth}, \epkg{hanging}, \epkg{midpage}. \\
%
-% Line numbering: & \pkg{fnlineno}, \pkg{lineno}. \\
+% Line numbering: & \ipkg{fnlineno}, \ipkg{lineno}. \\
%
% \midrule
%
% Direct formatting: & \cs{emph}, \cs{textsuperscript},
% \cs{textbf}, etc are supported.
% \cs{bfseries}, etc.\ are only supported in some cases.
-% \pkg{cancel}, \pkg{ellipsis}, \pkg{embrac}, \pkg{enparen},
-% \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips},
-% \pkg{lua-check-hyphen}, \pkg{luacolor},
-% \pkg{magaz}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize},
-% \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8},
-% \pkg{textfit}, \pkg{thinsp}, \pkg{trimclip}, \pkg{truncate},
-% \pkg{ulem}, \pkg{umoline}, \pkg{underscore}, \pkg{uspace},
-% \pkg{xellipsis}. \\
+% \mpkg{cancel}, \epkg{ellipsis}, \mpkg{embrac}, \spkg{enparen},
+% \ipkg{hyphenat}, \epkg{lettrine}, \epkg{lips},
+% \ipkg{lua-check-hyphen}, \ipkg{luacolor},
+% \epkg{magaz}, \ipkg{pdfrender}, \epkg{realscripts}, \mpkg{relsize},
+% \ipkg{scalefnt}, \epkg{soul}, \epkg{soulpos}, \epkg{soulutf8},
+% \epkg{textfit}, \epkg{thinsp}, \ipkg{trimclip}, \ipkg{truncate},
+% \mpkg{ulem}, \mpkg{umoline}, \ipkg{underscore}, \ipkg{uspace},
+% \mpkg{xellipsis}. \\
%
-% Acronyms: & \pkg{acro}, \pkg{acronym}. \\
+% Acronyms: & \mpkg{acro}, \mpkg{acronym}. \\
%
-% Ordinals: & \pkg{engord}, \pkg{fmtcount}, \pkg{nth}. \\
+% Ordinals: & \spkg{engord}, \spkg{fmtcount}, \spkg{nth}. \\
%
% Text ligatures: & Ligatures for symbols are supported.
% Ligatures for f, q, t are intentionally turned off
@@ -4773,81 +4828,80 @@ This boolean may be tested by the user for later use.
%
% \midrule
%
-% Fonts: & Used as-is. Appear in \SVG\ math expressions or embedded image environments. \\
+% Fonts: & Used as-is.
+% Appear in \SVG\ math expressions or embedded image environments.
+% \mpkg{fontaxes}, \mpkg{nfssext-cfr}, \mpkg{slantsc}, \ipkg{tabfigures}.
%
-% Symbols: & Native \LaTeX\ diacriticals, \pkg{academicons}, \pkg{bbding},
-% \pkg{chemgreek}, \pkg{dingbat}, \pkg{eurosym},
-% \pkg{fontawesome}, \pkg{fontawesome5}, \pkg{marvosym},
-% \pkg{metalogo}, \pkg{metalogox},
-% \pkg{pifont}, \pkg{textalpha},
-% \pkg{textcomp}, \pkg{textgreek}, \pkg{typicons}, \pkg{xunicode}.
+% Tested to work as-is: Special font macros in \spkg{cfr-lm} and others
+% which use \spkg{nfssext-cfr}. \\
%
-% Tested to work as-is:
-% \pkg{euro}, \pkg{gensymb}. \\
+% Symbols: & Native \LaTeX\ diacriticals, \mpkg{academicons}, \mpkg{bbding},
+% \mpkg{chemgreek}, \mpkg{dingbat}, \spkg{euro}, \mpkg{eurosym},
+% \mpkg{fontawesome}, \mpkg{fontawesome5}, \spkg{gensymb}, \mpkg{marvosym},
+% \mpkg{metalogo}, \mpkg{metalogox},
+% \mpkg{pifont}, \spkg{textalpha},
+% \mpkg{textcomp}, \spkg{textgreek}, \mpkg{typicons}, \mpkg{xunicode}.
+% \\
%
% \midrule
%
% Files: &
-% \pkg{attachfile}, \pkg{attachfile2}, \pkg{hyperxmp}, \pkg{inputtrc}, \pkg{intopdf},
-% \pkg{pdfpages}, \pkg{pdfx}, \pkg{xmpincl}. \\
+% \mpkg{attachfile}, \mpkg{attachfile2}, \ipkg{hyperxmp},
+% \mpkg{inputtrc}, \epkg{intopdf},
+% \mpkg{pdfpages}, \ipkg{pdfx}, \ipkg{xmpincl}. \\
%
% \midrule
%
% Science and engineering: &
-% \pkg{algorithm2e}, \pkg{algorithmicx}, \pkg{ar},
-% \pkg{axodraw2}, \pkg{bitpattern}, \pkg{bytefield},
-% \pkg{chemfig}, \pkg{chemformula}, \pkg{chemgreek}, \pkg{chemmacros}, \pkg{chemnum},
-% \pkg{karnaugh-map},
-% \pkg{listings}, \pkg{mhchem}, \pkg{phfqit}, \pkg{register}, \pkg{struktex}.
-%
-% Tested to work as-is:
-% \pkg{askmaps}, \pkg{blochsphere}, \pkg{bodegraph}, \pkg{bohr}, \pkg{circuitikz},
-% \pkg{elements}, \pkg{engtlc}, \pkg{fast-diagram},
-% \pkg{hepnicenames}, \pkg{heppennames}, \pkg{karnaughmap},
-% \pkg{linop}, \pkg{pgfgantt}, \pkg{physics}, \pkg{simpler-wick}, \pkg{slashed},
-% \pkg{structmech}, \pkg{tikz-karnaugh}, \pkg{tikzcodeblocks}.
-% \\
+% \mpkg{algorithm2e}, \mpkg{algorithmicx}, \mpkg{ar}, \spkg{askmaps},
+% \mpkg{axodraw2}, \mpkg{bitpattern}, \spkg{blochsphere}, \spkg{bodegraph},
+% \spkg{bohr}, \mpkg{bytefield},
+% \mpkg{chemfig}, \mpkg{chemformula}, \mpkg{chemgreek},
+% \mpkg{chemmacros}, \mpkg{chemnum},
+% \spkg{circuitikz}, \spkg{elements}, \spkg{engtlc}, \spkg{fast-diagram},
+% \spkg{hepnicenames}, \spkg{heppennames}, \spkg{karnaughmap}, \mpkg{karnaugh-map},
+% \mpkg{listings}, \spkg{linop}, \mpkg{mhchem}, \spkg{pgfgantt},
+% \mpkg{phfqit}, \spkg{physics}, \mpkg{register}, \spkg{simpler-wick},
+% \spkg{slashed}, \spkg{structmech}, \mpkg{struktex}.
+% \spkg{tikz-karnaugh}, \spkg{tikzcodeblocks} \\
%
% \midrule
%
-% Arts and humanities: & \pkg{foreign}, \pkg{forest}, \pkg{musicography}, \pkg{nameauth},
-% \pkg{octave}, \pkg{schemata}, \pkg{semantic-markup}, \pkg{vowel}, \pkg{xpiano}.
-%
-% Tested to work as-is:
-% \pkg{phonrule}, \pkg{piano}, \pkg{tikz-dependency}. \\
+% Arts and humanities: & \mpkg{foreign}, \mpkg{forest}, \mpkg{musicography},
+% \mpkg{nameauth}, \mpkg{octave}, \spkg{phonrule}, \spkg{piano},
+% \mpkg{schemata}, \mpkg{semantic-markup}, \spkg{tikz-dependency},
+% \mpkg{vowel}, \mpkg{xpiano} \\
%
% \midrule
%
-% Admonitions: & \pkg{notes}. \\
+% Admonitions: & \epkg{notes}. \\
%
-% Editorial: & \pkg{changebar}, \pkg{changes},
-% \pkg{easy-todo}, \pkg{ed}, \pkg{errata}, \pkg{fixme},
-% \pkg{fixmetodonotes},
-% \pkg{pdfcomment}, \pkg{pdfmarginpar},
-% \pkg{todo}, \pkg{todonotes}, \pkg{tram}, \pkg{xechangebar}.
-%
-% Tested to work as-is:
-% \pkg{changelog}, \pkg{easyReview}. \\
+% Editorial: & \ipkg{changebar}, \spkg{changelog}, \mpkg{changes},
+% \mpkg{easy-todo}, \spkg{easyReview}, \mpkg{ed}, \mpkg{errata}, \mpkg{fixme},
+% \mpkg{fixmetodonotes},
+% \ipkg{pdfcomment}, \ipkg{pdfmarginpar},
+% \mpkg{todo}, \mpkg{todonotes}, \epkg{tram}, \ipkg{xechangebar}.
+% \\
%
% \midrule
%
-% Accessibility: & \pkg{accsupp}, \pkg{axessibility}. \\
+% Accessibility: & \ipkg{accsupp}, \ipkg{axessibility}. \\
%
% \midrule
%
-% Debug: & \pkg{chkfloat}, \pkg{cmdtrack}, \pkg{dprogress},
-% \pkg{lua-visual-debug}, \pkg{refcheck},
-% \pkg{srcltx}, \pkg{srctex}, \pkg{vpe}, \pkg{xbmks}. \\
+% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress},
+% \ipkg{lua-visual-debug}, \ipkg{refcheck},
+% \ipkg{srcltx}, \ipkg{srctex}, \ipkg{vpe}, \ipkg{xbmks}. \\
%
% \midrule
%
% Working as-is: &
% Various utility, calculation, file, and text-only packages, such as
-% \pkg{calc},
-% \pkg{fileerr},
-% \pkg{somedefs},
-% \pkg{trace},
-% \pkg{xspace}.
+% \spkg{calc},
+% \spkg{fileerr},
+% \spkg{somedefs},
+% \spkg{trace},
+% \spkg{xspace}.
% Also, most math-only packages, including specialized typesetting for
% various fields of science and engineering. \\
%
@@ -7604,7 +7658,7 @@ This boolean may be tested by the user for later use.
% and \cs{StopDefiningTabulars} afterwards.
% Also see the \pkg{lwarp} documentation for the \pkg{fancybox} package.
% \item [To frame equations:] See \cref{sec:fancybox} for the \pkg{fancybox} package.
-% \item [For fancy framed minipages:] See packages \pkg{boxedminipage},
+% \item [For fancy framed minipages:] See packages \pkg{boxedminipage2e},
% \pkg{shadow}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed}.
% \item [Custom environments:] Use a custom environment to create a sidebar,
% containing a \env{BlockClass} environment
@@ -10973,6 +11027,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{autonum}
\LWR@loadafter{axessibility}
\LWR@loadafter{axodraw2}
+\LWR@loadafter{backnaur}
\LWR@loadafter{backref}
\LWR@loadafter{balance}
\LWR@loadafter{bbding}
@@ -11113,6 +11168,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{gridset}
\LWR@loadafter{hang}
\LWR@loadafter{hanging}
+\LWR@loadafter{hypbmsec}
\LWR@loadafter{hypcap}
\LWR@loadafter{hypdestopt}
\LWR@loadafter{hypernat}
@@ -11167,6 +11223,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{microtype}
\LWR@loadafter{midfloat}
\LWR@loadafter{midpage}
+\LWR@loadafter{minibox}
\LWR@loadafter{minitoc}
% morefloats must be allowed early for print mode
\LWR@notmemoirloadafter{moreverb}
@@ -11209,6 +11266,7 @@ This boolean may be tested by the user for later use.
\LWR@notmemoirloadafter{parskip}
\LWR@loadafter{pbox}
\LWR@loadafter{pdfcomment}
+\LWR@loadafter{pdfcrypt}
\LWR@loadafter{pdflscape}
\LWR@loadafter{pdfmarginpar}
\LWR@loadafter{pdfpages}
@@ -11270,6 +11328,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{semantic-markup}
\LWR@notmemoirloadafter{setspace}
\LWR@loadafter{shadow}
+\LWR@loadafter{shapepar}
\LWR@notmemoirloadafter{showidx}
\LWR@loadafter{showkeys}
\LWR@loadafter{showtags}
@@ -11277,6 +11336,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{sidenotes}
\LWR@loadafter{SIunits}
\LWR@loadafter{siunitx}
+\LWR@loadafter{slantsc}
\LWR@loadafter{soul}
\LWR@loadafter{soulpos}
\LWR@loadafter{soulutf8}
@@ -11291,6 +11351,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{subfigure}
\LWR@loadafter{supertabular}
\LWR@loadafter{t1inc}
+\LWR@loadafter{tabfigures}
\LWR@loadafter{tabls}
\LWR@loadafter{tablefootnote}
\LWR@notmemoirloadafter{tabularx}
@@ -11365,6 +11426,8 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{xmpincl}
\LWR@loadafter{xpiano}
\LWR@loadafter{xpinyin}
+\LWR@loadafter{xr}
+\LWR@loadafter{xr-hyper}
\LWR@loadafter{xtab}
% xunicode must be loaded before lwarp
\LWR@loadafter{xurl}
@@ -13024,6 +13087,8 @@ This boolean may be tested by the user for later use.
\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}
@@ -13688,6 +13753,7 @@ This boolean may be tested by the user for later use.
% the original print-mode \cs{<name>}.
% Also redefines \cs{<name>} to use \cs{LWR@<format>@<name>},
% where <format> is set by \cs{LWR@formatting}, and is |print| or |HTML|.
+%
% \begin{macrocode}
\newcommand*{\LWR@formatted}[1]{%
\ifcsundef{LWR@print@#1}{%
@@ -13712,6 +13778,7 @@ This boolean may be tested by the user for later use.
% in the macro name.
%
% An expandable version of \cs{LWR@formatted}.
+%
% \begin{macrocode}
\newcommand*{\LWR@expandableformatted}[1]{%
\ifcsundef{LWR@print@#1}{%
@@ -13738,6 +13805,7 @@ This boolean may be tested by the user for later use.
% the original print-mode \env{<name>}.
% Also redefines the environment |<name>| to use environment |LWR@<format>@<name>|,
% where <format> is set by \cs{LWR@formatting}, and is |print| or |HTML|.
+%
% \begin{macrocode}
\newcommand*{\LWR@formattedenv}[1]{%
\ifcsundef{LWR@print@#1}{%
@@ -13746,15 +13814,21 @@ This boolean may be tested by the user for later use.
\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}%
+ }%
}
% \end{macrocode}
% \end{macro}
%
+%
% \begin{macro}{\LWR@expandableformattedenv} \marg{environmentname}
%
% An expandable version of \env{LWR@formattedenv}.
+%
% \begin{macrocode}
\newcommand*{\LWR@expandableformattedenv}[1]{%
\ifcsundef{LWR@print@#1}{%
@@ -13763,8 +13837,12 @@ This boolean may be tested by the user for later use.
\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{macrocode}
% \end{macro}
@@ -13984,6 +14062,7 @@ This boolean may be tested by the user for later use.
% Some packages redefine \cs{\#}, which is used to generate \HTML, so the original must
% be remembered here.
% \changes{v0.51}{2018/03/12}{Fix: Remember original \cs{\#} in case is redefined.}
+% \changes{v0.72}{2019/05/24}{Use \cs{LWR@formatted} for \cs{bfseries}, etc.}
% \begin{macrocode}
\chardef\LWR@origpound=`\#
% \end{macrocode}
@@ -14010,25 +14089,8 @@ This boolean may be tested by the user for later use.
\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
-% \end{macrocode}
-% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
-% \begin{macrocode}
-\@ifundefined{sishape}{
- \LetLtxMacro\LWR@origsishape\scshape
-}{
- \LetLtxMacro\LWR@origsishape\sishape
-}
-% \end{macrocode}
-% \begin{macrocode}
-\LetLtxMacro\LWR@origitshape\itshape
+
\LetLtxMacro\LWR@origem\em
\LetLtxMacro\LWR@orignormalfont\normalfont
@@ -14717,6 +14779,8 @@ This boolean may be tested by the user for later use.
% \changes{v0.65}{2018/12/18}{\filenm{lwarp.css}: Improved \CSS\ for page layout.}
% \changes{v0.66}{2019/01/02}{\filenm{lwarp.css}: Improved \CSS\ for definition lists.}
% \changes{v0.66}{2019/02/28}{\filenm{lwarp.css}: Added \pkg{niceframe}.}
+% \changes{v0.72}{2019/05/24}{\filenm{lwarp.css}: Added \pkg{backnaur}.}
+% \changes{v0.72}{2019/05/26}{\filenm{lwarp.css}: Removed unneeded support for \cs{sishape}, \cs{textsi}.}
%
% ^^A *lwarp.css
%
@@ -14726,7 +14790,7 @@ This boolean may be tested by the user for later use.
\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
*/
@@ -14800,15 +14864,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; }
@@ -16126,6 +16193,27 @@ 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 ;
@@ -17226,10 +17314,10 @@ 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 ()
@@ -18190,15 +18278,17 @@ end -- not --version
\newcommand*{\LWR@depthparagraph}{4}
\newcommand*{\LWR@depthsubparagraph}{5}
% \end{macrocode}
-% used by \cs{itemize}, \cs{enumerate}, \cs{description}:
+% Used by \cs{itemize}, \cs{enumerate}, \cs{description}:
% \begin{macrocode}
\newcommand*{\LWR@depthlist}{6}
% \end{macrocode}
-% used by \cs{item}:
+% Used by \cs{item}:
% \begin{macrocode}
\newcommand*{\LWR@depthlistitem}{7}
+\let\LWR@depthdescitem\LWR@depthlistitem
% \end{macrocode}
+
% \subsection{Closing actions}
% A stack to record the action to take to close each nesting level:
@@ -18256,71 +18346,71 @@ end -- not --version
% \subsection{Pushing and popping the stack}
-% \begin{macro}{\pushclose} \marg{action} \marg{depth}
+% \begin{macro}{\LWR@pushclose} \marg{sectiontype}
% Pushes one return action and its \LaTeX\ depth onto the stacks.
% \changes{v0.46}{2018/01/18}{Fix: Stack unnesting.}
% \begin{macrocode}
-\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
-}
-% \end{macrocode}
-% \end{macro}
-
-
-% \begin{macro}{\popclose}
+\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}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR@popclose}
% Pops one action and its depth off the stacks.
% \changes{v0.46}{2018/01/18}{Fix: Stack unnesting.}
% \begin{macrocode}
-\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
+\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{macrocode}
% \end{macro}
@@ -18947,15 +19037,18 @@ end -- not --version
\LWR@closeone
-\popclose
+\LWR@popclose
}
% \end{macrocode}
-% \begin{macro}{\LWR@closeprevious} \marg{depth}
+% \begin{macro}{\LWR@closeprevious} \marg{sectintype}
% Close everything up to the given depth:
% \begin{macrocode}
\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%
+}%
% \end{macrocode}
% Close any pending paragraph:
% \begin{macrocode}
@@ -18965,12 +19058,12 @@ end -- not --version
% First close anything deeper, then at most one of the same level.
% \changes{v0.46}{2018/01/18}{Fix: Stack unnesting.}
% \begin{macrocode}
-\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%
@@ -21216,12 +21309,15 @@ end -- not --version
%
% \begin{macro}{\LWR@newautopagelabel} \marg{pagenumber counter}
% \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
+% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
+%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
% \begin{macrocode}
\newcommand*{\LWR@newautopagelabel}[1]{%
\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}}
}%
}
@@ -21803,22 +21899,22 @@ end -- not --version
-% \begin{macro}{\LWR@pushoneclose} \marg{depth} \marg{printclose}
+% \begin{macro}{\LWR@pushoneclose} \marg{sectiontype}
% Stacks the new sectioning level's closing tag,
% to be used when this section is closed some time later.
%
% \cs{LWR@stoppars} must be executed first.
% \watchout
% \begin{macrocode}
-\NewDocumentCommand{\LWR@pushoneclose}{m m}{%
+\NewDocumentCommand{\LWR@pushoneclose}{m}{%
\LWR@traceinfo{LWR@pushoneclose #1}%
- \pushclose{#2}{#1}%
+ \LWR@pushclose{#1}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\LWR@startnewdepth} \marg{depth} \marg{printclose}
+% \begin{macro}{\LWR@startnewdepth} \marg{sectiontype}
%
% Closes currently stacked tags of a lesser level,
% then opens the new nesting level by saving this new sectioning
@@ -21827,7 +21923,7 @@ end -- not --version
% \cs{LWR@stoppars} must be executed first.
% \watchout
% \begin{macrocode}
-\NewDocumentCommand{\LWR@startnewdepth}{m m}{%
+\NewDocumentCommand{\LWR@startnewdepth}{m}{%
% \end{macrocode}
% Close any stacked sections up to this new one.
% \begin{macrocode}
@@ -21835,7 +21931,7 @@ end -- not --version
% \end{macrocode}
% Push a new section depth:
% \begin{macrocode}
-\LWR@pushoneclose{#1}{#2}%
+\LWR@pushoneclose{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -21933,8 +22029,12 @@ end -- not --version
% The common actions for the high-level sectioning commands.
% \begin{macrocode}
\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}%
% \end{macrocode}
% Cancel special \env{minipage} horizontal space interaction:
% \begin{macrocode}
@@ -22274,36 +22374,44 @@ end -- not --version
% \subsection{\cs{section} and friends}
+%
+% For \pkg{memoir}, a second optional argument is allowed.
+%
+% For \pkg{hypbmsec}, a second optional argument or either parenthesis argument
+% is allowed.
+%
+% Each of these additional arguments are for headers or \PDF\ bookmarks,
+% and are ignored for \HTML\ output.
-% \begin{macro}{\part} * \oarg{TOC name} \marg{name}
+
+% \begin{macro}{\part} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
%
% \changes{v0.38}{2017/08/21}{Fix with \pkg{article} class.}
% \changes{v0.44}{2017/11/21}{Add preamble for \pkg{koma-script}.}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
%
% \begin{macrocode}
\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}{}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\chapter} * \oarg{TOC name} \oarg{heading name} \marg{name}
+% \begin{macro}{\chapter} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
%
% \changes{v0.28}{2017/04/06}{If \EPUB, prints footnotes before each section.}
% \changes{v0.40}{2017/09/22}{Added support for \pkg{quotchap}.}
% \changes{v0.44}{2017/11/21}{Add preamble for \pkg{koma-script}.}
% \changes{v0.45}{2017/12/04}{Add optional heading title for \pkg{memoir}.}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
\let\@printcites\relax% for quotchap package
@@ -22312,71 +22420,50 @@ 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%
+ \DeclareDocumentCommand{\chapter}{s d() o o d() m}{%
+ \LWR@section{#1}{#3}{#6}{chapter}%
-\LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}%
+ \@printcites% for quotchap package
-\LWR@section{#1}{#2}{#4}{chapter}%
-
-\@printcites% for quotchap package
-
-\chapter@preamble% for koma-script
-\renewcommand{\chapter@preamble}{}%
-}
+ \chapter@preamble% for koma-script
+ \renewcommand{\chapter@preamble}{}%
+ }
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\section} * \oarg{TOC name} \oarg{heading name} \marg{name}
+% \begin{macro}{\section} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
% \changes{v0.45}{2017/12/04}{Add optional heading title for \pkg{memoir}.}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
-\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}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\subsection} * \oarg{TOC name} \marg{name}
+% \begin{macro}{\subsection} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
-\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}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\subsubsection} * \oarg{TOC name} \marg{name}
+% \begin{macro}{\subsubsection} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
-\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}%
}
% \end{macrocode}
% \end{macro}
@@ -22384,30 +22471,24 @@ end -- not --version
-% \begin{macro}{\paragraph} * \oarg{TOC name} \marg{name}
+% \begin{macro}{\paragraph} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
-\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}%
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\subparagraph} * \oarg{TOC name} \marg{name}
+% \begin{macro}{\subparagraph} * \parg{2:PDF name} \oarg{3:TOC name}
+% \oarg{4:PDF name} \parg{5:PDF name} \marg{6:name}
+% \changes{v0.72}{2019/05/27}{Added support for \pkg{hypbmsec}.}
% \begin{macrocode}
-\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{macrocode}
% \end{macro}
@@ -22928,7 +23009,7 @@ end -- not --version
\newcommand*{\LWR@LwarpEnd}
{
\LWR@stoppars
-\LWR@closeprevious{\LWR@depthfinished}
+\LWR@closeprevious{finished}
% \end{macrocode}
% At the bottom of the ending file:
@@ -23118,7 +23199,7 @@ end -- not --version
% is to place the authors at the bottom of each \HTML\ page, such as:
% \begin{sourceverb}
% \HTMLPageBottom{
-% \begin{center}\textcopyright~2016 \theauthor\end{center}
+% \begin{center}\textcopyright~20xx \theauthor\end{center}
% }
% \end{sourceverb}
%
@@ -24355,7 +24436,7 @@ end -- not --version
% \begin{macrocode}
\newcommand*{\LWR@listitem}{%
\LWR@stoppars%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
+\LWR@startnewdepth{listitem}%
\LWR@htmltag{li}%
\LWR@startpars%
\LWR@origitem%
@@ -24385,7 +24466,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}%
@@ -24405,7 +24486,7 @@ end -- not --version
\newcommand*{\LWR@listend}{%
\LWR@traceinfo{LWR@listend}%
\LWR@stoppars%
-\LWR@closeprevious{\LWR@depthlist}%
+\LWR@closeprevious{list}%
\LWR@startpars%
}
% \end{macrocode}
@@ -24423,7 +24504,7 @@ end -- not --version
% \begin{macrocode}
\newcommand*{\LWR@itemizeitem}{%
\LWR@stoppars%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
+\LWR@startnewdepth{listitem}%
\LWR@htmltag{li}%
\LWR@startpars%
\LWR@origitem%
@@ -24471,7 +24552,7 @@ end -- not --version
{%
\LWR@stoppars%
\LWR@setlatestname{#1}%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}%
+\LWR@startnewdepth{descitem}%
% \end{macrocode}
% Temporarily disable \cs{hspace}, which |article.cls|, etc.\ use per \cs{item}
% for |description|s only.
@@ -27116,13 +27197,14 @@ end -- not --version
}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/12}{Fix: \cs{multicolumn} parameters.}
+% \changes{v0.72}{2019/06/07}{Fix: \cs{multicolumn} parameters.}
% \begin{macrocode}
-\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}}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
% \begin{macrocode}
@@ -27134,7 +27216,7 @@ end -- not --version
\IfStrEq{\LWR@strresult}{s}{\LWR@multicoltext}{}%
% \end{macrocode}
% \begin{macrocode}
-\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}{;}{%
@@ -29846,8 +29928,8 @@ autopage-\theLWR@currentautosec%
% Closes previous levels:
% \begin{macrocode}
\@ifundefined{chapter}
-{\LWR@closeprevious{\LWR@depthsection}}
-{\LWR@closeprevious{\LWR@depthchapter}}
+{\LWR@closeprevious{section}}
+{\LWR@closeprevious{chapter}}
% \end{macrocode}
% Prints any pending footnotes so that they appear above the potentially
% large \TOC:
@@ -30147,12 +30229,17 @@ autopage-\theLWR@currentautosec%
{%
\LWR@startpars%
% \end{macrocode}
+%
% Create an \HTML\ link to |<filename>#autosec-(page)|, with the name,
% of the given \HTML\ class.
+%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
\LWR@subhyperrefclass{%
- \LWR@htmlrefsectionfilename{autopage-#4}%
+ \LWR@htmlrefsectionfilename{\BaseJobname-autopage-#4}%
\LWR@origpound\LWR@print@mbox{autosec-#4}%
}{#3}{toc#2}%
% \end{macrocode}
@@ -30218,13 +30305,20 @@ autopage-\theLWR@currentautosec%
{%
\LWR@startpars%
% \end{macrocode}
+%
% Create an \HTML\ link to
% filename\#autoid-(float number), with text of the caption,
% of the given \HTML\ class.
+%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
\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}%
% \end{macrocode}
@@ -30465,11 +30559,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}}}%
@@ -30694,21 +30791,9 @@ autopage-\theLWR@currentautosec%
% \changes{v0.70}{2019/03/28}{Fix: \cs{\&} in a lateximage.}
% \begin{macrocode}
\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%
-% \end{macrocode}
-% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
-% \begin{macrocode}
-\LetLtxMacro\sishape\LWR@origsishape%
% \end{macrocode}
+% \changes{v0.72}{2019/05/24}{Use \cs{LWR@formatted} for \cs{bfseries}, etc.}
% \begin{macrocode}
-\LetLtxMacro\itshape\LWR@origitshape%
\LetLtxMacro\em\LWR@origem%
\LetLtxMacro\normalfont\LWR@orignormalfont%
\let\sp\LWR@origsp%
@@ -31047,6 +31132,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}%
% \end{macrocode}
% |lateximagedepth| must be nested to avoid generating paragraph tags.
% \AmS\ math modifies the \cs{text} macro such that \cs{addtocounter} does not
@@ -31219,6 +31306,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
]%
@@ -33039,6 +33127,16 @@ autopage-\theLWR@currentautosec%
\LWR@PreloadedPackage{graphicx}
% \end{macrocode}
+% \pkg{fontaxes} must be preloaded so that \pkg{lwarp} may patch it for \HTML.
+% \begin{macrocode}
+\LWR@PreloadedPackage{fontaxes}
+% \end{macrocode}
+
+% \pkg{nfssext-cfr} may be preloaded by \pkg{cfm-lm} or related font packages.
+% \begin{macrocode}
+\LWR@PreloadedPackage{nfssext-cfr}
+% \end{macrocode}
+
% \pkg{ulem} may be preloaded by \pkg{ctex}, \pkg{ctexart}, and related classes.
% \begin{macrocode}
\LWR@PreloadedPackage{ulem}
@@ -33749,7 +33847,7 @@ autopage-\theLWR@currentautosec%
% \end{macro}
%
% \begin{macro}{\IgnoreMinipageWidths} Locally requests that minipage widths be
-% honored.
+% ignored.
% \changes{v0.66}{2018/12/31}{Added,}
% \begin{macrocode}
\newcommand*{\IgnoreMinipageWidths}{\booltrue{LWR@forceminipagefullwidth}}
@@ -34393,9 +34491,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}
% \end{macrocode}
% \end{macro}
@@ -34408,9 +34507,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}
% \end{macrocode}
% \end{macro}
@@ -34423,9 +34523,44 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{b}{#1}%
}%
}
+
\LWR@formatted{textbf}
-\DeclareRobustCommand{\LWR@null@textbf}[1]{#1}
+\newcommand{\LWR@null@textbf}[1]{#1}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\texteb} \marg{text} \qquad From \pkg{nfssext-cfr}.
+% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
+% \begin{macrocode}
+\DeclareRobustCommand{\LWR@HTML@texteb}[1]{%
+ {%
+ \ebweight%
+ \InlineClass{texteb}{#1}%
+ }%
+}
+
+\LWR@formatted{texteb}
+
+\newcommand{\LWR@null@texteb}[1]{#1}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\textlg} \marg{text} \qquad From \pkg{nfssext-cfr}.
+% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
+% \begin{macrocode}
+\DeclareRobustCommand{\LWR@HTML@textlg}[1]{%
+ {%
+ \lgweight%
+ \InlineClass{textlg}{#1}%
+ }%
+}
+
+\LWR@formatted{textlg}
+
+\newcommand{\LWR@null@textlg}[1]{#1}
% \end{macrocode}
% \end{macro}
@@ -34438,9 +34573,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}
% \end{macrocode}
% \end{macro}
@@ -34453,9 +34589,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}
% \end{macrocode}
% \end{macro}
@@ -34467,9 +34604,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}
% \end{macrocode}
% \end{macro}
@@ -34483,9 +34621,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}
% \end{macrocode}
% \end{macro}
@@ -34497,29 +34636,47 @@ color:\LWR@origpound\LWR@tempcolor%
\LWR@htmlspan{i}{#1}%
}%
}
+
\LWR@formatted{textit}
-\DeclareRobustCommand{\LWR@null@textit}[1]{#1}
+\newcommand{\LWR@null@textit}[1]{#1}
% \end{macrocode}
% \end{macro}
+
% \begin{macro}{\textsc} \marg{text}
% \begin{macrocode}
\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}
% \end{macrocode}
% \end{macro}
+
+% \begin{macro}{\textulc} \marg{text} \qquad From \pkg{fontaxes}.
+% \changes{v0.72}{2019/05/27}{\pkg{fontaxes}: Added.}
+% \begin{macrocode}
+\DeclareRobustCommand{\LWR@HTML@textulc}[1]{%
+ {%
+ \ulcshape%
+ \InlineClass{textulc}{#1}%
+ }%
+}
+
+\LWR@formatted{textulc}
+
+\newcommand{\LWR@null@textulc}[1]{#1}
+% \end{macrocode}
+% \end{macro}
+
+
% \begin{macro}{\textsi} \marg{text}
% \changes{v0.65}{2018/12/09}{Added.}
% \begin{macrocode}
@@ -34530,16 +34687,18 @@ 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}}%
+% \InlineClass(
+% font-style: italic;
+% font-variant: small-caps ;
+% font-variant-numeric: oldstyle-nums ;
+% ){textsi}{#1}%
}%
}
+
\LWR@formatted{textsi}
-\DeclareRobustCommand{\LWR@null@textsi}[1]{#1}
+\newcommand{\LWR@null@textsi}[1]{#1}
% \end{macrocode}
% \end{macro}
@@ -34551,40 +34710,43 @@ 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}
% \end{macrocode}
% \end{macro}
-
% \begin{macro}{\textnormal} \marg{text}
% \begin{macrocode}
\DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}}
+
\LWR@formatted{textnormal}
-\DeclareRobustCommand{\LWR@null@textnormal}[1]{#1}
+\newcommand{\LWR@null@textnormal}[1]{#1}
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
-\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}{}
+\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}{}
% \end{macrocode}
%
% \changes{v0.62}{2018/11/17}{Fix for \cs{em}.}
% \begin{macrocode}
-\DeclareRobustCommand{\LWR@null@em}{}
+\newcommand{\LWR@null@em}{}
% \end{macrocode}
@@ -34615,6 +34777,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%
@@ -34626,6 +34789,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%
% \end{macrocode}
% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
% \begin{macrocode}
@@ -34792,12 +34956,15 @@ color:\LWR@origpound\LWR@tempcolor%
%
%
% \changes{v0.48}{2018/02/02}{Improved font control.}
+% \changes{v0.72}{2019/05/27}{\pkg{fontaxes}: Added.}
% Remembers the current font family, series, and shape.
+% \pkg{fontaxes} support is integrated here.
% \begin{macrocode}
\newcommand*{\LWR@f@family}{rm}
\newcommand*{\LWR@f@series}{md}
\newcommand*{\LWR@f@shape}{up}
+\newcommand*{\LWR@f@shapecaps}{ulc}
% \end{macrocode}
@@ -34825,7 +34992,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}%
@@ -34844,7 +35012,8 @@ 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}
% \end{macrocode}
@@ -34853,52 +35022,88 @@ color:\LWR@origpound\LWR@tempcolor%
% \changes{v0.48}{2018/02/02}{Improved font control.}
% \changes{v0.50}{2018/02/20}{Robustify macros.}
+% \changes{v0.72}{2019/05/24}{Use \cs{LWR@formatted} for \cs{bfseries}, etc.}
%
% \begin{macro}{\mdseries}
% \begin{macrocode}
-\renewrobustcmd*{\mdseries}{\renewcommand*{\LWR@f@series}{md}}
+\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}}
+\LWR@formatted{mdseries}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\bfseries}
% \begin{macrocode}
-\renewrobustcmd*{\bfseries}{\renewcommand*{\LWR@f@series}{bf}}
+\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}}
+\LWR@formatted{bfseries}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\ebweight} From \pkg{nfssext-cfr}.
+% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}}
+\LWR@formatted{ebweight}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\lgweight} From \pkg{nfssext-cfr}.
+% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}}
+\LWR@formatted{lgweight}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\rmfamily}
% \begin{macrocode}
-\renewrobustcmd*{\rmfamily}{\renewcommand*{\LWR@f@family}{rm}}
+\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}}
+\LWR@formatted{rmfamily}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\sffamily}
% \begin{macrocode}
-\renewrobustcmd*{\sffamily}{\renewcommand*{\LWR@f@family}{sf}}
+\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}}
+\LWR@formatted{sffamily}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\ttfamily}
% \begin{macrocode}
-\renewrobustcmd*{\ttfamily}{\renewcommand*{\LWR@f@family}{tt}}
+\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}}
+\LWR@formatted{ttfamily}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\upshape}
% \begin{macrocode}
-\renewrobustcmd*{\upshape}{\renewcommand*{\LWR@f@shape}{up}}
+\newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}}
+\LWR@formatted{upshape}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\itshape}
% \begin{macrocode}
-\renewrobustcmd*{\itshape}{\renewcommand*{\LWR@f@shape}{it}}
+\newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}}
+\LWR@formatted{itshape}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\scshape}
% \begin{macrocode}
-\renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}}
+\newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}}
+\LWR@formatted{scshape}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\ulcshape} From \pkg{fontaxes}.
+% \changes{v0.72}{2019/05/27}{\pkg{fontaxes}: Added.}
+% \begin{macrocode}
+\@ifundefined{ulcshape}{
+ \LetLtxMacro\ulcshape\upshape
+}{}
+\newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}}
+\LWR@formatted{ulcshape}
% \end{macrocode}
% \end{macro}
@@ -34906,23 +35111,27 @@ color:\LWR@origpound\LWR@tempcolor%
% \changes{v0.65}{2018/12/10}{Added \cs{sishape}.}
% \begin{macrocode}
\@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}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\slshape}
% \changes{v0.62}{2018/11/11}{Added.}
% \begin{macrocode}
-\renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}}
+\newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}}
+\LWR@formatted{slshape}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\normalfont}
% \begin{macrocode}
-\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape}
+\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape\ulcshape}
% \end{macrocode}
% \end{macro}
@@ -36853,7 +37062,7 @@ color:\LWR@origpound\LWR@tempcolor%
% \credits{Will Robertson}
%
% \DescribePackage{addlines}
-% \pkg{addlines} is emulated.
+% \pkg{addlines} is ignored.
%
% \changes{v0.39}{2017/08/27}{\pkg{addlines}: Added.}
% \changes{v0.64}{2018/12/06}{\pkg{addlines}: Updated to v0.3.}
@@ -36892,7 +37101,7 @@ color:\LWR@origpound\LWR@tempcolor%
%
% \credits{David Carlisle}
%
-% \DescribePackage{afterpage} Emulated.
+% \DescribePackage{afterpage} \pkg{afterpage} is emulated.
%
% \changes{v0.20}{2017/01/11}{\pkg{afterpage}: Added.}
%
@@ -37805,7 +38014,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \credits{Michael Salzenberg, Thomas Esser}
%
% \DescribePackage{anysize}
-% \pkg{anysize} is emulated.
+% \pkg{anysize} is ignored.
%
% \changes{v0.39}{2017/08/27}{\pkg{anysize}: Added.}
%
@@ -38243,7 +38452,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% \credits{Heiko Oberdiek}
%
-% \DescribePackage{atbegshi} Emulated.
+% \DescribePackage{atbegshi} \pkg{atbegshi} is ignored.
%
% \changes{v0.44}{2017/11/10}{\pkg{atbegshi}: Added.}
%
@@ -38691,6 +38900,76 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
%
%
+% \iffalse
+%<*backnaur>
+% \fi
+%
+% \part{lwarp-backnaur.sty}
+%
+% \section{backnaur}
+%
+% \credits{Adrian P. Robson}
+%
+% \DescribePackage{backnaur}
+% \pkg{backnaur} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.72}{2019/05/20}{\pkg{backnaur}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{backnaur}[2019/04/14]
+% \end{macrocode}
+%
+% A purely \HTML\ text output is generated, without math images.
+%
+% The various instances of \cs{LWR@stoppars} are added because the
+% print version uses the \env{eqnarray} environment
+% with \cs{\textbackslash} between
+% lines. For \HTML, paragraph handling must be turned off so that these
+% \cs{\textbackslash} macros are converted to \element{br} elements
+% without extra paragraph space.
+% \begin{macrocode}
+\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
+% \end{macrocode}
+%
+% \iffalse
+%</backnaur>
+% \fi
+%
+%
+%
%
% \iffalse
%<*backref>
@@ -38742,7 +39021,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% \credits{Patrick W. Daly}
%
-% \DescribePackage{balance} Emulated.
+% \DescribePackage{balance} \pkg{balance} is ignored.
%
% \changes{v0.34}{2017/07/27}{\pkg{balance}: Added.}
%
@@ -39365,7 +39644,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \credits{Peter Wilson}
%
% \DescribePackage{booklet}
-% \pkg{booklet} is nullified.
+% \pkg{booklet} is ignored.
%
% \changes{v0.60}{2018/09/18}{\pkg{booklet}: Added.}
%
@@ -39412,7 +39691,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \credits{Heiko Oberdiek}
%
% \DescribePackage{bookmark}
-% \pkg{bookmark} is emulated.
+% \pkg{bookmark} is ignored.
% \changes{v0.20}{2017/01/03}{\pkg{bookmark}: Added.}
%
@@ -39609,26 +39888,28 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \credits{Scott Pakin}
%
% \DescribePackage{boxedminipage2e}
-% \pkg{boxedminipage2e} is emulated.
+% \pkg{boxedminipage2e} is emulated for \HTML, and used as-is for \env{lateximage}s.
%
% \changes{v0.34}{2017/07/26}{\pkg{boxedminipage2e}: Added.}
+% \changes{v0.72}{2019/06/07}{\pkg{boxedminipage2e}: Added support for \env{lateximage}s.}
%
% \codehtml
%
% Discard all options for \pkg{lwarp-boxedminipage2e}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{boxedminipage2e}[2015/03/09]
+\LWR@ProvidesPackagePass{boxedminipage2e}[2015/03/09]
% \end{macrocode}
% \begin{macrocode}
-\newenvironment{boxedminipage}{%
-\begin{BlockClass}{framebox}%
-\minipage%
+\newenvironment{LWR@HTML@boxedminipage}{%
+ \begin{BlockClass}{framebox}%
+ \minipage%
}
-{
-\endminipage%
-\end{BlockClass}
+{%
+ \endminipage%
+ \end{BlockClass}%
}
+\LWR@formattedenv{boxedminipage}
% \end{macrocode}
% \iffalse
@@ -40365,7 +40646,7 @@ s%
% \credits{Peter Wilson}
%
% \DescribePackage{changepage}
-% \pkg{changepage} is emulated.
+% \pkg{changepage} is ignored.
%
% \changes{v0.22}{2017/03/02}{\pkg{changepage}: Added.}
%
@@ -40426,12 +40707,15 @@ s%
\LWR@ProvidesPackagePass{changes}[2019/01/26]
% \end{macrocode}
%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{changes}: Fix references for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
\renewcommand{\ChangesListline}[4]{%
\IfSubStr{\Changes@loc@show}{#1}{%
\LWR@startpars%
#2: #3 \qquad
- \nameref{autopage-#4}%
+ \nameref{\BaseJobname-autopage-#4}%
\LWR@stoppars%
}{}%
}
@@ -40519,14 +40803,18 @@ s%
{%
\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}}{}%
}%
}
@@ -40557,7 +40845,7 @@ s%
% \credits{Robin Fairbairns}
%
% \DescribePackage{chappg}
-% \pkg{chappg} is emulated.
+% \pkg{chappg} is ignored.
%
% \changes{v0.38}{2017/08/25}{\pkg{chappg}: Added.}
%
@@ -42241,7 +42529,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Peter Wilson}
%
% \DescribePackage{chngpage}
-% \pkg{chngpage} is emulated.
+% \pkg{chngpage} is ignored.
%
% \changes{v0.54}{2018/04/19}{\pkg{chngpage}: Added.}
% \changes{v0.62}{2018/10/18}{\pkg{chngpage}: Fix: Loads \pkg{lwarp-chngpage}.}
@@ -42683,7 +42971,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% \credits{Melchior FRANZ}
%
-% \DescribePackage{crop} Emulated.
+% \DescribePackage{crop} \pkg{crop} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{crop}: Added.}
%
@@ -42882,7 +43170,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Sigitas Tolu\v{s}is}
%
% \DescribePackage{cuted}
-% \pkg{cuted} is emulated.
+% \pkg{cuted} is ignored.
%
% \changes{v0.40}{2017/09/07}{\pkg{cuted}: Added.}
%
@@ -42917,7 +43205,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% \credits{Peter Wilson and Alan Hoenig}
%
-% \DescribePackage{cutwin} Emulated.
+% \DescribePackage{cutwin} \pkg{cutwin} is emulated.
%
% \changes{v0.26}{2017/03/30}{\pkg{cutwin}: Added.}
%
@@ -43002,7 +43290,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Hiroshi Nakashima}
%
% \DescribePackage{dblfnote}
-% \pkg{dblfnote} is emulated.
+% \pkg{dblfnote} is ignored.
%
% \changes{v0.40}{2017/09/06}{\pkg{dblfnote}: Added.}
%
@@ -43362,7 +43650,7 @@ name = \chemmacros_translate:n {scheme-name}
% \changes{v0.20}{2017/01/11}{\pkg{draftwatermark}: Added.}
%
% \DescribePackage{draftwatermark}
-% \pkg{draftwatermark} is emulated.
+% \pkg{draftwatermark} is ignored.
% \codehtml
@@ -43470,7 +43758,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Jørgen Steensgaard}
%
% \DescribePackage{ebook}
-% \pkg{ebook} is emulated.
+% \pkg{ebook} is ignored.
%
% \changes{v0.39}{2017/08/27}{\pkg{ebook}: Added.}
%
@@ -44389,7 +44677,7 @@ name = \chemmacros_translate:n {scheme-name}
% \changes{v0.20}{2017/01/11}{\pkg{eso-pic}: Added.}
%
% \DescribePackage{eso-pic}
-% \pkg{eso-pic} is emulated.
+% \pkg{eso-pic} is ignored.
% \codehtml
@@ -44482,7 +44770,7 @@ name = \chemmacros_translate:n {scheme-name}
% \changes{v0.20}{2017/01/11}{\pkg{everypage}: Added.}
%
% \DescribePackage{everypage}
-% \pkg{everypage} is emulated.
+% \pkg{everypage} is ignored.
% \codehtml
% \begin{macrocode}
@@ -44511,7 +44799,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% \credits{Martin Schr\"{o}der}
%
-% \DescribePackage{everyshi} Emulated.
+% \DescribePackage{everyshi} ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{everyshi}: Added.}
%
@@ -44545,7 +44833,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Piet van Oostrum}
%
% \DescribePackage{extramarks}
-% \pkg{extramarks} is emulated.
+% \pkg{extramarks} is ignored.
%
% \changes{v0.20}{2017/01/11}{\pkg{extramarks}: Added.}
% \changes{v0.66}{2019/02/02}{\pkg{extramarks}: Updated to v3.10.}
@@ -44868,7 +45156,7 @@ name = \chemmacros_translate:n {scheme-name}
% \credits{Piet van Oostrum}
%
% \DescribePackage{fancyhdr}
-% \pkg{fancyhdr} is nullified.
+% \pkg{fancyhdr} is ignored.
%
% \changes{v0.20}{2017/01/11}{\pkg{fancyhdr}: Added.}
% \changes{v0.33}{2017/06/18}{\pkg{fancyhdr}: Fix: Optional args for \cs{lhead}, etc.}
@@ -45396,7 +45684,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \credits{Patrick W. Daly}
%
-% \DescribePackage{figcaps} Emulated.
+% \DescribePackage{figcaps} \pkg{{figcaps}} is ignored.
%
% \changes{v0.34}{2017/07/27}{\pkg{figcaps}: Added.}
%
@@ -45860,7 +46148,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \credits{Mats Dahlgren}
%
-% \DescribePackage{floatflt} Emulated.
+% \DescribePackage{floatflt} \pkg{floatflt} is emulated.
%
% \changes{v0.26}{2017/03/30}{\pkg{floatflt}: Added.}
%
@@ -45931,7 +46219,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \credits{Vytas Statulevi\v{c}ius and Sigitas Tolu\v{s}is}
%
-% \DescribePackage{floatpag} Emulated.
+% \DescribePackage{floatpag} \pkg{floatpag} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{floatpag}: Added.}
%
@@ -46339,7 +46627,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \credits{Sigitas Tolu\v{s}is}
%
-% \DescribePackage{flushend} Emulated.
+% \DescribePackage{flushend} \pkg{flushend} is ignored.
%
% \changes{v0.34}{2017/07/27}{\pkg{flushend}: Added.}
%
@@ -46412,7 +46700,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \credits{Ulf A. Lindgren}
%
% \DescribePackage{fncychap}
-% \pkg{fncychap} is emulated.
+% \pkg{fncychap} is ignored.
%
% \changes{v0.38}{2017/08/24}{\pkg{fncychap}: Added.}
%
@@ -46521,7 +46809,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \credits{Hiroshi Nakashima}
%
% \DescribePackage{fnpos}
-% \pkg{fnpos} is emulated.
+% \pkg{fnpos} is ignored.
%
% \changes{v0.40}{2017/09/06}{\pkg{fnpos}: Added.}
%
@@ -46700,6 +46988,62 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
%
%
+% \iffalse
+%<*fontaxes>
+% \fi
+%
+% \part{lwarp-fontaxes.sty}
+%
+% \section{fontaxes}
+%
+% \credits{Andreas B\"{u}hmann, Michael Ummels}
+%
+% \DescribePackage{fontaxes}
+% \pkg{fontaxes} is emulated for \HTML, and used as-is for print output.
+%
+% Functionality for small caps is in the \pkg{lwarp} core.
+% Swashes and figure styles are ignored for \HTML.
+%
+% \changes{v0.72}{2019/05/27}{\pkg{fontaxes}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{fontaxes}[2014/03/23]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\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%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</fontaxes>
+% \fi
+%
+%
%
% \iffalse
%<*fontenc>
@@ -47305,7 +47649,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \section{fullminipage}
%
% \DescribePackage{fullminipage}
-% \pkg{fullminipage} is nullified.
+% \pkg{fullminipage} is ignored.
%
% \changes{v0.60}{2018/09/18}{\pkg{fullminipage}: Added.}
%
@@ -47528,6 +47872,9 @@ solid \LWR@origpound\LWR@tempcolor ; %
\LWR@ProvidesPackagePass{gloss}[2002/07/26]
% \end{macrocode}
%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{gloss}: Fix references for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
\xpatchcmd{\gls@gloss@iii}
{\thepage}
@@ -47536,8 +47883,8 @@ solid \LWR@origpound\LWR@tempcolor ; %
{\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}}}%
% \end{macrocode}
%
% \iffalse
@@ -48827,6 +49174,33 @@ alt="\LWR@igalt" \LWR@orignewline%
%
%
% \iffalse
+%<*hypbmsec>
+% \fi
+%
+% \part{lwarp-hypbmsec.sty}
+%
+% \section{hypbmsec}
+%
+% \DescribePackage{hypbmsec}
+% \pkg{hypbmsec} is emulated by the \pkg{lwarp} core.
+%
+% \changes{v0.72}{2019/05/28}{\pkg{hypbmsec}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{hypbmsec}[2016/05/16]
+% \end{macrocode}
+%
+%
+% \iffalse
+%</hypbmsec>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*hypcap>
% \fi
%
@@ -49377,7 +49751,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
% \section{hyperxmp}
%
-% \DescribePackage{hyperxmp} Emulated.
+% \DescribePackage{hyperxmp} \pkg{hyperxmp} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{hyperxmp}: Added.}
%
@@ -49466,7 +49840,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
% \credits{Thomas Titz}
%
-% \DescribePackage{idxlayout} Emulated.
+% \DescribePackage{idxlayout} \pkg{idxlayout} is emulated.
%
% \changes{v0.34}{2017/07/27}{\pkg{idxlayout}: Added.}
%
@@ -50833,7 +51207,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
% \credits{Daniel Flipo}
%
-% \DescribePackage{lettrine} Emulated.
+% \DescribePackage{lettrine} \pkg{lettrine} is emulated.
%
% \changes{v0.27}{2017/04/02}{\pkg{lettrine}: Added.}
%
@@ -50896,7 +51270,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \credits{Stephan I. Böttcher}
%
% \DescribePackage{lineno}
-% \pkg{lineno} is ignored.
+% \pkg{lineno} is partly emulated, but mostly ignored.
%
% \changes{v0.49}{2018/02/19}{\pkg{lineno}: Added.}
%
@@ -51385,7 +51759,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \section{listliketab}
%
% \DescribePackage{listliketab}
-% \pkg{listliketab} is emulated.
+% \pkg{listliketab} is ignored.
%
% \changes{v0.69}{2019/03/08}{\pkg{listliketab}: Added.}
%
@@ -51656,7 +52030,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \credits{D. P. Carlisle}
%
% \DescribePackage{lscape}
-% \pkg{lscape} is emulated.
+% \pkg{lscape} is ignored.
%
% \changes{v0.22}{2017/03/01}{\pkg{lscape}: Added.}
%
@@ -51738,7 +52112,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \credits{Axel Sommerfeldt}
%
% \DescribePackage{ltcaption}
-% \pkg{ltcaption} is emulated.
+% \pkg{ltcaption} is ignored.
% \changes{v0.20}{2017/01/29}{\pkg{ltcaption}: Added.}
@@ -52266,7 +52640,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \section{marginal}
%
% \DescribePackage{marginal}
-% \pkg{marginal} is emulated.
+% \pkg{marginal} is ignored.
%
% \changes{v0.64}{2018/127/07}{\pkg{marginal}: Added.}
%
@@ -52326,7 +52700,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
% \credits{Stephen Hicks}
%
-% \DescribePackage{marginfix} Emulated.
+% \DescribePackage{marginfix} \pkg{marginfix} is ignored.
%
% \changes{v0.26}{2017/03/29}{\pkg{marginfix}: Added.}
%
@@ -52370,7 +52744,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
%
% \credits{Markus Kohm}
%
-% \DescribePackage{marginnote} Emulated.
+% \DescribePackage{marginnote} \pkg{marginnote} is emulated.
%
% \changes{v0.26}{2017/03/30}{\pkg{marginnote}: Added.}
% \changes{v0.57}{2018/06/05}{\pkg{marginnote}: Fix: Long optional argument.}
@@ -52514,7 +52888,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
% \credits{Stephan Hennig}
%
% \DescribePackage{mcaption}
-% \pkg{mcaption} is nullified.
+% \pkg{mcaption} is ignored.
%
% \changes{v0.22}{2017/03/01}{\pkg{mcaption}: Added.}
%
@@ -53670,6 +54044,70 @@ background:
%
%
%
+%
+% \iffalse
+%<*minibox>
+% \fi
+%
+% \part{lwarp-minibox.sty}
+%
+% \section{minibox}
+%
+% \credits{Will Robertson}
+%
+% \DescribePackage{minibox}
+% \pkg{minibox} is patched for use by \pkg{lwarp}.
+%
+% Due to \HTML\ limitations regarding paragraphs and \element{div}s,
+% miniboxes inline with other text will appear on their own line.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{minibox}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{minibox}[2013/06/21]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\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}
+% \end{macrocode}
+%
+% \iffalse
+%</minibox>
+% \fi
+%
+%
+%
% \iffalse
%<*minitoc>
% \fi
@@ -53916,7 +54354,7 @@ background:
%
% \section{mparhack}
%
-% \DescribePackage{mparhack} Ignored.
+% \DescribePackage{mparhack} \pkg{mparhack} is ignored.
%
% \changes{v0.26}{2017/03/29}{\pkg{mparhack}: Added.}
%
@@ -54743,7 +55181,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
% \credits{Peter Wilson}
%
% \DescribePackage{needspace}
-% \pkg{needspace} is not used during \HTML\ conversion.
+% \pkg{needspace} is ignored.
%
% \changes{v0.20}{2016/12/22}{\pkg{needspace}: Added.}
%
@@ -54775,7 +55213,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
% \credits{Peter Wilson}
%
% \DescribePackage{nextpage}
-% \pkg{nextpage} is nullified.
+% \pkg{nextpage} is ignored.
%
% \changes{v0.22}{2017/03/01}{\pkg{nextpage}: Added.}
%
@@ -54801,6 +55239,493 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
%
% \iffalse
+%<*nfssext-cfr>
+% \fi
+%
+% \part{lwarp-nfssext-cfr.sty}
+%
+% \section{nfssext-cfr}
+%
+% \credits{Clea F. Rees}
+%
+% \DescribePackage{nfssext-cfr}
+% \pkg{nfssext-cfr} is emulated in \HTML, and used as-is in print output.
+%
+% Results depend on the browser's font.
+%
+% \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{nfssext-cfr}[2017/03/28]
+% \end{macrocode}
+%
+%
+% Macros which are present in the \pkg{lwarp} core are commented out here.
+% \begin{macrocode}
+\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@sishape}{}
+\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@ebweight}{\renewcommand*{\LWR@f@series}{eb}}
+\newrobustcmd{\LWR@HTML@ubweight}{\renewcommand*{\LWR@f@series}{eb}}
+% \newrobustcmd{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}}
+\newrobustcmd{\LWR@HTML@elweight}{\renewcommand*{\LWR@f@series}{lg}}
+\newrobustcmd{\LWR@HTML@ulweight}{\renewcommand*{\LWR@f@series}{lg}}
+% \newrobustcmd{\LWR@HTML@itshape}{}
+% \newrobustcmd{\LWR@HTML@scshape}{}
+% \newrobustcmd{\LWR@HTML@upshape}{}
+\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{sishape}
+\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{ebweight}
+\LWR@formatted{ubweight}
+% \LWR@formatted{lgweight}
+\LWR@formatted{elweight}
+\LWR@formatted{ulweight}
+% \LWR@formatted{itshape}
+% \LWR@formatted{scshape}
+% \LWR@formatted{upshape}
+\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@sishape}{}
+\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@ebweight}{}
+\newcommand{\LWR@null@ubweight}{}
+% \newcommand{\LWR@null@lgweight}{}
+\newcommand{\LWR@null@elweight}{}
+\newcommand{\LWR@null@ulweight}{}
+% \newcommand{\LWR@null@itshape}{}
+% \newcommand{\LWR@null@scshape}{}
+% \newcommand{\LWR@null@upshape}{}
+\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\sishape\LWR@null@sishape
+\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\ebweight\LWR@null@ebweight%
+\LetLtxMacro\ubweight\LWR@null@ubweight%
+% \LetLtxMacro\lgweight\LWR@null@lgweight%
+\LetLtxMacro\elweight\LWR@null@elweight%
+\LetLtxMacro\ulweight\LWR@null@ulweight%
+% \LetLtxMacro\itshape\LWR@null@itshape%
+% \LetLtxMacro\scshape\LWR@null@scshape%
+% \LetLtxMacro\upshape\LWR@null@upshape%
+\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@textsi}[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@texteb}[1]{#1}
+\newrobustcmd{\LWR@HTML@textub}[1]{\texteb{#1}}
+% \newrobustcmd{\LWR@HTML@textlg}[1]{#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{textsi}
+\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{texteb}
+\LWR@formatted{textub}
+% \LWR@formatted{textlg}
+\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@textsi}[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@texteb}[1]{#1}
+\newrobustcmd{\LWR@null@textub}[1]{#1}
+% \newrobustcmd{\LWR@null@textlg}[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\textsi\LWR@null@textsi%
+\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\texteb\LWR@null@texteb%
+\LetLtxMacro\textub\LWR@null@textub%
+% \LetLtxMacro\textlg\LWR@null@textlg%
+\LetLtxMacro\textel\LWR@null@textel%
+\LetLtxMacro\textul\LWR@null@textul%
+}
+
+\providecommand*{\zeroslash}{0}
+\newrobustcmd*{\LWR@HTML@zeroslash}{0}
+\LWR@formatted{zeroslash}
+% \end{macrocode}
+%
+% \iffalse
+%</nfssext-cfr>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*nicefrac>
% \fi
%
@@ -54929,6 +55854,9 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
\LWR@ProvidesPackagePass{nomencl}[2005/09/22]
% \end{macrocode}
%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{nomencl}: Fix references for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
\def\@@@nomenclature[#1]#2#3{%
\def\@tempa{#2}\def\@tempb{#3}%
@@ -54939,7 +55867,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
\endgroup
\@esphack}
-\renewcommand*{\pagedeclaration}[1]{, \nameref{autopage-#1}}
+\renewcommand*{\pagedeclaration}[1]{, \nameref{\BaseJobname-autopage-#1}}%
% \end{macrocode}
%
% \iffalse
@@ -55141,8 +56069,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
% \credits{Rapha\"{e}l Pinson}
%
-% \DescribePackage{nowidow}
-% \pkg{nowidow} is not used during \HTML\ conversion.
+% \DescribePackage{nowidow} \pkg{nowidow} is ignored.
%
% \changes{v0.20}{2017/01/03}{\pkg{nowidow}: Added.}
%
@@ -56330,6 +57257,32 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
%
%
+% \iffalse
+%<*pdfcrypt>
+% \fi
+%
+% \part{lwarp-pdfcrypt.sty}
+%
+% \section{pdfcrypt}
+%
+% \DescribePackage{pdfcrypt}
+% \pkg{pdfcrypt} is ignored.
+%
+% \changes{v0.72}{2019/05/27}{\pkg{pdfcrypt}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{pdfcrypt}[2016/05/16]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\pdfcryptsetup}[1]{}
+% \end{macrocode}
+%
+% \iffalse
+%</pdfcrypt>
+% \fi
%
%
%
@@ -56629,7 +57582,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
% \credits{J. Laurens}
%
-% \DescribePackage{pdfsync} Emulated.
+% \DescribePackage{pdfsync} \pkg{pdfsync} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{pdfsync}: Added.}
% \changes{v0.44}{2017/11/19}{\pkg{pdfsync}: Fixes.}
@@ -56825,7 +57778,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \section{pfnote}
%
% \DescribePackage{pfnote}
-% \pkg{pfnote} is emulated.
+% \pkg{pfnote} is ignored.
%
% \limitspfnote
%
@@ -56945,8 +57898,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \credits{Donald Arseneau}
%
-% \DescribePackage{placeins}
-% \pkg{placeins} is not used during \HTML\ conversion.
+% \DescribePackage{placeins} \pkg{placeins} is ignored.
%
% \changes{v0.20}{2017/01/19}{\pkg{placeins}: Added.}
%
@@ -57143,7 +58095,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \credits{Martin Schröder}
%
-% \DescribePackage{prelim2e} Emulated.
+% \DescribePackage{prelim2e} \pkg{prelim2e} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{prelim2e}: Added.}
%
@@ -57685,7 +58637,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Martin Schröder}
%
% \DescribePackage{ragged2e}
-% \pkg{ragged2e} is not used during \HTML\ conversion.
+% \pkg{ragged2e} is emulated.
%
% \changes{v0.20}{2017/01/19}{\pkg{ragged2e}: Added.}
% \changes{v0.54}{2018/04/19}{\pkg{ragged2e}: Fix: \cs{centering}, etc.}
@@ -58326,7 +59278,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \section{savetrees}
%
-% \DescribePackage{savetrees} Emulated.
+% \DescribePackage{savetrees} \pkg{savetrees} is ignored.
%
% \changes{v0.34}{2017/07/27}{\pkg{savetrees}: Added.}
%
@@ -58775,7 +59727,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Markus Kohm}
%
% \DescribePackage{scrlayer-scrpage}
-% \pkg{scrlayer-scrpage} is emulated.
+% \pkg{scrlayer-scrpage} is ignored.
%
% \testthis
%
@@ -58851,7 +59803,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Markus Kohm}
%
% \DescribePackage{scrpage2}
-% \pkg{scrpage2} is emulated.
+% \pkg{scrpage2} is ignored.
%
% \testthis
%
@@ -59031,7 +59983,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Rowland McDonnell}
%
% \DescribePackage{sectsty}
-% \pkg{sectsty} is emulated.
+% \pkg{sectsty} is ignored.
%
% \changes{v0.40}{2017/09/12}{\pkg{sectsty}: Added.}
%
@@ -59160,7 +60112,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Robin Fairbairns}
%
% \DescribePackage{setspace}
-% \pkg{setspace} is not used during \HTML\ conversion.
+% \pkg{setspace} is emulated.
%
% \changes{v0.20}{2016/12/22}{\pkg{setspace}: Improved support.}
%
@@ -59259,6 +60211,45 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
%
+% \iffalse
+%<*shapepar>
+% \fi
+%
+% \part{lwarp-shapepar.sty}
+%
+% \section{shapepar}
+%
+% \credits{Donald Arseneau}
+%
+% \DescribePackage{shapepar}
+% \pkg{shapepar} is patched for use by \pkg{lwarp}.
+% Shapes appear in print mode, as well as inside a \env{lateximage},
+% but are ignored for \HTML.
+%
+% \changes{v0.72}{2019/06/06}{\pkg{shapepar}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{shapepar}[2013/03/26]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\LWR@HTML@shapepar}[2][]{}
+\LWR@formatted{shapepar}
+
+\NewDocumentCommand{\LWR@HTML@cutout}{m d()}{}
+\LWR@formatted{cutout}
+% \end{macrocode}
+%
+% \iffalse
+%</shapepar>
+% \fi
+%
+%
+%
+%
+%
%
%
% \iffalse
@@ -59865,6 +60856,45 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
%
+% \iffalse
+%<*slantsc>
+% \fi
+%
+% \part{lwarp-slantsc.sty}
+%
+% \section{slantsc}
+%
+% \credits{Harald Harders}
+%
+% \DescribePackage{slantsc}
+% \pkg{slantsc} is emulated for \HTML, and used as-is for print output.
+%
+% \changes{v0.72}{2019/05/27}{\pkg{slantsc}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{slantsc}[2012/01/01]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\LWR@HTML@noscshape}{}
+\LWR@formatted{noscshape}
+
+\newcommand*{\LWR@null@noscshape}{}
+
+\appto{\LWR@nullfonts}{%
+\LetLtxMacro\noscshape\LWR@null@noscshape%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</slantsc>
+% \fi
+%
+%
+%
+%
%
% \iffalse
%<*soul>
@@ -59876,7 +60906,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \credits{Melchior FRANZ}
%
-% \DescribePackage{soul} Emulated.
+% \DescribePackage{soul} \pkg{soul} is emulated.
%
% \changes{v0.27}{2017/04/02}{\pkg{soul}: Added.}
% \changes{v0.42}{2017/10/20}{\pkg{soul}: If \progcode{FormatWP}, add explicit styles.}
@@ -60056,11 +61086,13 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \pkg{lwarp}'s \HTML\ output naturally supports \UTF-8 encoding.
%
% \changes{v0.44}{2017/11/10}{\pkg{soulutf8}: Added.}
+% \changes{v0.72}{2019/06/07}{\pkg{soulutf8}: Fix: Loads \pkg{soul}.}
%
% \codehtml
%
% \begin{macrocode}
\LWR@ProvidesPackageDrop{soulutf8}[2016/05/16]
+\RequirePackage{soul}
% \end{macrocode}
%
%
@@ -60892,7 +61924,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \credits{Frank Mittelbach, Rainer Sch\"{o}pf}
%
-% \DescribePackage{syntonly} Emulated.
+% \DescribePackage{syntonly} \pkg{syntonly} is ignored.
%
% \changes{v0.34}{2017/07/26}{\pkg{syntonly}: Added.}
%
@@ -60921,6 +61953,35 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
% \iffalse
+%<*tabfigures>
+% \fi
+%
+% \part{lwarp-tabfigures.sty}
+%
+% \section{tabfigures}
+%
+% \DescribePackage{tabfigures}
+% \pkg{tabfigures} is ignored.
+%
+% \changes{v0.72}{2019/05/27}{\pkg{tabfigures}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{tabfigures}[2012/01/24]
+% \end{macrocode}
+%
+% \begin{macrocode}
+% \end{macrocode}
+%
+% \iffalse
+%</tabfigures>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*tablefootnote>
% \fi
%
@@ -61089,7 +62150,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \section{tascmac}
%
% \DescribePackage{tascmac}
-% \pkg{tascmac} is ignored.
+% \pkg{tascmac} is emulated.
%
% \changes{v0.65}{2018/12/21}{\pkg{tascmac}: Added.}
%
@@ -64019,7 +65080,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \credits{Heiko Oberdiek}
%
-% \DescribePackage{transparent} Emulated.
+% \DescribePackage{transparent} \pkg{transparent} is emulated.
% \cs{texttransparent} works for inline objects.
% \cs{transparent} only works for \cs{includegraphics}.
%
@@ -64063,7 +65124,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \section{trimclip}
%
% \DescribePackage{trimclip}
-% \pkg{trimclip} is nullified.
+% \pkg{trimclip} is ignored.
%
% \changes{v0.57}{2018/05/26}{\pkg{trimclip}: Added.}
%
@@ -64732,7 +65793,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \section{upref}
%
-% \DescribePackage{upref} Ignored.
+% \DescribePackage{upref} \pkg{upref} is ignored.
%
% \changes{v0.36}{2017/08/09}{\pkg{upref}: Added.}
%
@@ -65275,7 +66336,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \changes{v0.20}{2017/01/11}{\pkg{wallpaper}: Added.}
%
% \DescribePackage{wallpaper}
-% \pkg{wallpaper} is emulated.
+% \pkg{wallpaper} is ignored.
% \codehtml
% \begin{macrocode}
@@ -65321,7 +66382,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Alexander I. Rozhenko}
%
% \DescribePackage{watermark}
-% \pkg{watermark} is emulated.
+% \pkg{watermark} is ignored.
%
% \changes{v0.44}{2017/11/10}{\pkg{watermark}: Added.}
%
@@ -66195,7 +67256,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \section{xechangebar}
%
% \DescribePackage{xechangebar}
-% \pkg{xechangebar} is ignored.
+% \pkg{xechangebar} is ignored
%
% \changes{v0.62}{2018/10/18}{\pkg{xechangebar}: Added.}
%
@@ -66646,7 +67707,7 @@ height:\LWR@printlength{\LWR@tempheight}%
%
% \credits{Maarten Sneep}
%
-% \DescribePackage{xmpincl} Emulated.
+% \DescribePackage{xmpincl} \pkg{xmpincl} is ignored.
%
% \changes{v0.34}{2017/08/03}{\pkg{xmpincl}: Added.}
%
@@ -66755,6 +67816,82 @@ height:\LWR@printlength{\LWR@tempheight}%
%
%
%
+% \iffalse
+%<*xr>
+% \fi
+%
+% \part{lwarp-xr.sty}
+%
+% \section{xr}
+%
+% \credits{Jean-Pierre Drucbert, David Carlisle}
+%
+% \DescribePackage{xr}
+% \pkg{xr} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{xr}: Added.}
+%
+% \codehtml
+%
+% \pkg{lwarp-xr-hyper} also uses \pkg{lwarp-xr}
+% to reuse the following definition.
+% Only load \pkg{xr} if \pkg{xr-hyper} has not been loaded:
+% \begin{macrocode}
+\ifdef{\externaldocument}{}{
+ \LWR@ProvidesPackagePass{xr}[2019/01/05]
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LetLtxMacro\LWR@orig@externaldocument\externaldocument
+
+\renewcommand*{\externaldocument}[2][]{%
+ \ifblank{#1}{%
+ \LWR@orig@externaldocument{#2_html}%
+ }{%
+ \LWR@orig@externaldocument[#1]{#2_html}%
+ }%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</xr>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
+%<*xr-hyper>
+% \fi
+%
+% \part{lwarp-xr-hyper.sty}
+%
+% \section{xr-hyper}
+%
+% \credits{David Carlisle}
+%
+% \DescribePackage{xr-hyper}
+% \pkg{xr-hyper} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.72}{2019/06/05}{\pkg{xr-hyper}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{xr-hyper}[2000/03/22]
+
+\LWR@origRequirePackage{lwarp-xr}
+% \end{macrocode}
+%
+% \iffalse
+%</xr-hyper>
+% \fi
+%
+%
+%
+%
%
% \iffalse
%<*xtab>
@@ -67047,18 +68184,19 @@ height:\LWR@printlength{\LWR@tempheight}%
% \pkg{zhlineskip} is ignored.
%
% \changes{v0.63}{2018/12/02}{\pkg{zhlineskip}: Added.}
+% \changes{v0.72}{2019/05/18}{\pkg{zhlineskip}: Updated to v1.0e.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{zhlineskip}[2018/11/30]
+\LWR@ProvidesPackageDrop{zhlineskip}[2019/05/15]
% \end{macrocode}
%
% \begin{macrocode}
\newcommand*\SetTextEnvironmentSinglespace[1]{}
-\newcommand*\RestoreTextEnvironmentLeading{}
+\newcommand*\RestoreTextEnvironmentLeading[1]{}
\newcommand*\SetMathEnvironmentSinglespace[1]{}
-\newcommand*\RestoreMathEnvironmentLeading{}
+\newcommand*\RestoreMathEnvironmentLeading[1]{}
% \end{macrocode}
%
% \iffalse
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
index 41dbcb45c21..0644207fb56 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
@@ -66,6 +66,7 @@ version 2005/12/01 or later.
\file{lwarp-autonum.sty}{\from{lwarp.dtx}{autonum}}
\file{lwarp-axessibility.sty}{\from{lwarp.dtx}{axessibility}}
\file{lwarp-axodraw2.sty}{\from{lwarp.dtx}{axodraw2}}
+\file{lwarp-backnaur.sty}{\from{lwarp.dtx}{backnaur}}
\file{lwarp-backref.sty}{\from{lwarp.dtx}{backref}}
\file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}}
\file{lwarp-bbding.sty}{\from{lwarp.dtx}{bbding}}
@@ -174,6 +175,7 @@ version 2005/12/01 or later.
\file{lwarp-fnpos.sty}{\from{lwarp.dtx}{fnpos}}
\file{lwarp-fontawesome.sty}{\from{lwarp.dtx}{fontawesome}}
\file{lwarp-fontawesome5.sty}{\from{lwarp.dtx}{fontawesome5}}
+\file{lwarp-fontaxes.sty}{\from{lwarp.dtx}{fontaxes}}
\file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}}
\file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
\file{lwarp-footnotebackref.sty}{\from{lwarp.dtx}{footnotebackref}}
@@ -203,6 +205,7 @@ version 2005/12/01 or later.
\file{lwarp-gridset.sty}{\from{lwarp.dtx}{gridset}}
\file{lwarp-hang.sty}{\from{lwarp.dtx}{hang}}
\file{lwarp-hanging.sty}{\from{lwarp.dtx}{hanging}}
+\file{lwarp-hypbmsec.sty}{\from{lwarp.dtx}{hypbmsec}}
\file{lwarp-hypcap.sty}{\from{lwarp.dtx}{hypcap}}
\file{lwarp-hypdestopt.sty}{\from{lwarp.dtx}{hypdestopt}}
\file{lwarp-hypernat.sty}{\from{lwarp.dtx}{hypernat}}
@@ -257,6 +260,7 @@ version 2005/12/01 or later.
\file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}}
\file{lwarp-midfloat.sty}{\from{lwarp.dtx}{midfloat}}
\file{lwarp-midpage.sty}{\from{lwarp.dtx}{midpage}}
+\file{lwarp-minibox.sty}{\from{lwarp.dtx}{minibox}}
\file{lwarp-minitoc.sty}{\from{lwarp.dtx}{minitoc}}
\file{lwarp-morefloats.sty}{\from{lwarp.dtx}{morefloats}}
\file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}}
@@ -275,6 +279,7 @@ version 2005/12/01 or later.
\file{lwarp-nccfancyhdr.sty}{\from{lwarp.dtx}{nccfancyhdr}}
\file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}
\file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}}
+\file{lwarp-nfssext-cfr.sty}{\from{lwarp.dtx}{nfssext-cfr}}
\file{lwarp-nicefrac.sty}{\from{lwarp.dtx}{nicefrac}}
\file{lwarp-niceframe.sty}{\from{lwarp.dtx}{niceframe}}
\file{lwarp-nomencl.sty}{\from{lwarp.dtx}{nomencl}}
@@ -295,6 +300,7 @@ version 2005/12/01 or later.
\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}
\file{lwarp-pbox.sty}{\from{lwarp.dtx}{pbox}}
\file{lwarp-pdfcomment.sty}{\from{lwarp.dtx}{pdfcomment}}
+\file{lwarp-pdfcrypt.sty}{\from{lwarp.dtx}{pdfcrypt}}
\file{lwarp-pdflscape.sty}{\from{lwarp.dtx}{pdflscape}}
\file{lwarp-pdfmarginpar.sty}{\from{lwarp.dtx}{pdfmarginpar}}
\file{lwarp-pdfpages.sty}{\from{lwarp.dtx}{pdfpages}}
@@ -354,6 +360,7 @@ version 2005/12/01 or later.
\file{lwarp-semantic-markup.sty}{\from{lwarp.dtx}{semantic-markup}}
\file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}}
\file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}}
+\file{lwarp-shapepar.sty}{\from{lwarp.dtx}{shapepar}}
\file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}}
\file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}}
\file{lwarp-showtags.sty}{\from{lwarp.dtx}{showtags}}
@@ -361,6 +368,7 @@ version 2005/12/01 or later.
\file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}}
\file{lwarp-SIunits.sty}{\from{lwarp.dtx}{SIunits}}
\file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}}
+\file{lwarp-slantsc.sty}{\from{lwarp.dtx}{slantsc}}
\file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}}
\file{lwarp-soulpos.sty}{\from{lwarp.dtx}{soulpos}}
\file{lwarp-soulutf8.sty}{\from{lwarp.dtx}{soulutf8}}
@@ -375,8 +383,9 @@ version 2005/12/01 or later.
\file{lwarp-subfigure.sty}{\from{lwarp.dtx}{subfigure}}
\file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
\file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}}
-\file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}}
+\file{lwarp-tabfigures.sty}{\from{lwarp.dtx}{tabfigures}}
\file{lwarp-tablefootnote.sty}{\from{lwarp.dtx}{tablefootnote}}
+\file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}}
\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
\file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}}
\file{lwarp-tascmac.sty}{\from{lwarp.dtx}{tascmac}}
@@ -446,6 +455,8 @@ version 2005/12/01 or later.
\file{lwarp-xmpincl.sty}{\from{lwarp.dtx}{xmpincl}}
\file{lwarp-xpiano.sty}{\from{lwarp.dtx}{xpiano}}
\file{lwarp-xpinyin.sty}{\from{lwarp.dtx}{xpinyin}}
+\file{lwarp-xr.sty}{\from{lwarp.dtx}{xr}}
+\file{lwarp-xr-hyper.sty}{\from{lwarp.dtx}{xr-hyper}}
\file{lwarp-xtab.sty}{\from{lwarp.dtx}{xtab}}
\file{lwarp-xunicode.sty}{\from{lwarp.dtx}{xunicode}}
\file{lwarp-xurl.sty}{\from{lwarp.dtx}{xurl}}
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>}{}}