lwarp (23nov17)

git-svn-id: svn://tug.org/texlive/trunk@45895 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2017-11-23 21:06:47 +0000
committer: Karl Berry <karl@freefriends.org> 2017-11-23 21:06:47 +0000
commit: a966a76688af35e8f788ba4cd9a98743c496ae73 (patch)
tree: b3095755a2db4ce5e44615e51546a37e76d9f1a4 /Master/texmf-dist/tex/latex/lwarp
parent: 03faaffd813fcdcc0465e974b5120de2690f0f46 (diff)
49 files changed, 1828 insertions, 341 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
index 7a3ab4aaa6e..49211be29ed 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
@@ -35,10 +35,18 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 }{}%
 \LWR@htmltagc{/span}%
 }%
-\let\origComment\Comment%
-\renewcommand{\Comment}[1]{\InlineClass{floatright}{\origComment{#1}}}%
+
+\let\LWR@origComment\Comment%
+
+\renewcommand{\Comment}[1]{%
+    \InlineClass{floatright}{\LWR@origComment{#1}}%
+}%
 }
 
+\renewcommand\algorithmiccomment[1]{%
+\hfill\HTMLunicode{25B7} #1% white right triangle
+}%
+
 \end{warpHTML}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
new file mode 100644
index 00000000000..79da130731e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-atbegshi.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `atbegshi')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{atbegshi}[2011/10/05]
+\newcommand*{\AtBeginShipout}[1]{}
+\newbox\AtBeginShipoutBox
+\newcommand*{\AtBeginShipoutNext}[1]{}
+\newcommand*{\AtBeginShipoutFirst}[1]{}
+\newcommand*{\AtBeginShipoutDiscard}{}
+\newcommand*{\AtBeginShipoutInit}{}
+\newcommand*{\AtBeginShipoutAddToBox}[1]{}
+\newcommand*{\AtBeginShipoutAddToBoxForeground}[1]{}
+\newcommand*{\AtBeginShipoutUpperLeft}[1]{}
+\newcommand*{\AtBeginShipoutUpperLeftForeground}[1]{}
+\newcommand*{\AtBeginShipoutOriginalShipout}[1]{}
+\def\AtBeginShipoutBoxWidth{0pt}
+\def\AtBeginShipoutBoxHeight{0pt}
+\def\AtBeginShipoutBoxDepth{0pt}
+
+\endinput
+%%
+%% End of file `lwarp-atbegshi.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
new file mode 100644
index 00000000000..7c5373aa229
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
@@ -0,0 +1,49 @@
+%%
+%% This is file `lwarp-cancel.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `cancel')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackagePass{cancel}
+\LetLtxMacro\LWR@origcancel\cancel
+\LetLtxMacro\LWR@origbcancel\bcancel
+\LetLtxMacro\LWR@origxcancel\xcancel
+
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro\cancel\LWR@origcancel%
+\LetLtxMacro\bcancel\LWR@origbcancel%
+\LetLtxMacro\xcancel\LWR@origxcancel%
+}
+
+\newcommand{\LWR@cancelcolor}[5]{%
+\ifcsempty{#2}%
+{\LWR@HTMLtextstyle{#5}{#3}{#1}}%
+{\LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}}%
+}
+
+\DeclareRobustCommand{\cancel}[1]{%
+\begingroup%
+\CancelColor%
+\LWR@findcurrenttextcolor%
+\color{black}%
+\LWR@cancelcolor{#1}{LWR@tempcolor}{sout}{text-decoration-color}%
+    {text-decoration:line-through}%
+\endgroup%
+}
+
+\LetLtxMacro\bcancel\cancel
+\LetLtxMacro\xcancel\cancel
+\endinput
+%%
+%% End of file `lwarp-cancel.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
index 3e980c5c31b..cd1be1bf28c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
@@ -26,6 +26,9 @@
 \newenvironment{adjustwidth}[2]{}{}
 \newenvironment{adjustwidth*}[2]{}{}
 
+\newcommand*{\strictpagecheck}{}
+\newcommand*{\easypagecheck}{}
+
 \endinput
 %%
 %% End of file `lwarp-changepage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
new file mode 100644
index 00000000000..07e598be14e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
@@ -0,0 +1,48 @@
+%%
+%% This is file `lwarp-easy-todo.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `easy-todo')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{easy-todo}
+
+\let\LWR@origlistoftodos\listoftodos
+
+\renewcommand{\listoftodos}{%
+\begingroup
+\renewcommand{\flushright}{}
+\LWR@origlistoftodos
+\endgroup
+}
+
+\renewcommand{\todoii}[2]{%
+\ifthenelse{\equal{\@todoobeyfinal}{true}}{%
+    \ifoptionfinal{\todoenable{false}}{\todoenable{true}}%
+}{}%
+\ifthenelse{\equal{\@todoenable}{true}}{%
+\refstepcounter{todos}%
+\noindent{%
+    \todocolor%
+    \LWR@textcurrentcolor{%
+        \normalfont\scriptsize{\bfseries{\thetodos.#1}}%
+    }%
+}%
+\addcontentsline{lod}{todos}{\protect{\thetodos. }#2}%
+}{}%
+}
+
+\endinput
+%%
+%% End of file `lwarp-easy-todo.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
new file mode 100644
index 00000000000..ce330c9ef49
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
@@ -0,0 +1,70 @@
+%%
+%% This is file `lwarp-fancyref.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `fancyref')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{fancyref}
+\newcommand*{\fancyrefhook}[1]{#1}
+\newcommand*{\fref}[2][]{\cref{#2}}
+\newcommand*{\Fref}[2][]{\Cref{#2}}
+\newcommand*{\fancyrefchaplabelprefix}{chap}
+\newcommand*{\fancyrefenumlabelprefix}{enum}
+\newcommand*{\fancyrefeqlabelprefix}{eq}
+\newcommand*{\fancyreffiglabelprefix}{fig}
+\newcommand*{\fancyreffnlabelprefix}{fn}
+\newcommand*{\fancyrefseclabelprefix}{sec}
+\newcommand*{\fancyreftablabelprefix}{tab}
+\newcommand*{\fancyrefchangeprefix}[2]{}
+\newcommand*{\fancyrefargdelim}{:}
+\newcommand*{\fancyrefloosespacing}{~}
+\newcommand*{\fancyreftightspacing}{\,}
+\newcommand*{\fancyrefdefaultspacing}{\fancyrefloosespacing}
+\providecommand*{\chaptername}{Chapter}
+\providecommand*{\figurename}{Figure}
+\providecommand*{\pagename}{Page}
+\providecommand*{\tablename}{Table}
+\renewcommand*{\Frefchapname}{\chaptername}
+\renewcommand*{\Frefenumname}{Item}
+\renewcommand*{\Frefeqname}{Equation}
+\renewcommand*{\Freffigname}{\figurename}
+\renewcommand*{\Freffnname}{Footnote}
+\renewcommand*{\Frefonname}{On}
+\renewcommand*{\Frefpgname}{\pagename}
+\renewcommand*{\Frefsecname}{Section}
+\renewcommand*{\Frefseename}{See}
+\renewcommand*{\Freftabname}{\tablename}
+\renewcommand*{\Freffigshortname}{Fig.}
+\renewcommand*{\Frefpgshortname}{P.}
+\renewcommand*{\Freftabshortname}{Tab.}
+\renewcommand*{\frefchapname}{\MakeLowercase{\Frefchapname}}
+\renewcommand*{\frefenumname}{\MakeLowercase{\Frefenumname}}
+\renewcommand*{\frefeqname}{\MakeLowercase{\Frefeqname}}
+\renewcommand*{\freffigname}{\MakeLowercase{\Freffigname}}
+\renewcommand*{\freffnname}{\MakeLowercase{\Freffnname}}
+\renewcommand*{\frefonname}{\MakeLowercase{\Frefonname}}
+\renewcommand*{\frefpgname}{\MakeLowercase{\Frefpgname}}
+\renewcommand*{\frefsecname}{\MakeLowercase{\Frefsecname}}
+\renewcommand*{\frefseename}{\MakeLowercase{\Frefseename}}
+\renewcommand*{\freftabname}{\MakeLowercase{\Freftabname}}
+\renewcommand*{\freffigshortname}{\MakeLowercase{\Freffigshortname}}
+\renewcommand*{\frefpgshortname}{\MakeLowercase{\Frefpgshortname}}
+\renewcommand*{\freftabshortname}{\MakeLowercase{\Freftabshortname}}
+\newcommand*{\fancyrefaddcaptions}[2]{}
+\newcommand*{\fancyrefdefaultformat}{\@empty}
+\newcommand{\frefformat}[3]{}
+\newcommand{\Frefformat}[3]{}
+\endinput
+%%
+%% End of file `lwarp-fancyref.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 471db8983b0..ecb8727ca62 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -69,33 +69,20 @@
 \FV@EndListFrame@Lines%
 \LWR@fvendnone%
 }
-
-\newcommand*{\LWR@FVfindcurrentcolor}{%
-\protect\colorlet{LWR@current@color}{.}%
-\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor%
-}
-
-\newcommand*{\LWR@FVtextstyle}{%
-\LWR@FVfindcurrentcolor
-\ifdefstring{\LWR@tempcolor}{000000}%
-{}%
-{color: \#\LWR@tempcolor ; }%
-}
-
 \newcommand*{\LWR@FVfindbordercolor}{%
 \FancyVerbRuleColor%
-\LWR@FVfindcurrentcolor
-\color{black}
+\LWR@findcurrenttextcolor%
+\color{black}%
 }
 
 \newcommand*{\LWR@FVborderstyle}[1]{%
-padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ;
-\LWR@FVfindbordercolor
-border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ;
+padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; %
+\LWR@FVfindbordercolor %
+border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; %
 }
 
 \def\FV@Frame@none{%
-\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle}%
+\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle}%
 \let\FV@BeginListFrame\LWR@fvstartnone%
 \let\FV@LeftListFrame\relax%
 \let\FV@RightListFrame\relax%
@@ -104,7 +91,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 \FV@Frame@none% default values
 
 \def\FV@Frame@single{%
-\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{}}%
+\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}%
 \let\FV@BeginListFrame\LWR@fvstartsingle%
 \let\FV@LeftListFrame\FV@LeftListFrame@Single%
 \let\FV@RightListFrame\FV@RightListFrame@Single%
@@ -112,7 +99,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 \def\FV@Frame@lines{%
 \renewcommand*{\LWR@FVstyle}{%
-    \LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}%
+    \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}%
 }%
 \let\FV@BeginListFrame\LWR@fvstartline%
 \let\FV@LeftListFrame\relax%
@@ -120,21 +107,21 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 \let\FV@EndListFrame\LWR@fvendline}
 
 \def\FV@Frame@topline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}}%
+\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}%
 \let\FV@BeginListFrame\LWR@fvstartline%
 \let\FV@LeftListFrame\relax%
 \let\FV@RightListFrame\relax%
 \let\FV@EndListFrame\LWR@fvendnone}
 
 \def\FV@Frame@bottomline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-bottom}}%
+\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}%
 \let\FV@BeginListFrame\LWR@fvstartnone%
 \let\FV@LeftListFrame\relax%
 \let\FV@RightListFrame\relax%
 \let\FV@EndListFrame\LWR@fvendline}
 
 \def\FV@Frame@leftline{%
-\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-left}}%
+\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}%
 \ifx\FancyVerbFillColor\relax%
 \let\FV@FrameFillLine\relax%
 \else%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
