lwarp (30jan18)

git-svn-id: svn://tug.org/texlive/trunk@46495 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2018-01-30 21:05:29 +0000
committer: Karl Berry <karl@freefriends.org> 2018-01-30 21:05:29 +0000
commit: 83e0b95d2f78cf405abe952e383dcd0d986eee66 (patch)
tree: 322c558d9417cafdf345ae56b31ef814ac057e72 /Master/texmf-dist/tex/latex
parent: 1b674ef86fe17b1011f19a929dfd82253eb90995 (diff)
222 files changed, 804 insertions, 451 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
index 5385e5397ea..96ccb036421 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `a4')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
index 75115e571ec..b7b4856ccac 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `a4wide')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
index 7e156f5d3fa..fd2495bd7b4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `a5comb')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
index 4d899d4076e..4c263a3dce4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `abstract')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
index e485c3b2121..5d9a249d838 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `addlines')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
index 4a4454d8bc5..21c7160a2b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `adjmulticol')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,8 +29,8 @@
 \LWR@forcenewpage%
 \uselengthunit{PT}%
 \BlockClass[%
-margin-left:\rndprintlength{\LWR@templengthone} ; %
-margin-right:\rndprintlength{\LWR@templengthtwo}%
+\mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+\mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}%
 ]{\LWR@mcolstype}%
 }
 {\endBlockClass}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
