lwarp (7sep18)

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

23 files changed, 1244 insertions, 526 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
new file mode 100644
index 00000000000..d210dc7a038
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-SIunits.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `SIunits')
+%% 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{SIunits}
+\DeclareRobustCommand{\unit}[2]{%
+\@inunitcommandtrue%    original
+\LWR@subsingledollar*%  lwarp
+{% alt tag
+    \textbackslash{}unit\{\LWR@HTMLsanitize{#1}\}%
+        \{ \LWR@HTMLsanitize{#2}\}% extra space
+}%
+{SIunits}% add'l hashing
+{%
+    \LWR@origensuredmath{%  lwarp modification
+        \SI@fstyle{#1\@qsk\period@active{#2}}%  original
+    }%
+}% contents
+\@inunitcommandfalse%   original
+}
+\endinput
+%%
+%% End of file `lwarp-SIunits.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
new file mode 100644
index 00000000000..73f2939e9f1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-accsupp.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `accsupp')
+%% 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{accsupp}
+\newcommand*{\BeginAccSupp}[1]{}
+\newcommand*{\EndAccSupp}[1]{}
+\endinput
+%%
+%% End of file `lwarp-accsupp.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
new file mode 100644
index 00000000000..2a08c69341a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
@@ -0,0 +1,312 @@
+%%
+%% This is file `lwarp-amsmath.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `amsmath')
+%% 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{amsmath}
+\def\maketag@@@#1{\text{#1}}
+\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}}
+
+\ifbool{mathjax}{}{% not mathjax
+
+\LetLtxMacro\LWR@origmake@df@tag@@\make@df@tag@@
+\LetLtxMacro\LWR@origmake@df@tag@@@\make@df@tag@@@
+
+\renewcommand*{\make@df@tag@@}[1]{%
+\LWR@remembertag{#1}%
+\LWR@origmake@df@tag@@{#1}%
+}
+
+\renewcommand*{\make@df@tag@@@}[1]{%
+\LWR@remembertag{#1}%
+\LWR@origmake@df@tag@@@{#1}%
+}
+
+}% not mathjax
+\BeforeBeginEnvironment{multline}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \booltrue{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbodynumbered{multline}]
+}
+}
+
+\AfterEndEnvironment{multline}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \boolfalse{LWR@amsmultline}
+    \LWR@addmathjax{multline}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{multline*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \booltrue{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbody{multline*}]
+}
+}
+
+\AfterEndEnvironment{multline*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \boolfalse{LWR@amsmultline}
+    \LWR@addmathjax{multline*}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+
+\BeforeBeginEnvironment{gather}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbodynumbered{gather}]
+}
+}
+
+\AfterEndEnvironment{gather}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{gather}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{gather*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbody{gather*}]
+}
+}
+
+\AfterEndEnvironment{gather*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{gather*}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{align}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbodynumbered{align}]
+}
+}
+
+\AfterEndEnvironment{align}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{align}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{align*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbody{align*}]
+}
+}
+
+\AfterEndEnvironment{align*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{align*}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{flalign}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}]
+}
+}
+
+\AfterEndEnvironment{flalign}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{flalign}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{flalign*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbody{flalign*}]
+}
+}
+
+\AfterEndEnvironment{flalign*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{flalign*}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{alignat}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbodynumbered{alignat}]
+}
+}
+
+\AfterEndEnvironment{alignat}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{alignat}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+
+\BeforeBeginEnvironment{alignat*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@syncmathjax
+    \boolfalse{LWR@amsmultline}
+    \LWR@beginhideamsmath
+}
+{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[\LWR@amsmathbody{alignat*}]
+}
+}
+
+\AfterEndEnvironment{alignat*}{
+
+\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+{
+    \LWR@endhideamsmath
+    \LWR@addmathjax{alignat*}{\the\@envbody}
+}
+{\end{lateximage}\end{BlockClass}}
+
+}
+\endinput
+%%
+%% End of file `lwarp-amsmath.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
new file mode 100644
index 00000000000..da16201e2df
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
@@ -0,0 +1,35 @@
+%%
+%% This is file `lwarp-asymptote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `asymptote')
+%% 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{asymptote}
+\BeforeBeginEnvironment{asy}{\begin{lateximage}}
+\AfterEndEnvironment{asy}{\end{lateximage}}
+
+\xpatchcmd{\asyinclude}
+    {\begingroup}
+    {\begin{lateximage}}
+    {}
+    {\LWR@patcherror{asymptote}{asyinclude-begingroup}}
+
+\xpatchcmd{\asyinclude}
+    {\endgroup}
+    {\end{lateximage}}
+    {}
+    {\LWR@patcherror{asymptote}{asyinclude-endgroup}}
+\endinput
+%%
+%% End of file `lwarp-asymptote.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty
new file mode 100644
index 00000000000..75bcbbc8c2f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-axessibility.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `axessibility')
+%% 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{axessibility}
+\newcommand{\wrap}[1]{}
+\endinput
+%%
+%% End of file `lwarp-axessibility.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
new file mode 100644
index 00000000000..3b69a0e9bb7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
@@ -0,0 +1,90 @@
+%%
+%% This is file `lwarp-breqn.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `breqn')
+%% 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{breqn}
+\setkeys{breqn}{spread={5pt}}
+
+\def\eqnumside{R}
+
+\BeforeBeginEnvironment{dmath}{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dmath- \mathimagename]
+}
+
+\AfterEndEnvironment{dmath}{
+    \end{lateximage}\end{BlockClass}
+}
+
+\BeforeBeginEnvironment{dmath*}{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dmath*- \mathimagename]
+}
+
+\AfterEndEnvironment{dmath*}{
+    \end{lateximage}\end{BlockClass}
+}
+
+\BeforeBeginEnvironment{dseries}{
+    \begin{BlockClass}{displaymathnumbered}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dseries- \mathimagename]
+}
+
+\AfterEndEnvironment{dseries}{
+    \end{lateximage}\end{BlockClass}
+}
+
+\BeforeBeginEnvironment{dseries*}{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dseries*- \mathimagename]
+}
+
+\AfterEndEnvironment{dseries*}{
+    \end{lateximage}\end{BlockClass}
+}
+
+\BeforeBeginEnvironment{dgroup}{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dgroup- \mathimagename]
+}
+
+\AfterEndEnvironment{dgroup}{
+    \end{lateximage}\end{BlockClass}
+}
+
+\BeforeBeginEnvironment{dgroup*}{
+    \begin{BlockClass}{displaymath}
+    \LWR@newautoidanchor%
+    \booltrue{LWR@indisplaymathimage}%
+    \begin{lateximage}[-breqn dgroup*- \mathimagename]
+}
+
+\AfterEndEnvironment{dgroup*}{
+    \end{lateximage}\end{BlockClass}
+}
+\endinput
+%%
+%% End of file `lwarp-breqn.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
new file mode 100644
index 00000000000..b6711dc6e8d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-bxpapersize.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `bxpapersize')
+%% 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{bxpapersize}
+\providecommand*\papersizesetup{\bxpapersizesetup}
+\newcommand*\bxpapersizesetup[1]{}
+\endinput
+%%
+%% End of file `lwarp-bxpapersize.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
new file mode 100644
index 00000000000..6c0ffa3f425
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-canoniclayout.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `canoniclayout')
+%% 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.
+s%
+\LWR@ProvidesPackageDrop{canoniclayout}
+\newcommand*{\currentfontletters}{}
+\newcommand*{\charactersperpage}{}
+\endinput
+%%
+%% End of file `lwarp-canoniclayout.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
index ca0052c3cda..71a336e8140 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
@@ -484,7 +484,7 @@
 }% AtBeginDocument
 \AtBeginDocument{
 \@ifchemmacrosmoduleloaded{reactions}{
-\PackageInfo{lwarp}{Patching~chemmacros~module~orbital}
+\PackageInfo{lwarp}{Patching~chemmacros~module~reactions}
 
 \cs_gset_protected:Npn \chemmacros_declare_reaction_env:nnnn #1#2#3#4
   {
@@ -734,7 +734,7 @@ name = \chemmacros_translate:n {scheme-name}
             \bool_if:NT \l__chemmacros_nmr_solvent_bool
                 {
                 \bool_if:NTF \l__chemmacros_nmr_parse_bool
-                    { \chemformula_ch:nn { } {#4} }
+                    {\ch{#4}}%  lwarp
                     {#4}
                 }
             \bool_if:NT \l__chemmacros_nmr_delimiters_bool
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
new file mode 100644
index 00000000000..f830e128976
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
@@ -0,0 +1,34 @@
+%%
+%% This is file `lwarp-draftcopy.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `draftcopy')
+%% 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{draftcopy}
+\newcommand{\draftcopyVersion}[1]{}
+\newcommand{\draftcopySetGrey}[1]{}
+\newcommand{\draftcopySetScale}[1]{}
+\newcommand{\draftcopySetScaleFactor}[1]{}
+\newcommand{\draftcopyFirstPage}[1]{}
+\newcommand{\draftcopyLastPage}[1]{}
+\newcommand{\draftcopyName}[2]{}
+\newcommand{\draftcopyPageTransform}[1]{}
+\newcommand{\draftcopyBottomTransform}[1]{}
+\newcommand{\draftcopyPageX}[1]{}
+\newcommand{\draftcopyPageY}[1]{}
+\newcommand{\draftcopyBottomX}[1]{}
+\newcommand{\draftcopyBottomY}[1]{}
+\endinput
+%%
+%% End of file `lwarp-draftcopy.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty
index 2e32fac7440..177a33c9161 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty
@@ -15,10 +15,30 @@
 %%   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{epstopdf-base}[2016/05/15]
