lwarp (23mar17)

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

79 files changed, 3726 insertions, 46 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
index 4c470c63641..dbe49f6c5e7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
@@ -188,6 +188,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-abstract.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
index f56a93787ff..392e7e6b82e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
@@ -130,6 +130,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-afterpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
index bb8af86c89e..c31f2fde6bc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
@@ -146,6 +146,27 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-algorithmicx.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
index f568d17e1f5..7e707a15dca 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
@@ -133,6 +133,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-alltt.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
new file mode 100644
index 00000000000..930bcda25e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
@@ -0,0 +1,232 @@
+%%
+%% This is file `lwarp-amsthm.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `amsthm')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@ProvidesPackagePass{amsthm}
+
+\newcommand{\LWR@newtheoremstyle}{plain}
+
+\renewcommand{\theoremstyle}[1]{%
+  \@ifundefined{th@#1}{%
+    \PackageWarning{amsthm}{Unknown theoremstyle `#1'}%
+    \thm@style{plain}%
+\renewcommand{\LWR@newtheoremstyle}{plain}% new
+  }{%
+    \thm@style{#1}%
+\renewcommand{\LWR@newtheoremstyle}{#1}% new
+  }%
+}
+
+\def\@xnthm#1#2{%
+  \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% new
+  \let\@tempa\relax
+  \@xp\@ifdefinable\csname #2\endcsname{%
+    \global\@xp\let\csname end#2\endcsname\@endtheorem
+    \ifx *#1% unnumbered, need to get one more mandatory arg
+      \edef\@tempa##1{%
+        \gdef\@xp\@nx\csname#2\endcsname{%
+          \@nx\@thm{\@xp\@nx\csname th@\the\thm@style\endcsname}%
+            {}{##1}}}%
+    \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
+  }%
+  \@tempa
+}
+
+\newcommand{\LWR@haveamsthmname}{
+\renewcommand{\thmname}[1]{\InlineClass{amsthmname\LWR@thisthmstyle}{##1}}
+}
+
+\newcommand{\LWR@haveamsthmnumber}{
+\renewcommand{\thmnumber}[1]{\InlineClass{amsthmnumber\LWR@thisthmstyle}{##1}}
+}
+
+\newcommand{\LWR@haveamsthmnote}{
+\renewcommand{\thmnote}[1]{\InlineClass{amsthmnote\LWR@thisthmstyle}{##1}}
+}
+
+\LWR@haveamsthmname
+\LWR@haveamsthmnumber
+\LWR@haveamsthmnote
+\def\@begintheorem#1#2[#3]{%
+  \BlockClass{amsthmbody\LWR@thisthmstyle}% new
+  \deferred@thm@head{
+\the\thm@headfont \thm@indent
+    \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new
+    \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new
+    \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new
+    \thm@swap\swappedhead\thmhead{#1}{#2}{#3}%
+    \the\thm@headpunct~
+    \thmheadnl % possibly a newline.
+    \hskip\thm@headsep
+  }%
+  \ignorespaces}
+\def\@endtheorem{\endBlockClass\endtrivlist\@endpefalse }
+\AtBeginDocument{
+\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box
+\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof
+\def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box
+}
+\renewenvironment{proof}[1][\proofname]{\par
+\BlockClass{amsthmproof}% new
+  \pushQED{\qed}%
+  \normalfont \topsep6\p@\@plus6\p@\relax
+  \trivlist
+  \item[\hskip\labelsep
+        \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes
+}{%
+  \InlineClass{theoremendmark}{\popQED}\endtrivlist%
+  \endBlockClass% new
+  \@endpefalse
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-amsthm.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
index 67b812d00e9..91f1b9e5c42 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
@@ -30,6 +30,8 @@
 
 
 
+
+
 \LWR@ProvidesPackageDrop{bookmark}
 
 \newcommand*{\bookmarksetup}[1]{}
@@ -136,6 +138,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-bookmark.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
index f4cb4a77035..e7e6a81af27 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
@@ -32,6 +32,8 @@
 
 
 
+
+
 \LWR@ProvidesPackageDrop{booktabs}
 \newcommand*{\addlinespace}[1]{}
 \newcommand*{\morecmidrules}{}
@@ -132,6 +134,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-booktabs.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
new file mode 100644
index 00000000000..79cf1c85149
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty
@@ -0,0 +1,156 @@
+%%
+%% This is file `lwarp-ccaption.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ccaption')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@loadnever{ccaption}{caption}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-ccaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
index 829844a250d..a11aa3afd0d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
@@ -32,6 +32,10 @@
 
 
 
+
+
+
+
 \LWR@ProvidesPackageDrop{changepage}
 
 \newif\ifoddpage
@@ -135,6 +139,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-changepage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
index 573e6069beb..e99b678edf6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
@@ -34,6 +34,10 @@
 
 
 
+
+
+
+
 \LWR@ProvidesPackageDrop{dcolumn}
 
 
@@ -129,6 +133,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-dcolumn.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
index 4bbab9ac043..467d0559cf9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
@@ -36,6 +36,11 @@
 
 
 
+
+
+
+
+
 \LWR@ProvidesPackageDrop{draftwatermark}
 
 \newcommand{\SetWatermarkAngle}[1]{}
@@ -139,6 +144,22 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-draftwatermark.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
new file mode 100644
index 00000000000..bb76767e53f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
@@ -0,0 +1,157 @@
+%%
+%% This is file `lwarp-ellipsis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ellipsis')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@ProvidesPackageDrop{ellipsis}
+
+\newcommand{\ellipsisgap}{0.1em}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-ellipsis.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
new file mode 100644
index 00000000000..4f86ec45251
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
@@ -0,0 +1,154 @@
+%%
+%% This is file `lwarp-emptypage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `emptypage')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@ProvidesPackageDrop{emptypage}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-emptypage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
index 7290d1fef8c..e2cb282563e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
@@ -36,6 +36,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{enumerate}
 
 \def\enit@shl#1{%
@@ -136,6 +144,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-enumerate.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
index b3b14a2f7d7..95b772ff0e0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
@@ -39,6 +39,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{epigraph}
 
 \newcommand{\qitem}[2]
@@ -165,6 +173,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-epigraph.sty'.
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 12b9f0d5f56..e8c8ed2db8f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
@@ -40,6 +40,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{eso-pic}
 
 \newcommand*{\LenToUnit}{}
@@ -148,6 +156,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-eso-pic.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
index 90d4796865e..369c043e564 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
@@ -40,6 +40,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{everypage}
 
 \newcommand*{\AddEverypageHook}[1]{}
@@ -132,6 +140,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-everypage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
index 412e7b86796..c9e8ba1d735 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
@@ -40,6 +40,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{extramarks}
 
 \newcommand*{\extramarks}[2]{}
@@ -140,6 +148,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-extramarks.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
index b9a811558c0..f3035b771bd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
@@ -41,6 +41,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{fancyhdr}
 
 \newcommand*{\fancyhead}[2][]{}
@@ -147,6 +156,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-fancyhdr.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
index 5e8a906f38a..602cd8c651b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
@@ -43,6 +43,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{float}[2016/03/04]
 
 
@@ -153,6 +162,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-float.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
index fa8388f28d1..5bfb41731e5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
@@ -46,6 +46,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{floatrow}
 
 
@@ -287,6 +296,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-floatrow.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
index a602feb9451..ab88a426589 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
@@ -46,6 +46,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{fontenc}
 
 \LWR@loadbefore{fontenc}
@@ -130,6 +139,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-fontenc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
index 5ef016a8a4e..b83acc75796 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
@@ -46,6 +46,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{fontspec}
 
 \LWR@loadbefore{fontspec}
@@ -129,6 +138,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-fontspec.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
new file mode 100644
index 00000000000..5ca5029df95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
@@ -0,0 +1,243 @@
+%%
+%% This is file `lwarp-framed.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `framed')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@ProvidesPackagePass{framed}
+
+
+\renewenvironment{framed}{%
+\BlockClass{framed}%
+}
+{\endBlockClass}
+
+\renewenvironment{oframed}{%
+\BlockClass{framed}%
+}
+{\endBlockClass}
+
+\renewenvironment{shaded}{%
+\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor%
+\BlockClass{framed}[background: \#\LWR@tempcolor]%
+}
+{\endBlockClass}
+
+\renewenvironment{shaded*}{%
+\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor%
+\BlockClass{framed}[background: \#\LWR@tempcolor]%
+}
+{\endBlockClass}
+
+\renewenvironment{leftbar}{%
+\BlockClass{framedleftbar}
+  \def\FrameCommand{}%
+  \MakeFramed {}
+}%
+ {\endMakeFramed\endBlockClass}
+
+\renewenvironment{snugshade}{%
+\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor%
+\BlockClass{snugframed}[background: \#\LWR@tempcolor]%
+}
+{\endBlockClass}
+
+\renewenvironment{snugshade*}{%
+\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor%
+\BlockClass{snugframed}[background: \#\LWR@tempcolor]%
+}
+{\endBlockClass}
+
+\let\oframed\framed
+\let\endoframed\endframed
+
+\RenewEnviron{titled-frame}[1]{%
+\CustomFBox{#1}{}{0pt}{0pt}{0pt}{0pt}{\BODY}
+}
+
+\renewcommand{\CustomFBox}[7]{%
+\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor%
+\begin{BlockClass}{framed}[border: 3px solid \#\LWR@tempcolor]%
+\ifthenelse{\isempty{#1}}{}{% not empty
+\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]%
+\textcolor{TFTitleColor}{\textbf{#1}}%
+\end{BlockClass}
+}% not empty
+
+#7
+
+\ifthenelse{\isempty{#2}}{}{% not empty
+\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor%
+\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]%
+\textcolor{TFTitleColor}{\textbf{#2}}%
+\end{BlockClass}
+}% not empty
+\end{BlockClass}
+}
+
+\renewcommand\TitleBarFrame[3][]{
+\CustomFBox
+    {#2}{}%
+    \fboxrule\fboxrule\fboxrule\fboxrule
+    {#3}%
+}
+
+\renewcommand{\TF@Title}[1]{#1}
+
+\let\MakeFramed\relax
+\let\endMakeFramed\relax
+
+\NewEnviron{MakeFramed}[1]{%
+\FrameCommand{\begin{minipage}{\linewidth}\BODY\end{minipage}}%
+}
+
+\renewcommand*{\fb@put@frame}[2]{%
+\relax%
+\@tempboxa%
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-framed.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
index b65fd706640..2f7895e91a3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
@@ -49,6 +49,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{ftnright}
 
 
@@ -128,6 +139,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-ftnright.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
index f438541ab9e..f58582b63be 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
@@ -51,6 +51,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{geometry}
 
 \renewcommand*{\geometry}[1]{}
@@ -135,6 +146,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-geometry.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index ab923d0d05c..5b5b728ecef 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -52,12 +52,28 @@
 
 
 
-\PackageError{lwarp-graphics}
-{The graphics package is not supported by
-the lwarp package's HTML conversion.
-Please use graphicx instead.   \protect\usepackage{graphicx}}
-{Graphicx requires a different syntax but is more flexible,
-and it is emulated by lwarp.}
+
+
+
+
+
+
+
+
+
+
+
+\LWR@loadnever{graphics}{graphicx}
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
index ed3fb17ebb4..42bfd7f6213 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
@@ -53,6 +53,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{graphicx}
 
 
@@ -129,6 +140,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-graphicx.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index a08f4ca0fba..defd5e7975d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -55,6 +55,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \typeout{Using the lwarp html version of package `hyperref' — discarding options.}
 \typeout{    Are not using ProvidesPackage, so that other packages}
 \typeout{    do not attempt to patch lwarp's version of `hyperref'.}
@@ -234,6 +245,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-hyperref.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
index 2d10317e991..70a80343793 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
@@ -56,6 +56,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{indentfirst}
 
 
@@ -129,6 +140,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-indentfirst.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
index cf6b095209f..3d2fe38f6c0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
@@ -56,6 +56,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{inputenc}
 
 \LWR@loadbefore{inputenc}
@@ -130,6 +141,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-inputenc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
index 27e3cbfeda6..1ff1e3f4966 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
@@ -58,6 +58,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{keyfloat}
 
 \AtBeginDocument{
@@ -157,6 +168,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-keyfloat.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
index 4d23afef1fe..53b7ef06cd2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
@@ -59,6 +59,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{layout}
 
 \NewDocumentCommand{\layout}{s}{}
@@ -130,6 +141,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-layout.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
index 018d3b54c64..130f48b71a0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
@@ -61,6 +61,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{letterspace}
 
 \newcommand*\lsstyle{}
@@ -134,6 +145,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-letterspace.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
new file mode 100644
index 00000000000..61471f60c6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
@@ -0,0 +1,171 @@
+%%
+%% This is file `lwarp-lips.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `lips')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\PackageInfo{lwarp}{Using the lwarp version of package `lips'.}%
+\ProvidesPackage{lwarp-lips}
+
+\NewDocumentCommand{\Lips}{}{\textellipsis}
+
+\NewDocumentCommand{\BracketedLips}{}{[\textellipsis]}
+
+\let\lips\Lips
+\let\olips\lips
+
+\DeclareOption*{}
+\DeclareOption{mla}{
+\let\lips\BracketedLips
+}
+\ProcessOptions\relax
+
+\newcommand \LPNobreakList {}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-lips.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
index ea2fca8b889..c1329066b5a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
@@ -62,6 +62,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \begin{warpHTML}
 \LWR@ProvidesPackagePass{listings}
 
@@ -233,6 +247,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-listings.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
index d569b6cd3f2..b4158dff15e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
@@ -65,6 +65,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{longtable}
 
 
@@ -170,6 +183,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-longtable.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
index e8e7c0cbdb2..6c50cb98a7f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
@@ -66,6 +66,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{lscape}
 
 \newenvironment*{landscape}{}{}
@@ -130,6 +143,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-lscape.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
index 49de52cee3b..fafe0ce3dd4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
@@ -69,6 +69,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{ltcaption}
 
 \newlength{\LTcapskip}
@@ -135,6 +148,14 @@
 
 
 
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-ltcaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
index 3dbdf2bbebd..78ee6a4b968 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
@@ -68,6 +68,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{mcaption}
 
 \newenvironment{margincap}{}{}
@@ -132,6 +146,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-mcaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
index 0555655a0d2..a1b74c0383f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
@@ -70,14 +70,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{mdframed}
 
 \LWR@origRequirePackage{amsthm}
 \LWR@origRequirePackage[framemethod=none]{mdframed}
 \mdfsetup{
-startcode={\LWR@mdframedstart},
+startcode={\LWR@mdframedstart\LWR@origraggedright},
 endcode={\LWR@mdframedend},
-startinnercode={\LWR@startpars},
+startinnercode={\LWR@startpars\LWR@origraggedright},
 endinnercode={\LWR@stoppars},
 }
 \newcommand*{\LWR@mdfprintcolor}[1]{%
@@ -287,6 +301,13 @@ solid
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-mdframed.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
index 47fb8539ab5..2b75582586d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
@@ -73,6 +73,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{microtype}
 
 \renewcommand*\DeclareMicrotypeSet[3][]{}
@@ -161,6 +175,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-microtype.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
index d7e9b07229e..e535f7f4f06 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
@@ -75,6 +75,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{multicol}[2015/09/13]
 
 
@@ -157,6 +171,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-multicol.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index ceb0967d563..17185bb2a8f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -77,6 +77,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{multirow}
 
 
@@ -129,6 +143,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-multirow.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
index f72ad7c1f73..359f2d3c3f6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
@@ -77,6 +77,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \typeout{Using the lwarp html version of package `nameref' — discarding options.}
 \typeout{    Are not using ProvidesPackage, so that other packages}
 \typeout{    do not attempt to patch lwarp's version of `nameref'.}
@@ -132,6 +146,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-nameref.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
index 4e472e399e7..36045c70bc6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
@@ -78,6 +78,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{needspace}
 
 \newcommand*{\needspace}[1]{}
@@ -131,6 +145,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-needspace.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
index a721939d307..b50ea7fc794 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
@@ -79,6 +79,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{newclude}
 
 \LWR@loadbefore{newclude}
@@ -130,6 +144,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-newclude.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
index f50d99d2b01..3ecb88915e8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
@@ -20,7 +20,6 @@
 
 
 
-
 \ProvidesPackage{lwarp-newproject}
 
 \RequirePackage{etoolbox}
@@ -130,6 +129,7 @@ a.tocfigure {margin-left: 0em}
 a.tocsubfigure {margin-left: 2em}
 a.toctable {margin-left: 0em}
 a.tocsubtable {margin-left: 2em}
+a.toctheorem {margin-left: 0em}
 a.toclstlisting {margin-left: 0em}
 
 body {
@@ -481,17 +481,6 @@ div.singlespace { line-height: 1.2 ; }
 div.onehalfspace { line-height: 1.5 ; }
 div.doublespace { line-height: 2 ; }
 
-.theorem {
-        background: #e0e0e0;
-        padding: 1ex ;
-        margin: 1em ;
-        border: 1px solid silver ;
-}
-
-.theoremlabel { font-weight: bold ; }
-
-.theoremcontents { font-style: italic; margin-left: 1em ; }
-
 /* Minipage environments, vertically aligned to top, center, bottom: */
 .minipage {
     /* display: inline-block ; */
@@ -553,6 +542,38 @@ div.doublespace { line-height: 2 ; }
 /*   display: inline-block ; */
 }
 
+/* framed package */
+.framed {
+    margin: 3ex 0em 3ex 0em ;
+   border: 1px solid black;
+     border-radius: 0px ;
+    padding: .3ex 1em 0ex 1em ;
+  display: block ;
+}
+
+.snugframed {
+    margin: 3ex 0em 3ex 0em ;
+   border: 1px solid black;
+     border-radius: 0px ;
+  display: block ;
+}
+
+.framedleftbar {
+    margin: 3ex 0em 3ex 0em ;
+   border-left: 3pt solid black;
+     border-radius: 0px ;
+    padding: .3ex .2em .3ex 1em ;
+  display: block ;
+}
+
+.framedtitle {
+margin: 0em ;
+padding: 0em ;
+    font-size: 130%
+}
+
+.framedtitle p { padding: .3em }
+
 dl {
   margin: 1ex 2em 1ex 0em;
   line-height: 1.3;
@@ -565,14 +586,14 @@ dl dt {
 
 dl dd p { margin-top: 0em; }
 
-nav.toc, nav.lof, nav.lot, nav.lol {
+nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm {
     font-family: "URW Classico", Optima, "Linux Biolinum O",
         "DejaVu Sans", "Bitstream Vera Sans",
         Geneva, Verdana, sans-serif ;
     margin-bottom: 4ex ;
 }
 
-nav.toc p, nav.lof p, nav.lot p, nav.lol p {
+nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p {
     line-height: 1.2 ;
     margin-top:.5ex ;
     margin-bottom:.5ex;
@@ -923,6 +944,78 @@ div.multicols p {margin-top: 0ex}
 /* Used to support algorithmicx: */
 span.floatright { float: right ; }
 
+/* Native LaTeX theorems: */
+
+.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; }
+.theoremlabel { font-style: normal; font-weight: bold ; margin-right: .5em ; }
+
+/* theorem, amsthm, and ntheorem packages */
+
+span.theoremheader,
+span.theoremheaderplain,
+span.theoremheaderdefinition,
+span.theoremheaderbreak,
+span.theoremheadermarginbreak,
+span.theoremheaderchangebreak,
+span.theoremheaderchange,
+span.theoremheadermargin
+{
+font-style:normal ; font-weight: bold ; margin-right: 1em ;
+}
+
+span.amsthmnameplain,
+span.amsthmnamedefinition,
+span.amsthmnumberplain,
+span.amsthmnumberdefinition
+{
+font-style:normal ; font-weight: bold ;
+}
+
+span.amsthmnameremark,
+span.amsthmnumberremark
+{font-style:italic ; font-weight: normal ; }
+
+span.amsthmnoteplain,
+span.amsthmnotedefinition
+{font-style:normal ;}
+
+span.theoremheaderremark,
+span.theoremheaderproof,
+span.amsthmproofname
+{font-style:italic ; font-weight: normal ; margin-right: 1em ; }
+
+span.theoremheadersc
+{
+font-style:normal ;
+font-variant: small-caps ;
+font-weight: normal ;
+margin-right: 1em ;
+}
+
+.theoremendmark {float:right}
+
+div.amsthmbodyplain, div.theorembodyplain, div.theorembodynonumberplain,
+div.theorembodybreak, div.theorembodynonumberbreak,
+div.theorembodymarginbreak,
+div.theorembodychangebreak,
+div.theorembodychange,
+div.theorembodymargin
+{
+font-style:italic;
+margin-top: 3ex ; margin-bottom: 3ex ;
+}
+
+div.theorembodydefinition, div.theorembodyremark, div.theorembodyproof,
+div.theorembodyplainupright, nonumberplainuprightsc,
+div.amsthmbodydefinition, div.amsthmbodyremark,
+div.amsthmproof
+{
+font-style: normal ;
+margin-top: 3ex ; margin-bottom: 3ex ;
+}
+
+span.amsthmnoteremark {}
+
 /*
 For CSS LaTeX and related logos:
 Based on:
@@ -1182,6 +1275,13 @@ font-size: 1.5em ;
 border-radius: 1ex ;
 }
 
+.framed .minipage , .framedleftbar .minipage {
+border: none ;
+background: none ;
+padding: 0ex ;
+margin: 0ex ;
+}
+
 figure.figure .minipage, figcaption .minipage { border: none; }
 
 div.marginblock div.minipage { border: none; }
@@ -1577,7 +1677,7 @@ MathJax.Hub.Config({
 
 -- Print the usage of the lwarpmk command:
 
-printversion = "v0.24"
+printversion = "v0.25"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -2108,6 +2208,27 @@ end -- not --version
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-newproject.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
index 96e675014f2..fb5102374e9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
@@ -80,6 +80,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{newunicodechar}
 
 \LWR@loadbefore{newunicodechar}
@@ -130,6 +144,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-newunicodechar.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
index 0fe5c1c8fdd..60461ef608e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
@@ -81,6 +81,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{nextpage}
 
 \newcommand{\cleartoevenpage}[1][]{}
@@ -133,6 +147,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-nextpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
index accbe65a987..0b8fb0579fb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
@@ -83,6 +83,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{nowidow}
 
 \newcommand*{\nowidow}[1][]{}
@@ -135,6 +149,13 @@
 
 
 
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-nowidow.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
new file mode 100644
index 00000000000..21a1229a28d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
@@ -0,0 +1,543 @@
+%%
+%% This is file `lwarp-ntheorem.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ntheorem')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\DeclareOption{thref}{}
+
+\newbool{LWR@ntheoremmarks}
+\boolfalse{LWR@ntheoremmarks}
+
+\DeclareOption{thmmarks}{
+\booltrue{LWR@ntheoremmarks}
+\newif\ifsetendmark\setendmarktrue
+}
+
+\newbool{LWR@ntheoremamsthm}
+\boolfalse{LWR@ntheoremamsthm}
+
+\DeclareOption{amsthm}{\booltrue{LWR@ntheoremamsthm}}
+
+\DeclareOption{amsmath}{}
+\DeclareOption{hyperref}{}
+
+\LWR@ProvidesPackagePass{ntheorem}
+\newcommand{\LWR@newtheoremstyle}{plain}
+\gdef\theoremstyle#1{%
+   \@ifundefined{th@#1}{\@warning
+          {Unknown theoremstyle `#1'. Using `plain'}%
+          \theorem@style{plain}
+            \renewcommand{\LWR@newtheoremstyle}{plain}% new
+}%
+      {
+\theorem@style{#1}
+        \renewcommand{\LWR@newtheoremstyle}{#1}% new
+}
+}
+
+
+\gdef\@xnthm#1#2[#3]{%
+  \ifthm@tempif
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \expandafter\@ifundefined{c@#1}%
+        {\@definecounter{#1}}{}%
+     \@newctr{#1}[#3]%
+     \expandafter\xdef\csname the#1\endcsname{%
+       \expandafter\noexpand\csname the#3\endcsname \@thmcountersep
+          {\noexpand\csname\the\theoremnumbering\endcsname{#1}}}%
+     \expandafter\gdef\csname mkheader@#1\endcsname
+       {\csname setparms@#1\endcsname
+        \@thm{#1}{#1}{#2}
+}%
+     \global\@namedef{end#1}{\@endtheorem}
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+  \fi
+}
+
+\gdef\@ynthm#1#2{%
+  \ifthm@tempif
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \expandafter\@ifundefined{c@#1}%
+        {\@definecounter{#1}}{}%
+     \expandafter\xdef\csname the#1\endcsname
+        {\noexpand\csname\the\theoremnumbering\endcsname{#1}}%
+     \expandafter\gdef\csname mkheader@#1\endcsname
+       {\csname setparms@#1\endcsname
+        \@thm{#1}{#1}{#2}
+}%
+     \global\@namedef{end#1}{\@endtheorem}
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+  \fi
+}
+
+\gdef\@othm#1[#2]#3{%
+  \@ifundefined{c@#2}{\@nocounterr{#2}}%
+   {\ifthm@tempif
+     \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+     \global\@namedef{the#1}{\@nameuse{the#2}}%
+     \expandafter\protected@xdef\csname num@addtheoremline#1\endcsname{%
+              \noexpand\@num@addtheoremline{#1}{#3}}%
+     \expandafter\protected@xdef\csname nonum@addtheoremline#1\endcsname{%
+              \noexpand\@nonum@addtheoremline{#1}{#3}}%
+    \theoremkeyword{#3}%
+    \expandafter\protected@xdef\csname #1Keyword\endcsname
+             {\the\theoremkeyword}%
+     \expandafter\gdef\csname mkheader@#1\endcsname
+       {\csname setparms@#1\endcsname
+                \@thm{#1}{#2}{#3}
+}%
+     \global\@namedef{end#1}{\@endtheorem}
+     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+  \fi}
+}
+\newcommand{\LWR@inctheorem}{%
+\addtocounter{LWR@thisfloat}{1}%
+\LWR@stoppars%
+\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}%
+\LWR@startpars%
+}
+\gdef\newtheoremstyle#1#2#3{%
+  \expandafter\@ifundefined{th@#1}%
+   {\expandafter\gdef\csname th@#1\endcsname{%
+    \def\@begintheorem####1####2{%
+\BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+\LWR@inctheorem% new
+#2}%
+    \def\@opargbegintheorem####1####2####3{%
+\BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+\LWR@inctheorem% new
+#3}%
+}%
+}%
+{\PackageError{\basename}{Theorem style #1 already defined}\@eha}
+}
+
+\renewtheoremstyle{plain}%
+  {\item[\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}%
+  {\item[\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]}
+
+\renewtheoremstyle{break}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderbreak}{##1\ ##2\theorem@separator}\newline
+]}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem@separator}\newline
+]}
+
+\renewtheoremstyle{change}%
+  {\item[\hskip\labelsep
+\theorem@headerfont
+\InlineClass{theoremheaderchange}{##2\ ##1\theorem@separator}]}%
+  {\item[\hskip\labelsep
+\theorem@headerfont
+\InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem@separator}]}
+
+\renewtheoremstyle{changebreak}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem@separator}\newline
+]}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem@separator}\newline
+]}
+
+\renewtheoremstyle{margin}%
+  {\item[\hskip\labelsep\theorem@headerfont
+\InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem@separator}
+]}%
+  {\item[\hskip\labelsep\theorem@headerfont
+\InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem@separator}
+]}
+
+\renewtheoremstyle{marginbreak}%
+  {\item[\hskip\labelsep\theorem@headerfont
+\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem@separator}\newline
+]}%
+  {\item[\hskip\labelsep\theorem@headerfont
+\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem@separator}\newline
+]}
+
+\renewtheoremstyle{nonumberplain}%
+  {\item[\theorem@headerfont\hskip\labelsep
+\InlineClass{theoremheaderplain}{##1\theorem@separator}]}%
+  {\item[\theorem@headerfont\hskip \labelsep
+\InlineClass{theoremheaderplain}{##1\ (##3)\theorem@separator}]}
+
+\renewtheoremstyle{nonumberbreak}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderbreak}{##1\theorem@separator}\newline
+]}%
+  {\item[
+\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderbreak}{##1\ (##3)\theorem@separator}\newline
+]}
+
+\renewtheoremstyle{empty}%
+  {\item[]}%
+  {\item[\theorem@headerfont \hskip\labelsep\relax
+\InlineClass{theoremheaderplain}{##3}]}
+
+\renewtheoremstyle{emptybreak}%
+  {\item[]}%
+  {\item[\theorem@headerfont \hskip\labelsep\relax
+\InlineClass{theoremheaderplain}{##3}] \ \newline}
+\ifbool{LWR@ntheoremamsthm}{}{
+\newtheoremstyle{plainupright}%
+  {\item[\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}%
+  {\item[\hskip\labelsep \theorem@headerfont
+\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]}
+
+\newtheoremstyle{nonumberplainuprightsc}%
+  {\item[\theorem@headerfont\hskip\labelsep
+\InlineClass{theoremheadersc}{##1\theorem@separator}]}%
+  {\item[\theorem@headerfont\hskip \labelsep
+\InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]}
+\theoremstyle{plainupright}
+\theorembodyfont{\upshape}
+\theoremsymbol{\ensuremath{_\Box}}
+\renewtheorem{Example}{Example}
+\renewtheorem{example}{Example}
+\renewtheorem{Beispiel}{Beispiel}
+\renewtheorem{beispiel}{Beispiel}
+\renewtheorem{Bemerkung}{Bemerkung}
+\renewtheorem{bemerkung}{Bemerkung}
+\renewtheorem{Anmerkung}{Anmerkung}
+\renewtheorem{anmerkung}{Anmerkung}
+\renewtheorem{Remark}{Remark}
+\renewtheorem{remark}{Remark}
+\renewtheorem{Definition}{Definition}
+\renewtheorem{definition}{Definition}
+
+\theoremstyle{nonumberplainuprightsc}
+\theoremsymbol{\ensuremath{_\blacksquare}}
+\renewtheorem{Proof}{Proof}
+\renewtheorem{proof}{Proof}
+\renewtheorem{Beweis}{Beweis}
+\renewtheorem{beweis}{Beweis}
+\qedsymbol{\ensuremath{_\blacksquare}}
+
+\theoremsymbol{}
+}% not amsthm
+\ifbool{LWR@ntheoremamsthm}{
+
+\gdef\th@plain{%
+  \def\theorem@headerfont{\normalfont\bfseries}\itshape%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodyplain}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderplain}{##1\ ##2.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodyplain}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderplain}{##1\ ##2\ (##3).}
+]}}
+
+\gdef\th@nonumberplain{%
+  \def\theorem@headerfont{\normalfont\bfseries}\itshape%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodyplain}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderplain}{##1.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodyplain}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderplain}{##1\ (##3).}
+]}}
+
+\gdef\th@definition{%
+  \def\theorem@headerfont{\normalfont\bfseries}\normalfont%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodydefinition}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderdefinition}{##1\ ##2.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodydefinition}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).}
+]}}
+
+\gdef\th@nonumberdefinition{%
+  \def\theorem@headerfont{\normalfont\bfseries}\normalfont%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodydefinition}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderdefinition}{##1.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodydefinition}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderdefinition}{##1\ (##3).}
+]}}
+
+\gdef\th@remark{%
+  \def\theorem@headerfont{\itshape}\normalfont%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodyremark}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderremark}{##1\ ##2.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodyremark}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderremark}{##1\ ##2\ (##3).}
+]}}
+
+\gdef\th@nonumberremark{%
+  \def\theorem@headerfont{\itshape}\normalfont%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodyremark}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderremark}{##1.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodyremark}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderremark}{##1\ (##3).}
+]}}
+
+\gdef\th@proof{%
+  \def\theorem@headerfont{\normalfont\bfseries}\itshape%
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembodyproof}% new
+\LWR@inctheorem% new
+      \item[\hskip\labelsep
+  \InlineClass{theoremheaderproof}{##1.}
+]}%
+  \def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembodyroof}% new
+\LWR@inctheorem% new
+     \item[\hskip\labelsep
+  \InlineClass{theoremheaderproof}{##1\ (##3).}
+]}}
+
+\newcounter{proof}%
+\if@thmmarks
+\newcounter{currproofctr}%
+\newcounter{endproofctr}%
+\fi
+
+\gdef\proofSymbol{\openbox}
+
+\newcommand{\proofname}{Proof}
+
+\newenvironment{proof}[1][\proofname]{
+\th@proof
+\def\theorem@headerfont{\itshape}%
+\normalfont
+\theoremsymbol{\ensuremath{_\blacksquare}}
+\@thm{proof}{proof}{#1}
+}%
+{\@endtheorem}
+
+}{}% amsthm option
+\let\LWR@origendtheorem\@endtheorem
+\renewcommand{\@endtheorem}{%
+\ifbool{LWR@ntheoremmarks}{%
+\ifsetendmark%
+\InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}%
+\setendmarkfalse%
+\fi%
+}{}%
+\LWR@origendtheorem%
+\ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}%
+\endBlockClass%
+}
+
+\gdef\NoEndMark{\global\setendmarkfalse}
+
+\renewcommand{\thm@@thmline@noname}[4]{%
+\hypertocfloat{1}{theorem}{thm}{#2 #3}{}%
+}
+
+\renewcommand{\thm@@thmline@name}[4]{%
+\hypertocfloat{1}{theorem}{thm}{#1 #2 #3}{}%
+}
+\def\thm@@thmline{\thm@@thmline@name}
+
+\def\listtheorems#1{
+\LWR@htmlelementclass{nav}{lothm}%
+\begingroup
+\c@tocdepth=-2%
+\def\thm@list{#1}\thm@processlist
+\endgroup
+\LWR@htmlelementclassend{nav}{lothm}%
+}
+
+
+\newcommand{\qed}{\qquad\the\qedsymbol}
+
+\AtBeginDocument{
+\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box
+\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof
+\def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box
+}
+\newcommand*{\thref}[1]{\cref{#1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-ntheorem.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
index 1bd09c3db67..5eeeaee846b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
@@ -85,6 +85,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{pagenote}
 \renewcommand*{\makepagenote}{}
 \RenewDocumentCommand{\printnotes}{s}{}
@@ -134,6 +151,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-pagenote.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
index 18899008492..6f069f01cfa 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
@@ -85,6 +85,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{parskip}
 
 
@@ -128,6 +145,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-parskip.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
index 5da3393a9d7..fd281a0cfd6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
@@ -86,6 +86,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{placeins}
 
 \newcommand*{\FloatBarrier}{}
@@ -130,6 +147,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-placeins.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
index 214bd879986..abbd40bb50e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
@@ -87,6 +87,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{ragged2e}
 
 \newcommand*{\Centering}{\centering}
@@ -151,6 +168,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-ragged2e.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
index 125e8edf648..ca68b65e161 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
@@ -89,6 +89,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{rotating}
 
 \let\sidewaystable\table
@@ -141,6 +158,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-rotating.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
index c59497c59a0..06c95c46c77 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
@@ -93,6 +93,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{setspace}
 
 \newcommand*{\setstretch}[1]{}
@@ -158,6 +175,10 @@
 
 
 
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp-setspace.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
new file mode 100644
index 00000000000..23c63b7d5c4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
@@ -0,0 +1,150 @@
+%%
+%% This is file `lwarp-showidx.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `idx')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-showidx.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
index 166d843913e..456ed725291 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
@@ -92,6 +92,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{showkeys}
 
 \NewDocumentCommand{\showkeys}{s}{}
@@ -130,6 +149,8 @@
 
 
 
+
+
 \endinput
 %%
 %% End of file `lwarp-showkeys.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
index a67c1fcf64f..87d940d6c7c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
@@ -94,6 +94,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{sidecap}
 
 \NewDocumentEnvironment{SCtable}{soo}
@@ -148,6 +167,8 @@
 
 
 
+
+
 \endinput
 %%
 %% End of file `lwarp-sidecap.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
index 14b698c8bad..889c70badaa 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
@@ -95,6 +95,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{subfig}
 
 \long\def\sf@@@subfloat#1[#2][#3]#4{%
@@ -325,6 +344,8 @@
 
 
 
+
+
 \endinput
 %%
 %% End of file `lwarp-subfig.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
index 8007f93855c..cac5295b5cd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
@@ -98,6 +98,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{tabularx}
 
 \newenvironment{tabularx}[2]
@@ -136,6 +155,8 @@
 
 
 
+
+
 \endinput
 %%
 %% End of file `lwarp-tabularx.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
index edc32546c69..83b94246046 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
@@ -101,6 +101,25 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{textpos}
 
 \NewDocumentEnvironment{textblock}{m r()}{}{}
@@ -146,6 +165,8 @@
 
 
 
+
+
 \endinput
 %%
 %% End of file `lwarp-textpos.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
new file mode 100644
index 00000000000..3ab9ad636af
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
@@ -0,0 +1,295 @@
+%%
+%% This is file `lwarp-theorem.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `theorem')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR@ProvidesPackagePass{theorem}
+
+\newcommand{\LWR@newtheoremstyle}{plain}
+
+\gdef\theoremstyle#1{%
+   \@ifundefined{th@#1}{\@warning
+          {Unknown theoremstyle `#1'. Using `plain'}%
+          \theorem@style{plain}%
+           \renewcommand{\LWR@newtheoremstyle}{plain}% new
+          }%
+      {%
+          \theorem@style{#1}%
+          \renewcommand{\LWR@newtheoremstyle}{#1}% new
+      }%
+      \begingroup
+        \csname th@\the\theorem@style \endcsname
+      \endgroup}
+
+\gdef\@xnthm#1#2[#3]{%
+   \expandafter\@ifdefinable\csname #1\endcsname
+   {%
+    \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+    \@definecounter{#1}\@newctr{#1}[#3]%
+    \expandafter\xdef\csname the#1\endcsname
+      {\expandafter \noexpand \csname the#3\endcsname
+       \@thmcountersep \@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
+   }}
+
+\gdef\@ynthm#1#2{%
+\expandafter\@ifdefinable\csname #1\endcsname
+   {
+\csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+\@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
+   }}
+
+\gdef\@othm#1[#2]#3{%
+  \expandafter\ifx\csname c@#2\endcsname\relax
+   \@nocounterr{#2}%
+  \else
+   \expandafter\@ifdefinable\csname #1\endcsname
+   {
+\csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+\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
+}%
+  \fi}
+\gdef\th@plain{%\normalfont\itshape
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+        \item[\hskip\labelsep
+\InlineClass{theoremheader}{##1\ ##2}
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+   \item[\hskip\labelsep
+\InlineClass{theoremheader}{##1\ ##2\ (##3)}
+]}
+}
+
+\gdef\th@break{%\normalfont\slshape
+  \def\@begintheorem##1##2{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip \labelsep
+\InlineClass{theoremheader}{##1\ ##2}\newline%
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+  \item[\hskip \labelsep
+\InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
+]}
+}
+
+\gdef\th@marginbreak{%\normalfont\slshape
+  \def\@begintheorem##1##2{
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep %
+\InlineClass{theoremheader}{##2 \qquad ##1}\newline
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep %
+\InlineClass{theoremheader}{##2 \qquad ##1\ %
+(##3)}\newline
+]}
+}
+
+\gdef\th@changebreak{%\normalfont\slshape
+  \def\@begintheorem##1##2{
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{##2\ ##1}\newline
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{ ##2\ ##1\ %
+(##3)}\newline
+]}
+}
+
+\gdef\th@change{%\normalfont\slshape
+  \def\@begintheorem##1##2{
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{##2\ ##1}
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{##2\ ##1\ (##3)}
+]}
+}
+
+\gdef\th@margin{%\normalfont\slshape
+  \def\@begintheorem##1##2{
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{##2 \qquad ##1}
+]}%
+\def\@opargbegintheorem##1##2##3{%
+\BlockClass{theorembody\LWR@thisthmstyle}% new
+\item[\hskip\labelsep
+\InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
+]}
+}
+\gdef\@endtheorem{\endBlockClass\endtrivlist}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-theorem.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
index 96f03811e22..0df5bea67e8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
@@ -103,6 +103,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{threeparttable}
 
 \newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
index 354ce7d6617..0dc8f379a45 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
@@ -103,6 +103,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{tikz}
 
 
@@ -111,10 +132,7 @@
 \newboolean{LWR@tikzbabel}
 
 \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0
-{
-\usetikzlibrary{babel}
-\booltrue{LWR@tikzbabel}
-}
+{\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}}
 {\boolfalse{LWR@tikzbabel}}
 
 \BeforeBeginEnvironment{tikzpicture}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
index eba76342e8b..380ed11add2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
@@ -108,6 +108,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{titleps}
 \RenewDocumentCommand{\newpagestyle}{m o m}{}
 \RenewDocumentCommand{\renewpagestyle}{m o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
index 570991c9b4f..951aabd7d12 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
@@ -110,6 +110,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{titlesec}
 
 \newcommand*{\titlelabel}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
index bb09e79b3ec..396d665f7b4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
@@ -112,6 +112,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{titletoc}
 
 \NewDocumentCommand{\dottedcontents}{m o m m m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index 8c2f5216c99..15c53fc3789 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -113,6 +113,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{titling}
 \let\LWR@orig@bsmtitlempty\@bsmtitlempty
 \renewcommand*{\@bsmtitlempty}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
index 2d97467ad29..dd431f15f6a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
@@ -116,6 +116,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{tocloft}
 
 \newcommand{\tocloftpagestyle}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
index c1f2e5b74e5..f3e86679300 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
@@ -118,6 +118,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{trivfloat}
 \LWR@origRequirePackage{trivfloat}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
index 0b9f468b82d..1ba032f72b0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
@@ -118,6 +118,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{verse}
 
 \AfterEndPreamble{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
index dc63e4c3761..dd2f1ddfc71 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
@@ -120,6 +120,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{wallpaper}
 
 \newcommand*{\CenterWallPaper}[2]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
index 1f6c2796026..fa907eca961 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
@@ -121,6 +121,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackageDrop{wrapfig}
 
 \newlength{\LWR@wrapwidth}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 32043419464..68baf3bc3b5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -123,13 +123,34 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{xcolor}
 
 \newcommand*{\LWR@tempcolor}{}
 
 \newcommand*{\LWR@currenttextcolor}{black}
 
-\NewDocumentCommand{\LWR@colorstyle}{m m m +m}{%
+\NewDocumentCommand{\LWR@colorstyle}{m m m m}{%
 \convertcolorspec{#2}{#3}{HTML}\LWR@tempcolor%
 \ifthenelse{\equal{#1}{color:}}%
 {\renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}}{}%
@@ -143,7 +164,7 @@
 
 
 
-\NewDocumentCommand{\LWR@textcolor}{O{named} m +m}{%
+\NewDocumentCommand{\LWR@textcolor}{O{named} m m}{%
 \begingroup%
 \LWR@colorstyle{color:}{#1}{#2}{#3}%
 \endgroup%
@@ -159,11 +180,20 @@
 
 \NewDocumentCommand{\LWR@fcolorbox}{O{named} m O{named} m m}{%
 \begingroup%
+\ifthenelse{\equal{#4}{none}}{% no background color
+\LWR@colorstyle{border:1px solid }{#1}{#2}{#5}%
+}{% yes background color
 \LWR@colorstyle{border:1px solid }{#1}{#2}%
 {\LWR@colorstyle{background:}{#3}{#4}{#5}}%
+}%
 \endgroup%
 }
 
+\let\textcolor\LWR@textcolor
+\let\pagecolor\LWR@pagecolor
+\let\colorbox\LWR@colorbox
+\let\fcolorbox\LWR@fcolorbox
+
 
 
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
index 6da4283cab2..e82dbd0ac6d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
@@ -124,6 +124,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \LWR@ProvidesPackagePass{xfrac}
 
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 438e5652786..99e2bdbb732 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{lwarp}
-    [2017/03/15 v0.24  Allows LaTeX to directly produce HTML5 output.]
+    [2017/03/22 v0.25  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -124,15 +124,25 @@ after lwarp.}
 {Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.}
 }
 
+\newcommand*{\LWR@loadnever}[2]{%
+\PackageError{lwarp}
+{Package #1 does not work with lwarp's HTML conversion.
+Please use the #2 package instead}
+{Package #1 conflicts with lwarp in some way, but package #2 probably will work instead.}
+}
+
 \LWR@loadafter{abstract}
 \LWR@loadafter{afterpage}
 \LWR@loadafter{algorithmicx}
 \LWR@loadafter{alltt}
+\LWR@loadafter{amsthm}
 \LWR@loadafter{bookmark}
 \LWR@loadafter{booktabs}
 \LWR@loadafter{changepage}
 \LWR@loadafter{dcolumn}
 \LWR@loadafter{draftwatermark}
+\LWR@loadafter{ellipsis}
+\LWR@loadafter{emptypage}
 \LWR@loadafter{enumerate}
 \LWR@loadafter{epigraph}
 \LWR@loadafter{eso-pic}
@@ -143,13 +153,12 @@ after lwarp.}
 \LWR@loadafter{float}
 \LWR@loadafter{ftnright}
 \LWR@loadafter{geometry}
-\LWR@loadafter{graphics}
-\LWR@loadafter{graphicx}
 \LWR@loadafter{hyperref}
 \LWR@loadafter{indentfirst}
 \LWR@loadafter{keyfloat}
 \LWR@loadafter{layout}
 \LWR@loadafter{letterspace}
+\LWR@loadafter{lips}
 \LWR@loadafter{listings}
 \LWR@loadafter{longtable}
 \LWR@loadafter{lscape}
@@ -163,17 +172,20 @@ after lwarp.}
 \LWR@loadafter{newtxmath}
 \LWR@loadafter{nextpage}
 \LWR@loadafter{nowidow}
+\LWR@loadafter{ntheorem}
 \LWR@loadafter{pagenote}
 \LWR@loadafter{parskip}
 \LWR@loadafter{placeins}
 \LWR@loadafter{ragged2e}
 \LWR@loadafter{rotating}
 \LWR@loadafter{setspace}
+\LWR@loadafter{showidx}
 \LWR@loadafter{showkeys}
 \LWR@loadafter{sidecap}
 \LWR@loadafter{subfig}
 \LWR@loadafter{tabularx}
 \LWR@loadafter{textpos}
+\LWR@loadafter{theorem}
 \LWR@loadafter{threeparttable}
 \LWR@loadafter{tikz}
 \LWR@loadafter{titleps}
@@ -747,10 +759,11 @@ top=1in,bottom=1in,%
 \newcommand*{\LWR@tagregularparagraph}{p}
 
 
+
 \newcommand*{\LWR@htmltagc}[1]{%
 {%
-\LWR@origttfamily%
-\LWR@origtextless#1\LWR@origtextgreater%
+\protect\LWR@origttfamily%
+\protect\LWR@origtextless#1\protect\LWR@origtextgreater%
 }%
 }
 
@@ -1609,10 +1622,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \let\XeTeX\LWR@XeTeX
 \let\XeLaTeX\LWR@XeLaTeX
 \let\ConTeXt\LWR@ConTeXt
-\let\textcolor\LWR@textcolor
-\let\pagecolor\LWR@pagecolor
-\let\colorbox\LWR@colorbox
-\let\fcolorbox\LWR@fcolorbox
 \let\rotatebox\LWR@rotatebox
 \let\scalebox\LWR@scalebox
 \let\reflectbox\LWR@reflectbox
@@ -2280,18 +2289,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \begin{warpHTML}
 
 \renewcommand{\@begintheorem}[2]{%
-\LWR@htmldivclass{theorem}
+\BlockClass{theoremcontents}
 \InlineClass{theoremlabel}{#1\ #2\ }
-\LWR@htmldivclass{theoremcontents}
 }
 \renewcommand{\@opargbegintheorem}[3]{%
-\BlockClass{theorem}
-\InlineClass{theoremlabel}{#1\ #2\ (#3)\ }
 \BlockClass{theoremcontents}
+\InlineClass{theoremlabel}{#1\ #2\ (#3)\ }
 }
 \renewcommand*{\@endtheorem}{%
 \endBlockClass% theoremcontents
-\endBlockClass% theorem
 }
 
 \end{warpHTML}
@@ -3079,7 +3085,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }% pars not allowed
 }% not lateximage
 }
-\newcommand*{\LWR@newlabel}[1]{%
+\NewDocumentCommand{\LWR@newlabel}{m o}{%
 \LWR@traceinfo{LWR@newlabel: !#1!}%
 \LWR@origlabel{#1}%
 \LWR@traceinfo{LWR@newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
@@ -3319,12 +3325,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 \renewcommand*{\addcontentsline}[3]{%
 \ifthenelse{\equal{#1}{toc}}{}{%
+\ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
 \addtocontents{\@nameuse{ext@#2}}{%
 \protect\LWRsetnextfloat%
 {\arabic{LWR@latestautopage}}%
 {\arabic{LWR@thisfloat}}%
-}%
-}%
+}% addtocontents
+}% not toc
 \LWR@origaddcontentsline{#1}{#2}{#3}%
 }
 
@@ -4978,6 +4985,27 @@ homehtmlfilename = "\HomeHTMLFileName"%
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 %%
 %% End of file `lwarp.sty'.