new file mode 100644
index 00000000000..1b64fc04c68
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
@@ -0,0 +1,61 @@
+%%
+%% This is file `lwarp-fixme.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `fixme')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{fixme}
+\let\@wrindex\LWR@wrindex
+\newcommand{\ext@fixme}{lox}
+
+\renewcommand{\l@fixme}[2]{\hypertocfloat{1}{fixme}{lox}{#1}{#2}}
+\def\FXFaceInlineHTMLStyle{font-weight:bold}
+
+\renewcommand*\FXLayoutInline[3]{ %
+\InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}%
+    {\@fxtextstd{#1}{#2}{#3}}%
+}
+
+\def\FXFaceEnvHTMLStyle{font-weight:bold}
+
+\renewcommand*\FXEnvLayoutPlainBegin[2]{%
+\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
+\ignorespaces#2 \fxnotename{#1}: \ignorespaces}
+
+\renewcommand*\FXEnvLayoutPlainEnd[2]{\endBlockClass}
+
+\renewcommand*\FXEnvLayoutSignatureBegin[2]{%
+\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
+\fxnotename{#1}: \ignorespaces}
+
+\renewcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}\endBlockClass}
+
+\def\FXFaceSignatureHTMLStyle{font-style:italic}
+
+\DeclareRobustCommand*\@fxsignature[1]{%
+\ifthenelse{\equal{#1}{}}%
+{}%
+{ -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}%
+}
+
+\def\FXFaceTargetHTMLStyle{font-style:italic}
+
+\renewcommand\FXTargetLayoutPlain[2]{%
+    \InlineClass[\FXFaceTargetHTMLStyle]{fixmetarget}{#2}%
+}
+
+\endinput
+%%
+%% End of file `lwarp-fixme.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
new file mode 100644
index 00000000000..82c54c24a51
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
@@ -0,0 +1,40 @@
+%%
+%% This is file `lwarp-fixmetodonotes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `fixmetodonotes')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{fixmetodonotes}
+
+\renewcommand{\NOTES@addtolist}[2]{%
+    \refstepcounter{NOTES@note}%
+    \addcontentsline{notes}{NOTES@note}{%
+        \protect\numberline{\theNOTES@note}{{#1}: {#2}}%
+    }%
+}
+
+\renewcommand{\NOTES@marker}[2]{\fbox{%
+    \textcolor{#2}{% WAS \color
+        \textbf{#1}}%
+    }}
+
+\renewcommand{\NOTES@colorline}[2]{%
+  \bgroup%
+    \ULon{\LWR@backgroundcolor{#1}{#2}}%
+}
+
+\endinput
+%%
+%% End of file `lwarp-fixmetodonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
index 5138dfa0f68..a0cb426d29b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
@@ -15,12 +15,7 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-
-
-\LWR@ProvidesPackageDrop{fontenc}
-
-\LWR@loadbefore{fontenc}
-
+\LWR@ProvidesPackagePass{fontenc}
 \endinput
 %%
 %% End of file `lwarp-fontenc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index 8895747c1c2..04c1b770d86 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -274,7 +274,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline%
 \LWR@traceinfo{includegraphics}
 \LWR@ensuredoingapar%
 \begingroup%
-\catcode`\_=12%
+\catcode`\_=12
 \LWR@includegraphicsb%
 }% includegraphics
 }% AtBeginDocument
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
new file mode 100644
index 00000000000..30fba575b43
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
@@ -0,0 +1,83 @@
+%%
+%% This is file `lwarp-hang.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `hang')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{hang}
+\newlength{\hangingindent}
+\setlength{\hangingindent}{1em}
+\newlength{\hangingleftmargin}
+\setlength{\hangingleftmargin}{0em}
+
+\newcommand*{\LWR@findhangingleftmargin}{%
+\setlength{\LWR@templengthone}{\hangingleftmargin}%
+\addtolength{\LWR@templengthone}{\hangingindent}%
+}
+
+\newenvironment{hangingpar}
+{
+    \LWR@findhangingleftmargin%
+    \uselengthunit{PT}%
+    \BlockClass[%
+        margin-left:\rndprintlength{\LWR@templengthone}; %
+        text-indent:-\rndprintlength{\hangingindent}%
+    ]%
+    {hangingpar}%
+}
+{\endBlockClass}
+
+\newenvironment{hanginglist}
+{%
+    \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}%
+    \renewcommand*{\LWR@printopenlist}{%
+        \LWR@findhangingleftmargin%
+        \uselengthunit{PT}%
+        ul style="list-style-type:none; %
+        margin-left:\rndprintlength{\LWR@templengthone}; %
+        text-indent:-\rndprintlength{\hangingindent}"%
+    }%
+    \let\item\LWR@itemizeitem%
+    \list{}{}%
+}
+{\endlist}
+
+\newenvironment{compacthang}
+{\hanginglist}
+{\endhanginglist}
+
+\newlength{\labeledleftmargin}
+\setlength{\labeledleftmargin}{0em}
+
+\newenvironment{labeledpar}[2]
+{%
+    \BlockClass[%
+        \LWR@findhangingleftmargin%
+        \uselengthunit{PT}%
+        margin-left:\rndprintlength{\LWR@templengthone}; %
+        text-indent:-\rndprintlength{\hangingindent}%
+    ]{labeledpar}#2%
+}
+{\endBlockClass}
+
+\newenvironment{labeledlist}[1]
+{\hanginglist}
+{\endhanginglist}
+
+\newenvironment{compactlabel}[1]
+{\hanginglist}
+{\endhanginglist}
+\endinput
+%%
+%% End of file `lwarp-hang.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
new file mode 100644
index 00000000000..4aae9c65223
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
@@ -0,0 +1,40 @@
+%%
+%% This is file `lwarp-ifoddpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ifoddpage')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+\LWR@ProvidesPackageDrop{ifoddpage}
+
+\newif\ifoddpage
+
+\newif\ifoddpageoroneside
+
+\DeclareRobustCommand{\checkoddpage}{\oddpagetrue\oddpageoronesidetrue}
+
+\def\oddpage@page{1}
+
+\def\@ifoddpage{%
+        \expandafter\@firstoftwo
+}
+
+\def\@ifoddpageoroneside{%
+        \expandafter\@firstoftwo
+}
+
+\endinput
+%%
+%% End of file `lwarp-ifoddpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
new file mode 100644
index 00000000000..f0e445be889
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-ltxtable.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ltxtable')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{ltxtable}
+\newcommand*{\LTXtable}[2]{%
+\input{#2}%
+}
+\endinput
+%%
+%% End of file `lwarp-ltxtable.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
index fe717da7589..13b7ce6da65 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
@@ -15,12 +15,82 @@
 %%   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{luatodonotes}
-\newcommand{\listoftodos}[1][]{}
-\newcommand{\todo}[2][]{}
-\newcommand{\missingfigure}[2][]{}
-\newcommand{\todototoc}{}
-\newcommand{\todoarea}[3][]{}%
+\LWR@ProvidesPackagePass{luatodonotes}
+\@todonotes@additionalMarginEnabledfalse
+\if@todonotes@disabled
+\else
+
+\newcommand{\ext@todo}{tdo}
+
+\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}}
+
+\renewcommand{\@todonotes@drawMarginNoteWithLine}{%
+\fcolorbox
+    {\@todonotes@currentbordercolor}
+    {\@todonotes@currentbackgroundcolor}
+    {\arabic{@todonotes@numberoftodonotes}}
+\marginpar{\@todonotes@drawMarginNote}
+}
+
+\renewcommand{\@todonotes@drawInlineNote}{%
+\fcolorboxBlock%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentbackgroundcolor}%
+    {%
+        \if@todonotes@authorgiven%
+        {\@todonotes@author:\,}%
+        \fi%
+        \@todonotes@text%
+    }%
+}
+
+\newcommand{\@todonotes@drawMarginNote}{%
+    \if@todonotes@authorgiven%
+        \@todonotes@author\par%
+    \fi%
+    \arabic{@todonotes@numberoftodonotes}: %
+    \fcolorbox%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentbackgroundcolor}%
+    {%
+        \@todonotes@sizecommand%
+        \@todonotes@text %
+    }%
+}%
+
+\renewcommand{\missingfigure}[2][]{%
+\setkeys{todonotes}{#1}%
+\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}%
+\fcolorboxBlock%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentfigcolor}%
+    {%
+        \setlength{\fboxrule}{4pt}%
+        \fcolorbox{red}{white}{Missing figure} \quad #2%
+    }
+}
+
+\LetLtxMacro\LWRTODONOTES@orig@todocommon\@todocommon
+
+\RenewDocumentCommand{\@todocommon}{m m}{%
+\begingroup%
+\renewcommand*{\phantomsection}{}%
+\LWRTODONOTES@orig@todocommon{#1}{#2}%
+\endgroup%
+}
+
+\renewcommand{\@todoarea}[3][]{%
+    \@todonotes@areaselectedtrue%
+    \@todocommon{#1}{#2}%
+    \todonotes@textmark@highlight{#3}%
+    \zref@label{@todonotes@\arabic{@todonotes@numberoftodonotes}@end}%
+}%
+
+\DeclareDocumentCommand{\todonotes@textmark@highlight}{m}{%
+\InlineClass[background:\#B3FFB3]{highlight}{#1}%
+}
+
+\fi% \if@todonotes@disabled
 \endinput
 %%
 %% End of file `lwarp-luatodonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
index 086076c5932..4e6cd302954 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
@@ -15,6 +15,7 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
+
 \LWR@ProvidesPackageDrop{midfloat}
 \newenvironment{strip}[1][]{}{}
 \newskip\stripsep
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index b52c068a6df..60435db9a66 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -42,7 +42,6 @@ class="td%
 "%
 \LWR@tdstartstyles%
 \LWR@addcmidrulewidth%
-\LWR@addformatwpalignment%
 \LWR@tdendstyles%
 }%
 \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
index 760535b8269..768fa0d3fdc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
@@ -103,9 +103,9 @@
   \fi}
 }
 \newcommand{\LWR@inctheorem}{%
-\addtocounter{LWR@thisfloat}{1}%
+\addtocounter{LWR@thisautoid}{1}%
 \LWR@stoppars%
-\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}%
 \LWR@startpars%
 }
 \gdef\newtheoremstyle#1#2#3{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
index 5f09308af45..e02f72634e7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
@@ -22,20 +22,20 @@
 \newcommand*{\overpicfontskip}{14}
 
 \BeforeBeginEnvironment{overpic}{%
-    \lateximage%
+    \begin{lateximage}%
     \fontsize{\overpicfontsize}{\overpicfontskip}%
     \selectfont%
 }
 
-\AfterEndEnvironment{overpic}{\endlateximage}
+\AfterEndEnvironment{overpic}{\end{lateximage}}
 
 \BeforeBeginEnvironment{Overpic}{%
-    \lateximage%
+    \begin{lateximage}%
     \fontsize{\overpicfontsize}{\overpicfontskip}%
     \selectfont%
 }
 
-\AfterEndEnvironment{Overpic}{\endlateximage}
+\AfterEndEnvironment{Overpic}{\end{lateximage}}
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
index 7b38dd79ff0..49213ad68bf 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
@@ -18,11 +18,14 @@
 
 \LWR@ProvidesPackagePass{paralist}
 \AtBeginEnvironment{compactitem}{\LWR@itemizestart}
-\AtEndEnvironment{compactitem}{\LWR@itemizeend}
 \AtBeginEnvironment{compactenum}{\LWR@enumeratestart}
-\AtEndEnvironment{compactenum}{\LWR@enumerateend}
 \AtBeginEnvironment{compactdesc}{\LWR@descriptionstart}
-\AtEndEnvironment{compactdesc}{\LWR@descriptionend}
+\AtEndEnvironment{compactitem}{\LWR@listend}
+\AtEndEnvironment{compactenum}{\LWR@listend}
+\AtEndEnvironment{compactdesc}{\LWR@listend}
+\AtBeginEnvironment{inparaitem}{\LetLtxMacro\item\LWR@origitem}
+\AtBeginEnvironment{inparaenum}{\LetLtxMacro\item\LWR@origitem}
+\AtBeginEnvironment{inparadesc}{\LetLtxMacro\item\LWR@origitem}
 \def\paradescriptionlabel#1{{\normalfont\textbf{#1}}}
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
new file mode 100644
index 00000000000..c92d689bd46
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
@@ -0,0 +1,67 @@
+%%
+%% This is file `lwarp-patch-komascript.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `patch-komascript')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\ProvidesPackage{lwarp-patch-komascript}
+\RequirePackage{lwarp-typearea}
+\RequirePackage{lwarp-tocbasic}
+\RequirePackage{lwarp-scrextend}
+\renewcommand*{\minisec}[1]{
+\begin{BlockClass}{minisec}
+#1
+\end{BlockClass}
+}
+\@ifundefined{setpartpreamble}{}{
+\RenewDocumentCommand{\setpartpreamble}{o o +m}{%
+\renewcommand{\part@preamble}{#3}%
+}
+}
+
+\@ifundefined{setchapterpreamble}{}{
+\RenewDocumentCommand{\setchapterpreamble}{o o +m}{%
+\renewcommand{\chapter@preamble}{#3}%
+}
+}
+\LetLtxMacro\captionbelow\caption
+\LetLtxMacro\captionabove\caption
+
+\LetLtxMacro\captionofbelow\captionof
+\LetLtxMacro\captionofabove\captionof
+
+\RenewDocumentEnvironment{captionbeside}{o m o o o s}
+{}
+{%
+\IfValueTF{#1}%
+{\caption[#1]{#2}}%
+{\caption{#2}}%
+}
+
+\RenewDocumentEnvironment{captionofbeside}{m o m o o o s}
+{}
+{%
+\IfValueTF{#2}%
+{\captionof{#1}[#2]{#3}}%
+{\captionof{#1}{#3}}%
+}
+
+\RenewDocumentCommand{\setcapindent}{s m}{}
+\renewcommand*{\setcaphanging}{}
+\renewcommand*{\setcapwidth}[2][]{}
+\renewcommand*{\setcapdynwidth}[2][]{}
+\RenewDocumentCommand{\setcapmargin}{s o m}{}
+\endinput
+%%
+%% End of file `lwarp-patch-komascript.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
index 26784207fcd..191ca40272f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
@@ -16,9 +16,9 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \LWR@ProvidesPackageDrop{pdfsync}
-\let\pdfsync\relax
-\let\pdfsyncstart\relax
-\let\pdfsyncstop\relax
+\newcommand*{\pdfsync}{}
+\newcommand*{\pdfsyncstart}{}
+\newcommand*{\pdfsyncstop}{}
 \endinput
 %%
 %% End of file `lwarp-pdfsync.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
new file mode 100644
index 00000000000..263205b4c29
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-preview.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `preview')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{preview}
+\newenvironment{preview}{}{}
+\newenvironment{nopreview}{}{}
+\NewDocumentCommand{\PreviewMacro}{s o o +m}{}
+\NewDocumentCommand{\PreviewEnvironment}{s o o +m}{}
+\newcommand{\PreviewSnarfEnvironment}[2][]{}
+\NewDocumentCommand{\PreviewOpen}{s o}{}
+\NewDocumentCommand{\PreviewClose}{s o}{}
+\let\ifPreview\iffalse% \fi for syntax highlighting
+\endinput
+%%
+%% End of file `lwarp-preview.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
index 073e92d16e5..3f4a5c75267 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.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@ProvidesPackagePass{romanbar}
 
 \DeclareRobustCommand{\Roman@bar}[1]{% #1 is in Roman, i.e. MMXII
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
new file mode 100644
index 00000000000..3542c5e2feb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
@@ -0,0 +1,149 @@
+%%
+%% This is file `lwarp-scrextend.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrextend')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{scrextend}
+\DeclareDocumentCommand{\setkomafont}{m m}{}
+\DeclareDocumentCommand{\addkomafont}{m m}{}
+\DeclareDocumentCommand{\usekomafont}{m}{}
+
+\DeclareDocumentCommand{\usefontofkomafont}{m}{}
+\DeclareDocumentCommand{\useencodingofkomafont}{m}{}
+\DeclareDocumentCommand{\usesizeofkomafont}{m}{}
+\DeclareDocumentCommand{\usefamilyofkomafont}{m}{}
+\DeclareDocumentCommand{\useseriesofkomafont}{m}{}
+\DeclareDocumentCommand{\useshapeofkomafont}{m}{}
+
+\AtBeginDocument{
+\let\LWR@maketitle\maketitle
+\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle}
+}
+
+\DeclareDocumentCommand{\extratitle}{m}{}
+\DeclareDocumentCommand{\titlehead}{m}{}
+\DeclareDocumentCommand{\subject}{m}{}
+\DeclareDocumentCommand{\publishers}{m}{\published{#1}}
+\DeclareDocumentCommand{\uppertitleback}{m}{}
+\DeclareDocumentCommand{\lowertitleback}{m}{}
+\DeclareDocumentCommand{\dedication}{m}{}
+
+\DeclareDocumentCommand{\ifthispageodd}{m m}{#1}
+
+\DeclareDocumentCommand{\titlepagestyle}{}{}
+
+\DeclareDocumentCommand{\cleardoublepageusingstyle}{m}{}
+\DeclareDocumentCommand{\cleardoubleemptypage}{}{}
+\DeclareDocumentCommand{\cleardoubleplainpage}{}{}
+\DeclareDocumentCommand{\cleardoublestandardpage}{}{}
+\DeclareDocumentCommand{\cleardoubleoddpage}{}{}
+\DeclareDocumentCommand{\cleardoubleoddpageusingstyle}{m}{}
+\DeclareDocumentCommand{\cleardoubleoddemptypage}{}{}
+\DeclareDocumentCommand{\cleardoubleoddplainpage}{}{}
+\DeclareDocumentCommand{\cleardoubleoddstandardpage}{}{}
+\DeclareDocumentCommand{\cleardoubleevenpage}{}{}
+\DeclareDocumentCommand{\cleardoubleevenpageusingstyle}{m}{}
+\DeclareDocumentCommand{\cleardoubleevenemptypage}{}{}
+\DeclareDocumentCommand{\cleardoubleevenplainpage}{}{}
+\DeclareDocumentCommand{\cleardoubleevenstandardpage}{}{}
+
+\DeclareDocumentCommand{\multiplefootnoteseparator}{}{%
+  \begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup
+}
+
+\DeclareDocumentCommand{\multfootsep}{}{,}
+
+\DeclareDocumentCommand{\footref}{m}{%
+  \begingroup
+    \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
+  \endgroup
+  \@footnotemark
+}
+
+\DeclareDocumentCommand{\deffootnote}{o m m m}{}
+\DeclareDocumentCommand{\deffootnotemark}{m}{}
+\DeclareDocumentCommand{\setfootnoterule}{o m}{}
+\DeclareDocumentCommand{\raggedfootnote}{}{}
+
+\DeclareDocumentCommand{\dictum}{o m}{
+\begin{LWR@BlockClassWP}{text-align:right}{}{dictum}
+    #2
+    \IfValueT{#1}
+    {
+        \ifbool{FormatWP}
+        {\begin{BlockClass}[border-top:1px solid gray]{dictumauthor}}
+        {\begin{BlockClass}{dictumauthor}}
+        \dictumauthorformat{#1}
+        \end{BlockClass}
+    }
+\end{LWR@BlockClassWP}
+}
+
+\DeclareDocumentCommand{\dictumwidth}{}{}
+\DeclareDocumentCommand{\dictumauthorformat}{m}{(#1)}
+\DeclareDocumentCommand{\dictumrule}{}{}
+\DeclareDocumentCommand{\raggeddictum}{}{}
+\DeclareDocumentCommand{\raggeddictumtext}{}{}
+\DeclareDocumentCommand{\raggeddictumauthor}{}{}
+
+\DeclareDocumentEnvironment{labeling}{o m}
+{%
+\def\sc@septext{#1}%
+\list{}{}%
+\let\makelabel\labelinglabel%
+}
+{
+\endlist
+}
+
+\DeclareDocumentCommand{\labelinglabel}{m}{%
+#1 \qquad \sc@septext%
+}
+
+\let\addmargin\relax
+\let\endaddmargin\relax
+\cslet{addmargin*}{\relax}
+\cslet{endaddmargin*}{\relax}
+
+\NewDocumentEnvironment{addmargin}{s O{} m}
+{
+\uselengthunit{PT}%
+\setlength{\LWR@templengthtwo}{#3}
+\ifblank{#2}
+{
+    \begin{BlockClass}[
+        margin-left:\rndprintlength{\LWR@templengthtwo} ;
+        margin-right:\rndprintlength{\LWR@templengthtwo}
+    ]{addmargin}
+}
+{
+    \setlength{\LWR@templengthone}{#2}
+    \begin{BlockClass}[
+        margin-left:\rndprintlength{\LWR@templengthone} ;
+        margin-right:\rndprintlength{\LWR@templengthtwo}
+    ]{addmargin}
+}
+}
+{\end{BlockClass}}
+
+\ExplSyntaxOn
+\cs_new:cpn {addmargin*} {\addmargin*}
+\cs_new_eq:cN {endaddmargin*} \endaddmargin
+\ExplSyntaxOff
+
+\DeclareDocumentCommand{\marginline}{m}{\marginpar{#1}}
+\endinput
+%%
+%% End of file `lwarp-scrextend.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
new file mode 100644
index 00000000000..7765e7d05b2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-scrhack.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrhack')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{scrhack}
+\endinput
+%%
+%% End of file `lwarp-scrhack.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
new file mode 100644
index 00000000000..1e1f8c7c7c0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
@@ -0,0 +1,30 @@
+%%
+%% This is file `lwarp-scrlayer-notecolumn.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrlayer-notecolumn')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{scrlayer-notecolumn}
+\newcommand*{\DeclareNoteColumn}[2][]{}
+\newcommand*{\DeclareNewNoteColumn}[2][]{}
+\newcommand*{\ProvideNoteColumn}[2][]{}
+\newcommand*{\RedeclareNoteColumn}[2][]{}
+\NewDocumentCommand{\makenote}{s o m}{\marginpar{#3}}
+\newcommand*{\syncwithnotecolumn}[1][]{}
+\newcommand*{\syncwithnotecolumns}[1][]{}
+\newcommand*{\clearnotecolumn}[1][]{}
+\newcommand*{\clearnotecolumns}[1][]{}
+\endinput
+%%
+%% End of file `lwarp-scrlayer-notecolumn.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
new file mode 100644
index 00000000000..6561d29e023
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
@@ -0,0 +1,59 @@
+%%
+%% This is file `lwarp-scrlayer-scrpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrlayer-scrpage')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{scrlayer-scrpage}
+\@ifundefined{footheight}{\newlength\footheight}{}
+\NewDocumentCommand{\lehead}{s o m}{}
+\NewDocumentCommand{\cehead}{s o m}{}
+\NewDocumentCommand{\rehead}{s o m}{}
+\NewDocumentCommand{\lohead}{s o m}{}
+\NewDocumentCommand{\cohead}{s o m}{}
+\NewDocumentCommand{\rohead}{s o m}{}
+\NewDocumentCommand{\lefoot}{s o m}{}
+\NewDocumentCommand{\cefoot}{s o m}{}
+\NewDocumentCommand{\refoot}{s o m}{}
+\NewDocumentCommand{\lofoot}{s o m}{}
+\NewDocumentCommand{\cofoot}{s o m}{}
+\NewDocumentCommand{\rofoot}{s o m}{}
+\NewDocumentCommand{\ohead}{s o m}{}
+\NewDocumentCommand{\chead}{s o m}{}
+\NewDocumentCommand{\ihead}{s o m}{}
+\NewDocumentCommand{\ofoot}{s o m}{}
+\NewDocumentCommand{\cfoot}{s o m}{}
+\NewDocumentCommand{\ifoot}{s o m}{}
+\DeclareDocumentCommand{\automark}{s o m}{}
+\DeclareDocumentCommand{\manualmark}{}{}
+\DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
+\DeclareDocumentCommand{\GenericMarkFormat}{}{}
+\newcommand*{\defpairofpagestyles}[3][]{}
+\newcommand*{\newpairofpagestyles}[3][]{}
+\newcommand*{\renewpairofpagestyles}[3][]{}
+\newcommand*{\providepairofpagestyles}[3][]{}
+\newcommand*{\clearmainofpairofpagestyles}
+\newcommand*{\clearplainofpairofpagestyles}
+\newcommand*{\clearpairofpagestyles}
+\NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{}
+\NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{}
+\NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{}
+\NewDocumentCommand{\providetriplepagestyle}{m o o m m m m m m}{}
+\newcommand*{\defpagestyle}[3]{}
+\newcommand*{\newpagestyle}[3]{}
+\newcommand*{\providepagestyle}[3]{}
+\newcommand*{\renewpagestyle}[3]{}
+\endinput
+%%
+%% End of file `lwarp-scrlayer-scrpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
new file mode 100644
index 00000000000..0a6da93405b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
@@ -0,0 +1,85 @@
+%%
+%% This is file `lwarp-scrlayer.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `scrlayer')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{scrlayer}
+\newcommand*{\DeclareSectionNumberDepth}[2]{}
+\newcommand*{\DeclareLayer}[2][]{}
+\newcommand*{\DeclareNewLayer}[2][]{}
+\newcommand*{\ProvideLayer}[2][]{}
+\newcommand*{\RedeclareLayer}[2][]{}
+\newcommand*{\ModifyLayer}[2][]{}
+\newcommand*{\layerhalign}{}
+\newcommand*{\layervalign}{}
+\newcommand*{\layerxoffset}{}
+\newcommand*{\layeryoffset}{}
+\newcommand*{\layerwidth}{}
+\newcommand*{\layerheight}{}
+\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
+\newcommand*{\putUL}[1]{}
+\newcommand*{\putUR}[1]{}
+\newcommand*{\putLL}[1]{}
+\newcommand*{\putLR}[1]{}
+\newcommand*{\putC}[1]{}
+\newcommand*{\GetLayerContents}[1]{}
+\newcommand{\IfLayerExists}[3]{#3}
+\newcommand*{\DestroyLayer}[1]{}
+\newcommand*{\layercontentsmeasure}{}
+\newcommand*{\currentpagestyle}{}
+\newcommand*{\BeforeSelectAnyPageStyle}[1]{}
+\newcommand*{\AfterSelectAnyPageStyle}[1]{}
+\newcommand*{\DeclarePageStyleAlias}[2]{}
+\newcommand*{\DeclareNewPageStyleAlias}[2]{}
+\newcommand*{\ProvidePageStyleAlias}[2]{}
+\newcommand*{\RedeclarePageStyleAlias}[2]{}
+\newcommand*{\DestroyPageStyleAlias}[1]{}
+\newcommand*{\GetRealPageStyle}[1]{}
+\newcommand*{\DeclarePageStyleByLayers}[3][]{}
+\newcommand*{\DeclareNewPageStyleByLayers}[3][]{}
+\newcommand*{\ProvidePageStyleByLayers}[3][]{}
+\newcommand*{\RedeclarePageStyleByLayers}[3][]{}
+\NewDocumentCommand{\ForEachLayerOfPageStyle}{s m m}{}
+\newcommand*{\AddLayersToPageStyle}[2]{}
+\newcommand*{\AddLayersAtBeginOfPageStyle}[2]{}
+\newcommand*{\AddLayersAtEndOfPageStyle}[2]{}
+\newcommand*{\RemoveLayersFromPageStyle}[2]{}
+\newcommand*{\AddLayersToPageStyleBeforeLayer}[3]{}
+\newcommand*{\AddLayersToPageStyleAfterLayer}[3]{}
+\newcommand*{\UnifyLayersAtPageStyle}[1]{}
+\newcommand*{\ModifyLayerPageStyleOptions}[2]{}
+\newcommand*{\AddToLayerPageStyleOptions}[2]{}
+\newcommand{\IfLayerPageStyleExists}[3]{#3}
+\newcommand{\IfRealLayerPageStyleExists}[3]{#3}
+\newcommand{\IfLayerAtPageStyle}[4]{#4}
+\newcommand{\IfSomeLayerAtPageStyle}[4]{#4}
+\newcommand{\IfLayersAtPageStyle}[4]{#4}
+\newcommand*{\DestroyRealLayerPageStyle}[1]{}
+\@ifundefined{footheight}{\newlength\footheight}{}
+\DeclareDocumentCommand{\automark}{s o m}{}
+\DeclareDocumentCommand{\manualmark}{}{}
+\DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
+\DeclareDocumentCommand{\GenericMarkFormat}{}{}
+\newcommand*{\@mkleft}[1]{}
+\newcommand*{\@mkright}[1]{}
+\newcommand*{\@mkdouble}[1]{}
+\newcommand*{\@mkboth}[2]{}
+\newcommand*{\scrlayerInitInterface}[1][]{}
+\newcommand{\scrlayerAddToInterface}[3][]{}
+\newcommand{\scrlayerAddCsToInterface}[3][]{}
+\newcommand{\scrlayerOnAutoRemoveInterface}[2][]{}
+\endinput
+%%
+%% End of file `lwarp-scrlayer.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
new file mode 100644
index 00000000000..749c4334a1f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
@@ -0,0 +1,53 @@
+%%
+%% This is file `lwarp-section.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `section')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{section}
+\ifx\chapter\undefined
+ \def\chsize{\Large}\def\hdsize{\huge}\else
+ \def\chsize{\huge}\def\hdsize{\Huge}
+\fi
+\let\ttsize\LARGE
+\let\ausize\large
+\let\dasize\large
+\let\secsize\Large
+\let\subsize\large
+\let\hdpos\raggedright
+\newcounter{hddepth}
+\let\fpind\relax
+\def\ttfnt{}
+\def\hdfnt{}
+\def\fefnt{}
+\def\thfnt{}
+\def\pgfnt{}
+\def\hmkfnt{}
+\let\mkcse\uppercase
+\def\hddot{}
+\def\cpdot{:}
+\def\nmdot{}
+\ifx\secindent\undefined
+ \newdimen\secindent
+ \newskip\secpreskp
+ \newskip\secpstskp
+ \newdimen\subindent
+ \newskip\subpreskp
+ \newskip\subpstskp
+ \newskip\parpstskp
+ \newcount\c@hddepth
+\fi
+\endinput
+%%
+%% End of file `lwarp-section.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
index 1dfaabf8668..acab55ea14e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
@@ -15,7 +15,7 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{soul}
+\LWR@ProvidesPackageDrop{soul}[2003/11/17]
 \RequirePackage{xcolor}% for \convertcolorspec
 \newcommand*{\LWR@soululcolor}{}
 
@@ -36,7 +36,7 @@
 {\LWR@HTMLtextstyle{#5}{#3}{#1}}%
 {%
     \convertcolorspec{named}{\csuse{#2}}{HTML}\LWR@tempcolor%
-    \LWR@HTMLtextstyle{#5;#4:\#\LWR@tempcolor}{#3}{#1}%
+    \LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}%
 }%
 }
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
new file mode 100644
index 00000000000..66eb3054fba
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
@@ -0,0 +1,38 @@
+%%
+%% This is file `lwarp-soulpos.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `soulpos')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\RequirePackage{soul}
+\RequirePackage{soulutf8}
+\LWR@ProvidesPackageDrop{soulpos}
+\NewDocumentCommand{\ulposdef}{m o m}{}
+
+\newdimen\ulwidth
+
+\newcommand\ifulstarttype[1]{%
+\expandafter\@secondoftwo%
+}
+
+\newcommand\ifulendtype[1]{%
+\expandafter\@secondoftwo%
+}
+
+\newcommand{\ulstarttype}{0}
+\newcommand{\ulendtype}{0}
+\newcommand\ulpostolerance{0}%
+\endinput
+%%
+%% End of file `lwarp-soulpos.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
new file mode 100644
index 00000000000..a63888298f6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-soulutf8.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `soulutf8')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{soulutf8}
+\endinput
+%%
+%% End of file `lwarp-soulutf8.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
index 591131562eb..3d1a075ea57 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
@@ -40,7 +40,7 @@
 \let\topcaption\tablecaption
 \let\bottomcaption\tablecaption
 
-\global\let\LWRST@caption\relax
+\newcommand*{\LWRST@caption}{}
 
 \newcommand*{\shrinkheight}[1]{}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
index 40112a31421..2e1f5eecfa4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.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@ProvidesPackagePass{textcomp}
 \let\LWR@origtextdegree\textdegree
 \let\LWR@origtextcelsius\textcelsius
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
index db79ea24fc4..0f9c437c774 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
@@ -28,14 +28,14 @@
 {\boolfalse{LWR@tikzbabel}}
 
 \BeforeBeginEnvironment{tikzpicture}{%
-\lateximage%
+\begin{lateximage}%
 \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0
 {}%
 {\catcode`\$=3} % dollar sign is math shift
 }
 
 \AfterEndEnvironment{tikzpicture}{%
-\endlateximage%
+\end{lateximage}%
 \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0
 {}%
 {\catcode`\$=\active}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
new file mode 100644
index 00000000000..73c0f79e6ed
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-tocbasic.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `tocbasic')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{tocbasic}
+
+\DeclareDocumentCommand{\usetocbasicnumberline}{o}{}
+\DeclareDocumentCommand{\DeclareTOCStyleEntry}{o m m}{}
+\DeclareDocumentCommand{\DeclareTOCEntryStyle}{m o m}{}
+\DeclareDocumentCommand{\DefineTOCEntryOption}{m o m}{}
+\DeclareDocumentCommand{\DefineTOCEntryBooleanOption}{m o m m m}{}
+\DeclareDocumentCommand{\DefineTOCEntryCommandOption}{m o m m m}{}
+\DeclareDocumentCommand{\DefineTOCEntryIfOption}{m o m m m}{}
+\DeclareDocumentCommand{\DefineTOCEntryLengthOption}{m o m m m}{}
+\DeclareDocumentCommand{\DefineTOCEntryNumberOption}{m o m m m}{}
+\DeclareDocumentCommand{\CloneTOCEntryStyle}{m m}{}
+\DeclareDocumentCommand{\TOCEntryStyleInitCode}{m m}{}
+\DeclareDocumentCommand{\TOCEntryStyleStartInitCode}{m m}{}
+
+\endinput
+%%
+%% End of file `lwarp-tocbasic.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
index e75a91c1da2..2b8e3c55ead 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
@@ -20,8 +20,8 @@
 
 \LWR@ProvidesPackagePass{tocbibind}
 
-  \renewenvironment{theindex}%
-    {%
+\renewenvironment{theindex}%
+{%
      \if@bibchapter
         \if@donumindex
             \chapter{\indexname}
@@ -48,7 +48,7 @@
 \let\item\LWR@indexitem%
 \let\subitem\LWR@indexsubitem%
 \let\subsubitem\LWR@indexsubsubitem%
-}
+}{}
 \renewcommand{\simplechapter}[1][\@empty]{%
     \def\@chapcntformat##1{%
         #1~\csname the##1\endcsname\simplechapterdelim\protect\quad%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
index 1e05d8fe368..1fe9a61bf71 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
@@ -202,16 +202,20 @@
 \newcommand{\pagenumbersoff}[1]{}
 \newcommand{\pagenumberson}[1]{}
 
-\NewDocumentCommand{\newlistof}{o m m m}
-{%
+\NewDocumentCommand{\newlistentry}{o m m m}
+{
 \IfValueTF{#1}
-{\newfloat{#2}{tbp}{#3}[#1]}
-{\newfloat{#2}{tbp}{#3}}
-\@namedef{listof#2}{\listof{#2}{#4}}
-\@namedef{#2depth}{1}
-\expandafter\newlength\csuse{cftbefore#2skip}
-\expandafter\newlength\csuse{cft#2indent}
-\expandafter\newlength\csuse{cft#2numwidth}
+{
+    \newcounter{#2}[#1]
+    \expandafter\edef\csname the#2\endcsname{
+        \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2}
+    }
+}
+{\newcounter{#2}}
+\@namedef{l@#2}##1##2{\hypertocfloat{1}{#2}{#3}{##1}{##2}}
+\expandafter\newlength\csname cftbefore#2skip\endcsname
+\expandafter\newlength\csname cft#2indent\endcsname
+\expandafter\newlength\csname cft#2numwidth\endcsname
 \@namedef{cft#2font}{}
 \@namedef{cft#2presnum}{}
 \@namedef{cft#2aftersnum}{}
@@ -220,6 +224,27 @@
 \@namedef{cft#2dotsep}{1}
 \@namedef{cft#2pagefont}{}
 \@namedef{cft#2afterpnum}{}
+\@namedef{toclevel@#2}{#4}
+\@namedef{cft#2fillnum}##1{}
+}
+
+\NewDocumentCommand{\newlistof}{o m m m}
+{%
+\IfValueTF{#1}
+{\newlistentry[#1]{#2}{#3}{0}}
+{\newlistentry{#2}{#3}{0}}
+\@namedef{ext@#2}{#3}
+\newcounter{#3depth}
+\setcounter{#3depth}{1}
+\@namedef{cftmark#3}{}
+\@namedef{listof#2}{\listof{#2}{#4}}
+\@namedef{@cftmake#3title}{}
+\expandafter\newlength\csname cftbefore#3titleskip\endcsname
+\expandafter\newlength\csname cftafter#3titleskip\endcsname
+\@namedef{cft#3titlefont}{}
+\@namedef{cftafter#3title}{}
+\@namedef{cft#3prehook}{}
+\@namedef{cft#3posthook}{}
 }
 
 \newcommand{\cftchapterprecis}[1]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
new file mode 100644
index 00000000000..3c3dfba16ba
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
@@ -0,0 +1,30 @@
+%%
+%% This is file `lwarp-tocstyle.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `tocstyle')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{tocstyle}
+\newcommand*{\usetocstyle}[2][]{}
+\newcommand*{\deactivatetocstyle}[1][]{}
+\newcommand*{\reactivatetocstyle}[1][]{}
+\NewDocumentCommand{\settocfeature}{o o m m}{}
+\NewDocumentCommand{\settocstylefeature}{o m m}{}
+\NewDocumentCommand{\newtocstyle}{o o m m}{}
+\newcommand*{\aliastoc}[2]{}
+\newcommand*{\showtoc}[2][]{}
+\newcommand{\iftochasdepth}[4]{}
+\endinput
+%%
+%% End of file `lwarp-tocstyle.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
new file mode 100644
index 00000000000..2814d1c7193
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
@@ -0,0 +1,60 @@
+%%
+%% This is file `lwarp-todo.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `todo')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{todo}
+
+\renewcommand\todoitem[2]{%
+    \refstepcounter{todo}%
+    \item[%
+        \HTMLunicode{2610} \quad
+        \ref{todopage:\thetodo}
+     ] : {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2%
+    \label{todolbl:\thetodo}%
+}%
+
+\renewcommand\doneitem[2]{%
+    \stepcounter{todo}%
+    \item[%
+        \HTMLunicode{2611} \quad
+        \ref{todopage:\thetodo}
+    ] \@nameuse{@done\the\c@todo}:
+        {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2%
+}
+
+\xpatchcmd{\@displaytodo}
+    {\todoformat #1}{\todoformat \textbf{#1}}{}
+    {\PackageWarning{lwarp-todo}{Unable to patch @displaytodo.}}
+
+\xpatchcmd{\@displayfulltodo}
+    {\todoformat #1}{\todoformat \textbf{#1}}{}
+    {\PackageWarning{lwarp-todo}{Unable to patch @displayfulltodo.}}
+
+\patchcmd{\todoenv}{\itshape see text.}{\textit{see text.}}{}
+    {\PackageWarning{lwarp-todo}{Unable to patch todoenv.}}
+
+\patchcmd{\astodos}{\todoformat #1}{\todoformat \textbf{#1}}{}
+    {\PackageWarning{lwarp-todo}{Unable to patch astodos.}}
+
+\AtBeginDocument{
+\crefname{todo}{todo}{todos}
+\Crefname{todo}{Todo}{Todos}
+}
+
+\endinput
+%%
+%% End of file `lwarp-todo.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
index 5fc3e762dcc..fc01e9edbb5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
@@ -15,11 +15,78 @@
 %%   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{todonotes}
-\newcommand{\listoftodos}[1][]{}
-\newcommand{\todo}[2][]{}
-\newcommand{\missingfigure}[2][]{}
-\newcommand{\todototoc}{}
+\LWR@ProvidesPackagePass{todonotes}
+\if@todonotes@disabled
+\else
+
+\newcommand{\ext@todo}{tdo}
+
+\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}}
+
+\renewcommand{\@todonotes@drawMarginNoteWithLine}{
+\fcolorbox
+    {\@todonotes@currentbordercolor}
+    {\@todonotes@currentbackgroundcolor}
+    {\arabic{@todonotes@numberoftodonotes}}
+\marginpar{\@todonotes@drawMarginNote}
+}
+
+\renewcommand{\@todonotes@drawInlineNote}{%
+\fcolorboxBlock%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentbackgroundcolor}%
+    {%
+        \if@todonotes@authorgiven%
+        {\@todonotes@author:\,}%
+        \fi%
+        \@todonotes@text%
+    }%
+}
+
+\renewcommand{\@todonotes@drawMarginNote}{%
+    \if@todonotes@authorgiven%
+        \@todonotes@author\par%
+    \fi%
+    \arabic{@todonotes@numberoftodonotes}: %
+    \fcolorbox%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentbackgroundcolor}%
+    {%
+        \@todonotes@sizecommand%
+        \@todonotes@text %
+    }%
+}%
+
+\renewcommand{\@todonotes@drawLineToRightMargin}{}
+
+\renewcommand{\@todonotes@drawLineToLeftMargin}{}
+
+\renewcommand{\missingfigure}[2][]{%
+\setkeys{todonotes}{#1}%
+\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}%
+\fcolorboxBlock%
+    {\@todonotes@currentbordercolor}%
+    {\@todonotes@currentfigcolor}%
+    {%
+        \setlength{\fboxrule}{4pt}%
+        \fcolorbox{red}{white}{Missing figure} \quad #2%
+    }
+}
+
+\LetLtxMacro\LWRTODONOTES@orig@todo\@todo
+
+\RenewDocumentCommand{\@todo}{o m}{%
+\begingroup%
+\renewcommand*{\phantomsection}{}%
+\IfValueTF{#1}{%
+    \LWRTODONOTES@orig@todo[#1]{#2}%
+}{%
+    \LWRTODONOTES@orig@todo{#2}%
+}
+\endgroup%
+}
+
+\fi% \if@todonotes@disabled
 \endinput
 %%
 %% End of file `lwarp-todonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
index c1e95e266e2..275434afa1b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
@@ -17,15 +17,9 @@
 %% version 2005/12/01 or later.
 
 
-
-
 \LWR@ProvidesPackageDrop{trivfloat}
 \LWR@origRequirePackage{trivfloat}
 
-\begin{warpall}
-
-\end{warpall}
-
 
 \begin{warpHTML}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
index bc114e6a4de..010b524170d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
@@ -16,10 +16,16 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \LWR@ProvidesPackageDrop{typearea}
-\newcommand*\typearea[2][\z@]{}
-\newcommand*{\recalctypearea}{}
+\DeclareDocumentCommand{\typearea}{o m}{}
+\DeclareDocumentCommand{\recalctypearea}{}{}
 \@ifundefined{footheight}{\newlength\footheight}{}
-\newcommand*\areaset[3][\z@]{}
+\DeclareDocumentCommand{\areaset}{o m m}{}
+\DeclareDocumentCommand{\activateareas}{}{}
+\DeclareDocumentCommand{\storeareas}{m}{}
+\DeclareDocumentCommand{\BeforeRestoreareas}{s m}{}
+\DeclareDocumentCommand{\AfterRestoreareas}{s m}{}
+\DeclareDocumentCommand{\AfterCalculatingTypearea}{s m}{}
+\DeclareDocumentCommand{\AfterSettingArea}{s m}{}
 \endinput
 %%
 %% End of file `lwarp-typearea.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
index 461d3a5ed41..a5b041f642e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
@@ -21,6 +21,7 @@
 \LWR@traceinfo{Patching verse.}
 \AtBeginEnvironment{verse}
 {%
+\LWR@restoreoriglists%
 \ifdef{\vleftskip}{%
 \setlength{\vleftskip}{\HTMLvleftskip}
 \setlength{\leftmargini}{\HTMLleftmargini}
@@ -29,8 +30,7 @@
 \LWR@atbeginverbatim{verse}
 \unskip\LWR@origvspace{-\baselineskip}
 }
-\AfterEndEnvironment{verse}{
-\unskip\LWR@origvspace{-\baselineskip}
+\AtEndEnvironment{verse}{
 \LWR@afterendverbatim
 }
 \ifdef{\poemtitle}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
new file mode 100644
index 00000000000..e0db46ef192
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-watermark.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `watermark')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{watermark}
+\newcommand{\watermark}[1]{}
+\newcommand{\leftwatermark}[1]{}
+\newcommand{\rightwatermark}[1]{}
+\newcommand{\thiswatermark}[1]{}
+\newcommand{\thispageheading}[1]{}
+\endinput
+%%
+%% End of file `lwarp-watermark.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 6ab31aea5eb..306c8e458ac 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -38,6 +38,27 @@
 }
 \newcommand*{\LWR@tempcolor}{}
 \newcommand*{\LWR@tempcolortwo}{}
+\newcommand*{\LWR@findcurrenttextcolor}{%
+\protect\colorlet{LWR@current@color}{.}%
+\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor%
+}
+
+\newcommand*{\LWR@currenttextcolorstyle}{%
+\LWR@findcurrenttextcolor%
+\ifdefstring{\LWR@tempcolor}{000000}%
+{}%
+{color: \#\LWR@tempcolor ; }%
+}
+\newcommand*{\LWR@textcurrentcolor}[1]{%
+\begingroup%
+\LWR@FBcancel%
+\LWR@findcurrenttextcolor%
+\InlineClass[color:\#\LWR@tempcolor]{textcolor}{%
+    \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}%
+    #1%
+}%
+\endgroup%
+}
 \NewDocumentCommand{\LWR@colorstyle}{m m}{%
 \begingroup%
 \LWR@FBcancel%
@@ -45,6 +66,14 @@
 \#\LWR@tempcolor%
 \endgroup%
 }
+\NewDocumentCommand{\LWR@backgroundcolor}{O{named} m m}{%
+\begingroup%
+\LWR@FBcancel%
+\InlineClass[background:\LWR@colorstyle{#1}{#2}]{backgroundcolor}{%
+#3%
+}%
+\endgroup%
+}
 \newcommand*{\LWR@borderpadding}[2]{%
 \uselengthunit{PT}%
 border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; %
@@ -53,7 +82,6 @@ padding:\rndprintlength{\fboxsep}%
 \RenewDocumentCommand{\textcolor}{O{named} m m}{%
 \begingroup%
 \LWR@FBcancel%
-\convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor%
 \InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{%
 \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}%
 #3%
@@ -63,7 +91,7 @@ padding:\rndprintlength{\fboxsep}%
 
 \renewcommand*{\pagecolor}[2][named]{}
 
-\let\nopagecolor\relax
+\renewcommand*{\nopagecolor}{}
 
 \RenewDocumentCommand{\colorbox}{O{named} m +m}{%
 \begingroup%
@@ -127,7 +155,7 @@ padding:\rndprintlength{\fboxsep}%
 {% yes background color
     \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo%
     \begin{BlockClass}[%
-    background:\#\LWR@tempcolortwo; %
+    background:\#\LWR@tempcolortwo\ ; %
     \LWR@borderpadding{#1}{#2}%
     ]{fcolorboxBlock}
     #5
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
index 33e55a7c2ae..72f6e84aae5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
@@ -45,7 +45,7 @@
 \let\topcaption\tablecaption
 \let\bottomcaption\tablecaption
 
-\global\let\LWRXT@caption\relax
+\newcommand*{\LWRXT@caption}{}
 
 \newcommand*{\shrinkheight}[1]{}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 195c33a9dd0..a0ac4d906f1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,8 +17,7 @@
 %% version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{lwarp}
-    [2017/11/08 v0.43  Allows LaTeX to directly produce HTML5 output.]
-
+    [2017/11/22 v0.44  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -29,6 +28,10 @@
 \ifLuaTeX
 \RequirePackage{luatex85}% until the geometry package is updated
 \fi
+\ifPDFTeX
+\RequirePackage[T1]{fontenc}
+\RequirePackage[utf8]{inputenc}
+\fi
 
 \RequirePackage{newunicodechar}
 
@@ -46,7 +49,8 @@
 \else
 \fi
 
-\RequirePackage{etoolbox}[2011/01/03]
+\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
+\RequirePackage{xpatch}
 
 \RequirePackage{ifplatform}% sense op-system platform
 \RequirePackage{letltxmacro}
@@ -165,7 +169,6 @@
 {\excludecomment{LWR@createlwarpmk}}
 
 
-
 \newcommand*{\LWR@loadafter}[1]{%
 \@ifpackageloaded{#1}
 {
@@ -206,12 +209,14 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{afterpage}
 \LWR@loadafter{algorithmicx}
 \LWR@loadafter{alltt}
+\LWR@loadafter{amsmath}
 \LWR@loadafter{amsthm}
 \LWR@loadafter{anonchap}
 \LWR@loadafter{anysize}
 \LWR@loadafter{appendix}
 \LWR@loadafter{arabicfront}
 \LWR@loadafter{array}
+\LWR@loadafter{atbegshi}
 \LWR@loadafter{authblk}
 \LWR@loadafter{balance}
 \LWR@loadafter{bigdelim}
@@ -221,6 +226,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{breakurl}
+\LWR@loadafter{cancel}
 \LWR@loadafter{ccaption}
 \LWR@loadafter{changepage}
 \LWR@loadafter{chngpage}
@@ -232,6 +238,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{dblfnote}
 \LWR@loadafter{dcolumn}
 \LWR@loadafter{draftwatermark}
+\LWR@loadafter{easy-todo}
 \LWR@loadafter{ebook}
 \LWR@loadafter{ellipsis}
 \LWR@loadafter{emptypage}
@@ -244,9 +251,12 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{extramarks}
 \LWR@loadafter{fancybox}
 \LWR@loadafter{fancyhdr}
+\LWR@loadafter{fancyref}
 \LWR@loadafter{fancyvrb}
 \LWR@loadafter{figcaps}
 \LWR@loadafter{fix2col}
+\LWR@loadafter{fixme}
+\LWR@loadafter{fixmetodonotes}
 \LWR@loadafter{float}
 \LWR@loadafter{floatflt}
 \LWR@loadafter{floatpag}
@@ -260,9 +270,11 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{geometry}
 \LWR@loadafter{glossaries}
 \LWR@loadafter{grffile}
+\LWR@loadafter{hang}
 \LWR@loadafter{hyperref}
 \LWR@loadafter{hyperxmp}
 \LWR@loadafter{idxlayout}
+\LWR@loadafter{ifoddpage}
 \LWR@loadafter{indentfirst}
 \LWR@loadafter{keyfloat}
 \LWR@loadafter{layout}
@@ -273,6 +285,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{longtable}
 \LWR@loadafter{lscape}
 \LWR@loadafter{ltcaption}
+\LWR@loadafter{ltxtable}
 \LWR@loadafter{luatodonotes}
 \LWR@loadafter{marginfit}
 \LWR@loadafter{marginfix}
@@ -302,6 +315,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{pfnote}
 \LWR@loadafter{placeins}
 \LWR@loadafter{prelim2e}
+\LWR@loadafter{preview}
 \LWR@loadafter{quotchap}
 \LWR@loadafter{ragged2e}
 \LWR@loadafter{realscripts}
@@ -311,6 +325,12 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{rotating}
 \LWR@loadafter{rotfloat}
 \LWR@loadafter{savetrees}
+\LWR@loadafter{scrextend}
+\LWR@loadafter{scrhack}
+\LWR@loadafter{scrlayer}
+\LWR@loadafter{scrlayer-notecolumn}
+\LWR@loadafter{scrlayer-scrpage}
+\LWR@loadafter{section}
 \LWR@loadafter{sectsty}
 \LWR@loadafter{setspace}
 \LWR@loadafter{shadow}
@@ -320,6 +340,8 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{sidenotes}
 \LWR@loadafter{siunitx}
 \LWR@loadafter{soul}
+\LWR@loadafter{soulpos}
+\LWR@loadafter{soulutf8}
 \LWR@loadafter{stabular}
 \LWR@loadafter{subfig}
 \LWR@loadafter{supertabular}
@@ -337,15 +359,17 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{titling}
 \LWR@loadafter{tocbibind}
 \LWR@loadafter{tocloft}
+\LWR@loadafter{tocstyle}
+\LWR@loadafter{todo}
 \LWR@loadafter{todonotes}
 \LWR@loadafter{transparent}
 \LWR@loadafter{trivfloat}
-\LWR@loadafter{typearea}
 \LWR@loadafter{ulem}
 \LWR@loadafter{upref}
 \LWR@loadafter{varioref}
 \LWR@loadafter{verse}
 \LWR@loadafter{wallpaper}
+\LWR@loadafter{watermark}
 \LWR@loadafter{wrapfig}
 \LWR@loadafter{xcolor}
 \LWR@loadafter{xfrac}
@@ -407,7 +431,10 @@ top=1in,bottom=1in,%
 
 \RequirePackage{xparse}
 
+\@ifundefined{AfterPackage}%
+{
 \RequirePackage{afterpackage}
+}{}
 
 \end{warpall}
 
@@ -651,6 +678,12 @@ top=1in,bottom=1in,%
 
 \end{warpall}
 
+\begin{warpHTML}
+\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{}
+\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{}
+\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{}
+\end{warpHTML}
+
 \begin{warpall}
 \newbool{FormatEPUB}
 \boolfalse{FormatEPUB}
@@ -793,14 +826,16 @@ top=1in,bottom=1in,%
 
 \let\LWR@orignewline\newline
 
-\LetLtxMacro{\LWR@origitem}{\item}
+\LetLtxMacro\LWR@origitem\item
 
+\AtBeginDocument{% in case packages change definition
 \LetLtxMacro{\LWR@origitemize}{\itemize}
 \LetLtxMacro{\LWR@endorigitemize}{\enditemize}
 \LetLtxMacro{\LWR@origenumerate}{\enumerate}
 \LetLtxMacro{\LWR@endorigenumerate}{\endenumerate}
 \LetLtxMacro{\LWR@origdescription}{\description}
 \LetLtxMacro{\LWR@endorigdescription}{\enddescription}
+}
 
 \let\LWR@origpar\par
 
@@ -808,8 +843,6 @@ top=1in,bottom=1in,%
 \let\LWR@orig@mpfootnotetext\@mpfootnotetext
 
 \let\LWR@origclearpage\clearpage
-\let\clearpage\relax
-\let\cleardoublepage\relax
 
 \end{warpHTML}
 
@@ -1113,7 +1146,7 @@ blockquotation p {
     margin-right: 3em ;
 }
 
-div.epigraph {
+div.epigraph, div.dictum {
   line-height: 1.2;
     text-align: left ;
     padding: 3ex 1em 0ex 1em ;
@@ -1124,7 +1157,7 @@ div.epigraph {
     max-width: 27em ;
 }
 
-div.epigraphsource{
+div.epigraphsource, div.dictumauthor {
     text-align:right ;
     margin-left:auto ;
 /*     max-width: 50% ; */
@@ -1133,8 +1166,9 @@ div.epigraphsource{
     line-height: 1.2;
 }
 
-div.epigraph p { padding: .5ex ; margin: 0ex ;}
-div.epigraphsource p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;}
+div.epigraph p, div.dictum p { padding: .5ex ; margin: 0ex ;}
+div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;}
+div.dictumauthor { font-style:italic }
 
 /* lettrine package: */
 span.lettrine { font-size: 3ex ; float: left ; }
@@ -1222,6 +1256,14 @@ span.paragraph {font-size: 1em ; font-variant: normal ;
 span.subparagraph {font-size: 1em ; font-variant: normal ;
     margin-right: 1em ;  }
 
+div.minisec {
+    font-family: "DejaVu Sans", "Bitstream Vera Sans",
+        Geneva, Verdana, sans-serif ;
+    font-style: normal ;
+    font-weight: bold ;
+    text-align: left ;
+}
+
 /* Title of the file */
 h1 {
   margin: 0ex 0em 0ex 0em ;
@@ -1271,7 +1313,7 @@ div.titlepage {
     border-top: 1px solid silver ;
 }
 
-.marginpar {
+.marginpar, .marginparblock {
     max-width:50%;
     float:right;
     text-align:left;
@@ -1285,7 +1327,7 @@ div.titlepage {
 
 .marginpar br { margin-bottom: 2ex ; }
 
-div.marginblock {
+div.marginblock, div.marginparblock {
     max-width:50%;
     float:right;
     text-align:left;
@@ -1294,14 +1336,19 @@ div.marginblock {
     overflow-x: auto;
 }
 
-div.marginblock div.minipage {
+div.marginblock div.minipage,
+div.marginparblock div.minipage {
     display: block ;
     margin: 0pt auto 0pt auto ;
 }
 
-div.marginblock div.minipage p { font-size: 85%}
+div.marginblock div.minipage p ,
+div.marginparblock div.minipage p
+    { font-size: 85%}
 
-div.marginblock br { margin-bottom: 2ex ; }
+div.marginblock br ,
+div.marginparblock br
+    { margin-bottom: 2ex ; }
 
 section.textbody div.footnotes{
     margin: 3ex 0em 0ex 0em ;
@@ -1588,14 +1635,14 @@ dl dt {
 
 dl dd p { margin-top: 0em; }
 
-nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm {
+nav {
     font-family: "URW Classico", Optima, "Linux Biolinum O",
         "DejaVu Sans", "Bitstream Vera Sans",
         Geneva, Verdana, sans-serif ;
     margin-bottom: 4ex ;
 }
 
-nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p {
+nav p {
     line-height: 1.2 ;
     margin-top:.5ex ;
     margin-bottom:.5ex;
@@ -2248,7 +2295,7 @@ span.abstractrunintitle{
     font-weight:bold;
 }
 
-div.epigraph {
+div.epigraph, div.dictum {
     background: #f5f5eb ;
     background-image: linear-gradient(to bottom, #f5f5eb, #C8C8B8);
 
@@ -2326,7 +2373,9 @@ div.fboxBlock div.minipage { box-shadow: none ; }
 
 figure.figure .minipage, figcaption .minipage { border: none; }
 
-div.marginblock div.minipage { border: none; }
+div.marginblock div.minipage ,
+div.marginparblock div.minipage
+    { border: none; }
 
 figure , div.marginblock {
     background-color: #eeeee7 ;
@@ -2742,7 +2791,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
 
 -- Print the usage of the lwarpmk command:
 
-printversion = "v0.43"
+printversion = "v0.44"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -3374,7 +3423,7 @@ end -- not --version
 
 \begin{warpHTML}
 \NewDocumentCommand{\LWR@setexparray}{m m m}{%
-\ifthenelse{\isempty{#3}}%
+\ifstrempty{#3}%
 {\csdef{#1#2}{}}%
 {\expandafter\edef\csname #1#2\endcsname{\expandonce#3}}%
 }
@@ -3453,7 +3502,7 @@ end -- not --version
         \equal{\LWR@tempone}{index}%
     }%
     {%
-        \LWR@traceinfo{prefixing the index name with an underscore.}%
+        \LWR@traceinfo{Prefixing the index name with an underscore.}%
         \_#1.html%
     }%
     {\HTMLFilename#1.html}%
@@ -3507,14 +3556,15 @@ end -- not --version
 
 \newcommand*{\LWR@closeoneprevious}{%
 
-\LWR@closeone{}
+\LWR@closeone
 
-\popclose{}
+\popclose
 }
 
 \newcommand*{\LWR@closeprevious}[1]{
 \LWR@stoppars
-\whiledo{\not\(\LWR@closedepthone<#1\)}{\LWR@closeoneprevious}
+\whileboolexpr{not test{\ifnumcomp{\LWR@closedepthone}{<}{#1}}}%
+    {\LWR@closeoneprevious}
 }
 
 \end{warpHTML}
@@ -3627,7 +3677,7 @@ end -- not --version
 \newenvironment*{LWR@nestspan}
 {%
 \LWR@traceinfo{LWR@nestspan}%
-\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
 {%
     \LWR@traceinfo{LWR@nestspan: inside a lateximage}%
 }%
@@ -3638,22 +3688,14 @@ end -- not --version
     \RenewDocumentEnvironment{BlockClass}{o m}{}{}%
     \renewcommand{\BlockClassSingle}[2]{##2}%
     \renewcommand{\LWR@forcenewpage}{}%
-    \renewcommand{\LWR@itemizestart}{%
-        \let\item\LWR@nestspanitem%
-    }%
-    \renewcommand{\LWR@itemizeend}{}%
-    \renewcommand{\LWR@enumeratestart}{%
-        \let\item\LWR@nestspanitem%
-    }%
-    \renewcommand{\LWR@enumerateend}{}%
-    \renewcommand{\LWR@descriptionstart}{%
+    \renewcommand{\LWR@liststart}{%
         \let\item\LWR@nestspanitem%
     }%
-    \renewcommand{\LWR@descriptionend}{}%
+    \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}%
 }% not in a lateximage
 }% starting env
 {% ending env
-\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
 {}%
 {\addtocounter{LWR@spandepth}{-1}}%
 \LWR@traceinfo{LWR@nestspan: done}%
@@ -3725,7 +3767,7 @@ end -- not --version
 
 \newcommand{\LWR@htmlblockcomment}
 {%
-\begingroup\catcode`\_=12%
+\begingroup\catcode`\_=12
 \LWR@htmlblockcommentb%
 }
 
@@ -3736,15 +3778,11 @@ end -- not --version
 }
 
 
-\NewDocumentCommand{\LWR@subhtmlelementclass}{m o m}{%
+\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{%
 \LWR@traceinfo{LWR@subhtmlelementclass #1 #3}%
-\IfValueTF{#2}%
-{% option
-    \ifthenelse{\equal{#2}{}}%
-    {\LWR@htmltag{#1 class="#3"}}% empty option
-    {\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option
-}% option
-{\LWR@htmltag{#1 class="#3"}}% no option
+\ifblank{#2}%
+{\LWR@htmltag{#1 class="#3"}}% empty option
+{\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option
 \LWR@traceinfo{LWR@subhtmlelementclass done}%
 }
 
@@ -3831,10 +3869,10 @@ end -- not --version
 \LWR@stoppars%
 \ifbool{FormatWP}%
 {%
-    \LWR@maybeincthisfloat%
+    \LWR@maybeincthisautoid%
     \LWR@htmltag{%
         div class="#3" %
-        id="autofloat-\arabic{LWR@thisfloat}"%
+        id="autoid-\arabic{LWR@thisautoid}"%
         \ifblank{#1}{}{ style="#1"}%
     }%
 }% FormatWP
@@ -3905,9 +3943,9 @@ end -- not --version
 {%
 \ifbool{LWR@doingstartpars}%
 {% handling pars
-    \ifthenelse{%
-        \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR%
-        \cnttest{\value{LWR@spandepth}}{>}{0}%
+    \ifboolexpr{
+        test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or
+        test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}}
     }% nested par tags?
     {}% no nested par tags
     {% yes nest par tags
@@ -3928,15 +3966,14 @@ end -- not --version
 {%
 \ifbool{LWR@doingapar}%
 {% handling pars
-    \ifthenelse{%
-        \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR%
-        \cnttest{\value{LWR@spandepth}}{>}{0}%
+    \ifboolexpr{
+        test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or
+        test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}}
     }%
     {% no nested par tags
-        \ifthenelse{%
-            \cnttest{\value{LWR@spandepth}}{>}{0}%
-            \AND%
-            \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
+        \ifboolexpr{
+            test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and
+            test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}}
         }%
         {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
         {}%
@@ -3950,7 +3987,7 @@ end -- not --version
     }% end of yes nest par tags
 }% end of handling pars
 {% not handling pars
-    \ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}%
+    \ifnumcomp{\value{LWR@spandepth}}{>}{0}%
     {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
     {}%
 }% not handling pars
@@ -3964,7 +4001,7 @@ end -- not --version
 
 \newcommand*{\LWR@startpars}%
 {%
-\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@spandepth}}{>}{0}%
 {}%
 {%
     \ifbool{LWR@doingstartpars}%
@@ -3981,7 +4018,7 @@ end -- not --version
 
 \newcommand*{\LWR@stoppars}%
 {%
-\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@spandepth}}{>}{0}%
 {}%
 {%
     \ifbool{LWR@doingapar}%
@@ -4058,18 +4095,29 @@ end -- not --version
 \newcommand*{\CSSFilename}[1]{}
 \end{warpprint}
 
+\begin{warpHTML}
+\let\LWR@origtitle\title
 
+\renewcommand*{\title}[1]{%
+    \LWR@origtitle{#1}%
+    \begingroup%
+        \renewcommand{\thanks}[1]{}%
+        \protected@xdef\thetitle{#1}%
+    \endgroup%
+}
+\end{warpHTML}
 \begin{warpall}
+\providecommand{\thetitle}{}
+
+\newcommand{\theHTMLTitle}{\thetitle}
 
+\newcommand{\HTMLTitle}[1]{\renewcommand{\theHTMLTitle}{#1}}
 \providecommand{\theauthor}{}
+
 \newcommand{\theHTMLAuthor}{\theauthor}
 
 \newcommand{\HTMLAuthor}[1]{\renewcommand{\theHTMLAuthor}{#1}}
 
-\end{warpall}
-
-\begin{warpall}
-
 
 \newcommand{\LWR@currentHTMLDescription}{}
 
@@ -4092,6 +4140,7 @@ end -- not --version
 \long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
 \def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
 \long\def\LWR@footnotetext#1{%
+\LWR@traceinfo{LWR@footnotetext}%
 \global\setbox\LWR@footnotes=\vbox{%
     \unvbox\LWR@footnotes%
     \protected@edef\@currentlabel{%
@@ -4178,11 +4227,30 @@ end -- not --version
 #2
 \end{LWR@BlockClassWP}
 }%
-{\LWR@htmlspanclass{marginpar}{#2}}%
+{%
+    \LWR@htmlspanclass{marginpar}{#2}%
+}%
+}
+\newcommand{\marginparBlock}[2][]{%
+\ifbool{FormatWP}%
+{%
+\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+#2
+\end{LWR@BlockClassWP}
+}%
+{%
+\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+#2
+\end{BlockClass}
+}%
 }
 
 \end{warpHTML}
 
+\begin{warpprint}
+\LetLtxMacro\marginparBlock\marginpar
+\end{warpprint}
+
 
 \begin{warpall}
 
@@ -4522,6 +4590,8 @@ end -- not --version
 }
 
 
+\newcommand{\part@preamble}{}% for koma-script
+
 \DeclareDocumentCommand{\part}{s o m}{%
 \LWR@maybeprintpendingfootnotes{\LWR@depthpart}%
 \LWR@stoppars%
@@ -4529,10 +4599,15 @@ end -- not --version
 \LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}%
 
 \LWR@section{#1}{#2}{#3}{part}%
+
+\part@preamble% for koma-script
+\renewcommand{\part@preamble}{}%
 }
 
 \let\@printcites\relax% for quotchap package
 
+\newcommand{\chapter@preamble}{}% for koma-script
+
 \@ifundefined{chapter}
 {}
 {%
@@ -4544,7 +4619,11 @@ end -- not --version
 \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}%
 
 \LWR@section{#1}{#2}{#3}{chapter}%
+
 \@printcites% for quotchap package
+
+\chapter@preamble% for koma-script
+\renewcommand{\chapter@preamble}{}%
 }
 }
 
@@ -4621,9 +4700,9 @@ end -- not --version
 \LWR@htmltag{html lang="\LWR@currentHTMLLanguage"{}}\LWR@orignewline
 \LWR@htmltag{head}\LWR@orignewline
 \LWR@htmltag{meta charset="UTF-8" /}\LWR@orignewline
-\ifcsempty{theHTMLAuthor}{}{
-\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline
-}
+\ifthenelse{\equal{\theHTMLAuthor}{}}%
+{}%
+{\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline}%
 \LWR@htmltag{meta name="generator" content="LaTeX lwarp package" /}%
     \LWR@orignewline
 \ifdefempty{\LWR@currentHTMLDescription}{}{%
@@ -4639,17 +4718,20 @@ content="width=device-width, initial-scale=1.0" /}%
 script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"{}}%
 \LWR@htmltag{/script}\LWR@orignewline
 \LWR@htmltag{![endif]{-}{-}}\LWR@orignewline
-\ifcsvoid{thetitle}{}{%
-\LWR@htmltag{title}\thetitle#1\LWR@htmltag{/title}\LWR@orignewline%
-}%
+\ifthenelse{\equal{\theHTMLTitle}{}}%
+{}%
+{\LWR@htmltag{title}\theHTMLTitle#1\LWR@htmltag{/title}\LWR@orignewline}%
 \LWR@htmltag{%
 link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@orignewline
 \ifbool{mathjax}%
 {%
+    \begingroup%
+    \LWR@restoreoriglists%
     \boolfalse{LWR@verbtags}
     \verbatiminput{lwarp_mathjax.txt}%
     \booltrue{LWR@verbtags}
+    \endgroup%
     \LWR@stoppars
 }% end of mathjax
 {}%
@@ -5040,6 +5122,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }{}%
 \begingroup%
 \LWR@origttfamily%
+\LWR@restoreoriglists%
 \LWR@FBcancel%
 \LetLtxMacro{\hspace}{\LWR@orighspace}%
 }
@@ -5105,47 +5188,63 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \end{warpHTML}
 
-
 \begin{warpHTML}
 
-\newcommand*{\LWR@itemizeitem}{%
+\newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
+\newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+
+\newcommand*{\LWR@listitem}{%
 \LWR@stoppars%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem{}}%
+\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
 \LWR@htmltag{li}%
 \LWR@startpars%
 \LWR@origitem%
 }
 
-\newcommand*{\LWR@itemizestart}{%
+\newcommand*{\LWR@liststart}{%
 \LWR@stoppars%
-\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}%
-\LWR@htmltag{ul style="list-style-type:none"{}}%
+\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}%
+\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline%
 \LWR@startpars%
-\let\item\LWR@itemizeitem%
-}
-
-\newcommand*{\LWR@itemizeend}{%
+\setlength{\topsep}{0pt}%
+\setlength{\partopsep}{0pt}%
+\setlength{\itemsep}{0pt}%
+\setlength{\parsep}{0pt}%
+\setlength{\leftmargin}{0pt}%
+\setlength{\rightmargin}{0pt}%
+\setlength{\listparindent}{0pt}%
+\setlength{\itemindent}{0pt}%
+\setlength{\labelsep}{1em}%
+}
+
+\newcommand*{\LWR@listend}{%
 \LWR@stoppars%
 \LWR@closeprevious{\LWR@depthlistitem}%
-\LWR@closeoneprevious{}%
+\LWR@closeoneprevious%
 \LWR@startpars%
 }
 
 
-
-\newcommand*{\LWR@enumeratestart}{%
+\newcommand*{\LWR@itemizeitem}{%
 \LWR@stoppars%
-\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}%
-\LWR@htmltag{ul style="list-style-type:none"{}}%
+\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}%
+\LWR@htmltag{li}%
 \LWR@startpars%
+\LWR@origitem%
+}
+
+\newcommand*{\LWR@itemizestart}{%
+\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
+\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
 \let\item\LWR@itemizeitem%
 }
 
-\newcommand*{\LWR@enumerateend}{%
-\LWR@stoppars%
-\LWR@closeprevious{\LWR@depthlistitem}%
-\LWR@closeoneprevious{}%
-\LWR@startpars%
+
+
+\newcommand*{\LWR@enumeratestart}{%
+\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
+\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+\let\item\LWR@itemizeitem%
 }
 
 
@@ -5153,7 +5252,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 {%
 \LWR@stoppars%
 \LWR@setlatestname{#1}%
-\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem{}}%
+\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}%
 \LetLtxMacro{\hspace}{\LWR@nohspace}%
 \LWR@origitem[]%
 \LetLtxMacro{\hspace}{\LWR@hspace}%
@@ -5165,28 +5264,43 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 
 \newcommand*{\LWR@descriptionstart}{%
-\LWR@stoppars%
-\LWR@pushoneclose{\LWR@depthlist}{\LWR@printclosedescription{}}%
-\LWR@htmltag{dl}%
-\LWR@startpars%
+\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
+\renewcommand*{\LWR@printopenlist}{dl}
 \let\item\LWR@descitem%
 }
 
-\newcommand*{\LWR@descriptionend}{%
-\LWR@stoppars%
-\LWR@closeprevious{\LWR@depthlistitem}%
-\LWR@closeoneprevious{}%
-\LWR@startpars%
-}
+
+\let\LWR@orig@trivlist\@trivlist
+\let\LWR@origtrivlist\trivlist
+\let\LWR@origendtrivlist\endtrivlist
 
 \newcommand*{\LWR@patchlists}{%
-\LetLtxMacro{\LWR@origitem}{\item}
-\AtBeginEnvironment{itemize}{\LWR@itemizestart}
-\AtEndEnvironment{itemize}{\LWR@itemizeend}
-\AtBeginEnvironment{enumerate}{\LWR@enumeratestart}
-\AtEndEnvironment{enumerate}{\LWR@enumerateend}
-\AtBeginEnvironment{description}{\LWR@descriptionstart}
-\AtEndEnvironment{description}{\LWR@descriptionend}
+    \let\item\LWR@listitem%
+    \renewcommand*{\@trivlist}{%
+        \LWR@liststart%
+        \LWR@orig@trivlist%
+    }%
+    \renewcommand*{\endtrivlist}{\LWR@origendtrivlist\LWR@listend}%
+    \renewcommand*{\trivlist}{%
+        \LWR@origtrivlist%
+        \def\makelabel####1{\LWR@orighspace{3em}####1}%
+    }%
+    \renewcommand*{\itemize}{\LWR@itemizestart\LWR@origitemize}%
+    \renewcommand*{\enumerate}{\LWR@enumeratestart\LWR@origenumerate}%
+    \renewcommand*{\description}{\LWR@descriptionstart\LWR@origdescription}%
+}
+
+\newcommand*{\LWR@restoreoriglists}{%
+\let\@trivlist\LWR@orig@trivlist%
+\let\trivlist\LWR@origtrivlist%
+\let\endtrivlist\LWR@origendtrivlist%
+\LetLtxMacro\item\LWR@origitem%
+\LetLtxMacro\itemize\LWR@origitemize%
+\LetLtxMacro\enditemize\LWR@endorigitemize%
+\LetLtxMacro\enumerate\LWR@origenumerate%
+\LetLtxMacro\endenumerate\LWR@endorigenumerate%
+\LetLtxMacro\description\LWR@origdescription%
+\LetLtxMacro\enddescription\LWR@endorigdescription%
 }
 
 \end{warpHTML}
@@ -5304,12 +5418,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@tabularampersand}{%
 \LWR@traceinfo{LWR@tabularampersand}%
-\ifthenelse{\cnttest{\value{LWR@tabulardepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}%
 {%
     \unskip%
     \LWR@closetabledatacell%
     \addtocounter{LWR@tablecolindex}{1}%
-\boolfalse{LWR@tabularcelladded}%
+    \boolfalse{LWR@tabularcelladded}%
     \LWR@getmynexttoken%
 }%
 {\LWR@origampmacro}%
@@ -5329,22 +5443,25 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     \booltrue{LWR@tabularmutemods}%
 }{}%
 \global\boolfalse{LWR@exitingtabular}%
-\whiledo{%
-    \(%
-        \boolean{LWR@intabularmetadata} \AND%
-        \NOT\boolean{LWR@tabularcelladded} \AND%
-        \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}%
-    \) \OR%
-    \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
-}{%
+\whileboolexpr{%
+    test {
+        \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}
+    } or %
+    (%
+        bool{LWR@intabularmetadata} and%
+        not bool{LWR@tabularcelladded} and%
+        test {
+            \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}
+        }%
+    )%
+}%
+{%
     \LWR@tabledatasinglecolumntag%
     \LWR@closetabledatacell%
     \addtocounter{LWR@tablecolindex}{1}%
     \boolfalse{LWR@tabularcelladded}%
     \global\booltrue{LWR@emptyatbang}%
-    \ifthenelse{%
-        \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
-    }%
+    \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
     {\LWR@getmynexttoken}%
     {}%
 }%
@@ -5354,14 +5471,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 
 
-\NewDocumentCommand{\LWR@tabularendofline}{s o}
-{%
-\ifthenelse{\value{LWR@tablecolindex}<\value{LWR@tabletotalcols}}{%
-    \LWR@tabularfinishrow%
-}%
-{%
-    \LWR@closetabledatacell%
-}%
+\NewDocumentCommand{\LWR@tabularendofline}{s o}{%
+\ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
+{\LWR@tabularfinishrow}%
+{\LWR@closetabledatacell}%
 \LWR@htmltag{/tr}\LWR@orignewline
 \global\booltrue{LWR@intabularmetadata}
 \global\boolfalse{LWR@startedrow}
@@ -5382,8 +5495,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@tablecolspec}{}
 
-\newcommand*{\LWR@strresult}{}
-\newcommand*{\LWR@strresulttwo}{}
+\providecommand*{\LWR@strresult}{}
+\providecommand*{\LWR@strresulttwo}{}
 
 \newcommand*{\LWR@origcolspec}{}
 
@@ -5407,7 +5520,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]
 \fullexpandarg%
 \LWR@traceinfo{have now read the next token}%
-\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
+\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}%
 {% left edge of the table:
     \LWR@traceinfo{at the left edge}%
     \LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@colparameter}%
@@ -5431,7 +5544,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]
 \fullexpandarg%
 \LWR@traceinfo{have now read the next token}%
-\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
+\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}%
 {% left edge of the table:
     \LWR@traceinfo{at the left edge}%
     \LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@colparameter}%
@@ -5464,7 +5577,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 \newcommand*{\LWR@parsebarcolumn}{%
 \LWR@traceinfo{bar column}%
-\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}%
+\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}%
 {% left edge of the table:
     \LWR@setexparray{LWR@colbarspec}{leftedge}{tvertbarl}%
 }%
@@ -5531,7 +5644,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \fullexpandarg%
 \LWR@traceinfo{finished StrLen}%
 \setcounter{LWR@tablecolspecwidth}{\LWR@strresult}%
-\whiledo{\not\value{LWR@tablecolspecindex}>\value{LWR@tablecolspecwidth}}{%
+\whileboolexpr{%
+    not test{%
+        \ifnumcomp{\value{LWR@tablecolspecindex}}{>}{\value{LWR@tablecolspecwidth}}%
+    }%
+}%
+{%
 \expandarg%
 \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@strresult]%
 \LWR@traceinfo{position \arabic{LWR@tablecolspecindex}: \LWR@strresult}%
@@ -5631,7 +5749,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 
 \newcommand*{\LWR@tabularleftedge}{%
-\ifthenelse{\cnttest{\value{LWR@tablecolindex}}=1}%
+\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}%
 {%
     \LWR@printatbang{at}{leftedge}%
     \LWR@printatbang{bang}{leftedge}%
@@ -5640,6 +5758,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 
 
+\newcommand*{\LWR@thiscolspec}{}
+
 \newcommand*{\LWR@tabledatasinglecolumntag}%
 {%
 \LWR@maybenewtablerow%
@@ -5657,17 +5777,18 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
         "%
         \LWR@tdstartstyles%
         \LWR@addcmidrulewidth%
-        \LWR@addformatwpalignment%
+        \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@thiscolspec]%
+        \LWR@addformatwpalignment{\LWR@thiscolspec}%
         \LWR@tdendstyles%
         }%
-        \ifthenelse{%
-            \equal{\LWR@strresult}{p}\OR%
-            \equal{\LWR@strresult}{m}\OR%
-            \equal{\LWR@strresult}{b}\OR%
-            \equal{\LWR@strresult}{P}\OR%
-            \equal{\LWR@strresult}{M}\OR%
-            \equal{\LWR@strresult}{B}\OR%
-            \equal{\LWR@strresult}{X}%
+        \ifboolexpr{%
+            test{ \ifdefstring{\LWR@strresult}{p} } or
+            test{ \ifdefstring{\LWR@strresult}{m} } or
+            test{ \ifdefstring{\LWR@strresult}{b} } or
+            test{ \ifdefstring{\LWR@strresult}{P} } or
+            test{ \ifdefstring{\LWR@strresult}{M} } or
+            test{ \ifdefstring{\LWR@strresult}{B} } or
+            test{ \ifdefstring{\LWR@strresult}{X} }
         }%
         {% allow pars
             \LWR@startpars%
@@ -5704,8 +5825,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \newcommand*{\LWR@clearmidrules}
 {%
 \setcounter{LWR@midrulecounter}{1}%
-\whiledo{%
-\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolspecwidth}}%
+\whileboolexpr{%
+    not test{%
+        \ifnumcomp{\value{LWR@midrulecounter}}{>}{\value{LWR@tablecolspecwidth}}%
+    }%
 }%
 {%
 \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}%
@@ -5718,10 +5841,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@subcmidrule}[4]{%
 \setcounter{LWR@midrulecounter}{#3}%
-\whiledo{\cnttest{\value{LWR@midrulecounter}}{<=}{#4}}%
+\whileboolexpr{%
+    not test {%
+        \ifnumcomp{\value{LWR@midrulecounter}}{>}{#4}%
+    }%
+}%
 {%
-\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}%
-\addtocounter{LWR@midrulecounter}{1}%
+    \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}%
+    \addtocounter{LWR@midrulecounter}{1}%
 }% whiledo
 \IfSubStr{#2}{l}{\LWR@setexparray{LWR@trimlrules}{#3}{l}}{}%
 \IfSubStr{#2}{r}{\LWR@setexparray{LWR@trimrrules}{#4}{r}}{}%
@@ -5800,18 +5927,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 text-align:#1; vertical-align:#2%
 }
 
-\newcommand*{\LWR@addformatwpalignment}{%
+\newcommand*{\LWR@addformatwpalignment}[1]{%
 \ifbool{FormatWP}{%
-\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]%
-\ifdefstring{\LWR@strresult}{l}{\LWR@WPcell{left}{middle}}{}%
-\ifdefstring{\LWR@strresult}{c}{\LWR@WPcell{center}{middle}}{}%
-\ifdefstring{\LWR@strresult}{r}{\LWR@WPcell{right}{middle}}{}%
-\ifdefstring{\LWR@strresult}{p}{\LWR@WPcell{left}{bottom}}{}%
-\ifdefstring{\LWR@strresult}{m}{\LWR@WPcell{left}{middle}}{}%
-\ifdefstring{\LWR@strresult}{b}{\LWR@WPcell{left}{top}}{}%
-\ifdefstring{\LWR@strresult}{P}{\LWR@WPcell{center}{bottom}}{}%
-\ifdefstring{\LWR@strresult}{M}{\LWR@WPcell{center}{middle}}{}%
-\ifdefstring{\LWR@strresult}{B}{\LWR@WPcell{center}{top}}{}%
+\IfSubStr{#1}{l}{\LWR@WPcell{left}{middle}}{}%
+\IfSubStr{#1}{c}{\LWR@WPcell{center}{middle}}{}%
+\IfSubStr{#1}{r}{\LWR@WPcell{right}{middle}}{}%
+\IfSubStr{#1}{p}{\LWR@WPcell{left}{bottom}}{}%
+\IfSubStr{#1}{m}{\LWR@WPcell{left}{middle}}{}%
+\IfSubStr{#1}{b}{\LWR@WPcell{left}{top}}{}%
+\IfSubStr{#1}{P}{\LWR@WPcell{center}{bottom}}{}%
+\IfSubStr{#1}{M}{\LWR@WPcell{center}{middle}}{}%
+\IfSubStr{#1}{B}{\LWR@WPcell{center}{top}}{}%
 }{}%
 }
 
@@ -5838,7 +5964,7 @@ text-align:#1; vertical-align:#2%
 \IfStrEq{\LWR@strresult}{S}{r}{}%
 \IfStrEq{\LWR@strresult}{X}{p}{}%
 \IfStrEq{\LWR@strresult}{|}{%
-    \ifthenelse{\value{LWR@tablemulticolspos}=1}%
+    \ifnumcomp{\value{LWR@tablemulticolspos}}{=}{1}%
         {\booltrue{LWR@mcolvertbarl}}%
         {\booltrue{LWR@mcolvertbarr}}%
 }{}%
@@ -5894,8 +6020,10 @@ text-align:#1; vertical-align:#2%
 \setcounter{LWR@tablemulticolspos}{1}%
 \StrLen{#1}[\LWR@strresult]%
 \setcounter{LWR@tablemulticolswidth}{\LWR@strresult}%
-\whiledo{%
-    \NOT\value{LWR@tablemulticolspos}>\value{LWR@tablemulticolswidth}%
+\whileboolexpr{%
+    not test {%
+        \ifnumcomp{\value{LWR@tablemulticolspos}}{>}{\value{LWR@tablemulticolswidth}}%
+    }
 }%
 {%
 #2{#1}%
@@ -5938,7 +6066,7 @@ rowspan="#2" %
 "%
 \LWR@tdstartstyles%
 \LWR@addcmidrulewidth%
-\LWR@addformatwpalignment%
+\LWR@addformatwpalignment{#5}%
 \LWR@tdendstyles%
 }% end of the opening table data tag
 \global\boolfalse{LWR@intabularmetadata}%
@@ -5961,7 +6089,7 @@ rowspan="#2" %
 \NewDocumentCommand{\LWR@longtabledatacaptiontag}{s o +m}
 {%
 \IfValueTF{#2}{% optional given?
-    \ifthenelse{\equal{#2}{}}% optional empty?
+    \ifblank{#2}% optional empty?
     {\LWR@setlatestname{#3}}% empty
     {\LWR@setlatestname{#2}}% given and non-empty
 }% optional given
@@ -5978,18 +6106,18 @@ rowspan="#2" %
 {% No star:
     \ifbool{LWR@starredlongtable}%
     {%
-    \ifthenelse{\equal{#2}{}}% TOC entry
-    {}%
-    {%
-        \refstepcounter{\LTcaptype}%
-        \protected@edef\@currentlabel{%
-        \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-    }%
+        \ifblank{#2}% TOC entry
+        {}%
+        {%
+            \refstepcounter{\LTcaptype}%
+            \protected@edef\@currentlabel{%
+            \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+        }%
     }{}%
     \LWR@figcaption%
     \csuse{fnum@\LTcaptype}\CaptionSeparator#3%
     \endLWR@figcaption%
-    \ifthenelse{\equal{#2}{}}% TOC entry empty
+    \ifblank{#2}% TOC entry empty
     {}%
     {% TOC entry not empty
         \IfNoValueTF{#2}% No TOC entry?
@@ -6045,10 +6173,15 @@ rowspan="#2" %
 \setcounter{LWR@tabhtmlcoltotal}{#2}%
 \setcounter{LWR@tabhtmlcolend}{#1}%
 \addtocounter{LWR@tabhtmlcolend}{#2}%
-\ifthenelse{\value{LWR@tabhtmlcolindex}=1}{%
+\ifnumcomp{\value{LWR@tabhtmlcolindex}}{=}{1}{%
     \LWR@subtabularhtmlcolumns{leftedge}%
 }{}%
-\whiledo{\value{LWR@tabhtmlcolindex}<\value{LWR@tabhtmlcolend}}{%
+\whileboolexpr{%
+    test {%
+        \ifnumcomp{\value{LWR@tabhtmlcolindex}}{<}{\value{LWR@tabhtmlcolend}}%
+    }%
+}%
+{%
     \LWR@subtabularhtmlcolumns{\arabic{LWR@tabhtmlcolindex}}%
     \addtocounter{LWR@tabhtmlcolindex}{1}%
 }% whiledo
@@ -6304,14 +6437,19 @@ rowspan="#2" %
 }%
 {%
 \LWR@traceinfo{LWR@tabular ending}%
-\ifthenelse{%
-    \(%
-        \boolean{LWR@intabularmetadata} \AND%
-        \NOT\boolean{LWR@tabularcelladded} \AND%
-        \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}%
-    \) \OR%
-    \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
-}{%
+\ifboolexpr{%
+    test {%
+        \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}
+    } or %
+    (%
+        bool{LWR@intabularmetadata} and%
+        not bool{LWR@tabularcelladded} and%
+        test {%
+            \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}%
+        }%
+    )%
+}%
+{%
     \LWR@tabularfinishrow%
 }%
 {%
@@ -6336,7 +6474,7 @@ rowspan="#2" %
 \begin{warpHTML}
 
 
-\newcommand*{\@currentlabelname}{}
+\providecommand*{\@currentlabelname}{}
 \def\LWR@stripperiod#1.\ltx@empty#2\@nil{#1}%
 \newcommand*{\LWR@setlatestname}[1]{%
 \GetTitleStringExpand{#1}%
@@ -6379,7 +6517,7 @@ rowspan="#2" %
 
 
 \newcommand*{\LWR@subsublabel}[1]{%
-\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
 {}%
 {% not lateximage
     \ifbool{LWR@doingstartpars}%
@@ -6513,22 +6651,19 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LWR@nolinkurlb%
 }
 
-\newcommand*{\LWR@urlb}[1]{%
-\href{#1}{#1}%
-\endgroup%
-\LWR@ensuredoingapar%
+\NewDocumentCommand{\LWR@urlb}{m}{%
+\LWR@hrefb{#1}{#1}%
 }
 
-\DeclareRobustCommand*{\LWR@urla}{%
+\DeclareRobustCommand*{\url}{%
 \LWR@ensuredoingapar%
 \begingroup\catcode`\_=12
 \LWR@urlb%
 }
 
-\let\url\LWR@urla
 
 \newcommand*{\LWR@subinlineimage}[5][]{%
-\ifthenelse{\equal{#1}{}}%
+\ifblank{#1}%
 {\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"{}}}%
 {\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"{}}}%
 }
@@ -6545,11 +6680,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \NewDocumentCommand{\LWR@floatbegin}{m o}{%
 \ifbool{FormatWP}{\newline}{}%
 \LWR@stoppars
-\addtocounter{LWR@thisfloat}{1}%
-\booltrue{LWR@freezethisfloat}%
+\addtocounter{LWR@thisautoid}{1}%
+\booltrue{LWR@freezethisautoid}%
 \begingroup%
 \LWR@origraggedright%
-\LWR@htmltag{figure id="autofloat-\arabic{LWR@thisfloat}" class="#1"}%
+\LWR@htmltag{figure id="autoid-\arabic{LWR@thisautoid}" class="#1"}%
 \ifbool{FormatWP}{%
     \LWR@orignewline%
     \LWR@BlockClassWP{}{}{wp#1}%
@@ -6575,20 +6710,25 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \ifbool{FormatWP}{\endLWR@BlockClassWP}{}%
 \LWR@htmlelementend{figure}%
 \endgroup%
-\boolfalse{LWR@freezethisfloat}%
+\boolfalse{LWR@freezethisautoid}%
 \LWR@startpars%
 \ifbool{FormatWP}{\newline}{}%
 }
 \let\end@float\LWR@floatend
 \let\end@dblfloat\LWR@floatend
 
-\newcounter{LWR@thisfloat}
+\newcounter{LWR@thisautoid}
 
-\newbool{LWR@freezethisfloat}
-\boolfalse{LWR@freezethisfloat}
+\newbool{LWR@freezethisautoid}
+\boolfalse{LWR@freezethisautoid}
+
+\newcommand*{\LWR@maybeincthisautoid}{%
+\ifbool{LWR@freezethisautoid}{}{\addtocounter{LWR@thisautoid}{1}}%
+}
 
-\newcommand*{\LWR@maybeincthisfloat}{%
-\ifbool{LWR@freezethisfloat}{}{\addtocounter{LWR@thisfloat}{1}}%
+\newcommand*{\LWR@newautoidanchor}{%
+\LWR@maybeincthisautoid%
+\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}%
 }
 
 \newcommand*{\@captype}{}
@@ -6599,11 +6739,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \AtBeginDocument{\renewcommand{\@makecaption}[2]{#1\CaptionSeparator#2}}
 
 
-\newcounter{LWR@nextautofloat}
+\newcounter{LWR@nextautoid}
 \newcounter{LWR@nextautopage}
 \newcommand*{\LWRsetnextfloat}[2]{%
 \setcounter{LWR@nextautopage}{#1}%
-\setcounter{LWR@nextautofloat}{#2}%
+\setcounter{LWR@nextautoid}{#2}%
 }
 
 \newcounter{LWR@latestautopage}
@@ -6654,15 +6794,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\LWR@origcaptionlistentry\captionlistentry
 
 \renewcommand*{\captionlistentry}{%
-\LWR@maybeincthisfloat%
 \LWR@ensuredoingapar%
-\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}%
 \LWR@origcaptionlistentry%
 }
 
 \def\LWR@LTcaptionlistentry{%
 \LWR@ensuredoingapar%
-\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}%
   \bgroup
   \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble *
           {\egroup\LWR@LT@captionlistentry}}%
@@ -6672,14 +6810,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\LWR@origaddcontentsline\addcontentsline
 
 \renewcommand*{\addcontentsline}[3]{%
-\ifthenelse{\equal{#1}{toc}}{}{%
-    \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
+\ifstrequal{#1}{toc}{}{% not TOC
+    \LWR@newautoidanchor%
+    \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}%
     \addtocontents{\@nameuse{ext@#2}}{%
-    \protect\LWRsetnextfloat%
-    {\arabic{LWR@latestautopage}}%
-    {\arabic{LWR@thisfloat}}%
-    }% addtocontents
-}% not toc
+        \protect\LWRsetnextfloat%
+        {\arabic{LWR@latestautopage}}%
+        {\arabic{LWR@thisautoid}}%
+    }%
+}% not TOC
 \LWR@origaddcontentsline{#1}{#2}{#3}%
 }
 
@@ -6687,9 +6826,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\LWR@origcaptionof\captionof
 
 \renewcommand*{\captionof}{%
-\LWR@maybeincthisfloat%
 \LWR@stoppars
-\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}%
 \LWR@origcaptionof%
 }
 }
@@ -6816,10 +6953,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 }
 
 
-\renewcommand*{\numberline}[1]{%
+\newcommand*{\LWR@numberline}[1]{%
 \LWR@sectionnumber{#1}\quad%
 }
 
+\LetLtxMacro\numberline\LWR@numberline
+
 \NewDocumentCommand{\hypertoc}{m m +m m}{%
 \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{%
     \LWR@startpars%
@@ -6847,7 +6986,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
     \LWR@startpars%
     \LWR@subhyperrefclass{%
     \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}%
-    \#autofloat-\arabic{LWR@nextautofloat}}%
+    \#autoid-\arabic{LWR@nextautoid}}%
     {#4}{toc#2}%
     \LWR@stoppars%
 }{}%
@@ -6912,7 +7051,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \InlineClass{indexsubsubitem}{}
 }
 
-\def\@wrindex#1{%
+\def\LWR@wrindex#1{%
 \addtocounter{LWR@autoindex}{1}%
 \LWR@newlabel{LWRindex-\theLWR@autoindex}%
 \protected@write\@indexfile{}%
@@ -6920,6 +7059,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \endgroup
 \@esphack}
 
+\let\@wrindex\LWR@wrindex
+
 \def\@wrglossary#1{%
 \addtocounter{LWR@autoglossary}{1}%
 \LWR@newlabel{LWRglossary-\theLWR@autoglossary}%
@@ -7019,6 +7160,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \csletcs{equation*}{LWR@origequationstar}%
 \csletcs{endequation*}{LWR@origendequationstar}%
 \LWR@restoreorigaccents%
+\LWR@restoreoriglists%
 \LWR@FBcancel%
 }
 
@@ -7027,7 +7169,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\LWR@origtextdollar\$
 
 \renewcommand*{\$}{%
-\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}%
 {\LWR@origtextdollar}%
 {\LWR@htmltagc{span}\LWR@origtextdollar\LWR@htmltagc{/span}}%
 }
@@ -7282,7 +7424,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbodynumbered{multline}]
+    \begin{lateximage}[\LWR@amsmathbodynumbered{multline}]
 }
 }
 
@@ -7294,7 +7436,7 @@ $#1$}
     \boolfalse{LWR@amsmultline}
     \LWR@addmathjax{multline}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7307,7 +7449,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbody{multline*}]
+    \begin{lateximage}[\LWR@amsmathbody{multline*}]
 }
 }
 
@@ -7319,7 +7461,7 @@ $#1$}
     \boolfalse{LWR@amsmultline}
     \LWR@addmathjax{multline*}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7333,7 +7475,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbodynumbered{gather}]
+    \begin{lateximage}[\LWR@amsmathbodynumbered{gather}]
 }
 }
 
@@ -7344,7 +7486,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{gather}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7357,7 +7499,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbody{gather*}]
+    \begin{lateximage}[\LWR@amsmathbody{gather*}]
 }
 }
 
@@ -7368,7 +7510,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{gather*}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7381,7 +7523,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbodynumbered{align}]
+    \begin{lateximage}[\LWR@amsmathbodynumbered{align}]
 }
 }
 
@@ -7392,7 +7534,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{align}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7405,7 +7547,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbody{align*}]
+    \begin{lateximage}[\LWR@amsmathbody{align*}]
 }
 }
 
@@ -7416,7 +7558,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{align*}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7429,7 +7571,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbodynumbered{flalign}]
+    \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}]
 }
 }
 
@@ -7440,7 +7582,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{flalign}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7453,7 +7595,7 @@ $#1$}
     \LWR@beginhideamsmath
 }
 {
-    \lateximage[\LWR@amsmathbody{flalign*}]
+    \begin{lateximage}[\LWR@amsmathbody{flalign*}]
 }
 }
 
@@ -7464,7 +7606,7 @@ $#1$}
     \LWR@endhideamsmath
     \LWR@addmathjax{flalign*}{\the\@envbody}
 }
-{\endlateximage}
+{\end{lateximage}}
 
 }
 
@@ -7618,7 +7760,7 @@ $#1$}
     \let\LWR@equationtag\theequation%
     \addtocounter{LWR@lateximagenumber}{1}%
     \LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}%
-    \boolfalse{mathjax}
+    \boolfalse{mathjax}%
     \LWR@ensuredoingapar%
     \addtocounter{LWR@externalfilecnt}{1}%
     \LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}%
@@ -7902,9 +8044,9 @@ $#1$}
 
 \begin{warpHTML}
 
-\BeforeBeginEnvironment{picture}{\lateximage}
+\BeforeBeginEnvironment{picture}{\begin{lateximage}}
 
-\AfterEndEnvironment{picture}{\endlateximage}
+\AfterEndEnvironment{picture}{\end{lateximage}}
 
 \end{warpHTML}
 
@@ -7974,9 +8116,9 @@ $#1$}
 \LWR@stoppars%
 \ifbool{FormatWP}{%
 
-\addtocounter{LWR@thisfloat}{1}%
-\booltrue{LWR@freezethisfloat}%
-\LWR@htmltag{div id="autofloat-\arabic{LWR@thisfloat}" class="wpminipage"}%
+\addtocounter{LWR@thisautoid}{1}%
+\booltrue{LWR@freezethisautoid}%
+\LWR@htmltag{div id="autoid-\arabic{LWR@thisautoid}" class="wpminipage"}%
 
 }{}%
 \LWR@traceinfo{minipage: creating div class}%
@@ -8027,7 +8169,7 @@ $#1$}
 \ifbool{FormatWP}{%
 
 \LWR@htmlelementend{div}%
-\boolfalse{LWR@freezethisfloat}%
+\boolfalse{LWR@freezethisautoid}%
 
 }{}%
 \LWR@htmldivclassend{minipage}%
@@ -8431,9 +8573,9 @@ width:\rndprintlength{\LWR@tempwidth}%
 \ifnum\gluestretchorder\LWR@tempwidth>0%
 \setlength{\LWR@tempwidth}{2em}%
 \fi%
-\ifthenelse{\dimtest{\LWR@tempwidth}{=}{0pt}}{}{%
+\ifdimcomp{\LWR@tempwidth}{=}{0pt}{}{%
     \LWR@minipagestoppars%
-    \ifthenelse{\dimtest{\LWR@tempwidth}{=}{.16667em}}
+    \ifdimcomp{\LWR@tempwidth}{=}{.16667em}%
     {%
         \HTMLunicode{2009}% thin breakable space
     }%
@@ -8473,6 +8615,8 @@ width:\rndprintlength{\LWR@tempwidth}%
 \renewcommand*{\nopagebreak}[1][]{}
 
 \RenewDocumentCommand{\enlargethispage}{s m}{}
+\renewcommand*{\clearpage}{}
+\renewcommand*{\cleardoublepage}{}
 \newcommand*{\LWR@currenttextcolor}{black}
 \NewDocumentCommand{\LWR@rule}{o m m}{%
 \setlength{\LWR@tempwidth}{#2}%
@@ -8495,9 +8639,9 @@ width:\rndprintlength{\LWR@tempwidth}%
     \LWR@htmltagc{%
     span
     style="%
-    \ifbool{FormatWP}{}{background:\LWR@currenttextcolor; }%
-    width:\printlength{\LWR@tempwidth}; %
-    height:\printlength{\LWR@tempheight}; %
+    \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }%
+    width:\printlength{\LWR@tempwidth} ; %
+    height:\printlength{\LWR@tempheight} ; %
     \IfValueT{#1}%
     {%
         \setlength{\LWR@tempraise}{0pt-#1}%
author	Karl Berry <karl@freefriends.org>	2017-11-23 21:06:47 +0000
committer	Karl Berry <karl@freefriends.org>	2017-11-23 21:06:47 +0000
commit	a966a76688af35e8f788ba4cd9a98743c496ae73 (patch)
tree	b3095755a2db4ce5e44615e51546a37e76d9f1a4 /Master/texmf-dist/tex/latex/lwarp
parent	03faaffd813fcdcc0465e974b5120de2690f0f46 (diff)