index 0e0a91cf3a3..3376be7a49d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `afterpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
index 49211be29ed..83d44c47f51 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `algorithmicx')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
index 3153d9d562a..54b19682371 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `alltt')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
index b411574059f..e6bd5b2d5c5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `amsthm')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,15 +25,15 @@
   \@ifundefined{th@#1}{%
     \PackageWarning{amsthm}{Unknown theoremstyle `#1'}%
     \thm@style{plain}%
-    \renewcommand{\LWR@newtheoremstyle}{plain}% new
+    \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
   }{%
     \thm@style{#1}%
-    \renewcommand{\LWR@newtheoremstyle}{#1}% new
+    \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
   }%
 }
 
 \def\@xnthm#1#2{%
-  \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% new
+  \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% lwarp
   \let\@tempa\relax
   \@xp\@ifdefinable\csname #2\endcsname{%
     \global\@xp\let\csname end#2\endcsname\@endtheorem
@@ -45,7 +45,7 @@
     \else % numbered theorem, need to check for optional arg
       \def\@tempa{\@oparg{\@ynthm{#2}}[]}%
     \fi
-    \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% new
+    \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% lwarp
   }%
   \@tempa
 }
@@ -67,9 +67,9 @@
 \LWR@haveamsthmnote
 \def\@begintheorem#1#2[#3]{%
     \item[
-    \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new
-    \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new
-    \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new
+    \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp
+    \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp
+    \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp
     \thm@swap\swappedhead\thmhead{#1}{#2}{#3}%
     \the\thm@headpunct~
     \thmheadnl % possibly a newline.
@@ -79,8 +79,8 @@
 \def\@thm#1#2#3{%
   \ifhmode\unskip\unskip\par\fi
   \normalfont
-  \LWR@forcenewpage% new
-  \BlockClass{amsthmbody\LWR@thisthmstyle}% new
+  \LWR@forcenewpage% lwarp
+  \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp
   \trivlist
   \let\thmheadnl\relax
   \let\thm@swap\@gobble
@@ -103,8 +103,8 @@
 \def\cref@thmoptarg[#1]#2#3#4{%
     \ifhmode\unskip\unskip\par\fi%
     \normalfont%
-    \LWR@forcenewpage% new
-    \BlockClass{amsthmbody\LWR@thisthmstyle}% new
+    \LWR@forcenewpage% lwarp
+    \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp
     \trivlist%
     \let\thmheadnl\relax%
     \let\thm@swap\@gobble%
@@ -132,8 +132,8 @@
 \def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box
 }
 \renewenvironment{proof}[1][\proofname]{\par
-\LWR@forcenewpage% new
-    \BlockClass{amsthmproof}% new
+\LWR@forcenewpage% lwarp
+    \BlockClass{amsthmproof}% lwarp
   \pushQED{\qed}%
   \normalfont \topsep6\p@\@plus6\p@\relax
   \trivlist
@@ -141,7 +141,7 @@
         \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes
 }{%
   \InlineClass{theoremendmark}{\popQED}\endtrivlist%
-  \endBlockClass% new
+  \endBlockClass% lwarp
   \@endpefalse
 }
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
index 95d947d9249..32f32476404 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `anonchap')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
index b5d2594592d..9b2617cc8c3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `anysize')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
index 44355e88652..4794c1f132f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `appendix')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
index ba654a2c2ca..7a961fb23a6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `arabicfront')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
index a3998ec7356..fd54aab0591 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `array')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
index 79da130731e..dda62313392 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `atbegshi')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
index 362f1ac0ad5..9f3af3b6443 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `authblk')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
index 26ef59c8a4d..0722a4f18df 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `backref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
index 15c7ca58dcd..99f6b10586e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `balance')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
index d3fe7347b2d..3d23100b395 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `bigdelim')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
index 36e7528dffd..286ef67ec1f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `bigstrut')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
new file mode 100644
index 00000000000..9a13b437bcf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-blowup.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `blowup')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{blowup}
+\newcommand*\blowUp[1]{}
+\endinput
+%%
+%% End of file `lwarp-blowup.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
index 488c6c278da..36b5a08db5e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `bookmark')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
index e1d2ef4f50a..a09291c335e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `booktabs')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty
index 7cc99db7ac8..888af3f9cb5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `boxedminipage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
index f190ee0e856..f8c89ce3b5b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `boxedminipage2e')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
index 4dbc5689393..49420b1f66e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `breakurl')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
index 7c5373aa229..1c9e5258781 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `cancel')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
new file mode 100644
index 00000000000..326fc563905
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
@@ -0,0 +1,139 @@
+%%
+%% This is file `lwarp-caption.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `caption')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{caption}
+
+\renewcommand\caption@ibox[3]{%
+  \@testopt{\caption@iibox{#1}{#2}{#3}}{%
+        \linewidth% lwarp
+  }%
+}
+\long\def\caption@iibox#1#2#3[#4]{%
+  \@testopt{\caption@iiibox{#1}{#2}{#3}{#4}}\captionbox@hj@default
+}
+\long\def\caption@iiibox#1#2#3#4[#5]#6{%
+  \begingroup
+  #1*% set \caption@position
+  \caption@iftop{%
+    \LWR@traceinfo{caption@iiibox top}%
+    \endgroup
+    \parbox[t]{#4}{%
+      #1\relax
+      \caption@setposition t%
+      {\caption#2{#3}}% lwarp
+       #6% lwarp
+    }%
+  }{%
+    \LWR@traceinfo{caption@iiibox bottom}%
+    \endgroup
+    \parbox[b]{#4}{%
+      #1\relax
+      \caption@setposition b%
+         #6% lwarp
+      {\caption#2{#3}}% lwarp
+     }%
+  }%
+\LWR@traceinfo{caption@iiibox: done}%
+}
+
+\def\caption@caption{%
+  \caption@iftype
+    {%
+     \caption@checkgrouplevel\@empty\caption
+     \caption@star
+       {\caption@refstepcounter\@captype}%
+       {\caption@dblarg{\@caption\@captype}}}%
+    {\caption@Error{\noexpand\caption outside float}%
+     \caption@gobble}%
+}
+
+\long\def\caption@@caption#1[#2]#3{%
+  \ifcaption@star \else
+    \caption@prepareanchor{#1}{#2}%
+    \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
+    \@nameuse{nag@hascaptiontrue}%
+  \fi
+  \par
+  \caption@beginex{#1}{#2}{#3}%
+    \caption@setfloatcapt{%
+      \caption@boxrestore
+      \if@minipage
+        \@setminipage
+      \fi
+      \caption@normalsize
+      \ifcaption@star
+        \let\caption@makeanchor\@firstofone
+      \fi
+      \@makecaption{\csname fnum@#1\endcsname}%
+                   {\ignorespaces\caption@makeanchor{#3}}\par
+      \caption@if@minipage\@minipagetrue\@minipagefalse}%
+  \caption@end%
+}
+
+\renewcommand\caption@@@make[2]{%
+\LWR@startpars% lwarp
+  \caption@ifempty{#2}{%
+    \let\caption@lsep\@empty
+    \let\caption@tfmt\@firstofone
+  }%
+    \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% lwarp
+  \caption@applyfont
+  \caption@fmt
+    {\ifcaption@star\else
+       \begingroup
+         \captionlabelfont
+         #1%
+       \endgroup
+     \fi}%
+    {\ifcaption@star\else
+       \begingroup
+         \caption@iflf\captionlabelfont
+         \relax\caption@lsep
+       \endgroup
+     \fi}%
+    {{\captiontextfont
+      \caption@ifstrut
+        {\vrule\@height\ht\strutbox\@width\z@}%
+        {}%
+      \nobreak\hskip\z@skip % enable hyphenation
+      \caption@tfmt{#2}
+    \LWR@ensuredoingapar% lwarp
+      \caption@ifstrut
+        {\ifhmode\@finalstrut\strutbox\fi}%
+        {}%
+      \par}}
+\LWR@stoppars% lwarp
+}
+
+\renewcommand{\caption@@make@}[2]{%
+  \caption@stepthecounter
+  \caption@beginhook
+      \caption@@@make{#1}{#2}%
+  \caption@endhook
+}
+
+\DeclareCaptionBox{parbox}{%
+#2%
+}
+\DeclareCaptionBox{colorbox}{%
+#2%
+}
+
+\endinput
+%%
+%% End of file `lwarp-caption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty
new file mode 100644
index 00000000000..5e8a9d1f45c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption2.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-caption2.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `caption2')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@loadnever{caption2}{caption}
+\endinput
+%%
+%% End of file `lwarp-caption2.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
index 6ad676dbd2c..b92ee84a1ae 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ccaption')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
index c298ef3c677..c39f7fb9c20 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `changebar')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
index c055a02b86d..ea2e773c68b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `changepage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,8 +32,8 @@
 \renewenvironment{adjustwidth*}[2]{}{}
 }
 
-\DeclareDocumentCommand{\strictpagecheck}{}
-\DeclareDocumentCommand{\easypagecheck}{}
+\DeclareDocumentCommand{\strictpagecheck}{}{}
+\DeclareDocumentCommand{\easypagecheck}{}{}
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
index c983b8ac2a3..d180a40a539 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `chappg')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
index e7491649353..bd132c0499e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `chngpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
index 6681dd37091..77313d6a534 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `cite')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
index 834b336ebb1..7fa7a4caeb6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `color')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
index 80721c9dbd1..eb59e27b5a2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `continue')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
index 92882551a24..ad5af72cfe7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `crop')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
index e9d679aac0a..056a2171b6e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `cuted')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
index b89b2b48e56..512f4d6d42f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `cutwin')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
index 33c7c567d5c..66d2aee8bd1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `dblfnote')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
index f9e82a803da..5da5db25b13 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `dcolumn')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
index 3c8e3e608cf..904fe1e804c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `draftwatermark')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
index 07e598be14e..e879ba790d6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `easy-todo')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
index cd1cb6d4a7a..f50767a53fd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ebook')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
index 168775adc01..2e9a077363d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ellipsis')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
index 637559a08c9..c29ca596c20 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `emptypage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
index 97f39e23d8f..6093d8b6f55 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `endfloat')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
new file mode 100644
index 00000000000..7a3d721bff4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
@@ -0,0 +1,46 @@
+%%
+%% This is file `lwarp-endheads.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `endheads')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{endheads}
+\newcommand{\changesinglepageabbrev}[1]{}
+\newcommand{\changemultiplepageabbrev}[1]{}
+\newcommand{\changenotesname}[1]{}
+\newcommand{\changenotesheader}[1]{}
+\newcommand{\changenotescontentsname}[1]{}
+\newcommand{\changechapternotesline}[1]{}
+\newcommand{\checknoteheaders}{}
+\newif\ifnotesincontentson \notesincontentsonfalse
+\newcommand{\notesincontents}{\notesincontentsontrue}
+\newif\ifendnoteheaderson \endnoteheadersonfalse
+\newcommand{\setupendnoteheaders}{%
+    \endnoteheadersontrue%
+}
+\newif\iftitleinnotes \titleinnotestrue
+\newcommand{\styleforchapternotebegin}{}
+\newcommand{\styleforchapternoteend}{}
+\newcommand{\setstyleforchapternotebegin}[1]{%
+    \renewcommand{\styleforchapternotebegin}{#1}%
+}
+\newcommand{\setstyleforchapternoteend}[1]{%
+    \renewcommand{\styleforchapternoteend}{#1}%
+}
+\newcommand{\resetendnotes}{}
+\newif\ifnotesbychapteron \notesbychapteronfalse
+\newcommand{\notesbychapter}{\notesbychapterontrue}
+\endinput
+%%
+%% End of file `lwarp-endheads.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
index ab261f9beef..59a2d9436b4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `endnotes')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
index c15721e63a0..ea2a39a3aa4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `enumerate')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
index 69e61d69b38..a4a24b60a44 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `enumitem')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
index df4cd6d0f67..baf988e25e6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `epigraph')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -34,13 +34,13 @@
 
 \DeclareDocumentCommand{\epigraph}{m m}
 {
-\begin{LWR@BlockClassWP}{text-align:right}{}{epigraph}
+\begin{LWR@BlockClassWP}{\mbox{text-align:right}}{}{epigraph}
 \qitem{#1}{#2}
 \end{LWR@BlockClassWP}
 }
 
 \DeclareDocumentEnvironment{epigraphs}{}
-{\LWR@BlockClassWP{text-align:right}{}{epigraph}}
+{\LWR@BlockClassWP{\mbox{text-align:right}}{}{epigraph}}
 {\endLWR@BlockClassWP}
 \newenvironment*{flushepinormal}{}{}
 \@ifclassloaded{memoir}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
index b56685abffd..fd3172607d1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `eso-pic')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
index e61ca8712c0..aa2bcaa75f5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `everypage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
index d20e80cc9dc..073ff556142 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `everyshi')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
index 9e94df697d9..820e3c45f1f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `extramarks')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
index 2b37662cbe5..a16f15b61f8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fancybox')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
index 48933536a65..1a93b496b11 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fancyhdr')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
index ce330c9ef49..e66e8a76c87 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fancyref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 4a70cda4dd0..9f3585173cf 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fancyvrb')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
index d42a23cf6ae..70f1919ab68 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `figcaps')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
index f13ec7aecf5..85851fa8afd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fix2col')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
index 1b64fc04c68..a064511b55d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fixme')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
index 82c54c24a51..fd3bd2744a6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fixmetodonotes')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
index 25a6c34b70c..e5c21ea61e7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `flafter')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
index c9ac7efb6a3..f67fc713f41 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `float')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
index f661c366309..20ebdc37a1e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `floatflt')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
index c3912bcc43a..81ef9e7f447 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `floatpag')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
index 6eac63bcabd..d5827bb74a4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `floatrow')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
index b41219370d1..7cb16fcb5e8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fltrace')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
index 9672ae47b95..0c53f72061a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `flushend')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
index 6542a5c317c..5c234932e88 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fncychap')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
index 3e12b0db889..29f64314007 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fnpos')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
index a0cb426d29b..1ee0eb7d46f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fontenc')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
index 9af1946bd8f..43ed388849f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fontspec')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
index 4c749966490..c5201420915 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `footmisc')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
index cb86afd25fe..3c3baaf7432 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `footnote')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
index d76644d04f3..64c537bbd06 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `footnotehyper')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty
index c9cb7e00c97..04fdb7dd02c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `footnpag')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
index 2382f8affa5..77d65ddb393 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `framed')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
index 7689e016cf6..33b79f6ef0d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ftnright')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty
index bc517f86663..d5240e57333 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fullpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
index 1eb992f9c2a..8cd46c52925 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fullwidth')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty
index 2e23840efe8..35f1f2f11f2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `fwlw')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
index 61c1a43b917..89d84bb1892 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `geometry')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
index f30a5337752..746c0ce2704 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `glossaries')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index febcad9a763..c2ab09c314e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `graphics')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -240,17 +240,17 @@ img src="%
 {\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}%
 \ifthenelse{\NOT\equal{\LWR@igangle}{}}%
 {%
-\LWR@rotstyle{-ms-}{\LWR@igangle}%
-\LWR@rotstyle{-webkit-}{\LWR@igangle}%
-\LWR@rotstyle{}{\LWR@igangle%
+\LWR@rotstyle{-ms-}{\LWR@igangle} %
+\LWR@rotstyle{-webkit-}{\LWR@igangle} %
+\LWR@rotstyle{}{\LWR@igangle %
 }}{}%
 \ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR%
 \NOT\equal{\LWR@igyscale}{1}}%
-{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}%
-\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}%
-\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}%
+{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} %
+\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} %
+\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{} %
 \ifthenelse{\NOT\equal{\LWR@opacity}{1}}%
-{opacity:\LWR@opacity;}%
+{opacity:\LWR@opacity; }%
 {}%
 " \LWR@orignewline}{}%
 \LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
index 47abc0d6da5..76f1b1cc37b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `graphicx')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
index 21865e88d67..34abd49dcf6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `grffile')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
index 30fba575b43..c573cd21602 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `hang')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,8 +31,8 @@
     \LWR@findhangingleftmargin%
     \uselengthunit{PT}%
     \BlockClass[%
-        margin-left:\rndprintlength{\LWR@templengthone}; %
-        text-indent:-\rndprintlength{\hangingindent}%
+        \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+        \mbox{text-indent:-\rndprintlength{\hangingindent}}%
     ]%
     {hangingpar}%
 }
@@ -44,9 +44,9 @@
     \renewcommand*{\LWR@printopenlist}{%
         \LWR@findhangingleftmargin%
         \uselengthunit{PT}%
-        ul style="list-style-type:none; %
-        margin-left:\rndprintlength{\LWR@templengthone}; %
-        text-indent:-\rndprintlength{\hangingindent}"%
+        ul style="\mbox{list-style-type:none;} %
+        \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+        \mbox{text-indent:-\rndprintlength{\hangingindent}}"%
     }%
     \let\item\LWR@itemizeitem%
     \list{}{}%
@@ -65,8 +65,8 @@
     \BlockClass[%
         \LWR@findhangingleftmargin%
         \uselengthunit{PT}%
-        margin-left:\rndprintlength{\LWR@templengthone}; %
-        text-indent:-\rndprintlength{\hangingindent}%
+        \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+        \mbox{text-indent:-\rndprintlength{\hangingindent}}%
     ]{labeledpar}#2%
 }
 {\endBlockClass}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
index 27babf27838..7b80b347059 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `hanging')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,8 +29,8 @@
 {%
     \uselengthunit{PT}%
     \BlockClass[%
-        margin-left:\rndprintlength{#1}; %
-        text-indent:-\rndprintlength{#1}%
+        \mbox{margin-left:\rndprintlength{#1}} ; %
+        \mbox{text-indent:-\rndprintlength{#1}}%
     ]%
     {hangingpar}%
 }
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index 9a3dbe39609..e39cf45b3b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `hyperref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
index 9fb1ed187c2..6067b360622 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `hyperxmp')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
index facada26dda..08012499224 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `idxlayout')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
index 4aae9c65223..4d161c0630b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ifoddpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
index 65a9a5b7e80..c9dbabe4948 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `indentfirst')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
index 9d976026d8a..305d0e4a4d0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `inputenc')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
index 86e466408e4..20124144cfa 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `keyfloat')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,15 +20,42 @@
 \LWR@ProvidesPackagePass{keyfloat}
 
 \AtBeginDocument{
-
-\let\KFLT@boxinner\relax
-\let\endKFLT@boxinner\relax
-
-\NewEnviron{KFLT@boxinner}
+\RenewDocumentCommand{\KFLT@onefigureimage}{}
+{%
+\LWR@traceinfo{KFLT@onefigureimage}%
+\ifthenelse{\NOT\equal{\KFLT@lw}{}}%
+{\includegraphics%
+[scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}}%
+{% not linewidth
+\ifthenelse{\dimtest{\KFLT@w}{>}{0pt}}%
+{% width is given
+\ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}%
+{% w and h
+\includegraphics%
+[scale=\KFLT@s,%
+width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
+}% w and h
+{% only w
+\includegraphics%
+[scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}%
+}% only w
+}% width is given
+{% width is not given
+\ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}%
+{\includegraphics%
+[scale=\KFLT@s,height=\KFLT@h]{\KFLT@i}}%
+{\includegraphics%
+[scale=\KFLT@s]{\KFLT@i}}%
+}% width is not given
+}% not linewidth
+\LWR@traceinfo{KFLT@onefigureimage: done}%
+}
+\RenewDocumentEnvironment{KFLT@boxinner}{}
 {%
 \LWR@traceinfo{KFLT@boxinner}%
 \LWR@stoppars%
-\KFLT@frame{\BODY}%
+}
+{
 \LWR@startpars%
 \LWR@traceinfo{KFLT@boxinner: done}%
 }
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
index d799a78fe34..53e30b95262 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `layout')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
index c2f1353987b..e92a59e77b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `letterspace')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
index d24b787798e..4797dcd0663 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `lettrine')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
index a323c48dd0f..786c71d929d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `lips')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
index 134ca9b20e5..805e5de83a9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `listings')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
index acef725862f..69d760bd55f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `longtable')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
index 87e093ee194..edd434cc1a6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `lscape')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
index 01fbf6add9a..a651217295a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ltcaption')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
index f0e445be889..2c8c891da6f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ltxtable')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
index 13b7ce6da65..8c849b51d8f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `luatodonotes')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
index 777c939ddc4..235d2b7e157 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `marginfit')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
index 1886d21ae01..f0b24f0bd9e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `marginfix')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
index 9e00b76716d..1b378f126da 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `marginnote')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
index 74a93c60ceb..17194a86b06 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `mcaption')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
index 2c32ff0f9d3..8260d72e3a1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `mdframed')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -292,8 +292,8 @@ background:
           \begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
           {\end{mdframed}}%
      }%
-    \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new
-    \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new
+    \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% lwarp
+    \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR@mdthisenv}{md#2}}% lwarp
    }%
  }
 \DeclareDocumentCommand\newmdtheoremenv{O{} m o m o }{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
index 0d797ec70d9..167864fdd0e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `memhfixc')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
index 4a36afbfd09..4aad5da06cd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `metalogo')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
index 0061012e6e3..edee78b25d3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `microtype')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
index 4e6cd302954..7d488cdcab9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `midfloat')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
index be0793d58fd..5fc61d6ebb0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `midpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 \LWR@ProvidesPackageDrop{midpage}
 \newenvironment{midpage}
-{\begin{BlockClass}[margin-top:6ex ; margin-bottom:6ex]{midpage}}
+{\begin{BlockClass}[\mbox{margin-top:6ex} ; \mbox{margin-bottom:6ex}]{midpage}}
 {\end{BlockClass}}
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
index 1cdc23f4ff3..f186e5dd31a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `moreverb')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty
index b3f99274978..bb6e8005b8a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-morewrites.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `morewrites')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
index cfc39a98d2e..ba78fec0115 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `mparhack')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
index 69db5903c3e..82035621c47 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `multicol')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index cb12114ef03..747c03c6443 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `multirow')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,12 +27,12 @@
 \LWR@tabularleftedge%
 \LWR@htmltag{td rowspan="#2" %
 \IfValueT{#1}{%
-\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
-\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+\ifstrequal{#1}{b}{style="\mbox{vertical-align:bottom}" }{}%
+\ifstrequal{#1}{t}{style="\mbox{vertical-align:top}" }{}%
 }%
 \ifdefvoid{\LWR@multirowborder}{}{%
-style="border-\LWR@multirowborder: 2px dotted black ; %
-padding-\LWR@multirowborder: 2px" %
+style="\mbox{border-\LWR@multirowborder:} 2px dotted black ; %
+\mbox{padding-\LWR@multirowborder:} 2px" %
 }%
 class="td%
 \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
new file mode 100644
index 00000000000..109f28dbeb8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-multitoc.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `multitoc')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{multitoc}
+\newcommand{\multicolumntoc}{2}
+\newcommand{\multicolumnlot}{2}
+\newcommand{\multicolumnlof}{2}
+\newcommand*{\immediateaddtocontents}[2]{}
+\endinput
+%%
+%% End of file `lwarp-multitoc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
index 04b0f2b2052..a6a01190896 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `nameref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
index ec0e9d85218..c769c3656c9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `natbib')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
index c3ef6ca79b6..ff14862ea21 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `needspace')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
index c7bf7b97112..03260354585 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `newclude')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
index b06d1f69915..829458a8877 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `newunicodechar')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
index 0d770048bc3..75a64300bf1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `nextpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
index 2c179264345..47a989f8788 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `nonumonpart')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
index 2c930be7a1a..2a2eaeadf24 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `nopageno')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
index ee368983256..6ba92bada47 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `nowidow')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
index 48259f312e3..abc0c017891 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ntheorem')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -49,8 +49,8 @@
    \fi
    \refstepcounter[#1]{#2}%  <<< cleveref modification
    \theorem@prework
-    \LWR@forcenewpage% new
-    \BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+    \LWR@forcenewpage% lwarp
+    \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
    \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
    \ifuse@newframeskips  % cf. latex.ltx for topsepadd: \@trivlist
      \ifthm@inframe
@@ -85,8 +85,8 @@
    \fi
    \refstepcounter{#2}%
    \theorem@prework
-    \LWR@forcenewpage% new
-    \BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+    \LWR@forcenewpage% lwarp
+    \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
    \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
    \ifuse@newframeskips  % cf. latex.ltx for topsepadd: \@trivlist
      \ifthm@inframe
@@ -115,17 +115,17 @@
    \@ifundefined{th@#1}{\@warning
           {Unknown theoremstyle `#1'. Using `plain'}%
           \theorem@style{plain}
-            \renewcommand{\LWR@newtheoremstyle}{plain}% new
+            \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
             }%
       {
         \theorem@style{#1}
-        \renewcommand{\LWR@newtheoremstyle}{#1}% new
+        \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
         }
 }
 
 \gdef\@xnthm#1#2[#3]{%
   \ifthm@tempif
-     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
      \expandafter\@ifundefined{c@#1}%
         {\@definecounter{#1}}{}%
      \@newctr{#1}[#3]%
@@ -137,13 +137,13 @@
         \@thm{#1}{#1}{#2}
         }%
      \global\@namedef{end#1}{\@endtheorem}
-     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
   \fi
 }
 
 \gdef\@ynthm#1#2{%
   \ifthm@tempif
-     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
      \expandafter\@ifundefined{c@#1}%
         {\@definecounter{#1}}{}%
      \expandafter\xdef\csname the#1\endcsname
@@ -153,14 +153,14 @@
         \@thm{#1}{#1}{#2}
         }%
      \global\@namedef{end#1}{\@endtheorem}
-     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
   \fi
 }
 
 \gdef\@othm#1[#2]#3{%
   \@ifundefined{c@#2}{\@nocounterr{#2}}%
    {\ifthm@tempif
-     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
      \global\@namedef{the#1}{\@nameuse{the#2}}%
      \expandafter\protected@xdef\csname num@addtheoremline#1\endcsname{%
               \noexpand\@num@addtheoremline{#1}{#3}}%
@@ -174,23 +174,23 @@
                 \@thm{#1}{#2}{#3}
         }%
      \global\@namedef{end#1}{\@endtheorem}
-     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
   \fi}
 }
 \newcommand{\LWR@inctheorem}{%
 \addtocounter{LWR@thisautoid}{1}%
 \LWR@stoppars%
-\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
 \LWR@startpars%
 }
 \gdef\newtheoremstyle#1#2#3{%
   \expandafter\@ifundefined{th@#1}%
    {\expandafter\gdef\csname th@#1\endcsname{%
     \def\@begintheorem####1####2{%
-    \LWR@inctheorem% new
+    \LWR@inctheorem% lwarp
     #2}%
     \def\@opargbegintheorem####1####2####3{%
-    \LWR@inctheorem% new
+    \LWR@inctheorem% lwarp
     #3}%
 }%
 }%
@@ -332,12 +332,12 @@
 \gdef\th@plain{%
   \def\theorem@headerfont{\normalfont\bfseries}\itshape%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderplain}{##1\ ##2.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderplain}{##1\ ##2\ (##3).}
         ]}}
@@ -345,12 +345,12 @@
 \gdef\th@nonumberplain{%
   \def\theorem@headerfont{\normalfont\bfseries}\itshape%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderplain}{##1.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderplain}{##1\ (##3).}
         ]}}
@@ -358,12 +358,12 @@
 \gdef\th@definition{%
   \def\theorem@headerfont{\normalfont\bfseries}\normalfont%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderdefinition}{##1\ ##2.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).}
         ]}}
@@ -371,12 +371,12 @@
 \gdef\th@nonumberdefinition{%
   \def\theorem@headerfont{\normalfont\bfseries}\normalfont%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderdefinition}{##1.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderdefinition}{##1\ (##3).}
         ]}}
@@ -384,12 +384,12 @@
 \gdef\th@remark{%
   \def\theorem@headerfont{\itshape}\normalfont%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderremark}{##1\ ##2.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderremark}{##1\ ##2\ (##3).}
         ]}}
@@ -397,12 +397,12 @@
 \gdef\th@nonumberremark{%
   \def\theorem@headerfont{\itshape}\normalfont%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderremark}{##1.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderremark}{##1\ (##3).}
         ]}}
@@ -410,12 +410,12 @@
 \gdef\th@proof{%
   \def\theorem@headerfont{\normalfont\bfseries}\itshape%
   \def\@begintheorem##1##2{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
       \item[
   \InlineClass{theoremheaderproof}{##1.}
         ]}%
   \def\@opargbegintheorem##1##2##3{%
-        \LWR@inctheorem% new
+        \LWR@inctheorem% lwarp
      \item[
   \InlineClass{theoremheaderproof}{##1\ (##3).}
         ]}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
index e02f72634e7..d8936eebf53 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `overpic')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
index f5f078e00ff..3ce323a9dde 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `pagenote')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
index bbc134dd980..1ea976df496 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `pagesel')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
index 49213ad68bf..c80e0226228 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `paralist')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
index 8ea5d9853b6..7aafd0eb613 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `parskip')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
index c92d689bd46..4efdb3e6641 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `patch-komascript')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
index b4137e1a4da..0db069503aa 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `patch-memoir')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
index 77c4bca36fe..2ec560e763d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `pdflscape')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
index 191ca40272f..2a5b91511d1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `pdfsync')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
index 7bac54a7c01..7967c22c6cb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `pfnote')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
index 15b024ee36b..9c901faea81 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `placeins')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
index 59dd4fe10a2..09fedf01429 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `prelim2e')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
index 169c4f82724..d30b8a69a9b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `prettyref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
index 263205b4c29..81a125c75b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `preview')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
index 7822c42e918..58b4e59aa3a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `quotchap')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
index 79ab2dbc526..0437ea68732 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ragged2e')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
index 804a294623a..0a9e47fff36 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `realscripts')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,8 +28,8 @@
 
 \newcommand*{\LWR@setrealscriptsalign}[1]{%
 \renewcommand*{\LWR@realscriptsalign}{}%
-\ifthenelse{\equal{#1}{c}}{\renewcommand{\LWR@realscriptsalign}{text-align:center;}}{}%
-\ifthenelse{\equal{#1}{r}}{\renewcommand{\LWR@realscriptsalign}{text-align:right;}}{}%
+\ifthenelse{\equal{#1}{c}}{\renewcommand{\LWR@realscriptsalign}{\mbox{text-align:center} ; }}{}%
+\ifthenelse{\equal{#1}{r}}{\renewcommand{\LWR@realscriptsalign}{\mbox{text-align:right} ; }}{}%
 }
 
 \DeclareDocumentCommand \textsubsuperscript {s O{l} mm} {%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
index 8319957105e..f246190304e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `relsize')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
index 3f4a5c75267..48ac021bc5a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `romanbar')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
index 456d620bd9b..475e4adaf74 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `romanbarpagenumber')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
index 94243a77016..f5a0584da28 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `rotating')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
index 33d30c5224a..809d42dbae3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `rotfloat')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
index 679b6475d00..b3478bc281a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `savetrees')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty
index 0c08dc5b326..798b1cd6b68 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scalefnt')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
index 3542c5e2feb..40d49d6708f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scrextend')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -78,12 +78,12 @@
 \DeclareDocumentCommand{\raggedfootnote}{}{}
 
 \DeclareDocumentCommand{\dictum}{o m}{
-\begin{LWR@BlockClassWP}{text-align:right}{}{dictum}
+\begin{LWR@BlockClassWP}{\mbox{text-align:right}}{}{dictum}
     #2
     \IfValueT{#1}
     {
         \ifbool{FormatWP}
-        {\begin{BlockClass}[border-top:1px solid gray]{dictumauthor}}
+        {\begin{BlockClass}[\mbox{border-top:} 1px solid gray]{dictumauthor}}
         {\begin{BlockClass}{dictumauthor}}
         \dictumauthorformat{#1}
         \end{BlockClass}
@@ -124,15 +124,15 @@
 \ifblank{#2}
 {
     \begin{BlockClass}[
-        margin-left:\rndprintlength{\LWR@templengthtwo} ;
-        margin-right:\rndprintlength{\LWR@templengthtwo}
+        \mbox{margin-left:\rndprintlength{\LWR@templengthtwo}} ;
+        \mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}
     ]{addmargin}
 }
 {
     \setlength{\LWR@templengthone}{#2}
     \begin{BlockClass}[
-        margin-left:\rndprintlength{\LWR@templengthone} ;
-        margin-right:\rndprintlength{\LWR@templengthtwo}
+        \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ;
+        \mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}
     ]{addmargin}
 }
 }
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
index 7765e7d05b2..c5fbc2b3549 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scrhack')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
index 1e1f8c7c7c0..7a3572825da 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scrlayer-notecolumn')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
index 6561d29e023..0d8a6abd786 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scrlayer-scrpage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
index 0a6da93405b..ca9546729f3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `scrlayer')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
index 749c4334a1f..40bca3c5c20 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `section')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
new file mode 100644
index 00000000000..5231852206a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
@@ -0,0 +1,35 @@
+%%
+%% This is file `lwarp-sectionbreak.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `sectionbreak')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\LWR@ProvidesPackagePass{sectionbreak}
+
+\renewcommand\asterism{\HTMLunicode{2042}}
+
+\renewcommand\pre@sectionbreak{}
+\renewcommand\post@sectionbreak{}
+
+\renewcommand\print@sectionbreak[1]{%
+\begin{center}
+#1
+\end{center}
+}
+
+
+\endinput
+%%
+%% End of file `lwarp-sectionbreak.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
index d759412b268..c27b98d78d7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `sectsty')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
index a8e454210ae..5371a767e4a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `setspace')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
index 193a5591035..1a2a5bfc9ad 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `shadow')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
index 24bd0244915..96922a5b5c8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `idx')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
index c032f4c14b7..66cb44a4324 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `showkeys')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
index 0669fce1338..6adce9c43b1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `sidecap')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
index 1549c9e3582..14903cd9b0a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `sidenotes')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,24 +16,26 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 \LWR@ProvidesPackagePass{sidenotes}
-\RenewDocumentCommand \sidecaption {s o o m}
+\RenewDocumentCommand \sidecaption {s o o +m}
 {
     \LWR@stoppars
+    \begingroup
   \captionsetup{style=sidecaption}
   \IfBooleanTF{#1}
   { % starred
-    \IfNoValueOrEmptyTF{#2}
-    {\marginnote{\caption*{#4}}}
-    {\marginnote{\caption*{#4}}[#2]}
+    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+    \caption*{#4}
+    \end{BlockClass}
   }
   { % unstarred
   \IfNoValueOrEmptyTF{#2}
     {\def\@sidenotes@sidecaption@tof{#4}}
     {\def\@sidenotes@sidecaption@tof{#2}}
-  \IfNoValueOrEmptyTF{#3}
-    {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}}
-    {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}[#3]}
+    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+    \caption[\@sidenotes@sidecaption@tof]{#4}
+    \end{BlockClass}
   }
+    \endgroup
     \LWR@startpars
 }
 \NewDocumentEnvironment{KFLTsidenotes@marginfloat}{O{-1.2ex} m}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
index aa9924e05f8..33b039f2d5a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `siunitx')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
index acab55ea14e..e67ae89cdd3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `soul')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
index 66eb3054fba..5260e4c2f6d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `soulpos')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
index a63888298f6..52738c7864a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `soulutf8')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
index 3e47e4a3289..a05fb970bcc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `stabular')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
index efb1a16c8ca..79745461deb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `subfig')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,8 +19,15 @@
 \LWR@ProvidesPackagePass{subfig}
 
 \long\def\sf@@@subfloat#1[#2][#3]#4{%
-\begin{minipage}{\linewidth}% new
-\LWR@stoppars% new
+\begin{minipage}{\linewidth}% lwarp
+\IfValueTF{#2}{%
+    \LWR@setlatestname{#2}%
+}{%
+    \IfValueTF{#3}{%
+        \LWR@setlatestname{#3}%
+    }{}%
+}%
+\LWR@stoppars% lwarp
     \@ifundefined{FBsc@max}{}%
         {\FB@readaux{\let\FBsuboheight\relax}}%
     \@tempcnta=\@ne
@@ -37,15 +44,6 @@
       \sf@bottom=\sf@nearskip
     \fi
     \leavevmode
-    \setbox\@tempboxa \hbox{#4}%
-    \@tempdima=\wd\@tempboxa
-    \@ifundefined{FBsc@max}{}%
-        {\global\advance\Xhsize-\wd\@tempboxa
-         \dimen@=\ht\@tempboxa
-         \advance\dimen@\dp\@tempboxa
-         \ifdim\dimen@>\FBso@max
-           \global\FBso@max\dimen@
-         \fi}%
     \bgroup
       \bgroup
         \ifcase\@tempcnta
@@ -59,11 +57,11 @@
           \ifx \@empty#3\relax \else
             \sf@subcaption{#1}{#2}{#3}%
           \fi\egroup
-            \LWR@startpars% new
+            \LWR@startpars% lwarp
             #4
-            \LWR@stoppars% new
+            \LWR@stoppars% lwarp
         }{%
-        \LWR@startpars% new
+        \LWR@startpars% lwarp
         \@ifundefined{FBsc@max}%
             {
                 #4
@@ -73,7 +71,7 @@
              \else
                 #4
              \fi}%
-        \LWR@stoppars% new
+        \LWR@stoppars% lwarp
           \egroup
           \ifx \@empty#3\relax \else
             \sf@subcaption{#1}{#2}{#3}%
@@ -88,13 +86,13 @@
     \ifmaincaptiontop\else
       \global\advance\@nameuse{c@\@captype}\m@ne
     \fi
-\end{minipage}% new
-\LWR@startpars% new
+\end{minipage}% lwarp
+\LWR@startpars% lwarp
   \endgroup\ignorespaces%
 }%
 
 \long\def\sf@subcaption#1#2#3{%
-\LWR@stoppars% new
+\LWR@stoppars% lwarp
   \ifx \relax#2\relax \else
     \bgroup
       \let\label=\@gobble
@@ -110,14 +108,14 @@
     \fi
     \@ifundefined{FBsc@max}%
         {
-\LWR@traceinfo{sfsubcap B1}% new
-            \LWR@figcaption% new
+\LWR@traceinfo{sfsubcap B1}% lwarp
+            \LWR@figcaption% lwarp
             \caption@make
                 {\@nameuse{sub\@captype name}}%
                 {\@nameuse{thesub\@captype}}%
                 {#3}
-            \endLWR@figcaption% new
-\LWR@traceinfo{sfsubcap B2}% new
+            \endLWR@figcaption% lwarp
+\LWR@traceinfo{sfsubcap B2}% lwarp
         }%
         {\dimen@\ht0%
          \advance\dimen@\dp0%
@@ -133,66 +131,20 @@
             }%
          \fi
 
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
                \caption@make
                    {\@nameuse{sub\@captype name}}%
                    {\@nameuse{thesub\@captype}}%
                    {#3}
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
 
         }%
   \egroup
-\LWR@startpars% new
-}
-
-\renewcommand\caption@@@make[2]{%
-\LWR@startpars% new
-  \sbox\@tempboxa{#1}%
-  \ifdim\wd\@tempboxa=\z@
-    \let\caption@lsep\relax
-  \fi
-  \caption@ifempty{#2}{%
-    \let\caption@lsep\@empty
-    \let\caption@tfmt\@firstofone
-  }%
-    \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new
-  \caption@applyfont
-  \caption@fmt
-    {\ifcaption@star\else
-       \begingroup
-         \captionlabelfont
-         #1%
-       \endgroup
-     \fi}%
-    {\ifcaption@star\else
-       \begingroup
-         \caption@iflf\captionlabelfont
-         \relax\caption@lsep
-       \endgroup
-     \fi}%
-    {{\captiontextfont
-      \caption@ifstrut
-        {\vrule\@height\ht\strutbox\@width\z@}%
-        {}%
-      \nobreak\hskip\z@skip % enable hyphenation
-      \caption@tfmt{#2}
-    \LWR@ensuredoingapar% new
-      \caption@ifstrut
-        {\ifhmode\@finalstrut\strutbox\fi}%
-        {}%
-      \par}}
-\LWR@stoppars% new
-}
-
-\renewcommand{\caption@@make@}[2]{%
-  \caption@stepthecounter
-  \caption@beginhook
-      \caption@@@make{#1}{#2}%
-  \caption@endhook
+\LWR@startpars% lwarp
 }
 
 \def\subfloat@label{%
-\LWR@ensuredoingapar% new
+\LWR@ensuredoingapar% lwarp
   \@ifnextchar(%   %) match left parenthesis
     {\sf@sub@label}
     {\sf@sub@label(Sub\@captype\space
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
index 82a09cc4dbc..f69086f105c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `subfigure')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
index a146d307b88..8bb138caf45 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `supertabular')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
index 8ca59206b5c..ca0992c2959 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `syntonly')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty
index 2bf7ee86b01..9640e6b3115 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tabls')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
index fab7370755b..0c13cddabf9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tabularx')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
index f2a7b3c5b07..8cc750f8dbb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tabulary')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
index f8e3b165110..78f4e102ce4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `textarea')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
index 2e1f5eecfa4..c421898bafd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `textcomp')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
index 0865fc742e1..4bf4be4fc9c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `textfit')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
index 21c805d6997..de1a5bb8ffe 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `textpos')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
index c0bad5e4b7f..72947b29fde 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `theorem')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,11 +25,11 @@
    \@ifundefined{th@#1}{\@warning
           {Unknown theoremstyle `#1'. Using `plain'}%
           \theorem@style{plain}%
-           \renewcommand{\LWR@newtheoremstyle}{plain}% new
+           \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
           }%
       {%
           \theorem@style{#1}%
-          \renewcommand{\LWR@newtheoremstyle}{#1}% new
+          \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
       }%
       \begingroup
         \csname th@\the\theorem@style \endcsname
@@ -38,7 +38,7 @@
 \gdef\@xnthm#1#2[#3]{%
    \expandafter\@ifdefinable\csname #1\endcsname
    {%
-    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
     \@definecounter{#1}\@newctr{#1}[#3]%
     \expandafter\xdef\csname the#1\endcsname
       {\expandafter \noexpand \csname the#3\endcsname
@@ -49,20 +49,20 @@
             \expandafter \endcsname \the \theorem@bodyfont
      \@thm{#1}{#2}}%
     \global \expandafter \let \csname end#1\endcsname \@endtheorem
-    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
    }}
 
 \gdef\@ynthm#1#2{%
     \expandafter\@ifdefinable\csname #1\endcsname
    {
-    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
     \@definecounter{#1}%
     \expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}%
     \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
      \expandafter{\csname th@\the \theorem@style \expandafter
      \endcsname \the\theorem@bodyfont \@thm{#1}{#2}}%
     \global \expandafter \let \csname end#1\endcsname \@endtheorem
-    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
    }}
 
 \gdef\@othm#1[#2]#3{%
@@ -71,14 +71,14 @@
   \else
    \expandafter\@ifdefinable\csname #1\endcsname
    {
-    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
     \expandafter \xdef \csname the#1\endcsname
      {\expandafter \noexpand \csname the#2\endcsname}%
     \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
      \expandafter{\csname th@\the \theorem@style \expandafter
      \endcsname \the\theorem@bodyfont \@thm{#2}{#3}}%
     \global \expandafter \let \csname end#1\endcsname \@endtheorem
-    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+    \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
     }%
   \fi}
 \gdef\th@plain{%
@@ -161,8 +161,8 @@
     }
 }
 \gdef\@thm#1#2{\refstepcounter{#1}%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
+\LWR@forcenewpage% lwarp
+    \BlockClass{theorembody\LWR@thisthmstyle}% lwarp
    \trivlist
    \@topsep \theorempreskipamount               % used by first \item
    \@topsepadd \theorempostskipamount           % used by \@endparenv
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
index d56adf85638..e241621739a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `threeparttable')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
index caca518a2c8..67e9e0c8377 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tikz')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
index 1cc8bb7a6ac..040533a6c0b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `titleps')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
index 8e9892773a1..4213cb7e6e2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `titleref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
index 797865b5c2f..738a07efcbf 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `titlesec')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
index 32cf62a33e4..8b1d1a40f97 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `titletoc')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index 7da04f1da90..58fdeda7e22 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `titling')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
index 73c0f79e6ed..0a2193d552e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tocbasic')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
index 1481bcf32ec..7ca19d5e869 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tocbibind')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
index b93eddf47e1..8e1976128b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tocloft')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
index 3c3dfba16ba..6fcbbeeede3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `tocstyle')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
index 2814d1c7193..3106abe1072 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `todo')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
index fc01e9edbb5..0c29784b898 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `todonotes')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
index 221759527b4..fb9d85084a7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `transparent')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
index 275434afa1b..a6c6f6bedf5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `trivfloat')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
index 2e99d817407..61b4e521ee9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `turnthepage')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
index 010b524170d..50c96875147 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `typearea')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
index bd89310b269..a5f5dc07776 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `ulem')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
index 81cfd6fa7f8..bee0e4619fc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `upref')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
index a5b041f642e..a76d19b9b3c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `verse')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
index 228e89f88d6..300247f76c8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `wallpaper')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
index e0db46ef192..d2424dee1a9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `watermark')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
index ef8270c1804..22a508217b4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `wrapfig')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 306c8e458ac..3d862a1aa58 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `xcolor')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
index c5092c059df..ace5816c046 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `xfrac')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
index 746ac736e28..2c250b4770b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `xltxtra')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
index 3d8faeb3a03..2b4f98adace 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `xmpincl')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
index 5a850ed5391..0906997a27a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `xtab')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
new file mode 100644
index 00000000000..a7e43d79665
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-xurl.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `xurl')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackageDrop{xurl}
+\endinput
+%%
+%% End of file `lwarp-xurl.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
index 808d1e5e966..48da87ded96 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `zwpagelayout')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index bd8ecd191dd..44c58f4f4a8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -6,7 +6,7 @@
 %%
 %% lwarp.dtx  (with options: `package')
 %% This is a generated file.
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2018 Brian Dunn
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{lwarp}
-    [2018/01/23 v0.46  Allows LaTeX to directly produce HTML5 output.]
+    [2018/01/30 v0.47  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -51,6 +51,8 @@
 \newcommand*\LWR@providelength[1]{%
     \ifdeflength{#1}{}{\newlength{#1}}%
 }
+\newcommand*{\LWR@convertto}[2]{\strip@pt\dimexpr #2*65536/\number\dimexpr 1#1}
+
 \RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
 \RequirePackage{xpatch}
 
@@ -226,12 +228,14 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{balance}
 \LWR@loadafter{bigdelim}
 \LWR@loadafter{bigstrut}
+\LWR@loadafter{blowup}
 \LWR@loadafter{bookmark}
 \LWR@notmemoirloadafter{booktabs}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{breakurl}
 \LWR@loadafter{cancel}
+\LWR@loadafter{caption}
 \LWR@notmemoirloadafter{ccaption}
 \LWR@loadafter{changebar}
 \LWR@notmemoirloadafter{changepage}
@@ -251,6 +255,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{ellipsis}
 \LWR@loadafter{emptypage}
 \LWR@loadafter{endfloat}
+\LWR@loadafter{endheads}
 \LWR@loadafter{endnotes}
 \LWR@notmemoirloadafter{enumerate}
 \LWR@loadafter{enumitem}
@@ -319,6 +324,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@notmemoirloadafter{moreverb}
 \LWR@notmemoirloadafter{mparhack}
 \LWR@loadafter{multirow}
+\LWR@loadafter{multitoc}
 \LWR@loadafter{nameref}
 \LWR@loadafter{natbib}
 \LWR@notmemoirloadafter{needspace}
@@ -355,6 +361,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{scrlayer-notecolumn}
 \LWR@loadafter{scrlayer-scrpage}
 \LWR@loadafter{section}
+\LWR@loadafter{sectionbreak}
 \LWR@loadafter{sectsty}
 \LWR@notmemoirloadafter{setspace}
 \LWR@loadafter{shadow}
@@ -403,6 +410,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{xltxtra}
 \LWR@loadafter{xmpincl}
 \LWR@loadafter{xtab}
+\LWR@loadafter{xurl}
 \LWR@loadafter{zwpagelayout}
 
 
@@ -507,8 +515,6 @@ top=1in,bottom=1in,%
 
 \RequirePackage{newfloat}
 
-\RequirePackage{caption}
-
 
 \end{warpHTML}
 
@@ -541,9 +547,7 @@ top=1in,bottom=1in,%
 }
 \newcommand*{\LWR@lookforpackagename}[1]{%
 \LWR@findword{\LWR@requirepackagenames}{#1}[\LWR@strresult]%
-\LWR@traceinfo{LWR@lookforpackagename with blanks: !\LWR@strresult!}%
 \StrSubstitute[100]{\LWR@strresult}{ }{}[\LWR@strresulttwo]%
-\LWR@traceinfo{LWR@lookforpackagename without blanks: !\LWR@strresulttwo!}%
 \IfStrEq{\LWR@strresulttwo}{}%
 {}% no filename
 {% yes filename
@@ -612,6 +616,13 @@ top=1in,bottom=1in,%
 \end{warpHTML}
 
 
+\begin{warpHTML}
+
+\RequirePackage{caption}%
+
+\end{warpHTML}
+
+
 
 
 \begin{warpall}
@@ -629,9 +640,9 @@ top=1in,bottom=1in,%
 \begin{warpHTML}
 
 \def\@include#1 {%
-\immediate\openout\LWR@quickfile #1_html_inc.tex% new
-\immediate\write\LWR@quickfile{\string\input{#1.tex}}% new
-\immediate\closeout\LWR@quickfile% new
+\immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp
+\immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp
+\immediate\closeout\LWR@quickfile% lwarp
 \LWR@origclearpage% \changed
 \if@filesw
     \immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
@@ -2401,6 +2412,8 @@ div.minipage {
     border-radius: 1ex ;
 }
 
+div.framebox div.minipage {border:none ; background:none}
+
 section.textbody > div.minipage {
     box-shadow: 3px 3px 3px #808080 ;
 }
@@ -2847,7 +2860,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.46"
+printversion = "v0.47"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -3123,7 +3136,7 @@ err = os.execute(
  lwimgpage .. " " .. sourcename .."_html.pdf lateximagetemp-%d.pdf")
 -- Crop the image:
 err = os.execute(
-"pdfcrop --hires lateximagetemp-" .. lwimgpage ..".pdf lateximage-" .. lwimgnum ..".pdf")
+"pdfcrop  lateximagetemp-" .. lwimgpage ..".pdf lateximage-" .. lwimgnum ..".pdf")
 if ( err ~= 0 ) then print ( "lwarpmk: File error.") ; os.exit(1) ; end
 -- Convert the image to svg:
 err = os.execute(
@@ -3831,7 +3844,7 @@ end -- not --version
 \begingroup%
 \LWR@FBcancel%
 \ifmmode\else\protect\LWR@origttfamily\fi%
-\LWR@origtextless{}!{-}{-}%
+\mbox{\LWR@origtextless{}!{-}{-}}%
 \endgroup%
 }%
 }
@@ -3841,7 +3854,7 @@ end -- not --version
 \begingroup%
 \LWR@FBcancel%
 \ifmmode\else\protect\LWR@origttfamily\fi%
-{-}{-}\LWR@origtextgreater{}%
+\mbox{{-}{-}\LWR@origtextgreater}%
 \endgroup%
 }%
 }
@@ -3953,7 +3966,7 @@ end -- not --version
     \addtocounter{LWR@thisautoidWP}{1}%
     \LWR@htmltag{%
         div class="#3" %
-        id="autoidWP-\arabic{LWR@thisautoidWP}"%
+        id="\mbox{autoidWP-\arabic{LWR@thisautoidWP}}"%
         \ifblank{#1}{}{ style="#1"}%
     }%
 }% FormatWP
@@ -4534,7 +4547,7 @@ end -- not --version
 }
 
 \newcommand*{\LWR@createautosec}[1]{%
-\LWR@htmltag{#1 id="autosec-\arabic{page}"}%
+\LWR@htmltag{#1 id="\mbox{autosec-\arabic{page}}"}%
 }
 
 \NewDocumentCommand{\LWR@pushoneclose}{m m}{%
@@ -4916,6 +4929,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@htmltag{section class="textbody"}
 \LWR@patchlists
 \catcode`\$=\active
+\immediate\write\@mainaux{\catcode`\string$\active}%
+\LetLtxMacro\LWR@syntaxhighlightone$% balance for editor syntax highlighting
 \LWR@startpars
 \LWR@traceinfo{LWR@lwarpStart: done}
 }
@@ -5315,7 +5330,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \begin{warpHTML}
 
 \newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+
+\newcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
 
 
 \def\@mklab#1{%
@@ -5398,7 +5414,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@itemizestart}{%
 \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+\renewcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
 \let\item\LWR@itemizeitem%
 }
 
@@ -5406,7 +5422,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@enumeratestart}{%
 \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+\renewcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
 \let\item\LWR@itemizeitem%
 }
 
@@ -6036,6 +6052,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newlength{\LWR@templengthone}%
 \newlength{\LWR@templengthtwo}%
+\newlength{\LWR@templengththree}%
 
 \newboolean{LWR@tdhavecellstyle}
 
@@ -6100,7 +6117,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@WPcell}[2]{%
 \LWR@tdaddstyle%
-text-align:#1; vertical-align:#2%
+\mbox{text-align:#1}; \mbox{vertical-align:#2}%
 }
 
 \newcommand*{\LWR@addformatwpalignment}[1]{%
@@ -6226,8 +6243,8 @@ text-align:#1; vertical-align:#2%
 \IfValueT{#2}{ % rows?
 rowspan="#2" %
 \IfValueT{#1}{% vpos?
-\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
-\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+\ifstrequal{#1}{b}{style="\mbox{vertical-align:bottom}" }{}%
+\ifstrequal{#1}{t}{style="\mbox{vertical-align:top}" }{}%
 }% vpos?
 }% rows?
  class="td%
@@ -6713,16 +6730,16 @@ rowspan="#2" %
     {% pars allowed
         \ifbool{LWR@doingapar}%
         {% par started
-            \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+            \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
         }% par started
         {% par not started
             \LWR@stoppars%
-            \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+            \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
             \LWR@startpars%
         }% par not started
     }% pars allowed
     {% pars not allowed
-        \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+        \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
     }% pars not allowed
 }% not lateximage
 }
@@ -6746,7 +6763,7 @@ rowspan="#2" %
 \LWR@traceinfo{LWR@startref A: !#1!}%
 \LWR@htmltag{a href="%
 \LWR@traceinfo{LWR@startref B}%
-\LWR@htmlrefsectionfilename{#1}%
+\mbox{\LWR@htmlrefsectionfilename{#1}}%
 \LWR@traceinfo{LWR@startref C}%
 \#%
 \LWR@traceinfo{LWR@startref D: !#1!}%
@@ -6764,7 +6781,7 @@ rowspan="#2" %
     }%
     {%
         \LWR@traceinfo{LWR@startref D3}%
-        \LWR@sanitized%
+        \mbox{\LWR@sanitized}%
     }%
 }%
 \LWR@traceinfo{LWR@startref E}%
@@ -6793,14 +6810,14 @@ rowspan="#2" %
 {(\cpageref{#2})}%
 }
 
-\DeclareRobustCommand*{\nameref}[1]{%
-\LWR@traceinfo{nameref A}%
+\newrobustcmd*{\nameref}[1]{%
+\LWR@traceinfo{nameref}%
 \LWR@startref{#1}%
 \LWR@traceinfo{nameref B}%
 \LWR@nameref{#1}%
 \LWR@traceinfo{nameref C}%
 \LWR@htmltag{/a}%
-\LWR@traceinfo{nameref D}%
+\LWR@traceinfo{nameref: done}%
 }
 
 \LetLtxMacro\Nameref\nameref
@@ -6880,7 +6897,7 @@ autopage-\theLWR@currentautosec%
 \booltrue{LWR@freezethisautoid}%
 \begingroup%
 \LWR@origraggedright%
-\LWR@htmltag{figure id="autoid-\arabic{LWR@thisautoid}" class="#1"}%
+\LWR@htmltag{figure id="\mbox{autoid-\arabic{LWR@thisautoid}}" class="#1"}%
 \ifbool{FormatWP}{%
     \LWR@orignewline%
     \LWR@BlockClassWP{}{}{wp#1}%
@@ -6923,7 +6940,7 @@ autopage-\theLWR@currentautosec%
 \newcommand*{\LWR@newautoidanchor}{%
 \ifbool{LWR@freezethisautoid}{}{%
     \addtocounter{LWR@thisautoid}{1}%
-    \LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+    \LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
 }%
 }
 
@@ -6932,7 +6949,12 @@ autopage-\theLWR@currentautosec%
 
 \AtBeginDocument{\providecommand*{\CaptionSeparator}{:~}}
 
-\AtBeginDocument{\renewcommand{\@makecaption}[2]{#1\CaptionSeparator#2}}
+\AtBeginDocument{\renewcommand{\@makecaption}[2]{%
+    \LWR@traceinfo{@makecaption}%
+    #1\CaptionSeparator#2%
+    \LWR@traceinfo{@makecaption: done}%
+}%
+}
 
 
 \newcounter{LWR@nextautoid}
@@ -6947,22 +6969,26 @@ autopage-\theLWR@currentautosec%
 
 \newenvironment*{LWR@figcaption}
 {%
+\LWR@traceinfo{LWR@figcaption env start}%
 \LWR@htmlblocktag{figcaption}
 \ifbool{FormatWP}{%
 \begin{BlockClass}[font-style:italic]{italic}
 \LWR@origvspace*{\baselineskip}
 }{}%
+\LWR@traceinfo{LWR@figcaption env start: done}%
 }
 {%
+\LWR@traceinfo{LWR@figcaption env end}%
 \ifbool{FormatWP}{\end{BlockClass}}{}%
 \LWR@htmlblocktag{/figcaption}%
+\LWR@traceinfo{LWR@figcaption env end: done}%
 }
 
 \let\LWR@origcaption@begin\caption@begin
 \let\LWR@origcaption@end\caption@end
 \let\LWR@orig@@par\@@par
 
-\newcommand{\LWR@caption@begin}
+\newcommand{\LWR@caption@begin}[1]
 {
 \LWR@traceinfo{LWR@caption@begin}%
 \begingroup%
@@ -6970,11 +6996,14 @@ autopage-\theLWR@currentautosec%
 \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
 \RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}%
 \LWR@figcaption%
-\LWR@origcaption@begin%
+\LWR@traceinfo{LWR@caption@begin: about to LWR@origcaption@begin}%
+\LWR@origcaption@begin{#1}%
+\LWR@traceinfo{LWR@caption@begin: done}%
 }
 
 \newcommand{\LWR@caption@end}
 {%
+\LWR@traceinfo{LWR@caption@end}%
 \LWR@origcaption@end%
 \LWR@origvspace*{\baselineskip}%
 \endLWR@figcaption%
@@ -6996,7 +7025,7 @@ autopage-\theLWR@currentautosec%
 
 \def\LWR@LTcaptionlistentry{%
 \LWR@ensuredoingapar%
-\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
   \bgroup
   \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble *
           {\egroup\LWR@LT@captionlistentry}}%
@@ -7168,7 +7197,7 @@ autopage-\theLWR@currentautosec%
 \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{%
     \LWR@startpars%
     \LWR@subhyperrefclass{%
-        \LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4%
+        \LWR@htmlrefsectionfilename{autopage-#4}\#\mbox{autosec-#4}%
     }{#3}{toc#2}%
     \LWR@stoppars%
 }
@@ -7197,7 +7226,7 @@ autopage-\theLWR@currentautosec%
     \LWR@startpars%
     \LWR@subhyperrefclass{%
     \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}%
-    \#autoid-\arabic{LWR@nextautoid}}%
+    \#\mbox{autoid-\arabic{LWR@nextautoid}}}%
     {#4}{toc#2}%
     \LWR@stoppars%
 }{}%
@@ -7439,30 +7468,64 @@ autopage-\theLWR@currentautosec%
 
 }% not mathjax
 }%
+\newlength{\LWR@singledollarwidth}
+\newlength{\LWR@singledollarheight}
+\newlength{\LWR@singledollardepth}
+
 \protected\gdef\LWR@subsingledollar#1{%
+\begingroup%
+\normalsize%
 \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
 {%
-        {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}%
+    {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}%
 }% mathjax
 {% not mathjax
-        \begin{lateximage}%
-        [\textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)]%
+    \LWR@restoreorigformatting%
+    \LWR@orignormalsize%
+    \global\setlength{\LWR@singledollardepth}{\depthof{%
         \LWR@origdollar#1\LWR@origdollar%
-        \end{lateximage}%
+    }*\real{.8}}%
+    \global\setlength{\LWR@singledollarwidth}{\widthof{%
+        \LWR@origdollar#1\LWR@origdollar%
+    }*\real{.8}}%
+    \global\setlength{\LWR@singledollarheight}{\totalheightof{%
+        \LWR@origdollar#1\LWR@origdollar%
+    }*\real{.8}}%
+        \def\LWR@singledollarstyle{%
+            height:\LWR@convertto{em}{\the\LWR@singledollarheight }em%
+        }%
+    \ifdimless{\LWR@singledollarheight}{.3em}%
+    {%
+        \def\LWR@singledollarstyle{%
+            width:\LWR@convertto{em}{\the\LWR@singledollarwidth} em%
+        }%
+    }%
+    {}%
+    \ifdimgreater{\LWR@singledollardepth}{0.01em}{%
+        \def\LWR@singledollardepthstyle{%
+            \ ; \mbox{vertical-align:-\LWR@convertto{em}{\the\LWR@singledollardepth} em} %
+        }%
+    }{%
+        \def\LWR@singledollardepthstyle{}%
+    }%
+    \begin{lateximage}%
+        [\textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)]%
+        [\LWR@singledollarstyle \LWR@singledollardepthstyle]%
+    \LWR@origdollar#1\LWR@origdollar%
+    \end{lateximage}%
 }%
+\endgroup%
 }
 
 \protected\gdef\LWR@singledollar#1${%
 \LWR@subsingledollar{#1}%
 }
 
-\protected\gdef\(#1\){%
-$#1$}
+\protected\gdef\(#1\){$#1$}
 \protected\gdef\[#1\]{$$#1$$}
 
 \endgroup
 
-
 \LetLtxMacro\LWR@origensuredmath\@ensuredmath
 
 \renewcommand{\@ensuredmath}[1]{%
@@ -7978,7 +8041,7 @@ $#1$}
 
 \catcode`\$=\active%
 
-\NewDocumentEnvironment{lateximage}{O{image}}
+\NewDocumentEnvironment{lateximage}{O{image}O{}}
 {%
 \LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}%
 \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
@@ -8000,7 +8063,7 @@ $#1$}
     \setcounterpageref{LWR@LIpage}{LWRlateximage\arabic{LWR@lateximagenumber}}%
     \LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}%
     \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" %
-    class="lateximagesource"} \LWR@orignewline
+    class="lateximagesource"}%
     \LWR@traceinfo{lateximage: about to write to lateximages.txt}%
     \immediate\write\LWR@lateximagesfile{|\arabic{LWR@LIpage}|\arabic{LWR@externalfilecnt}|}%
     \LWR@traceinfo{lateximage: about to create open comment}%
@@ -8037,10 +8100,10 @@ $#1$}
     \LWR@orignewpage%
     \LWR@origscriptsize%
     \LWR@origvspace*{.5\baselineskip}%
-    \LWR@htmlclosecomment{}\LWR@orignewline%
+    \LWR@htmlclosecomment%
     \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}%
     \LWR@subinlineimage[#1]{lateximage}%
-    {lateximages\OSPathSymbol{}lateximage-\theLWR@externalfilecnt}{svg}{}%
+    {lateximages\OSPathSymbol{}\mbox{lateximage-\theLWR@externalfilecnt}}{svg}{#2}%
     \LWR@ensuredoingapar%
     \LWR@htmltag{/span}%
     \ifbool{HTMLDebugComments}{%
@@ -8054,7 +8117,7 @@ $#1$}
 \end{warpHTML}
 
 \begin{warpprint}
-\newenvironment{lateximage}[1][]{}{}
+\NewDocumentEnvironment{lateximage}{O{image}O{}}{}{}
 \end{warpprint}
 
 
@@ -8064,7 +8127,7 @@ $#1$}
 {
 \LWR@forcenewpage
 \ifbool{FormatWP}
-{\BlockClass[text-align:center]{center}}
+{\BlockClass[\mbox{text-align:center}]{center}}
 {\BlockClass{center}}
 }
 {\endBlockClass}
@@ -8073,7 +8136,7 @@ $#1$}
 {
 \LWR@forcenewpage
 \ifbool{FormatWP}
-{\BlockClass[text-align:right]{flushright}}
+{\BlockClass[\mbox{text-align:right}]{flushright}}
 {\BlockClass{flushright}}
 }
 {\endBlockClass}
@@ -8082,7 +8145,7 @@ $#1$}
 {
 \LWR@forcenewpage
 \ifbool{FormatWP}
-{\BlockClass[text-align:left]{flushleft}}
+{\BlockClass[\mbox{text-align:left}]{flushleft}}
 {\BlockClass{flushleft}}
 }
 {\endBlockClass}
@@ -8324,18 +8387,18 @@ $#1$}
 \ifbool{FormatWP}{%
 
 \addtocounter{LWR@thisautoidWP}{1}%
-\LWR@htmltag{div id="autoidWP-\arabic{LWR@thisautoidWP}" class="wpminipage"}%
+\LWR@htmltag{div id="\mbox{autoidWP-\arabic{LWR@thisautoidWP}}" class="wpminipage"}%
 
 }{}%
 \LWR@traceinfo{minipage: creating div class}%
 \LWR@htmltag{div class="minipage" style="%
-\ifthenelse{\equal{#1}{t}}{vertical-align:bottom ; }{}%
-\ifthenelse{\equal{#1}{c}}{vertical-align:middle ; }{}%
-\ifthenelse{\equal{#1}{b}}{vertical-align:top ; }{}%
-\ifthenelse{\equal{#3}{t}}{justify-content:flex-start ; }{}%
-\ifthenelse{\equal{#3}{c}}{justify-content:center ; }{}%
-\ifthenelse{\equal{#3}{b}}{justify-content:flex-end ; }{}%
-\ifthenelse{\equal{#3}{s}}{justify-content:space-between ; }{}%
+\ifthenelse{\equal{#1}{t}}{\mbox{vertical-align:bottom} ; }{}%
+\ifthenelse{\equal{#1}{c}}{\mbox{vertical-align:middle} ; }{}%
+\ifthenelse{\equal{#1}{b}}{\mbox{vertical-align:top} ; }{}%
+\ifthenelse{\equal{#3}{t}}{\mbox{justify-content:flex-start} ; }{}%
+\ifthenelse{\equal{#3}{c}}{\mbox{justify-content:center} ; }{}%
+\ifthenelse{\equal{#3}{b}}{\mbox{justify-content:flex-end} ; }{}%
+\ifthenelse{\equal{#3}{s}}{\mbox{justify-content:space-between} ; }{}%
 \LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}%
 \uselengthunit{PT}%
 \ifbool{LWR@minipagefullwidth}%
@@ -8407,8 +8470,8 @@ $#1$}
     \setlength{\LWR@tempwidth}{#2}%
     \uselengthunit{PT}%
     \InlineClass[%
-        display:inline-block ; %
-        text-align:\LWR@align\ ; %
+        \mbox{display:inline-block} ; %
+        \mbox{text-align}:\LWR@align\ ; %
         width:\rndprintlength{\LWR@tempwidth}%
     ]%
     {makebox}%
author	Karl Berry <karl@freefriends.org>	2018-01-30 21:05:29 +0000
committer	Karl Berry <karl@freefriends.org>	2018-01-30 21:05:29 +0000
commit	83e0b95d2f78cf405abe952e383dcd0d986eee66 (patch)
tree	322c558d9417cafdf345ae56b31ef814ac057e72 /Master/texmf-dist/tex/latex
parent	1b674ef86fe17b1011f19a929dfd82253eb90995 (diff)