-\providecommand*{\epstopdfsetup}[1]{}
-\providecommand*{\epstopdfcall}[1]{}
-\providecommand*{\epstopdfDeclareGraphicsRule}[4]{}
+\LWR@ProvidesPackagePass{epstopdf-base}[2016/05/15]
+\newcommand*{\LWR@HTML@ETE@OrgGin@setfile}[3]{%
+    \edef\LWR@tempone{#3}%
+    \StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]%
+    \StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]%
+    \xdef\LWR@parsedfilename{\LWR@tempone}%
+}
+
+\LWR@formatted{ETE@OrgGin@setfile}
+\renewcommand*{\LWR@HTML@Gin@setfile}[3]{%
+    \ETE@Gin@setfile{#1}{#2}{#3}%
+}
+\AtBeginDocument{
+\DeclareGraphicsExtensions{%
+    .eps,.EPS,.svg,.SVG,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+}
+\DeclareGraphicsRule{.svg}{svg}{.svg}{}
+\DeclareGraphicsRule{.SVG}{svg}{.SVG}{}
+}
+\appto\LWR@restoreorigformatting{%
+\DeclareGraphicsExtensions{%
+    .eps,.EPS,.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+}%
+}
 \endinput
 %%
 %% End of file `lwarp-epstopdf-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty
index d25150f6484..4dc7a2592bb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty
@@ -15,10 +15,7 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{epstopdf}
-\providecommand*{\epstopdfsetup}[1]{}
-\providecommand*{\epstopdfcall}[1]{}
-\providecommand*{\epstopdfDeclareGraphicsRule}[4]{}
+\LWR@ProvidesPackagePass{epstopdf}[2016/05/15]
 \endinput
 %%
 %% End of file `lwarp-epstopdf.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
new file mode 100644
index 00000000000..d27d5d3e63f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-fnbreak.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `fnbreak')
+%% 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{fnbreak}
+\newcommand*{\fnbreakverbose}{}
+\newcommand*{\fnbreaknonverbose}{}
+\newcommand*{\fnbreaklabel}{}
+\newcommand*{\fnbreaknolabel}{}
+\endinput
+%%
+%% End of file `lwarp-fnbreak.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index 6a8c37a1207..deaef2c9227 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -130,12 +130,26 @@
 
 \newsavebox{\LWR@imagesizebox}
 
-\let\LWR@origGin@setfile\Gin@setfile
+\newcommand*{\LWR@HTML@Gin@setfile}[3]{%
+    \xdef\LWR@parsedfilename{#3}%
+}
 
 \AtBeginDocument{
 \define@key{Gin}{class}{}
 }
 
+\AtBeginDocument{
+\@ifpackageloaded{epstopdf}
+{
+    \newcommand*{\LWR@replaceEPSSVG}{}
+}{%
+    \newcommand*{\LWR@replaceEPSSVG}{%
+        \StrSubstitute{\LWR@tempone}{.eps}{.svg}[\LWR@tempone]%
+        \StrSubstitute{\LWR@tempone}{.EPS}{.SVG}[\LWR@tempone]%
+    }
+}%
+}
+
 \NewDocumentCommand{\LWR@includegraphicsb}{s o o m}
 {%
 \LWR@traceinfo{LWR@includegraphicsb #4}%
@@ -152,11 +166,13 @@
     }%
 }{}%
 \begingroup%
-\renewcommand*{\Gin@setfile}[3]{%
-\LWR@traceinfo{Gin@setfile ##3}%
-\xdef\LWR@parsedfilename{##3}%
-}%
-\Ginclude@graphics{\detokenize\expandafter{#4}}%
+\LetLtxMacro\Gin@setfile\LWR@HTML@Gin@setfile%
+\edef\LWR@tempone{#4}%
+\StrSubstitute{\LWR@tempone}{.pdf}{.svg}[\LWR@tempone]%
+\StrSubstitute{\LWR@tempone}{.PDF}{.SVG}[\LWR@tempone]%
+\LWR@replaceEPSSVG%
+\xdef\LWR@parsedfilename{\LWR@tempone}%
+\Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}%
 \endgroup%
 \filename@parse{\LWR@parsedfilename}%
 \LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
new file mode 100644
index 00000000000..3a856513eda
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
@@ -0,0 +1,52 @@
+%%
+%% This is file `lwarp-nccfancyhdr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `nccfancyhdr')
+%% 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{nccfancyhdr}
+\newcommand*{\headrulewidth}{}
+\newcommand*{\footrulewidth}{}
+\newcommand{\headstrutheight}{}
+\newcommand{\footstrutheight}{}
+\newcommand*{\headrule}{}
+\newcommand*{\footrule}{}
+
+\newdimen\headwidth
+\newcommand*{\extendedheaders}{}
+\newcommand*{\normalheaders}{}
+
+\newcommand*{\fancyhead}[2][]{}
+\newcommand*{\fancyfoot}[2][]{}
+\newcommand*{\fancyhf}[2][]{}
+\newcommand*{\fancypagestyle}[2]{}
+\newcommand*{\lhead}[2][]{}
+\newcommand*{\chead}[2][]{}
+\newcommand*{\rhead}[2][]{}
+\newcommand*{\lfoot}[2][]{}
+\newcommand*{\cfoot}[2][]{}
+\newcommand*{\rfoot}[2][]{}
+
+\newcommand{\nouppercase}[1]{#1}
+
+\NewDocumentCommand{\fancycenter}{o o m m m}{}
+
+\NewDocumentCommand{\newpagestyle}{m o m}{}
+
+\newcommand*{\iffloatpage}[2]{#2}
+\newcommand*{\ifftopfloat}[2]{#2}
+\newcommand*{\iffbotfloat}[2]{#2}
+\endinput
+%%
+%% End of file `lwarp-nccfancyhdr.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty
index a74f58bf1a2..de194222e08 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty
@@ -25,6 +25,7 @@
 \LWR@origUnitsNiceFrac[#1]{#2}{#3}%
 \endgroup%
 }
+\CustomizeMathJax{\newcommand{\nicefrac}[3][]{#2/#3}}
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
new file mode 100644
index 00000000000..63b6da8d004
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
@@ -0,0 +1,31 @@
+%%
+%% This is file `lwarp-pdftricks.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `pdftricks')
+%% 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{pdftricks}
+\def\PDFTfigname{\BaseJobname-fig\thepsfig}
+\PackageWarning{lwarp-pdftricks}{
+When the pdftricks images change,
+remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
+}
+
+\AfterEndDocument{\typeout{***}}
+\AfterEndDocument{\typeout{*** Note: If pdftricks images are not found, new, or updated,}}
+\AfterEndDocument{\typeout{*** \space use 'lwarpmk pdftosvg \BaseJobname-fig*.pdf'}}
+\AfterEndDocument{\typeout{***}}
+\endinput
+%%
+%% End of file `lwarp-pdftricks.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
new file mode 100644
index 00000000000..1a1654db8fd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-pst-eps.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `pst-eps')
+%% 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{pst-eps}
+\renewenvironment{TeXtoEPS}{}{}
+\renewcommand{\PSTtoEPS}[3][]{}
+\endinput
+%%
+%% End of file `lwarp-pst-eps.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
new file mode 100644
index 00000000000..d4f3e032de2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-pstricks.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `pstricks')
+%% 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{pstricks}
+\BeforeBeginEnvironment{pspicture}{\begin{lateximage}[(pspicture)]}
+\AfterEndEnvironment{pspicture}{\end{lateximage}}
+\endinput
+%%
+%% End of file `lwarp-pstricks.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty
new file mode 100644
index 00000000000..28e7405a572
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-units.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `units')
+%% 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{units}[1998/08/04]
+\CustomizeMathJax{\newcommand{\unit}[2][]{#1 #2}}
+\CustomizeMathJax{\newcommand{\unitfrac}[3][]{#1 #2/#3}}
+
+\endinput
+%%
+%% End of file `lwarp-units.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty
new file mode 100644
index 00000000000..636cd518cc6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty
@@ -0,0 +1,30 @@
+%%
+%% This is file `lwarp-xunicode.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `xunicode')
+%% 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.
+
+\@ifpackageloaded{lwarp}{\LWR@loadbefore{xunicode}}{}
+
+\LWR@ProvidesPackagePass{xunicode}[2011/09/09]
+\newcommand*{\LWR@HTML@textcircled}[1]{%
+\InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}%
+}
+
+\LWR@formatted{textcircled}
+
+\endinput
+%%
+%% End of file `lwarp-xunicode.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index a1b52d3adf8..719adc22c37 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}
-    [2018/07/07 v0.58  Allows LaTeX to directly produce HTML5 output.]
+    [2018/09/07 v0.59  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -38,6 +38,8 @@
 \ifLuaTeX
 \RequirePackage{luatex85}% until the geometry package is updated
 \fi
+
+\RequirePackage{ifpdf}
 \newcommand{\LWR@mdfive}[1]{%
 \PackageError{lwarp}
 {No MD5 macro was found.}
@@ -68,7 +70,6 @@
     }
 }
 \fi
-
 \RequirePackage{newunicodechar}
 
 \newunicodechar{⨯}{\texttimes}
@@ -194,6 +195,12 @@
 
 \DeclareBoolOption[false]{latexmk}
 
+\DeclareBoolOption[false]{dvips}
+
+\DeclareBoolOption[false]{dvipdfm}
+
+\DeclareBoolOption[false]{dvipdfmx}
+
 \ProcessKeyvalOptions*\relax
 
 \providecommand*{\BaseJobname}{\LWR@BaseJobname}
@@ -334,6 +341,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{a4wide}
 \LWR@loadafter{a5comb}
 \LWR@notmemoirloadafter{abstract}
+\LWR@loadafter{accsupp}
 \LWR@loadafter{acro}
 \LWR@loadafter{acronym}
 \LWR@loadafter{adjmulticol}
@@ -351,9 +359,12 @@ For a possible alternative, see package(s) #2.}
 \LWR@notmemoirloadafter{appendix}
 \LWR@loadafter{arabicfront}
 \LWR@notmemoirloadafter{array}
+\LWR@loadafter{arydshln}
+\LWR@loadafter{asymptote}
 \LWR@loadafter{attachfile}
 \LWR@loadafter{attachfile2}
 \LWR@loadafter{authblk}
+\LWR@loadafter{axessibility}
 \LWR@loadafter{axodraw2}
 \LWR@loadafter{backref}
 \LWR@loadafter{balance}
@@ -365,8 +376,11 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{breakurl}
+\LWR@loadafter{breqn}
+\LWR@loadafter{bxpapersize}
 \LWR@loadafter{bytefield}
 \LWR@loadafter{cancel}
+\LWR@loadafter{canoniclayout}
 \LWR@loadafter{caption}
 \LWR@loadafter{caption2}
 \LWR@loadafter{cases}
@@ -391,6 +405,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{dblfnote}
 \LWR@notmemoirloadafter{dcolumn}
 \LWR@loadafter{diagbox}
+\LWR@loadafter{draftcopy}
 \LWR@loadafter{draftwatermark}
 \LWR@loadafter{easy-todo}
 \LWR@loadafter{ebook}
@@ -426,6 +441,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{floatrow}
 \LWR@loadafter{fltrace}
 \LWR@loadafter{flushend}
+\LWR@loadafter{fnbreak}
 \LWR@loadafter{fncychap}
 \LWR@loadafter{fnlineno}
 \LWR@loadafter{fnpos}
@@ -495,6 +511,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{multitoc}
 \LWR@loadafter{nameref}
 \LWR@loadafter{natbib}
+\LWR@notmemoirloadafter{nccfancyhdr}
 \LWR@notmemoirloadafter{needspace}
 \LWR@loadafter{newtxmath}
 \LWR@notmemoirloadafter{nextpage}
@@ -516,6 +533,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{pdflscape}
 \LWR@loadafter{pdfpages}
 \LWR@loadafter{pdfsync}
+\LWR@loadafter{pdftricks}
 \LWR@loadafter{pdfx}
 \LWR@loadafter{pfnote}
 \LWR@loadafter{phfqit}
@@ -523,6 +541,8 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{prelim2e}
 \LWR@loadafter{prettyref}
 \LWR@loadafter{preview}
+\LWR@loadafter{pst-eps}
+\LWR@loadafter{pstricks}
 \LWR@loadafter{quotchap}
 \LWR@loadafter{quoting}
 \LWR@loadafter{ragged2e}
@@ -551,6 +571,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{showkeys}
 \LWR@loadafter{sidecap}
 \LWR@loadafter{sidenotes}
+\LWR@loadafter{SIunits}
 \LWR@loadafter{siunitx}
 \LWR@loadafter{soul}
 \LWR@loadafter{soulpos}
@@ -587,6 +608,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{turnthepage}
 \LWR@loadafter{ulem}
 \LWR@loadafter{underscore}
+\LWR@loadafter{units}
 \LWR@loadafter{upref}
 \LWR@loadafter{url}
 \LWR@loadafter{varioref}% no lwarp package provided
@@ -704,10 +726,6 @@ top=1in,bottom=1in,%
 
 \RequirePackage{zref}
 
-\RequirePackage{amsmath}
-\def\maketag@@@#1{\text{#1}}
-\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}}
-
 
 \RequirePackage{printlen}
 
@@ -1236,72 +1254,189 @@ top=1in,bottom=1in,%
 \immediate\closeout\LWR@quickfile
 \end{warpprint}
 
+
 \begin{warpprint}
-\AtBeginDocument{
-\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
-\immediate\openout\LWR@quickfile=lwarpmk.conf
+
+\newcommand*{\LWR@lwarpconfversion}{1}% also in lwarpmk.lua
+\catcode`\$=12
+\def\LWR@dollarchar{$}
+\catcode`\$=3
+\catcode`\&=12
+\def\LWR@ampersand{&}
+\catcode`\&=4
 \ifbool{usingOSWindows}{
-\immediate\write\LWR@quickfile{opsystem = "Windows"}
+    \def\LWR@opquote{"}
 }{
-\immediate\write\LWR@quickfile{opsystem = "Unix"}
+    \def\LWR@opquote{'}
 }
-\ifPDFTeX
-\immediate\write\LWR@quickfile{latexname = "pdflatex"}
-\fi
-\ifXeTeX
-\immediate\write\LWR@quickfile{latexname = "xelatex"}
-\fi
-\ifLuaTeX
-\immediate\write\LWR@quickfile{latexname = "lualatex"}
-\fi
-\immediate\write\LWR@quickfile{sourcename = "\jobname"}
-\immediate\write\LWR@quickfile{%
-homehtmlfilename = "\HomeHTMLFilename"%
-}
-\immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
-\immediate\write\LWR@quickfile{shellescape = "\ifshellescape true\else false\fi"}
-\immediate\write\LWR@quickfile{printindexcmd = "\LWR@PrintIndexCmd"}
-\immediate\write\LWR@quickfile{HTMLindexcmd = "\LWR@HTMLIndexCmd"}
-\immediate\write\LWR@quickfile{latexmkindexcmd = "\LWR@LatexmkIndexCmd"}
-\immediate\write\LWR@quickfile{glossarycmd = "\LWR@GlossaryCmd"}
-\immediate\write\LWR@quickfile{pdftotextenc = "\LWR@pdftotextEnc"}
-\immediate\closeout\LWR@quickfile
-}% AtBeginDocument
-\end{warpprint}
-
-\begin{warpprint}
-\AtBeginDocument{
-\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
-\immediate\openout\LWR@quickfile=\jobname.lwarpmkconf
 \ifbool{usingOSWindows}{
-\immediate\write\LWR@quickfile{opsystem = "Windows"}
+    \def\LWR@opsequence{\LWR@ampersand}
 }{
-\immediate\write\LWR@quickfile{opsystem = "Unix"}
+    \def\LWR@opsequence{\LWR@ampersand\LWR@ampersand}
 }
-\ifPDFTeX
-\immediate\write\LWR@quickfile{latexname = "pdflatex"}
-\fi
-\ifXeTeX
-\immediate\write\LWR@quickfile{latexname = "xelatex"}
-\fi
-\ifLuaTeX
-\immediate\write\LWR@quickfile{latexname = "lualatex"}
+\ifshellescape
+    \def\LWR@shellescapecmd{--shell-escape }
+\else
+    \def\LWR@shellescapecmd{}
 \fi
-\immediate\write\LWR@quickfile{sourcename = "\jobname"}
-\immediate\write\LWR@quickfile{%
-homehtmlfilename = "\HomeHTMLFilename"%
-}
-\immediate\write\LWR@quickfile{htmlfilename = "\HTMLFilename"}
-\immediate\write\LWR@quickfile{latexmk = "\ifbool{LWR@latexmk}{true}{false}"}
-\immediate\write\LWR@quickfile{shellescape = "\ifshellescape true\else false\fi"}
-\immediate\write\LWR@quickfile{printindexcmd = "\LWR@PrintIndexCmd"}
-\immediate\write\LWR@quickfile{HTMLindexcmd = "\LWR@HTMLIndexCmd"}
-\immediate\write\LWR@quickfile{latexmkindexcmd = "\LWR@LatexmkIndexCmd"}
-\immediate\write\LWR@quickfile{glossarycmd = "\LWR@GlossaryCmd"}
-\immediate\write\LWR@quickfile{pdftotextenc = "\LWR@pdftotextEnc"}
+\newcommand*{\LWR@compilecmd}[2]{%
+    #1 \LWR@shellescapecmd \jobname#2%
+}
+\newcommand*{\LWR@addcompilecmd}[2]{%
+    \space \LWR@opsequence \space\space
+    #1 \jobname#2%
+}
+\newcommand*{\LWR@unknownengine}{%
+    \PackageError{lwarp}
+    {Unknown LaTeX engine.}
+    {Lwarp only knows about pdflatex, dvi latex, xelatex, and lualatex.}
+}
+\newcommand*{\LWR@latexmkvar}[2]{%
+    -e
+    \LWR@opquote%
+    \LWR@dollarchar #1=q/#2/%
+    \LWR@opquote
+}
+\newcommand*{\LWR@latexmkcmd}[1]{%
+    latexmk  \space \LWR@shellescapecmd \space  #1 \space
+    -recorder \space
+    \LWR@latexmkvar{makeindex}{\LWR@LatexmkIndexCmd}
+}
+\newcommand*{\LWR@latexmkdvipdfm}[1]{%
+    -pdfdvi \space
+    \LWR@latexmkvar{dvipdf}{%
+        #1
+        \@percentchar O
+        -o \@percentchar D
+        \@percentchar S%
+    }
+}
+\ifbool{LWR@latexmk}{
+    \ifpdf
+        \ifPDFTeX
+            \def\LWR@latexcmd{\LWR@latexmkcmd{-pdf -dvi- -ps-}}
+        \else
+            \ifLuaTeX
+                \def\LWR@latexcmd{\LWR@latexmkcmd{-lualatex}}
+            \else
+                \LWR@unknownengine
+            \fi
+        \fi
+    \else% \ifpdf
+        \ifXeTeX
+            \def\LWR@latexcmd{\LWR@latexmkcmd{-xelatex}}
+        \else% \ifXeTeX
+            \ifbool{LWR@dvipdfm}{
+                \def\LWR@latexcmd{%
+                    \LWR@latexmkcmd{%
+                        \LWR@latexmkdvipdfm{dvipdfm}%
+                    }
+                }
+            }{
+                \ifbool{LWR@dvipdfmx}{
+                    \def\LWR@latexcmd{%
+                        \LWR@latexmkcmd{%
+                            \LWR@latexmkdvipdfm{dvipdfmx}%
+                        }
+                    }
+                }{
+                    \def\LWR@latexcmd{\LWR@latexmkcmd{-pdfps}}
+                }
+            }
+        \fi
+    \fi% \ifpdf
+    \def\LWR@printlatexcmd{\LWR@latexcmd \space \jobname}
+    \def\LWR@HTMLlatexcmd{\LWR@latexcmd \space \jobname_html}
+}% latexmk
+{% not latexmk
+    \ifpdf
+        \ifPDFTeX
+            \def\LWR@printlatexcmd{\LWR@compilecmd{pdflatex}{}}
+            \def\LWR@HTMLlatexcmd{\LWR@compilecmd{pdflatex}{_html}}
+        \else
+            \ifLuaTeX
+                \def\LWR@printlatexcmd{\LWR@compilecmd{lualatex}{}}
+                \def\LWR@HTMLlatexcmd{\LWR@compilecmd{lualatex}{_html}}
+            \else
+                \LWR@unknownengine
+            \fi
+        \fi
+    \else% \ifpdf
+        \ifXeTeX
+            \def\LWR@printlatexcmd{\LWR@compilecmd{xelatex}{}}
+            \def\LWR@HTMLlatexcmd{\LWR@compilecmd{xelatex}{_html}}
+        \else
+            \ifbool{LWR@dvipdfm}{
+                \def\LWR@printlatexcmd{%
+                    \LWR@compilecmd{latex}{}
+                    \LWR@addcompilecmd{dvipdfm}{}
+                }
+                \def\LWR@HTMLlatexcmd{%
+                    \LWR@compilecmd{latex}{_html}
+                    \LWR@addcompilecmd{dvipdfm}{_html}
+                }
+            }{
+                \ifbool{LWR@dvipdfmx}{
+                    \def\LWR@printlatexcmd{%
+                        \LWR@compilecmd{latex}{}
+                        \LWR@addcompilecmd{dvipdfmx}{}
+                    }
+                    \def\LWR@HTMLlatexcmd{%
+                        \LWR@compilecmd{latex}{_html}
+                        \LWR@addcompilecmd{dvipdfmx}{_html}
+                    }
+                }{% dvips
+                    \def\LWR@printlatexcmd{%
+                        \LWR@compilecmd{latex}{}
+                        \LWR@addcompilecmd{dvips}{}
+                        \LWR@addcompilecmd{ps2pdf}{}.ps
+                    }
+                    \def\LWR@HTMLlatexcmd{%
+                        \LWR@compilecmd{latex}{_html}
+                        \LWR@addcompilecmd{dvips}{_html}
+                        \LWR@addcompilecmd{ps2pdf}{_html}.ps
+                    }
+                }
+            }
+        \fi% \ifXeTeX
+    \fi% \ifpdf
+}% latexmk
+\newcommand{\LWR@writeconf}[1]{%
+\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
+\immediate\openout\LWR@quickfile=#1
+\immediate\write\LWR@quickfile{confversion = [[\LWR@lwarpconfversion]]}
+\ifbool{usingOSWindows}{
+    \immediate\write\LWR@quickfile{opsystem = [[Windows]]}
+}{
+    \immediate\write\LWR@quickfile{opsystem = [[Unix]]}
+}
+\immediate\write\LWR@quickfile{sourcename = [[\jobname]]}
+\immediate\write\LWR@quickfile{homehtmlfilename = [[\HomeHTMLFilename]]}
+\immediate\write\LWR@quickfile{htmlfilename = [[\HTMLFilename]]}
+\immediate\write\LWR@quickfile{latexmk = [[\ifbool{LWR@latexmk}{true}{false}]]}
+\immediate\write\LWR@quickfile{printlatexcmd = [[\LWR@printlatexcmd]]}
+\immediate\write\LWR@quickfile{HTMLlatexcmd = [[\LWR@HTMLlatexcmd]]}
+\immediate\write\LWR@quickfile{printindexcmd = [[\LWR@PrintIndexCmd]]}
+\immediate\write\LWR@quickfile{HTMLindexcmd = [[\LWR@HTMLIndexCmd]]}
+\immediate\write\LWR@quickfile{latexmkindexcmd = [[\LWR@LatexmkIndexCmd]]}
+\immediate\write\LWR@quickfile{glossarycmd = [[\LWR@GlossaryCmd]]}
+\immediate\write\LWR@quickfile{pdftotextenc = [[\LWR@pdftotextEnc]]}
 \immediate\closeout\LWR@quickfile
-}% AtBeginDocument
+}
+
+
+\end{warpprint}
+
+\begin{warpprint}
+
+\AtBeginDocument{\LWR@writeconf{lwarpmk.conf}}
+
+\end{warpprint}
+
+\begin{warpprint}
+
+\AtBeginDocument{\LWR@writeconf{\jobname.lwarpmkconf}}
+
 \end{warpprint}
 
 
@@ -3225,18 +3360,20 @@ MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function () {
         seteqsection.num = AMS.number;
         var n = this.GetArgument(name);
         if (n === "") {
-        seteqsection = seteqsectionDefault;
+            seteqsection = seteqsectionDefault;
         } else {
-        if (!seteqsections["_"+n])
-            seteqsections["_"+n] = {name:n, num:0};
-        seteqsection = seteqsections["_"+n];
+            if (!seteqsections["_"+n])
+                seteqsections["_"+n] = {name:n, num:0};
+            seteqsection = seteqsections["_"+n];
         }
         AMS.number = seteqsection.num;
     },
     mySetEqNumber: function (name) {
         var n = this.GetArgument(name);
         if (!n || !n.match(/^ *[0-9]+ *$/))
-            n = ""; else n = parseInt(n)-1;
+            n = "";
+        else
+            n = parseInt(n)-1;
         <!-- $ syntax highlighting -->
         if (n === "" || n < 1)
             TEX.Error
@@ -3247,13 +3384,19 @@ MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function () {
     MathJax.Hub.Config({
     TeX: {
         equationNumbers: {
-        formatTag: function (n)
-            {return "("+(seteqsection.name+"."+n).replace(/^\./,"")+")"},
-        formatID: function (n) {
-            n = (seteqsection.name+'.'+n).replace
-                (/[:"'<>&]/g,"").replace(/^\./,"");
-            return 'mjx-eqn-' + n;
-        }
+            formatTag: function (n) {
+                <!-- if not numeric, don't include the chapter -->
+                if (!n.match(/^ *[0-9]+ *$/ ))
+                <!-- $ syntax highlighting -->
+                    return "("+(n).replace(/^\./,"")+")" ;
+                else
+                    return "("+(seteqsection.name+"."+n).replace(/^\./,"")+")" ;
+            },
+            formatID: function (n) {
+                n = (seteqsection.name+'.'+n).replace
+                    (/[:"'<>&]/g,"").replace(/^\./,"");
+                return 'mjx-eqn-' + n;
+            }
         }
     }
     });
@@ -3293,7 +3436,7 @@ MathJax.Hub.Config({
 
 <!-- Alternative CDN provider: -->
 <script type="text/javascript" async
-src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS_HTML-full">
+src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-AMS_HTML-full">
 </script>
 
 <!-- No longer supported after April 30, 2017: -->
@@ -3313,7 +3456,8 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.58"
+printversion = "v0.59"
+requiredconfversion = "1" -- also at *lwarpmk.conf
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -3340,6 +3484,7 @@ lwarpmk pdftohtml [-p project]:
     Converts project_html.pdf to project_html.html and individual HTML files.
     Finishes the HTML conversion even if there was a compile error.
 lwarpmk pdftosvg <list of file names>: Converts each PDF file to SVG.
+lwarpmk epstopdf <list of file names>: Converts each EPS file to PDF.
 lwarpmk clean [-p project]: Remove .aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl*
 lwarpmk cleanall [-p project]: Remove auxiliary files and also project.pdf, *.html
 lwarpmk cleanlimages: Removes all images from the "lateximages" directory.
@@ -3350,37 +3495,6 @@ lwarpmk --help: Print this help message.
 -- printconf ()
 end
 
--- function printconf ()
--- --
--- -- Print the format of the configuration file lwarpmk.conf:
--- --
--- print ( [[
--- An example lwarpmk.conf or <project>.lwarpmkconf project file:
--- --
--- opsystem = "Unix"   (or "Windows")
--- latexname = "pdflatex"  (or "lualatex", or "xelatex")
--- sourcename = "projectname"  (the source-code filename w/o .tex)
--- homehtmlfilename = "index"  (or perhaps the project name)
--- htmlfilename = ""  (or "projectname" - filename prefix)
--- latexmk = "false"  (or "true" to use latexmk to build PDFs)
--- shellescape = "false"
--- printindexcmd = "makeindex -s lwarp.ist <name>.idx"
--- HTMLindexcmd = "makeindex -s lwarp.ist <name>_html.idx"
--- latexmkindexcmd = "makeindex -s lwarp.ist"
--- -- indexprog = "makeindex" or "xindy"
--- -- makeindexstyle = "lwarp.ist" (or a custom file based on lwarp.ist)
--- -- xindylanguge = "english"  (use a language supported by xindy)
--- -- xindycodepage = "utf8"  (use a codepage supported by xindy)
--- -- xindystyle = "lwarp.xdy" (or a custom file based on lwarp.xdy)
--- glossarycmd = "makeglossaries"
--- pdftotextenc = "UTF-8"  (use an encoding supported by pdftotext)
--- --
--- Filenames must contain only letters, numbers, underscore, or dash.
--- Values must be in upright "quotes".
---
--- ]] ) ;
--- end
-
 function splitfile (destfile,sourcefile)
 --
 -- Split one large sourcefile into a number of files,
@@ -3418,6 +3532,11 @@ function cvalueerror ( line, linenum , cvalue )
     os.exit(1) ;
 end
 
+function ignoreconf ()
+-- Global argument index
+argindex = 2
+end
+
 function loadconf ()
 --
 -- Load settings from the project's "lwarpmk.conf" file:
@@ -3435,9 +3554,11 @@ if ( arg[argindex] == "-p" ) then
     argindex = argindex + 1
 end
 -- Additional defaults:
+confversion = "0"
 opsystem = "Unix"
 latexmk = "false"
-shellescape = "false"
+printlatexcmd = ""
+HTMLlatexcmd = ""
 printindexcmd = ""
 HTMLindexcmd = ""
 latexmkindexcmd = ""
@@ -3470,11 +3591,11 @@ else -- file exists
 -- Read the file:
 print ("lwarpmk: Reading " .. conffile ..".")
 local cfile = io.open(conffile)
--- Scan each line:
+-- Scan each line, parsing each line as: name = [[string]]
 local linenum = 0
 for line in cfile:lines() do -- scan lines
 linenum = linenum + 1
-i,j,cvarname,cvalue = string.find (line,"([%w-_]*)%s*=%s*\"([^\"]*)\"") ;
+i,j,cvarname,cvalue = string.find (line,"([%w-_]*)%s*=%s*%[%[([^%]]*)%]%]") ;
 -- Error if incorrect enclosing characters:
 if ( i == nil ) then
     print ("lwarpmk: ===")
@@ -3484,48 +3605,25 @@ if ( i == nil ) then
 --    printconf () ;
     os.exit(1) ;
 end -- nil
-if ( cvarname == "opsystem" ) then
+if ( cvarname == "confversion" ) then
+    confversion = cvalue
+elseif ( cvarname == "opsystem" ) then
     -- Verify choice of opsystem:
     if ( (cvalue == "Unix") or (cvalue == "Windows") ) then
         opsystem = cvalue
     else
         cvalueerror ( line, linenum , cvalue )
     end
-elseif ( cvarname == "latexname" ) then
-    -- Verify choice of LaTeX compiler:
-    if (
-        (cvalue == "pdflatex") or
-        (cvalue == "xelatex") or
-        (cvalue == "lualatex")
-    ) then
-        latexname = cvalue
-    else
-        cvalueerror ( line, linenum , cvalue )
-    end
 elseif ( cvarname == "sourcename" ) then sourcename = cvalue
 elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue
 elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue
 elseif ( cvarname == "latexmk" ) then latexmk = cvalue
-elseif ( cvarname == "shellescape" ) then shellescape = cvalue
+elseif ( cvarname == "printlatexcmd" ) then printlatexcmd = cvalue
+elseif ( cvarname == "HTMLlatexcmd" ) then HTMLlatexcmd = cvalue
 elseif ( cvarname == "printindexcmd" ) then printindexcmd = cvalue
 elseif ( cvarname == "HTMLindexcmd" ) then HTMLindexcmd = cvalue
 elseif ( cvarname == "latexmkindexcmd" ) then latexmkindexcmd = cvalue
 elseif ( cvarname == "glossarycmd" ) then glossarycmd = cvalue
--- to be removed:
--- elseif ( cvarname == "indexprog" ) then
---     -- Verify choice of indexing program:
---     if (
---         (cvalue == "makeindex") or
---         (cvalue == "xindy")
---     ) then
---         indexprog = cvalue
---     else
---         cvalueerror ( line, linenum , cvalue )
---     end
--- elseif ( cvarname == "makeindexstyle" ) then makeindexstyle = cvalue
--- elseif ( cvarname == "xindylanguage" ) then xindylanguage = cvalue
--- elseif ( cvarname == "xindycodepage" ) then xindycodepage = cvalue
--- elseif ( cvarname == "xindystyle" ) then xindystyle = cvalue
 elseif ( cvarname == "pdftotextenc" ) then pdftotextenc = cvalue
 else
     print ("lwarpmk: ===")
@@ -3545,7 +3643,7 @@ end -- file exists
 -- This could happen if a local copy of lwarp has recently been recompiled.
 if sourcename=="lwarp" then
     print ("lwarpmk: ===")
-    print ("lwarpmk: Lwarp has recently been recompiled in this directory,")
+    print ("lwarpmk: lwarp.sty has recently been recompiled in this directory,")
     print ("lwarpmk: and \"lwarpmk.conf\" is no longer set for your own project.")
     print ("lwarpmk: Recompile your own project using pdf/lua/xelatex <projectname>.")
     print ("lwarpmk: After a recompile, \"lwarpmk.conf\" will be set for your project,")
@@ -3580,9 +3678,33 @@ elseif opsystem=="Windows" then -- For Windows
     cmdgroupclosename = ""
     seqname = " & "
     bgname = ""
-else print ( "lwarpmk: Select Unix or Windows for opsystem" )
+else
+    print ("lwarpmk: ===")
+    print ("lwarpmk: Select Unix or Windows for opsystem." )
+    print ("lwarpmk: ===")
+    os.exit(1)
 end --- for Windows
-
+-- Warning if the operating system does not appear to be correct,
+-- in case files were transferred to another system.
+if ( (package.config:sub(1,1)) ~= dirslash ) then
+    print ("lwarpmk: ===")
+    print ("lwarpmk: It appears that lwarpmk.conf is for a different operating system." )
+    print ("lwarpmk: To adjust lwarpmk.conf for the current operating system," )
+    print ("lwarpmk:   recompile the original document using xe/lua/pdflatex." )
+    print ("lwarpmk: ")
+    print ("lwarpmk: lwarpmk shall attempt to continue...")
+    print ("lwarpmk: ===")
+end
+-- Error if the configuration file's version is not current:
+if ( confversion ~= requiredconfversion ) then
+    print ("lwarpmk: ===")
+    print ("lwarpmk: The configuration files lwarpmk.conf and "..sourcename..".lwarpmkconf" )
+    print ("lwarpmk:   must be updated.  To update the configuration files," )
+    print ("lwarpmk:   recompile "..sourcename..".tex using xe/lua/pdflatex," )
+    print ("lwarpmk:   then use lwarpmk again.")
+    print ("lwarpmk: ===")
+    os.exit(1)
+end
 end -- loadconf
 
 function executecheckerror ( executecommands , errormessage )
@@ -3621,35 +3743,29 @@ io.close(fsource)
 return false
 end
 
-function onetime (fsuffix)
+function onetime (latexcmd, fsuffix)
 --
 -- Compile one time, return true if should compile again.
 -- fsuffix is "" for print, "_html" for HTML output.
 --
-print("lwarpmk: Compiling with " .. latexname .. " " .. sourcename..fsuffix)
-local thisshellescape = " "
-if ( shellescape == "true" ) then
-    thisshellescape = " -shell-escape "
-else
-    thisshellescape = " "
-end
+print("lwarpmk: Compiling with: " .. latexcmd)
 executecheckerror (
-    latexname .. thisshellescape .. sourcename..fsuffix ,
+    latexcmd ,
     "Compile error."
 )
 return (reruntoget(sourcename .. fsuffix .. ".log") ) ;
 end
 
-function manytimes (fsuffix)
+function manytimes (latexcmd, fsuffix)
 --
 -- Compile up to five times.
 -- fsuffix is "" for print, "_html" for HTML output
 --
-if onetime(fsuffix) == true then
-if onetime(fsuffix) == true then
-if onetime(fsuffix) == true then
-if onetime(fsuffix) == true then
-if onetime(fsuffix) == true then
+if onetime(latexcmd, fsuffix) == true then
+if onetime(latexcmd, fsuffix) == true then
+if onetime(latexcmd, fsuffix) == true then
+if onetime(latexcmd, fsuffix) == true then
+if onetime(latexcmd, fsuffix) == true then
 end end end end end
 end
 
@@ -3681,7 +3797,7 @@ end
 function removeaux ()
 --
 -- Remove auxiliary files:
--- All aux files are removed since there may be many bbl*.aux files.
+-- All .aux files are removed since there may be many bbl*.aux files.
 --
 os.execute ( rmname .. " *.aux " ..
     sourcename ..".toc " .. sourcename .. "_html.toc " ..
@@ -3689,6 +3805,7 @@ os.execute ( rmname .. " *.aux " ..
     sourcename ..".lot " .. sourcename .. "_html.lot " ..
     " *.idx " ..
     " *.ind " ..
+    sourcename ..".ps " .. sourcename .."_html.ps " ..
     sourcename ..".log " .. sourcename .. "_html.log " ..
     sourcename ..".gl* " .. sourcename .. "_html.gl* " ..
     " *_html_inc.* "
@@ -3914,34 +4031,22 @@ if ( pagezerowarning == true ) then
 end -- pagezerowarning
 end -- function
 
-function compilelatexmk ( fsuffix )
+function convertepstopdf ()
 --
--- Use latexmk to compile source and index:
--- fsuffix is "" for print, or "_html" for HTML
+-- Converts EPS files to PDF files.
+-- The filenames are arg[argindex] and up.
+-- arg[1] is the command "pdftosvg".
 --
--- Maybe select the shell-escape option:
-local thisshellescape = " "
-if ( shellescape == "true" ) then
-    thisshellescape = " -shell-escape "
-else
-    thisshellescape = " "
-end
--- The recorder option is required to detect changes in <project>.tex
--- while we are loading <project>_html.tex.
-executecheckerror (
-    "latexmk -pdf -dvi- -ps- -recorder "
-    .. "-e "
-    .. opquote
-    .. "$makeindex = q/" -- $
-    .. latexmkindexcmd
-    .. " /"
-    .. opquote
-    .. " -pdflatex=\"" .. latexname .. thisshellescape .." %O %S\" "
-    .. sourcename..fsuffix ..".tex"
-    ,
-    "Compile error."
-)
-end -- function
+ignoreconf ()
+for i = argindex , #arg do
+    if (lfs.attributes(arg[i],"mode")==nil) then
+        print ("lwarpmk: File \"" .. arg[i] .. "\" does not exist.")
+    else
+        print ("lwarpmk: Converting \"" .. arg[i] .. "\"")
+        os.execute ( "epstopdf " .. arg[i] )
+    end -- if
+end -- do
+end --function
 
 function convertpdftosvg ()
 --
@@ -3949,6 +4054,7 @@ function convertpdftosvg ()
 -- The filenames are arg[argindex] and up.
 -- arg[1] is the command "pdftosvg".
 --
+ignoreconf ()
 for i = argindex , #arg do
     if (lfs.attributes(arg[i],"mode")==nil) then
         print ("lwarpmk: File \"" .. arg[i] .. "\" does not exist.")
@@ -3985,7 +4091,11 @@ print ("lwarpmk: " .. printversion .. "  Automated make for the LaTeX lwarp pack
 if arg[1] == "print" then
 loadconf ()
 if ( latexmk == "true" ) then
-    compilelatexmk ("")
+    print ("lwarpmk: Compiling with: " .. printlatexcmd)
+    executecheckerror (
+        printlatexcmd ,
+        "Compile error."
+    )
     print ("lwarpmk: Done.")
 else -- not latexmk
     verifyfileexists (sourcename .. ".tex") ;
@@ -3998,7 +4108,7 @@ else -- not latexmk
         )
     ) then
         -- Recompile if not yet up to date:
-        manytimes("")
+        manytimes(printlatexcmd, "")
         print ("lwarpmk: Done.") ;
     else
         print ("lwarpmk: " .. sourcename .. ".pdf is up to date.") ;
@@ -4010,7 +4120,7 @@ end -- not latexmk
 elseif arg[1] == "print1" then
     loadconf ()
     verifyfileexists (sourcename .. ".tex") ;
-    onetime("")
+    onetime(printlatexcmd, "")
     print ("lwarpmk: Done.") ;
 
 -- lwarpmk printindex:
@@ -4039,7 +4149,11 @@ updateanddone ()
 elseif arg[1] == "html" then
 loadconf ()
 if ( latexmk == "true" ) then
-    compilelatexmk ("_html")
+    print ("lwarpmk: Compiling with: " .. HTMLlatexcmd)
+    executecheckerror (
+        HTMLlatexcmd ,
+        "Compile error."
+    )
     pdftohtml ()
     print ("lwarpmk: Done.")
 else -- not latexmk
@@ -4053,7 +4167,7 @@ else -- not latexmk
         )
     ) then
         -- Recompile if not yet up to date:
-        manytimes("_html")
+        manytimes(HTMLlatexcmd, "_html")
         pdftohtml ()
         print ("lwarpmk: Done.")
     else
@@ -4066,7 +4180,7 @@ end -- not latexmk
 elseif arg[1] == "html1" then
     loadconf ()
     verifyfileexists ( sourcename .. ".tex" ) ;
-    onetime("_html")
+    onetime(HTMLlatexcmd, "_html")
     pdftohtml ()
     print ("lwarpmk: Done.")
 
@@ -4122,13 +4236,14 @@ print ("lwarpmk: Done.")
 
 -- lwarpmk cleanall
 -- Remove project.aux, .toc, .lof, .lot, .log, *.idx, *.ind, *_html_inc.*, .gl*
---    and also project.pdf, *.html
+--    and also project.pdf, project.dvi, *.html
 
 elseif arg[1] == "cleanall" then
 loadconf ()
 removeaux ()
 os.execute ( rmname .. " " ..
     sourcename .. ".pdf " .. sourcename .. "_html.pdf " ..
+    sourcename .. ".dvi " .. sourcename .. "_html.dvi " ..
     "*.html"
     )
 print ("lwarpmk: Done.")
@@ -4141,8 +4256,14 @@ loadconf ()
 os.execute ( rmname .. " lateximages/*" )
 print ("lwarpmk: Done.")
 
+-- lwarpmk epstopdf <list of file names>
+-- Convert EPS files to PDF using epstopdf
+elseif arg[1] == "epstopdf" then
+convertepstopdf ()
+print ("lwarpmk: Done.")
+
 -- lwarpmk pdftosvg <list of file names>
--- Convert PDf files to SVG using pdftocairo
+-- Convert PDF files to SVG using pdftocairo
 elseif arg[1] == "pdftosvg" then
 convertpdftosvg ()
 print ("lwarpmk: Done.")
@@ -5313,7 +5434,7 @@ end -- not --version
 \newcommand{\LWR@customizeMathJax}{%
 \ifbool{mathjax}{
 \LWR@stoppars
-\LWR@htmlcomment{Nullify \textbackslash{}ensuremath for MathJax:}
+\LWR@htmlcomment{Nullify \textbackslash{}ensuremath, footnotes for MathJax:}
 
 \(\newcommand\ensuremath[1]{##1}\)
 
@@ -8955,33 +9076,37 @@ autopage-\theLWR@currentautosec%
 
 \AtBeginDocument{
 
-\IfFileExists{lwarp_baseline_marker.png}%
+\ifpdf
+    \newcommand*{\LWR@baselinename}{lwarp_baseline_marker.png}
+\else
+    \ifXeTeX
+        \newcommand*{\LWR@baselinename}{lwarp_baseline_marker.png}
+    \else
+        \newcommand*{\LWR@baselinename}{lwarp_baseline_marker.eps}
+    \fi
+\fi
+
+\IfFileExists{\LWR@baselinename}%
 {
     \@ifpackageloaded{graphicx}{
         \newcommand*{\LWR@addbaselinemarker}{%
-            \LWR@origincludegraphics[%
-                width=10sp,height=10sp%
-            ]{lwarp_baseline_marker.png}%
+            \LWR@origincludegraphics{\LWR@baselinename}%
         }
     }{
         \@ifpackageloaded{graphics}{
             \newcommand*{\LWR@addbaselinemarker}{%
-                \LWR@origincludegraphics{lwarp_baseline_marker.png}%
+                \LWR@origincludegraphics{\LWR@baselinename}%
             }
         }{
             \PackageWarning{lwarp}{Load graphicx or graphics
                 for improved SVG math baselines,}
-            \newcommand*{\LWR@addbaselinemarker}{%
-                \hspace*{10sp}%
-            }
+            \newcommand*{\LWR@addbaselinemarker}{}
         }
     }
-}{% lwarp_baseline_marker.png not present
-    \PackageWarning{lwarp}{File lwarp_baseline_marker.png is not installed alongside
+}{% lwarp_baseline_marker.png or .eps is not present
+    \PackageWarning{lwarp}{File \LWR@baselinename\space is not installed alongside
         the lwarp-*.sty files, so SVG math baselines may not be accurate,}
-    \newcommand*{\LWR@addbaselinemarker}{%
-        \hspace*{10sp}%
-    }
+    \newcommand*{\LWR@addbaselinemarker}{}
 }
 
 }% AtBeginDocument
@@ -9041,7 +9166,6 @@ autopage-\theLWR@currentautosec%
     \fi%
     \global\sbox{\LWR@singledollarbox}{%
         \usebox{\LWR@singledollarbox}%
-        \hspace*{-10sp}%
         \raisebox{-\dp\LWR@singledollarbox}{%
             \LWR@addbaselinemarker%
         }%
@@ -9124,9 +9248,7 @@ autopage-\theLWR@currentautosec%
         }%
     }%
     \LWR@addbaselinemarker%
-    \hspace*{-10sp}%
     \usebox{\LWR@singledollarbox}%
-    \hspace*{-10sp}%
     \LWR@addbaselinemarker%
     \end{lateximage}%
 }% not mathjax
@@ -9195,13 +9317,16 @@ autopage-\theLWR@currentautosec%
 }% not mathjax
 }
 
+\AtBeginDocument{
 \protected\gdef\(#1\){$#1$}
 \protected\gdef\[#1\]{$$#1$$}
+}
 
 \endgroup
-
+\AtBeginDocument{
 \LetLtxMacro\LWR@openbracketnormal\[
 \LetLtxMacro\LWR@closebracketnormal\]
+}
 
 \LetLtxMacro\LWR@origensuredmath\@ensuredmath
 
@@ -9314,10 +9439,12 @@ autopage-\theLWR@currentautosec%
 \LWR@orignewline
 }
 
+\AtBeginDocument{
 \let\LWR@origequation\equation
 \let\LWR@origendequation\endequation
 \csletcs{LWR@origequation*}{equation*}
 \csletcs{LWR@origendequation*}{endequation*}
+}
 \newcommand*{\LWR@doequation}[2]{%
 
 \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
@@ -9361,29 +9488,37 @@ autopage-\theLWR@currentautosec%
 
 }
 
+\AtBeginDocument{
 \let\equation\relax
 \let\endequation\relax
 \csletcs{equation*}{relax}
 \csletcs{endequation*}{relax}
+}
 
+\AtBeginDocument{
 \NewEnviron{equation}%
 {\LWR@doequation{\BODY}{equation}}%
 [\LWR@doendequation{equation}]
 
 \LetLtxMacro\LWR@equationnormal\equation
-\LetLtxMacro\LWR@endequationnormal\endequation
+\LetLtxMacro\endLWR@equationnormal\endequation
+}
 
+\AtBeginDocument{
 \NewEnviron{equation*}%
 {\LWR@doequation{\BODY}{equation*}}%
 [\LWR@doendequation{equation*}]
 
 \csletcs{LWR@equationnormalstar}{equation*}
 \csletcs{LWR@endequationnormalstar}{endequation*}
+}
 
+\AtBeginDocument{
 \LetLtxMacro\LWR@equationless\equation
-\LetLtxMacro\LWR@endequationless\endequation
+\LetLtxMacro\endLWR@equationless\endequation
 \csletcs{LWR@equationlessstar}{equation*}
 \csletcs{LWR@endequationlessstar}{endequation*}
+}
 
 \newcommand*{\displaymathnormal}{%
 \ifbool{LWR@origmathjax}{\booltrue{mathjax}}{\boolfalse{mathjax}}%
@@ -9392,7 +9527,7 @@ autopage-\theLWR@currentautosec%
 \LetLtxMacro\displaymath\LWR@displaymathnormal%
 \LetLtxMacro\enddisplaymath\endLWR@displaymathnormal%
 \LetLtxMacro\equation\LWR@equationnormal%
-\LetLtxMacro\endequation\LWR@endequationnormal%
+\LetLtxMacro\endequation\endLWR@equationnormal%
 \csletcs{equation*}{LWR@equationnormalstar}%
 \csletcs{endequation*}{LWR@endequationnormalstar}%
 }
@@ -9515,279 +9650,6 @@ autopage-\theLWR@currentautosec%
 
 }
 \csgpreto{eqnarray*}{\boolfalse{LWR@numbereqnarray}}
-\BeforeBeginEnvironment{multline}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \booltrue{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymathnumbered}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbodynumbered{multline}]
-}
-}
-
-\AfterEndEnvironment{multline}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \boolfalse{LWR@amsmultline}
-    \LWR@addmathjax{multline}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{multline*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \booltrue{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymath}
-    \LWR@newautoidanchor
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbody{multline*}]
-}
-}
-
-\AfterEndEnvironment{multline*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \boolfalse{LWR@amsmultline}
-    \LWR@addmathjax{multline*}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-
-\BeforeBeginEnvironment{gather}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymathnumbered}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbodynumbered{gather}]
-}
-}
-
-\AfterEndEnvironment{gather}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{gather}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{gather*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymath}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbody{gather*}]
-}
-}
-
-\AfterEndEnvironment{gather*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{gather*}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{align}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymathnumbered}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbodynumbered{align}]
-}
-}
-
-\AfterEndEnvironment{align}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{align}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{align*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymath}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbody{align*}]
-}
-}
-
-\AfterEndEnvironment{align*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{align*}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{flalign}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymathnumbered}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}]
-}
-}
-
-\AfterEndEnvironment{flalign}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{flalign}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{flalign*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymath}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbody{flalign*}]
-}
-}
-
-\AfterEndEnvironment{flalign*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{flalign*}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{alignat}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymathnumbered}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbodynumbered{alignat}]
-}
-}
-
-\AfterEndEnvironment{alignat}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{alignat}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
-\BeforeBeginEnvironment{alignat*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@syncmathjax
-    \boolfalse{LWR@amsmultline}
-    \LWR@beginhideamsmath
-}
-{
-    \begin{BlockClass}{displaymath}
-    \LWR@newautoidanchor%
-    \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\LWR@amsmathbody{alignat*}]
-}
-}
-
-\AfterEndEnvironment{alignat*}{
-
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
-    \LWR@endhideamsmath
-    \LWR@addmathjax{alignat*}{\the\@envbody}
-}
-{\end{lateximage}\end{BlockClass}}
-
-}
-
 \end{warpHTML}
 
 \begin{warpHTML}
@@ -9881,19 +9743,6 @@ autopage-\theLWR@currentautosec%
 \xdef\LWR@equationtag{#1}%
 }%
 
-\LetLtxMacro\LWR@origmake@df@tag@@\make@df@tag@@
-\LetLtxMacro\LWR@origmake@df@tag@@@\make@df@tag@@@
-
-\renewcommand*{\make@df@tag@@}[1]{%
-\LWR@remembertag{#1}%
-\LWR@origmake@df@tag@@{#1}%
-}
-
-\renewcommand*{\make@df@tag@@@}[1]{%
-\LWR@remembertag{#1}%
-\LWR@origmake@df@tag@@@{#1}%
-}
-
 }% not mathjax
 }% AtBeginDocument
 
@@ -10106,17 +9955,12 @@ autopage-\theLWR@currentautosec%
 \end{warpHTML}
 
 \begin{warpHTML}
-\@ifpackageloaded{textcomp}
-{
-\LWR@origRequirePackage{lwarp-textcomp}
-}
-{}
+\@ifpackageloaded{textcomp}{\LWR@origRequirePackage{lwarp-textcomp}}{}
 
-\@ifpackageloaded{graphics}
-{
-\LWR@origRequirePackage{lwarp-graphics}
-}
-{}
+\@ifpackageloaded{xunicode}{\LWR@origRequirePackage{lwarp-xunicode}}{}
+
+\@ifpackageloaded{graphics}{\LWR@origRequirePackage{lwarp-graphics}}{}
+\@ifpackageloaded{graphicx}{\LWR@origRequirePackage{lwarp-graphicx}}{}
 
 \end{warpHTML}
 
@@ -10385,7 +10229,7 @@ autopage-\theLWR@currentautosec%
 
 \begin{warpHTML}
 
-\BeforeBeginEnvironment{picture}{\begin{lateximage}}
+\BeforeBeginEnvironment{picture}{\begin{lateximage}[(picture)]}
 
 \AfterEndEnvironment{picture}{\end{lateximage}}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp_baseline_marker.eps b/Master/texmf-dist/tex/latex/lwarp/lwarp_baseline_marker.eps
new file mode 100644
index 00000000000..f5c93c7ed61
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp_baseline_marker.eps
@@ -0,0 +1,32 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
+%%Title: lwarp_baseline_marker.eps
+%%CreationDate: Sun Sep  2 17:10:42 2018
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 2
+%%Pages: 1
+%%BoundingBox: 0 0 1 1
+%%EndComments
+%%BeginProlog
+% Use own dictionary to avoid conflicts
+10 dict begin
+%%EndProlog
+%%Page: 1 1
+% Translate for offset
+0 0 translate
+% Translate to begin of first scanline
+0 0.22677165354330711 translate
+0.22677165354330711 -0.22677165354330711 scale
+% Image geometry
+1 1 8
+% Transformation matrix
+[ 1 0 0 1 0 0 ]
+currentfile /ASCII85Decode filter /RunLengthDecode filter
+%%BeginData:           13 ASCII Bytes
+image
+!<%E~>
+%%EndData
+showpage
+%%Trailer
+end
+%%EOF