lwarp (6mar19)

git-svn-id: svn://tug.org/texlive/trunk@50266 c570f23f-e606-0410-a88d-b1316a301751

16 files changed, 636 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
new file mode 100644
index 00000000000..1bfc98831ff
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-bigfoot.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `bigfoot')
+%% This is a generated file.
+%% Copyright 2016-2018 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{bigfoot}[2015/08/30]
+\RequirePackage{manyfoot}
+\RequirePackage{perpage}
+
+\def\RestyleFootnote#1#2{}
+\def\FootnoteSpecific#1{}
+\def\DefineFootnoteStack#1{}
+\def\PushFootnoteMark#1{}
+\def\PopFootnoteMark#1{}
+\def\hfootfraction{0.9}
+\def\vtypefraction{0.7}
+\def\FootnoteMinimum{1sp}
+\def\FootnoteMainMinimum{0pt}
+\newcount\bigfoottolerance
+\bigfoottolerance=100
+\providecommand\footnotecarryratio{2}
+\endinput
+%%
+%% End of file `lwarp-bigfoot.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
index a07c1bdebb3..3dafc252f94 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
@@ -24,8 +24,8 @@
 }
 \def\V@@footnotetext{%
 \LWR@traceinfo{V@footnotetext}%
-\global\setbox\LWR@footnotes=\vbox\bgroup%
-    \unvbox\LWR@footnotes%
+\global\setbox\LWR@footnotebox=\vbox\bgroup%
+    \unvbox\LWR@footnotebox%
     \protected@edef\@currentlabel{%
         \csname p@footnote\endcsname\@thefnmark%
     }% @currentlabel
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 7de273fb1a2..12e5b5a0052 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -28,8 +28,8 @@
 }
 \def\V@@footnotetext{%
 \LWR@traceinfo{V@footnotetext}%
-\global\setbox\LWR@footnotes=\vbox\bgroup%
-    \unvbox\LWR@footnotes%
+\global\setbox\LWR@footnotebox=\vbox\bgroup%
+    \unvbox\LWR@footnotebox%
     \protected@edef\@currentlabel{%
         \csname p@footnote\endcsname\@thefnmark%
     }% @currentlabel
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
new file mode 100644
index 00000000000..a85e78627dc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-footnotebackref.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `footnotebackref')
+%% This is a generated file.
+%% Copyright 2016-2018 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{footnotebackref}[2012/07/01]
+\endinput
+%%
+%% End of file `lwarp-footnotebackref.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index d71c661c49a..7adf994a3e9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -22,7 +22,9 @@
 \typeout{    Are not using ProvidesPackage, so that other packages}
 \typeout{    do not attempt to patch lwarp's version of `hyperref'.}
 \DeclareOption*{}
-\ProcessOptions\relax
+\let\ds@\@empty%         from the original \ProcessOptions
+\edef\@curroptions{}%    lwarp modification to \ProcessOptions
+\@process@ptions\relax%  from the original \ProcessOptions
 
 \newcommand*{\hypersetup}[1]{}
 \newcommand*{\hyperbaseurl}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
new file mode 100644
index 00000000000..7329d57cfa5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
@@ -0,0 +1,159 @@
+%%
+%% This is file `lwarp-layouts.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `layouts')
+%% This is a generated file.
+%% Copyright 2016-2018 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{layouts}[2009/09/02]
+\newif\ifoddpagelayout
+  \oddpagelayouttrue
+\newif\iftwocolumnlayout
+  \twocolumnlayoutfalse
+\newif\ifdrawmarginpars
+  \drawmarginparstrue
+\newif\ifdrawparameters
+  \drawparameterstrue
+\newif\iflistaspara
+  \listasparatrue
+\newif\ifruninhead
+  \runinheadfalse
+\newif\ifprintparameters
+  \printparameterstrue
+\newif\ifdrawdimensions
+  \drawdimensionsfalse
+\newif\ifprintheadings
+  \printheadingstrue
+\newcommand{\testdrawdimensions}{}
+\newcommand{\testprintparameters}{}
+\newcommand{\setlabelfont}[1]{}
+\newcommand{\setparametertextfont}[1]{}
+\newcommand{\setvaluestextsize}[1]{}
+\newcommand{\setlayoutscale}[1]{}
+\newcommand{\setuplayouts}{}
+\newcommand{\printinunitsof}[1]{}
+\newcommand{\prntlen}[1]{}
+\newcommand{\trypaperwidth}[1]{}
+\newcommand{\trypaperheight}[1]{}
+\newcommand{\tryhoffset}[1]{}
+\newcommand{\tryvoffset}[1]{}
+\newcommand{\trytopmargin}[1]{}
+\newcommand{\tryheadheight}[1]{}
+\newcommand{\tryheadsep}[1]{}
+\newcommand{\trytextheight}[1]{}
+\newcommand{\tryfootskip}[1]{}
+\newcommand{\tryoddsidemargin}[1]{}
+\newcommand{\tryevensidemargin}[1]{}
+\newcommand{\trytextwidth}[1]{}
+\newcommand{\trymarginparsep}[1]{}
+\newcommand{\trymarginparwidth}[1]{}
+\newcommand{\trymarginparpush}[1]{}
+\newcommand{\trycolumnsep}[1]{}
+\newcommand{\trycolumnseprule}[1]{}
+\newcommand{\setfootbox}[2]{}
+\newcommand{\currentpage}{}
+\newcommand{\drawpage}{(draw page)}
+\newcommand{\pagediagram}{(page diagram)}
+\newcommand{\pagedesign}{(page design)}
+\newcommand{\pagevalues}{(page values)}
+\newcommand{\trystockwidth}[1]{}
+\newcommand{\trystockheight}[1]{}
+\newcommand{\trytrimedge}[1]{}
+\newcommand{\trytrimtop}[1]{}
+\newcommand{\tryuppermargin}[1]{}
+\newcommand{\tryspinemargin}[1]{}
+\newcommand{\currentstock}{}
+\newcommand{\drawstock}{(draw stock)}
+\newcommand{\stockdiagram}{(stock diagram)}
+\newcommand{\stockdesign}{(stock design)}
+\newcommand{\stockvalues}{(stock values)}
+\newcommand{\tryitemindent}[1]{}
+\newcommand{\trylabelwidth}[1]{}
+\newcommand{\trylabelsep}[1]{}
+\newcommand{\tryleftmargin}[1]{}
+\newcommand{\tryrightmargin}[1]{}
+\newcommand{\trylistparindent}[1]{}
+\newcommand{\trytopsep}[1]{}
+\newcommand{\tryparskip}[1]{}
+\newcommand{\trypartopsep}[1]{}
+\newcommand{\tryparsep}[1]{}
+\newcommand{\tryitemsep}[1]{}
+\newcommand{\currentlist}{}
+\newcommand{\drawlist}{(draw list)}
+\newcommand{\listdiagram}{(list diagram)}
+\newcommand{\listdesign}{(list design)}
+\newcommand{\listvalues}{(list values)}
+\newcommand{\tryfootins}[1]{}
+\newcommand{\tryfootnotesep}[1]{}
+\newcommand{\tryfootnotebaseline}[1]{}
+\newcommand{\tryfootruleheight}[1]{}
+\newcommand{\tryfootrulefrac}[1]{}
+\newcommand{\currentfootnote}{}
+\newcommand{\drawfootnote}{(draw footnote)}
+\newcommand{\footnotediagram}{(footnote diagram)}
+\newcommand{\footnotedesign}{(footnote design)}
+\newcommand{\footnotevalues}{(footnote values)}
+\newcommand{\tryparindent}[1]{}
+\newcommand{\tryparlinewidth}[1]{}
+\newcommand{\tryparbaselineskip}[1]{}
+\newcommand{\currentparagraph}{}
+\newcommand{\drawparagraph}{(draw paragraph)}
+\newcommand{\paragraphdiagram}{(paragraph diagram)}
+\newcommand{\paragraphdesign}{(paragraph design)}
+\newcommand{\paragraphvalues}{(paragraph values)}
+\newcommand{\trybeforeskip}[1]{}
+\newcommand{\tryafterskip}[1]{}
+\newcommand{\tryindent}[1]{}
+\newcommand{\currentheading}{}
+\newcommand{\drawheading}[1]{(draw heading)}
+\newcommand{\headingdiagram}[1]{(heading diagram)}
+\newcommand{\headingdesign}[1]{(heading design)}
+\newcommand{\headingvalues}{(heading values)}
+\newcommand{\trytextfloatsep}[1]{}
+\newcommand{\tryfloatsep}[1]{}
+\newcommand{\tryintextsep}[1]{}
+\newcommand{\trytopfigrule}[1]{}
+\newcommand{\trybotfigrule}[1]{}
+\newcommand{\currentfloat}{}
+\newcommand{\drawfloat}{(draw float)}
+\newcommand{\floatdiagram}{(float diagram)}
+\newcommand{\floatdesign}{(float design)}
+\newcommand{\floatvalues}{(float values)}
+\newcommand{\trytotalnumber}[1]{}
+\newcommand{\trytopnumber}[1]{}
+\newcommand{\trybottomnumber}[1]{}
+\newcommand{\trytopfraction}[1]{}
+\newcommand{\trytextfraction}[1]{}
+\newcommand{\trybottomfraction}[1]{}
+\newcommand{\currentfloatpage}{}
+\newcommand{\drawfloatpage}{(draw floatpage)}
+\newcommand{\floatpagediagram}{(floatpage diagram)}
+\newcommand{\floatpagedesign}{(floatpage design)}
+\newcommand{\floatpagevalues}{(floatpage values)}
+\newcommand{\trytocindent}[1]{}
+\newcommand{\trytocnumwidth}[1]{}
+\newcommand{\trytoclinewidth}[1]{}
+\newcommand{\trytocrmarg}[1]{}
+\newcommand{\trytocpnumwidth}[1]{}
+\newcommand{\trytocdotsep}[1]{}
+\newcommand{\currenttoc}{}
+\newcommand{\drawtoc}{(draw toc)}
+\newcommand{\tocdiagram}{(toc diagram)}
+\newcommand{\tocdesign}{(toc design)}
+\newcommand{\tocvalues}{(toc values)}
+\newcommand{\drawaspread}[8][0]{(a spread)}
+\newcommand{\drawfontframe}[1]{(font frame)}
+\newcommand{\drawfontframelabel}[1]{}
+\endinput
+%%
+%% End of file `lwarp-layouts.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
index 93282300c6c..d069f6faaac 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
@@ -18,7 +18,7 @@
 
 
 \begin{warpHTML}
-\LWR@ProvidesPackagePass{listings}[2015/06/04]
+\LWR@ProvidesPackagePass{listings}[2018/09/02]
 
 \lst@column@flexible
 \let\LWR@origlst@Init\lst@Init
@@ -133,12 +133,12 @@
 \lst@Key{numbers}{none}{%
     \let\lst@PlaceNumber\@empty
     \lstKV@SwitchCases{#1}%
-    {none&\\%
-     left&\def\lst@PlaceNumber{%
+    {none:\\%
+     left:\def\lst@PlaceNumber{%
             \LWR@orignormalfont%
             \lst@numberstyle{\thelstnumber}\kern\lst@numbersep%
     }\\%
-     right&\def\lst@PlaceNumber{\LWR@origrlap{\LWR@orignormalfont
+     right:\def\lst@PlaceNumber{\LWR@origrlap{\LWR@orignormalfont
                 \kern 6in \kern\lst@numbersep
                 \lst@numberstyle{\thelstnumber}}}%
     }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
index 00d7a5815a0..30a6da0545e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
@@ -19,6 +19,8 @@
 
 
 \LWR@ProvidesPackageDrop{longtable}[2014/10/28]
+\newbool{LWR@longtable@havehead}
+\boolfalse{LWR@longtable@havehead}
 \newenvironment{longtable*}[2][]{%
 \LWR@floatbegin{table}%
 \setcaptiontype{\LTcaptype}%
@@ -26,6 +28,7 @@
 \caption@setoptions{@longtable}%
 \caption@LT@setup%
 \booltrue{LWR@starredlongtable}%
+\boolfalse{LWR@longtable@havehead}%
 \let\captionlistentry\LWR@LTcaptionlistentry%
 \tabular{#2}
 }
@@ -38,16 +41,49 @@
 \caption@setoptions{@longtable}%
 \caption@LT@setup%
 \refstepcounter{\LTcaptype}%
+\boolfalse{LWR@longtable@havehead}%
 \let\captionlistentry\LWR@LTcaptionlistentry%
 \tabular{#2}
 }
 {\endtabular\LWR@floatend}
 
 \newcounter{LTchunksize}
-\def\endhead{\LWR@tabularendofline}% throws away options //[dim] and //*
-\def\endfirsthead{\LWR@tabularendofline}
-\def\endfoot{\LWR@tabularendofline}
-\def\endlastfoot{\LWR@tabularendofline}
+\newcommand*{\LWR@longtable@headerror}{%
+    \PackageError{lwarp}
+    {For longtable:\MessageBreak
+    1: Keep either one of an \protect\endhead\space or
+        \protect\endfirsthead\space\MessageBreak
+        \space phrase as-is, to be used by both print and HTML.\MessageBreak
+    2: Place any other \protect\end... phrases inside a\MessageBreak
+        \space\protect\warpprintonly\space macro,
+            to be ignored by HTML.\MessageBreak
+    3: Add a final footer for HTML at the end of the table\MessageBreak
+        \space inside a \protect\warpHTMLonly\space macro.
+            This can be\MessageBreak
+        \space a copy of an \protect\endfoot\space or
+            \protect\endfirstfoot\space phrase,\MessageBreak
+        \space but without the actual \protect\endfoot\space
+            or \protect\endfirstfoot\MessageBreak
+        \space macros.  If using threeparttablex, add\MessageBreak
+        \space \protect\insertTableNotes\space here,
+            optionally with\MessageBreak
+        \space \protect\UseMinipageWidths\space in front.\MessageBreak
+    See the lwarp documentation regarding longtables\MessageBreak
+    and threeparttablex}
+    {See the lwarp documentation regading longtables and threeparttablex.}
+}
+\newcommand*{\LWR@longtable@maybeheaderror}{%
+\ifbool{LWR@longtable@havehead}%
+    {\LWR@longtable@headerror}%
+    {%
+        \booltrue{LWR@longtable@havehead}
+        \LWR@tabularendofline% throws away options //[dim] and //*
+    }%
+}
+\def\endhead{\LWR@longtable@maybeheaderror}
+\def\endfirsthead{\LWR@longtable@maybeheaderror}
+\def\endfoot{\LWR@longtable@headerror}
+\def\endlastfoot{\LWR@longtable@headerror}
 \newcommand\tabularnewline{\LWR@tabularendofline}
 \newcommand{\setlongtables}{}% Obsolete command, does nothing.
 \newlength{\LTleft}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
new file mode 100644
index 00000000000..27f721062fb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
@@ -0,0 +1,97 @@
+%%
+%% This is file `lwarp-manyfoot.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `manyfoot')
+%% This is a generated file.
+%% Copyright 2016-2018 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{manyfoot}[2005/09/11]
+\RequirePackage{nccfoots}
+
+\newcommand{\extrafootnoterule}{}
+
+\let\defaultfootnoterule\footnoterule
+
+\newcommand*{\SelectFootnoteRule}[2][0]{}
+
+\newcommand{\footnoterulepriority}{1}
+
+\newcommand{\SetFootnoteHook}[1]{}
+\@onlypreamble\SetFootnoteHook
+
+\newcommand{\SplitNote}{}
+
+\newcommand*\ExtraParaSkip[1]{}
+
+\newcommand*{\newfootnote}[2][plain]{%
+    \ifstrequal{#2}{default}{}{% not "default"
+        \expandafter\newbox\csname LWR@footnote#2box\endcsname%
+        \appto{\LWR@printpendingfootnotes}{%
+            \LWR@@printpendingfootnotes{footnote#2}%
+        }
+        \long\csdef{Footnotetext#2}##1##2{%
+            \NCC@makefnmark{##1}%
+            \LWR@@footnotetext{##2}{LWR@footnote#2box}%
+        }%
+        \long\csdef{Footnotetext#2+}##1##2{%
+            \NCC@makefnmark{##1}%
+            \LWR@@footnotetext{##2}{LWR@footnote#2box}%
+        }%
+    }% not "default"
+}
+\@onlypreamble\newfootnote
+
+\newcommand*{\DeclareNewFootnote}[2][plain]{%
+  \@ifnextchar[%
+        {\LWR@manyfoot@declare{#1}{#2}}%
+        {\LWR@manyfoot@declare{#1}{#2}[arabic]}%
+}
+
+\def\LWR@manyfoot@declare#1#2[#3]{%
+\ifstrequal{#2}{default}{}{% not "default"
+  \newfootnote[#1]{#2}%
+  \newcounter{footnote#2}%
+    \newcounter{footnote#2Reset}%
+    \setcounter{footnote#2Reset}{0}%
+    \csdef{thefootnote#2}{%
+      \expandafter\noexpand\csname @#3\endcsname%
+      \expandafter\noexpand\csname c@footnote#2\endcsname%
+    }%
+    \expandafter\NewDocumentCommand\csname footnote#2\endcsname{t{+}t{+}t{-}t{-}}{%
+        \stepcounter{footnote#2}%
+        \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+        \@footnotemark%
+        \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+    }%
+    \csdef{footnotemark#2}{%
+        \stepcounter{footnote#2}%
+        \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+        \@footnotemark%
+    }%
+    \expandafter\NewDocumentCommand\csname footnotetext#2\endcsname{t{+}t{+}t{-}t{-}}{%
+        \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+        \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+    }%
+    \csdef{Footnotemark#2}{%
+      \Footnotemark%
+    }%
+    \csdef{Footnote#2}##1{%
+      \Footnotemark{##1}%
+      \csuse{Footnotetext#2}{##1}%
+    }%
+}% not "default"
+}
+\@onlypreamble\DeclareNewFootnote
+\endinput
+%%
+%% End of file `lwarp-manyfoot.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
new file mode 100644
index 00000000000..711d2543ee9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
@@ -0,0 +1,33 @@
+%%
+%% This is file `lwarp-niceframe.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `niceframe')
+%% This is a generated file.
+%% Copyright 2016-2018 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{niceframe}% the original date is in yyyy/dd/mm format
+\newcommand{\LWR@niceframe}[3]{
+    \setlength{\LWR@templengthone}{#1}
+    \begin{BlockClass}[max-width:\LWR@printlength{\LWR@templengthone}]{#3}
+    #2
+    \end{BlockClass}
+}
+
+\newcommand{\niceframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{niceframe}}
+\newcommand{\curlyframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{curlyframe}}
+\newcommand{\artdecoframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{artdecoframe}}
+
+\newcommand{\generalframe}[9]{\LWR@niceframe{\textwidth}{#9}{generalframe}}
+\endinput
+%%
+%% End of file `lwarp-niceframe.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
new file mode 100644
index 00000000000..832f0171802
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
@@ -0,0 +1,53 @@
+%%
+%% This is file `lwarp-perpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `perpage')
+%% This is a generated file.
+%% Copyright 2016-2018 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{perpage}[2014/10/25]
+\newcommand\AddAbsoluteCounter[1]
+{
+    \@ifundefined{c@abs#1}{%
+        \expandafter\newcount\csname c@abs#1\endcsname
+        \global\value{abs#1}\@ne
+        \expandafter\xdef\csname theabs#1\endcsname{%
+        }%
+    }
+    {}
+}
+
+\AddAbsoluteCounter{page}
+\def\theabspage{1}
+
+\newcommand*\MakePerPage[2][1]{%
+    \ifltxcounter{#2Reset}{%
+        \setcounter{#2Reset}{#1}%
+    }{
+
+}%
+}
+
+\newcommand*\MakeSorted[1]{}
+
+\newcommand*\MakeSortedPerPage[2][1]{%
+    \ifltxcounter{#2Reset}{%
+        \setcounter{#2Reset}{#1}%
+    }{
+}%
+}
+
+\newcommand*{\theperpage}{1}
+\endinput
+%%
+%% End of file `lwarp-perpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
new file mode 100644
index 00000000000..0ce3361f8d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-showtags.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `showtags')
+%% This is a generated file.
+%% Copyright 2016-2018 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{showtags}% no version is given
+\newcommand{\thecitetag}[1]{}
+\endinput
+%%
+%% End of file `lwarp-showtags.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
new file mode 100644
index 00000000000..8d895c7b552
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-tablefootnote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `tablefootnote')
+%% This is a generated file.
+%% Copyright 2016-2018 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{tablefootnote}[2014/01/26]
+\LetLtxMacro\tablefootnote\footnote
+\endinput
+%%
+%% End of file `lwarp-tablefootnote.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
index 07d2d6f7ddc..fc5f83698ce 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
@@ -21,7 +21,9 @@
 \LWR@ProvidesPackageDrop{threeparttable}[2003/06/13]
 
 
-\newenvironment*{threeparttable}[1][b]{}{}
+\newenvironment*{threeparttable}[1][b]
+    {\def\@captype{table}}
+    {}
 
 \newenvironment*{tablenotes}[1][]
 {%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
new file mode 100644
index 00000000000..dec7be606ea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-threeparttablex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `threeparttablex')
+%% This is a generated file.
+%% Copyright 2016-2018 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{threeparttablex}[2013/07/23]
+\renewcommand\insertTableNotes{%
+    \setlength{\LWR@templengthone}{.375in*\value{LWR@tabletotalLaTeXcols}}%
+    \setlength{\LWR@templengthone}{\minof{\textwidth}{\LWR@templengthone}}%
+    \setlength{\LWR@templengthone}{\maxof{2.5in}{\LWR@templengthone}}%
+  \multicolumn{\value{LWR@tabletotalLaTeXcols}}{c}{%
+      \parbox{\LWR@templengthone}{%
+        \begin{tablenotes}[\TPTL@optarg]%
+          \TPTL@font%
+          \TPTL@body%
+        \end{tablenotes}%
+      }%
+  }%
+}
+
+\renewcommand\TPTL@tnotex[2]{\tnote{\nameref{#2}}}
+\endinput
+%%
+%% End of file `lwarp-threeparttablex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index e38af279f34..45aebc5efbf 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/02/23 v0.67  Allows LaTeX to directly produce HTML5 output.]
+    [2019/03/05 v0.68  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -137,6 +137,8 @@ For a possible alternative, see class(es) #2.}
 \LWR@earlyloadnever{ae}{cm-super, lmodern}
 \LWR@earlyloadnever{aecompl}{cm-super, lmodern}
 \LWR@earlyloadnever{aecc}{cm-super, lmodern}
+\LWR@earlyloadnever{alg}{algorithm2e, algorithmicx}
+\LWR@earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
 \LWR@earlyloadnever{boxedminipage}{boxedminipage2e}
 \LWR@earlyloadnever{caption2}{caption}
 \@ifpackageloaded{xeCJK}{}{
@@ -148,8 +150,10 @@ For a possible alternative, see class(es) #2.}
 \LWR@earlyloadnever{colortab}{colortbl}
 \LWR@earlyloadnever{epsf}{graphicx}
 \LWR@earlyloadnever{fancyheadings}{fancyhdr}
+\LWR@earlyloadnever{fncylab}{cleveref}
 \LWR@earlyloadnever{glossary}{glossaries}
 \LWR@earlyloadnever{hyper}{hyperref}
+\LWR@earlyloadnever{pdfcprot}{microtype}
 \LWR@earlyloadnever{picinpar}{floatflt, wrapfig}
 \LWR@earlyloadnever{picins}{floatflt, wrapfig}
 \LWR@earlyloadnever{sistyle}{siunitx}
@@ -193,6 +197,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{balance}
 \LWR@loadafter{bbding}
 \LWR@loadafter{bigdelim}
+\LWR@loadafter{bigfoot}
 \LWR@loadafter{bigstrut}
 \LWR@loadafter{bitpattern}
 \LWR@loadafter{blowup}
@@ -287,11 +292,13 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{fnbreak}
 \LWR@loadafter{fncychap}
 \LWR@loadafter{fnlineno}
+\LWR@loadafter{fnpara}
 \LWR@loadafter{fnpos}
 \LWR@loadafter{fontawesome}
 \LWR@loadafter{fontawesome5}
 \LWR@loadafter{footmisc}
 \LWR@loadafter{footnote}
+\LWR@loadafter{footnotebackref}
 \LWR@loadafter{footnotehyper}
 \LWR@loadafter{footnoterange}
 \LWR@loadafter{footnpag}
@@ -329,6 +336,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{keyfloat}
 \LWR@loadafter{layaureo}
 \LWR@loadafter{layout}
+\LWR@loadafter{layouts}
 \LWR@loadafter{leading}
 \LWR@loadafter{letterspace}
 \LWR@loadafter{lettrine}
@@ -347,6 +355,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{luatodonotes}
 \LWR@loadafter{magaz}
 \LWR@notmemoirloadafter{makeidx}
+\LWR@loadafter{manyfoot}
 \LWR@loadafter{marginfit}
 \LWR@loadafter{marginfix}
 \LWR@loadafter{marginnote}
@@ -359,7 +368,6 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{microtype}
 \LWR@loadafter{midfloat}
 \LWR@loadafter{midpage}
-\LWR@loadafter{morefloats}
 \LWR@notmemoirloadafter{moreverb}
 \LWR@notmemoirloadafter{mparhack}
 \LWR@loadafter{multicap}
@@ -375,6 +383,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{newtxmath}
 \LWR@notmemoirloadafter{nextpage}
 \LWR@loadafter{nicefrac}
+\LWR@loadafter{niceframe}
 \LWR@loadafter{nomencl}
 \LWR@loadafter{nonfloat}
 \LWR@loadafter{nonumonpart}
@@ -401,6 +410,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{pdfsync}
 \LWR@loadafter{pdftricks}
 \LWR@loadafter{pdfx}
+\LWR@loadafter{perpage}
 \LWR@loadafter{pfnote}
 \LWR@loadafter{phfqit}
 \LWR@loadafter{pifont}
@@ -453,6 +463,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{shadow}
 \LWR@notmemoirloadafter{showidx}
 \LWR@loadafter{showkeys}
+\LWR@loadafter{showtags}
 \LWR@loadafter{sidecap}
 \LWR@loadafter{sidenotes}
 \LWR@loadafter{SIunits}
@@ -472,6 +483,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{supertabular}
 \LWR@loadafter{t1inc}
 \LWR@loadafter{tabls}
+\LWR@loadafter{tablefootnote}
 \LWR@notmemoirloadafter{tabularx}
 \LWR@loadafter{tabulary}
 \LWR@loadafter{tascmac}
@@ -482,6 +494,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{thinsp}
 \LWR@loadafter{threadcol}
 \LWR@loadafter{threeparttable}
+\LWR@loadafter{threeparttablex}
 \LWR@loadafter{thumb}
 \LWR@loadafter{thumbs}
 \LWR@loadafter{tikz}
@@ -539,7 +552,7 @@ For a possible alternative, see class(es) #2.}
 \LWR@loadafter{zwpagelayout}
 \newcommand{\LWR@mdfive}[1]{%
 \PackageError{lwarp}
-{No MD5 macro was found.}
+{No MD5 macro was found}
 {Lwarp must find the macros pdfmdfivesum or mdfivesum.}
 }
 \let\LWR@mdfive\pdfmdfivesum
@@ -997,6 +1010,8 @@ For a possible alternative, see class(es) #2.}
 \newcommand*{\LWR@checkloadfilename}[1]{%
 \LWR@checkloadnever{#1}{ae}{latinmodern}
 \LWR@checkloadnever{#1}{aecc}{latinmodern}
+\LWR@checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
+\LWR@checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
 \LWR@checkloadnever{#1}{bitfield}{bytefield}
 \LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e}
 \LWR@checkloadnever{#1}{caption2}{caption}
@@ -1005,9 +1020,11 @@ For a possible alternative, see class(es) #2.}
 \LWR@checkloadnever{#1}{doublespace}{setspace}
 \LWR@checkloadnever{#1}{epsf}{graphicx}
 \LWR@checkloadnever{#1}{fancyheadings}{fancyhdr}
+\LWR@checkloadnever{#1}{fncylab}{cleveref}
 \LWR@checkloadnever{#1}{glossary}{glossaries}
 \LWR@checkloadnever{#1}{hyper}{hyperref}
 \LWR@checkloadnever{#1}{newthm}{ntheorem}
+\LWR@checkloadnever{#1}{pdfcprot}{microtype}
 \LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig}
 \LWR@checkloadnever{#1}{picins}{floatflt, wrapfig}
 \LWR@checkloadnever{#1}{rplain}{fancyhdr}
@@ -2486,6 +2503,34 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;}
 
 .framedtitle p { padding: .3em }
 
+/* For the niceframe package: */
+
+div.niceframe, div.curlyframe, div.artdecoframe, div.generalframe {
+    padding: 1ex ;
+    margin: 2ex auto ;
+    border-radius: 2ex ;
+}
+
+div.niceframe {
+    border: 6px groove black ;
+}
+
+div.curlyframe {
+    border-left: 3px dotted black ;
+    border-right: 3px dotted black ;
+    border-radius: 6ex ;
+}
+
+div.artdecoframe {
+    border-left: 10px double black ;
+    border-right: 10px double black ;
+    border-radius: 6ex ;
+}
+
+div.generalframe {
+    border: 6px groove black ;
+}
+
 dl {
   margin: 1ex 2em 1ex 0em;
   line-height: 1.3;
@@ -2735,6 +2780,11 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule
     text-align: left ;
 }
 
+.minipage .tnotes {
+    margin: 0pt ;
+    padding: 0pt ;
+}
+
 .tnotes dl dt p {margin-bottom:0px;}
 
 .tnoteitemheader {margin-right: 1em;}
@@ -3817,7 +3867,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.67"
+printversion = "v0.68"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -4211,6 +4261,15 @@ function warnlimages ()
     print ("lwarpmk: ===")
 end -- warnlimages
 
+function warnlimagesrecompile ()
+-- Warning if must recompile before creating limages:
+    print ("")
+    print ("lwarpmk: ===")
+    print ("lwarpmk: The document must be recompiled before creating the lateximages.")
+    print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+    print ("lwarpmk: ===")
+end --warnlimagesrecompile
+
 function checklimages ()
 --
 -- Check <sourcename>.txt to see if need to recompile first.
@@ -4239,12 +4298,14 @@ for line in limagesfile:lines() do
         end
     end -- if i~=nil
 end -- do
+-- The last line should be |end|end|end|.
+-- If not, the compile must have aborted, and the images are incomplete.
+if ( lwimgpage ~= "end" ) then
+    warnlimagesrecompile()
+    os.exit(1) ;
+end
 if ( pagezerowarning ) then
-    print ("")
-    print ("lwarpmk: ===")
-    print ("lwarpmk: The document must be recompiled before creating the lateximages.")
-    print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
-    print ("lwarpmk: ===")
+    warnlimagesrecompile()
     os.exit(1) ;
 end -- pagezerowarning
 end -- checklimages
@@ -4324,6 +4385,8 @@ if ( (i~=nil) ) then
     -- Skip if the page number is 0:
     if ( lwimgpage == "0" ) then
         pagezerowarning = true
+    -- Skip if the page number is "end":
+    else if ( lwimgpage == "end" ) then
     else
         -- Skip is this image is hashed and already exists:
         local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
@@ -4346,6 +4409,7 @@ if ( (i~=nil) ) then
                 createwindowsimage (lwimgfullname)
             end
         end -- not hashed or not exists
+    end -- not page "end"
     end -- not page 0
 end -- not nil
 end -- createonelateximage
@@ -5596,20 +5660,21 @@ end -- not --version
 
 \newcounter{FootnoteDepth}
 \setcounter{FootnoteDepth}{3}
-
+\newcounter{footnoteReset}
+\setcounter{footnoteReset}{0}
 \end{warpall}
 
 \begin{warpHTML}
 
-\newbox\LWR@footnotes
+\newbox\LWR@footnotebox
 \long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1}
 \def\@makefnmark{%
     \textsuperscript{\@thefnmark}%
 }
-\long\def\LWR@footnotetext#1{%
+\long\def\LWR@@footnotetext#1#2{%
 \LWR@traceinfo{LWR@footnotetext}%
-\global\setbox\LWR@footnotes=\vbox{%
-    \unvbox\LWR@footnotes%
+\global\setbox\csname #2\endcsname=\vbox{%
+    \unvbox\csname #2\endcsname%
     \protected@edef\@currentlabel{%
         \csname p@footnote\endcsname\@thefnmark%
     }% @currentlabel
@@ -5636,6 +5701,7 @@ end -- not --version
 \LWR@ensuredoingapar%
 }%
 
+\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}
 \LetLtxMacro\@footnotetext\LWR@footnotetext
 \newbox\LWR@mpfootnotes
 \long\def\@mpfootnotetext#1{%
@@ -5671,16 +5737,25 @@ end -- not --version
 \AtBeginDocument{
 \def\thempfootnote{\@alph\c@mpfootnote}
 }
-\newcommand*{\LWR@printpendingfootnotes}{%
-\ifvoid\LWR@footnotes\else
+\newcommand*{\LWR@@printpendingfootnotes}[1]{%
+\expandafter\ifvoid\csname LWR@#1box\endcsname\else
     \LWR@forcenewpage
     \begin{BlockClass}{footnotes}
     \LWR@origmedskip
-    \unvbox\LWR@footnotes
-    \setbox\LWR@footnotes=\vbox{}
+    \unvbox\csuse{LWR@#1box}
+    \setbox\csuse{LWR@#1box}=\vbox{}
     \end{BlockClass}
+    \ifltxcounter{#1Reset}{%
+        \ifnumgreater{\value{#1Reset}}{0}{%
+            \setcounter{#1}{\value{#1Reset}}%
+            \addtocounter{#1}{-1}%
+        }{}%
+    }{}%
 \fi
 }
+\newcommand*{\LWR@printpendingfootnotes}{%
+    \LWR@@printpendingfootnotes{footnote}%
+}
 \newcommand*{\LWR@maybeprintpendingfootnotes}[1]{%
 \ifboolexpr{
     not test{\ifnumcomp{#1}{>}{\value{FootnoteDepth}}} or
@@ -6602,6 +6677,9 @@ end -- not --version
 \LWR@htmltag{/body}\LWR@orignewline
 \LWR@htmltag{/html}\LWR@orignewline
 \LWR@orignewpage
+\immediate\write\LWR@lateximagesfile{%
+    |end|end|end|%
+}%
 \immediate\closeout\LWR@lateximagesfile
 }
 
@@ -8664,6 +8742,11 @@ rowspan="#2" %
 \NewDocumentCommand{\LWR@HTMLcline}{m}%
 {\LWR@docmidrule{#1}\LWR@getmynexttoken}%
 
+\newcommand{\LWR@tabular@warpprintonly}[1]{%
+    \ifbool{warpingprint}{#1}{}%
+    \LWR@getmynexttoken%
+}
+
 \AtBeginDocument{
 \@ifundefined{frenchbsetup}%
 {% no babel-french
@@ -8702,6 +8785,7 @@ rowspan="#2" %
 \global\boolfalse{LWR@tabularcelladded}%
 \LWR@clearmidrules%
 \LetLtxMacro{\\}{\LWR@tabularendofline}%
+\LetLtxMacro\warpprintonly\LWR@tabular@warpprintonly%
 \LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
 \LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
 \gdef\LWR@columnHTMLcolor{}%
@@ -11093,6 +11177,7 @@ color:\LWR@origpound\LWR@tempcolor%
 \begin{warpall}
 \let\fboxBlock\fbox
 \end{warpall}
+
 \begin{warpHTML}
 \newcommand{\LWR@HTML@fboxBlock}[1]{%
 \LWR@forceminwidth{\fboxrule}%