lwarp (5sep17)

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

34 files changed, 3290 insertions, 1461 deletions

diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index 3712d0a0be2..2fe8a549f8c 100644
--- a/Master/texmf-dist/doc/latex/lwarp/README.txt
+++ b/Master/texmf-dist/doc/latex/lwarp/README.txt
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.38   README.txt
+LaTeX lwarp package v0.39   README.txt
 
 Files included are:
 
diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
index 18f1dd6c2a1..cfdead6d480 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
index 4e2a99cd3dd..83e427b029d 100755
--- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
+++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
@@ -4,7 +4,7 @@
 
 -- Print the usage of the lwarpmk command:
 
-printversion = "v0.38"
+printversion = "v0.39"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
index 00fe3ffbe9d..ba6ac00dd1f 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{lwarp}
-%<package>    [2017/08/27 v0.38  Allows LaTeX to directly produce HTML5 output.]
+%<package>    [2017/09/05 v0.39  Allows LaTeX to directly produce HTML5 output.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -68,11 +68,24 @@
 
 \usepackage[log-declarations=false]{xparse}
 
+
+
 \usepackage[lwarpmk]{lwarp}
 
 \usepackage[erewhon]{newtxmath}
 
 
+
+\usepackage{titlesec}
+
+\titleformat{\part}[hang]
+    {\LARGE\ttfamily\bfseries}{}{0pt}{}[\marginpar{\hfill{}File\,\thepart}]
+
+\titlespacing*{\part}{0pt}{*5}{0ex}
+
+
+
+
 \usepackage{needspace}
 
 
@@ -105,6 +118,8 @@
 % \usepackage{morefloats}
 % \usepackage{marginfix}
 
+
+
 \usepackage{tocloft}
 \renewcommand{\cftpartfont}{\Large\bfseries}
 \setlength{\cftsecnumwidth}{2.5em}
@@ -189,31 +204,31 @@ Keywords={LaTeX, HTML, conversion}%
 \renewcommand*{\thepart}{\arabic{part}}
 
 
-\newcommand{\lmacro}[1]{\textbackslash#1}
-\newcommand{\cmds}[1]{\texttt{#1}}
-\newcommand{\env}[1]{\texttt{#1}}
-\newcommand{\pkg}[1]{\textsf{#1}}
-\newcommand{\acro}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\element}[1]{\texttt{<#1>}}
-\newcommand{\attribute}[1]{\texttt{#1}}
-
-\newcommand{\TOC}{\acro{TOC}}
-\newcommand{\LOF}{\acro{LOF}}
-\newcommand{\LOT}{\acro{LOT}}
-
-\newcommand{\HTML}{\acro{HTML}}
-\newcommand{\HTMLfive}{\HTML\oldstylenums{5}}
-\newcommand{\CSS}{\acro{CSS}}
-\newcommand{\CSSthree}{\CSS\oldstylenums{3}}
-\newcommand{\EPUB}{\acro{EPUB}}
-\newcommand{\SVG}{\acro{SVG}}
-\newcommand{\PNG}{\acro{PNG}}
-\newcommand{\JPG}{\acro{JPG}}
-\newcommand{\PDF}{\acro{PDF}}
-\newcommand{\tikz}{Ti\textit{k}z}
-\newcommand{\MathML}{Math\acro{ML}}
-\newcommand{\CTAN}{\acro{CTAN}}
-\newcommand{\TDS}{\acro{TDS}}
+\newrobustcmd{\lmacro}[1]{\textbackslash#1}
+\newrobustcmd{\cmds}[1]{\texttt{#1}}
+\newrobustcmd{\env}[1]{\texttt{#1}}
+\newrobustcmd{\pkg}[1]{\textsf{#1}}
+\newrobustcmd{\acro}[1]{\textsc{\lowercase{#1}}}
+\newrobustcmd{\element}[1]{\texttt{<#1>}}
+\newrobustcmd{\attribute}[1]{\texttt{#1}}
+
+\newrobustcmd{\TOC}{\acro{TOC}}
+\newrobustcmd{\LOF}{\acro{LOF}}
+\newrobustcmd{\LOT}{\acro{LOT}}
+
+\newrobustcmd{\HTML}{\acro{HTML}}
+\newrobustcmd{\HTMLfive}{\HTML\oldstylenums{5}}
+\newrobustcmd{\CSS}{\acro{CSS}}
+\newrobustcmd{\CSSthree}{\CSS\oldstylenums{3}}
+\newrobustcmd{\EPUB}{\acro{EPUB}}
+\newrobustcmd{\SVG}{\acro{SVG}}
+\newrobustcmd{\PNG}{\acro{PNG}}
+\newrobustcmd{\JPG}{\acro{JPG}}
+\newrobustcmd{\PDF}{\acro{PDF}}
+\newrobustcmd{\tikz}{Ti\textit{k}z}
+\newrobustcmd{\MathML}{Math\acro{ML}}
+\newrobustcmd{\CTAN}{\acro{CTAN}}
+\newrobustcmd{\TDS}{\acro{TDS}}
 
 \newcommand{\goesto}{$\Rightarrow$}
 
@@ -344,6 +359,20 @@ may cause a file split, which would put a table of contents out
 of the home page if it is after the abstract.
 }
 
+\newcommand{\limitstitlepage}{%
+\pkg{lwarp} supports the native \LaTeX\ titling commands, and also
+\margintag{package support}
+supports the packages \pkg{authblk} and \pkg{titling}.  If both are
+\watchout[load order]
+used, \pkg{authblk} should be loaded before \pkg{titling}.
+
+If using the \pkg{titling} package, additional titlepage fields
+\margintag{\cs{published} and \cs{subtitle}}
+for \cs{published} and \cs{subtitle} may be added by using
+\cs{AddSubtitlePublished} in the preamble.
+See \cref{sec:publishedsubtitle}.
+}
+
 \newcommand{\limitsappendix}{%
 During \HTML\ conversion, the option \texttt{toc} without
 \watchout[incorrect \acro{TOC} link]
@@ -533,6 +562,10 @@ For \HTML\, only the inline macros are supported: \cs{textlarger}, \cs{textsmall
 
 While creating \SVG\ math for \HTML, the original definitions are temporarilty restored,
 and so should work as expected.
+
+The \HTML\ browser's setting for minumum font size
+\watchout[not small]
+may limit how small the output will be displayed.
 }
 
 \newcommand{\limitsreferences}{%
@@ -869,97 +902,172 @@ Use \CSS\ or \cs{textcolor} where possible.
 }
 
 \newcommand{\limitstabular}{%
-\begin{itemize}
-\item When defining environments or macros which include \env{tabular}
-    plus\watchout[misplaced alignment alignment tab character \&]
-    \index{alignment tab character \&, misplaced}
-    \index{misplaced alignment tab character \&}
-    instances of the \texttt{\&} character, it may be
-    necessary to make \texttt{\&} active before the environment or macro is defined,
-    then restore \texttt{\&} to its default catcode after, using the following commands:
-    \begin{sourcedisplay}
-    \cs{StartDefiningTabulars} \\
-    <define macros or environments using \env{tabular} and \texttt{\&} here> \\
-    \cs{EndDefiningTabulars}
-    \end{sourcedisplay}
-
-\item Vertical rules are not yet supported.
-    \margintag{column types}
-
-\item \texttt{*} in a column specification is not used (so far).
-    Repeat the column type the correct number of times.
-
-\item Only one each of \texttt{@}, \texttt{!}, \texttt{>}, and \texttt{<}
-    may be used at each column, and they are used in that order.
-
-\item \cs{newcolumntype} is ignored; unknown column types are set to \texttt{l}.
-
-\item \pkg{tabularx} ignores the width, but \texttt{X} columns do produce paragraph
-    columns or multicolumns.
-
-\item Multirow and multicolumn cannot be used at the same time.
-    \watchout[\cs{multirow} \& \cs{multicolumn}]
-    (No rectangular holes wider than one column or taller than one row.)
-
-\item For multirow, insert \cs{mrowcell} into any empty multi-row cells.
-    This will be a null function for the print output, and is a placeholder for
-    \watchout[\cs{multirow}]
-    parsing the table for \HTML\ output.
-
-\item If a multirow reaches to the bottom of a table,
-    and \cs{bottomrule} does not go over to that edge,
-    \margintag{\cs{multirow} with rules}
-    try adding a line of empty cells below the \cs{bottomrule}.
-    This may be a browser bug.
-    \changes{v0.19}{2016/05/28}{Docs: \env{multirow} browser bug workaround.}
-
-\item If a \cs{midrule} is desired after the last row,
-    \margintag{rule at last row}
-    an additional row of blank cells must be used.
-
-\item Multiple paragraphs in one cell of a p, b, m column
-    must have \cs{newline} between paragraphs.
-    \watchout[paragraphs]
-
-\item \cs{cmidrule} does not support width or trim options
-    due to \CSS\ limitations.
-    \margintag{\cs{cmidrule} width, trim}
-
-\item \cs{cmidrule} borders are generated by the individual cells
-    \margintag{\cs{cmidrule} and \cs{multicolumn}}
-    on the following row,
-    and so do not necessarily work correctly when the following row
-    has \cs{multicolumn} cells below \cs{cmidrule} borders.
-
-\item For \pkg{longtable}, place headings and footings which
-    \margintag{\env{longtable} headings}
-    do not apply to \HTML\ inside \cs{warpprintonly\{\}}.
-
-\item For \cs{toprule} and \cs{bottomrule},
-    when combined with a \env{warpprint} or \env{warpHTML} environment,
-    \watchout[\cs{warpprintonly}]
-    if a ``misplaced \cs{noalign}'' error occurs,
-    change \\
-    \hspace*{.375in}\cmds{This \& That \cs{endhead}} \\
-    to \\
-    \hspace*{.375in}\cmds{\cs{warpprintonly}\{This \& That \cs{endhead}\}} \\
-    and likewise with the other \cs{end} headings.
-    Keep the \cs{endfirsthead} row unchanged, as it is still relevent to \HTML\ output.
-
-\item For S columns (from the \pkg{siunitx} package),
-    \watchout[S columns]
-    while producing print output,
-    anything non-numeric must be placed
-    inside \{ \} braces, including commands such as \cs{multirow}.
-    While producing \HTML\ output, though, anything placed inside
-    braces is not seen by \pkg{lwarp}'s tabular handling algorithm.
-    To resolve this problem, make a copy of the row, with one version
-    for print output, containing the extra braces, and another version
-    for \HTML\ output, without the extra braces, such as: \\
-    \hspace*{.375in} \cs{warpprintonly}\{\texttt{1 \& 2 \& \textcolor{red}{\{}\cs{multirow}\{2\}\{2cm\}\{Text\}\textcolor{red}{\}} \& 3 \textbackslash\textbackslash\}} \\
-    \hspace*{.375in} \cs{warpHTMLonly}\{\texttt{1 \& 2 \& \cs{multirow}\{2\}\{2cm\}\{Text\} \& 3 \textbackslash\textbackslash\}}
+Tabular mostly works as expected, but pay special attention to the
+following, especially if working with environments, macros inside tabulars,
+multirows, \texttt{*} column specifiers, \pkg{siunitx} \texttt{S} columns,
+or the packages \pkg{longtable}, \pkg{supertabular}, or \pkg{xtab}.
+\begin{description}
+\item [Defining environments:] \
+    \begin{itemize}
+    \item When defining environments or macros which include \env{tabular}
+        and\watchout[misplaced alignment alignment tab character \&]
+        \index{alignment tab character \&, misplaced}
+        \index{misplaced alignment tab character \&}
+        \index{tabular>misplaced alignment tab character \&}
+        instances of the \texttt{\&} character, it may be
+        necessary to make \texttt{\&} active before the environment or macro is defined,
+        then restore \texttt{\&} to its default catcode after, using the following commands.
+        These are are ignored in print mode.
+        \begin{sourcedisplay}
+        \textcolor{red}{\cs{StartDefiningTabulars}} \\
+        <define macros or environments using \env{tabular} and \texttt{\&} here> \\
+        \textcolor{red}{\cs{EndDefiningTabulars}}
+        \end{sourcedisplay}
+    \item \limitsresumetabular
+    \end{itemize}
+
+\item [Cell contents:] \
+    \begin{itemize}
+    \item Multiple paragraphs in one cell of a \texttt{p}, \texttt{b}, \texttt{m} column
+        \watchout[paragraphs]
+        must have \cs{newline} between paragraphs.
+    \item For \pkg{multirow}, insert \cs{mrowcell} into any empty multi-row cells.
+        \watchout[\cs{multirow}]
+        This will be a null function for the print output, and is a placeholder for
+        parsing the table for \HTML\ output.
+    \item The \pkg{multirow} documentation regarding colored cells recommends using
+        a negative number of rows.  This will not work with \pkg{lwarp}, so
+        \cs{warpprintonly} and \cs{warpHTMLonly} must be used to make versions for
+        print and \HTML.
+    \item \limitsmulticolumnrow
+        See \cref{sec:multicolumnmultirow}.
+    \item Using a custom macro inside a tabular data cell
+        \watchout[macro in a table]\margintag{custom macros}
+        \index{tabular>row corruption}%
+        \index{tabular>macros inside}%
+        may result in an extra \HTML\ data cell tag, corrupting the \HTML\ table.
+        To avoid this, use \cs{TabularMacro} just before the macro.
+        This is ignored in print mode.
+        \begin{sourcedisplay}
+        \textcolor{red}{\cs{TabularMacro}}\cs{somemacro} \&
+            more row contents \textbackslash\textbackslash
+        \end{sourcedisplay}
+    \end {itemize}
+
+\item [Column specifiers:] \
+    \begin{itemize}
+    \item Vertical rules are not yet supported.
+        \margintag{column types}
+
+    \item \texttt{*} in a column specification is not used (so far).
+        \watchout[* column specification]
+        Repeat the column type the correct number of times.
+
+    \item Only one each of \texttt{@}, \texttt{!}, \texttt{>}, and \texttt{<}
+        may be used at each column, and they are used in that order.
+
+    \item \cs{newcolumntype} is ignored; unknown column types are set to \texttt{l}.
+    \end{itemize}
+
+\item [Rules:] \
+    \begin{itemize}
+    \item If a multirow reaches to the bottom of a table,
+        and \cs{bottomrule} does not go over to that edge,
+        \margintag{\cs{multirow} with rules}
+        try adding a line of empty cells below the \cs{bottomrule}.
+        (This may be a browser bug.)
+        \changes{v0.19}{2016/05/28}{Docs: \env{multirow} browser bug workaround.}
+
+    \item If a \cs{midrule} is desired after the last row,
+        \margintag{rule at last row}
+        an additional row of blank cells must be used.
+
+    \item \cs{cmidrule} does not support width or trim options
+        due to \CSS\ limitations.
+        \margintag{\cs{cmidrule} width, trim}
+
+    \item \cs{cmidrule} borders are generated by the individual cells
+        \margintag{\cs{cmidrule} and \cs{multicolumn}}
+        on the following row,
+        and so do not necessarily work correctly when the following row
+        has \cs{multicolumn} cells below \cs{cmidrule} borders.
+    \item For \cs{toprule} and \cs{bottomrule},
+        \watchout[\cs{warpprintonly}]
+        when combined with a \env{warpprint} or \env{warpHTML} environment,
+        \margintag{misplaced \cs{noalign}}%
+        \index{tabular>misplaced \protect\cs{noalign}}%
+        \index{misplaced \protect\cs{noalign}}
+        if a ``misplaced \cs{noalign}'' error occurs,
+        change
+        \begin{sourcedisplay}
+        This \& That \cs{endhead}
+        \end{sourcedisplay}
+        to
+        \begin{sourcedisplay}
+        \textcolor{red}{\cs{warpprintonly}\{}This \& That \cs{endhead}\textcolor{red}{\}}
+        \end{sourcedisplay}
+        and likewise with the other \cs{end} headings.
+        Keep the \cs{endfirsthead} row unchanged, as it is still relevent to \HTML\ output.
+    \end{itemize}
+
+\item[Other:] \
+    \begin{itemize}
+    \item \pkg{tabularx} ignores the width, but \texttt{X} columns do produce paragraph
+        columns or multicolumns.
+    \item For \pkg{longtable}, place headings and footings which
+        \margintag{\env{longtable} headings}
+        do not apply to \HTML\ inside \cs{warpprintonly\{\}}.
+    \item For S columns (from the \pkg{siunitx} package),
+        \watchout[S columns]
+        while producing print output,
+        anything non-numeric must be placed
+        inside \{ \} braces, including commands such as \cs{multirow}.
+        While producing \HTML\ output, though, anything placed inside
+        braces is not seen by \pkg{lwarp}'s tabular handling algorithm.
+        To resolve this problem, make a copy of the row, with one version
+        for print output, containing the extra braces, and another version
+        for \HTML\ output, without the extra braces, such as: \\
+        \hspace*{.375in} \cs{warpprintonly}\{\texttt{1 \& 2 \& \textcolor{red}{\{}\cs{multirow}\{2\}\{2cm\}\{Text\}\textcolor{red}{\}} \& 3 \textbackslash\textbackslash\}} \\
+        \hspace*{.375in} \cs{warpHTMLonly}\{\texttt{1 \& 2 \& \cs{multirow}\{2\}\{2cm\}\{Text\} \& 3 \textbackslash\textbackslash\}}
+    \end{itemize}
+\end{description}
+}
 
-\end{itemize}
+\newcommand{\limitsmulticolumnrow}{%
+\pkg{lwarp} does not support combining \cs{multicolumn} and \cs{multirow}.
+\watchout[\cs{multicolumn} \& \cs{multirow}]
+Use \cs{multicolumnrow} instead.
+To create a 2 column, 3 row cell:
+\begin{sourcedisplay}
+\cs{multicolumnrow}\{2\}\{c\}[c]\{3\}[0]\{1in\}[0pt]\{Text\}
+\end{sourcedisplay}
+The two arguments for \cs{multicolumn} come first, followed by
+the five arguments for \cs{multirow}, many of which are optional,
+followed by the contents.
+}
+
+\newcommand{\limitsresumetabular}{%
+When creating a new environment
+\watchout[\env{tabular} inside another environment]
+which contains a \env{tabular} environment,
+\pkg{lwarp}'s emulation of the tabular does not automatically resume
+when the containing enviroment ends, resulting in corrupted \HTML\ rows.
+To fix this, use \cs{ResumeTabular} as follows.
+This is ignored in print mode.
+\begin{sourcedisplay}
+\textcolor{red}{\cs{StartDefiningTabulars}} \% because \& is used in a definition \\
+\cs{newenvironment}\{outerenvironment\} \\
+\{ \\
+\cs{tabular}\{cc\} \\
+left \& right \textbackslash\textbackslash \\
+\} \\
+\{ \\
+\textcolor{red}{\cs{TabularMacro}\cs{ResumeTabular}} \\
+left \& right \textbackslash\textbackslash \\
+\cs{endtabular} \\
+\} \\
+\textcolor{red}{\cs{EndDefiningTabulars}} \\
+\end{sourcedisplay}
 }
 
 \newcommand{\limitslongtable}{%
@@ -986,6 +1094,18 @@ Keep the \cs{endfirsthead} row, which is still relevent to \HTML\ output.
 or place it inside \cs{warpingprintonly}.
 }
 
+\newcommand{\limitssupertabular}{%
+For \cs{tablefirsthead}, etc., enclose them as follows:
+\watchout[misplaced alignment alignment tab character \&]
+\begin{sourcedisplay}
+\textcolor{red}{\cs{StartDefiningTabulars}} \\
+\cs{tablefirsthead} \\
+\dots \\
+\textcolor{red}{\cs{EndDefiningTabulars}}
+\end{sourcedisplay}
+See \cref{sec:limitstabular}.
+}
+
 \newcommand{\limitssaveboxes}{%
 \LaTeX\ boxes are placed inline and do not allow line breaks, so boxes
 with long contents may overflow the line during \HTML\ conversion.
@@ -1323,7 +1443,7 @@ This boolean may be tested by the user for later use.
 %<*package>
 % \fi
 %
-% \CheckSum{13540}
+% \CheckSum{13780}
 %
 % \CharacterTable
 % {Upper-case     \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -1403,6 +1523,7 @@ This boolean may be tested by the user for later use.
 % \changes{v0.36}{2017/08/17}{\ 2017/08/17}
 % \changes{v0.37}{2017/08/19}{\ 2017/08/19}
 % \changes{v0.38}{2017/08/27}{\ 2017/08/27}
+% \changes{v0.39}{2017/09/05}{\ 2017/09/05}
 
 
 
@@ -1537,6 +1658,41 @@ This boolean may be tested by the user for later use.
 % For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
 %
 % \begin{description}
+% \item[v0.39:] \
+%   \begin{itemize}
+%       \item Improved the titlepage \HTML\ code, \cs{thanks} notes,
+%           \margintag{title pages}
+%           and \cs{maketitle}.
+%           \pkg{titling} is no longer required, but is still supported.
+%           The \cs{published} and \cs{subtitle} fields are no longer provided,
+%           \watchout[\cs{published} and \cs{subtitle}]
+%           but \cs{AddSubtitlePublished} replicates them using \pkg{titling}.
+%           See \cref{sec:publishedsubtitle}.
+%           \pkg{authblk} is added, and should be loaded before \pkg{titling}.
+%           \watchout[load order]
+%           See \cref{sec:titles}.
+%       \item \cs{multirow} now supports the new optional |vpos| argument.
+%           \margintag{tabular}
+%       \item Added \cs{multicolumnrow} for combined
+%           \margintag{multi column/row cell}
+%           \cs{multicolumn} and \cs{multirow}.
+%           See \cref{sec:multicolumnmultirow}.
+%       \item Tabular special cases:
+%       \begin{itemize}
+%            \item Added \cs{TabularMacro} to mark custom macros
+%                \watchout[macros inside tabular]
+%                inside tabular data cells, avoiding row corruption.
+%                See \cref{sec:limitstabular}.
+%            \item Added \cs{ResumeTabular} for use when a \env{tabular} environment
+%                \watchout[tabular defined inside another environment]
+%                is defined inside another environment.
+%                See \cref{sec:limitstabular}.
+%       \end{itemize}
+%       \item Added \pkg{supertabular}, \pkg{xtab}, \pkg{bigstrut}, \pkg{bigdelim}.
+%       \item Added \pkg{fullwidth}.
+%       \item Added \pkg{addlines}, \pkg{anysize}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
+%           \pkg{textarea}, \pkg{zwpagelayout}, \pkg{typearea}, \pkg{ebook}.
+%   \end{itemize}
 % \item[v0.38:] \
 %   \begin{itemize}
 %   \item Added |lwarpmk print1| and |lwarpmk html1| actions to
@@ -2053,68 +2209,106 @@ This boolean may be tested by the user for later use.
 % Supported functions\label{tab:supported}} \endfirsthead
 % \warpprintonly{\multicolumn{2}{c}{\pkg{lwarp} Supported Functions --- continued} \\
 %	Category & Status \\ \toprule \endhead}
+%
 % \toprule
+%
 % Category & Status \\
+%
 % \midrule
+%
 % Engines: & pdf\LaTeX, \XeLaTeX, \LuaLaTeX \\
+%
 % \midrule
+%
 % Classes: & \pkg{book}, \pkg{report}, or \pkg{article}. \pkg{memoir} is planned. \\
+%
 % \midrule
-% Page layout: & Emulates \pkg{fancyhdr}, \pkg{titleps}. \\
+%
+% Page layout: & Emulates \pkg{geometry}, \pkg{fancyhdr}, \pkg{titleps},
+%       \pkg{addlines}, \pkg{anysize}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
+%       \pkg{textarea}, \pkg{zwpagelayout}, \pkg{typearea}, \pkg{ebook}. \\
+%
 % Sectioning: & Supported, with hyperlinks.
 % 	Honors \cmds{tocdepth} and \cmds{secnumdepth}.
 % 	Adds \cmds{FileDepth} for splitting the \HTML\ output.
 % 	Files may be numbered sequentially or named according to section name.
 % 	Common short words and punctuation is removed from the filenames. 
 %	Emulates \pkg{titlesec}, \pkg{fncychap}. \\
+%
 % Table of contents, figures, tables: & Supported, with hyperlinks.
 %	Supports \pkg{tocbibind}.  Emulates \pkg{titletoc} and \pkg{tocloft}. \\
-% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}.  Optional
-% 	\pkg{titling}-based commands for published and subtitle. \\
+%
+% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}, \pkg{authblk}. \\
+%
 % Front \&\ back matter: & \pkg{abstract}, \pkg{appendix} \\
+%
+% Indexing: & \cmds{texindy} is used, with hyperlinks. \pkg{idxlayout} is emulated. \\
+%
+% Glossary: & \pkg{glossaries} and \cmds{xindy} are used. \\
+%
+% Bibliography: & Supported text-only. \\
+%
 % \midrule
+%
 % Cross-references: & Emulated, with hyperlinks.
 %   \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{url}. \\
-% Bibliography & Supported text-only. \\
-% Languages & \pkg{babel}.  (\pkg{polyglossia} is untested.) \\
+%
+% Languages: & \pkg{babel}.  (\pkg{polyglossia} is untested.) \\
+%
 % \midrule
+%
 % Margin notes: & \pkg{marginfit}, \pkg{marginfix}. \\
+%
 % Footnotes: & \pkg{footnote}, \pkg{footmisc},
 %	\pkg{marginnote}, \pkg{sidenote}, \pkg{pagenote}, \pkg{endnotes}. \\
-% Indexing: & \cmds{texindy} is used, with hyperlinks. \pkg{idxlayout} is emulated. \\
-% Glossary: & \pkg{glossaries} and \cmds{xindy} are used. \\
-% Bibliography: & Supported, without hyperlinks so far. \\
+%
 % \midrule
+%
 % Math: & Supported.  Converted to \SVG\ images with \HTML\ \cmds{ALT} tags containing the
 % 	\LaTeX{} source for the math expression.
 %	MathJax supported as an alternative.
 % 	\AmS{} environments are supported.
 % 	User-defined macros are available during converson,
 % 	due to native \LaTeX{} processing.\\
+%
 % Theorems: & Support for native \LaTeX\ theorems, plus
 %	\pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}. \\
+%
 % Add'l math: & \pkg{delarray}, \pkg{bm}, math fonts via \SVG\ images. \\
+%
 % Units and fractions: & \pkg{siunitx}, \pkg{xfrac}, \pkg{nicefrac}, \pkg{units} \\
+%
 % \midrule
+%
 % Floats: & Appear where declared.
 %	\pkg{float}, \pkg{rotfloat}, \pkg{newfloat}, \pkg{caption} and \pkg{subcaption},
 %	\pkg{subfig}, \pkg{capt-of}, \pkg{placeins}, \pkg{trivfloat}, \pkg{floatrow},
 %	\pkg{keyfloat}, \pkg{wrapfig}, \pkg{cutwin}, \pkg{floatflt}. \\
+%
 % \midrule
+%
 % Tabular &
 %   \env{tabular} environment, \pkg{array}, \pkg{tabularx}, \pkg{tabulary},
-%   \pkg{threeparttable}, \pkg{multirow}, \pkg{longtable}, \pkg{booktabs}. \\
+%   \pkg{threeparttable}, \pkg{multirow},
+%   \pkg{longtable}, \pkg{supertabular}, \pkg{xtab},
+%   \pkg{booktabs}. \\
+%
 % \midrule
+%
 % Graphics & \pkg{graphics} and \pkg{graphicx} are emulated.
-% \cs{includegraphics} supports \cmds{width}, \cmds{height},
-% \cmds{origin}, \cmds{angle}, and \cmds{scale} tags, and adds \cmds{class}.
-% References to \PDF\ files are changed to \SVG, other image types
-% are accepted as well.
-% \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle.
-% \pkg{grffile} is emulated. \\
+%   \cs{includegraphics} supports \cmds{width}, \cmds{height},
+%   \cmds{origin}, \cmds{angle}, and \cmds{scale} tags, and adds \cmds{class}.
+%   References to \PDF\ files are changed to \SVG, other image types
+%   are accepted as well.
+%   \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle.
+%   \pkg{grffile} is emulated. \\
+%
 % \pkg{rotating}: & Emulated.  All objects are displayed unrotated. \\
+%
 % \pkg{picture} and \pkg{tikz}: & Converted to an \SVG\ image. \\
+%
 % \midrule
+%
 % \pkg{xcolor}: & \textcolor{DarkGreen}{Supported}.
 %   Full package color names, any color models,
 %   and \textcolor{Goldenrod}{mixing}.
@@ -2122,42 +2316,65 @@ This boolean may be tested by the user for later use.
 %   \colorbox{LightSteelBlue}{\cs{colorbox}},
 %   \fcolorbox{red}{NavajoWhite}{\cs{fcolorbox}}.
 %   Enhanced for \HTML\ compatibility. \\
+%
 % \midrule
+%
 % Lists: & Standard \LaTeX\ environments are supported, along with
 %	\pkg{enumitem}, \pkg{enumerate}, \pkg{paralist}.
 %	Spacing is still controlled by \CSS. \\
+%
 % \midrule
+%
 % Environments: & Standard \LaTeX{} environments are supported. \\
+%
 % \env{minipage}: & Supported with some \HTMLfive-imposed limitations.
 %	Nested minipages are supported.
 % 	Footnotes appear at the bottom of the \HTML\ page. \\
+%
 % Quotations: & \pkg{verse}, \pkg{csquotes}, \pkg{epigraph} \\
+%
 % Verbatim: & \pkg{verbatim}, \pkg{moreverb}, \pkg{fancyvrb} (except for verbatim footnotes). \\
+%
 % Frames: & \pkg{framed}, \pkg{fancybox}, \pkg{mdframed}, \pkg{boxedminipage2e}, \pkg{shadow}. \\
+%
 % \pkg{multicol}: & Emulated, with \CSSthree.
-% Converted to up to three columns with an optional heading,
-% per browser support. Single-column if unsupported.\\
+%   Converted to up to three columns with an optional heading,
+%   per browser support. Single-column if unsupported.\\
+%
+% \env{fullwidth}: & Emulated. \\
+%
 % \midrule
+%
 % Direct formatting: & \cs{emph}, \cs{textsuperscript},
 % 	\cs{textbf}, etc are supported.
 % 	\cs{bfseries}, etc.\ are not yet supported.
 %	\pkg{lettrine}, \pkg{ulem}, \pkg{soul}, \pkg{relsize}, \pkg{scalefnt},
 %   and \pkg{realscripts} are supported. \\
+%
 % Ordinals: & \pkg{nth}, \pkg{fmtcount}, and \pkg{engord} are supported. \\
+%
 % Text ligatures: & Ligatures for symbols are supported.
 % 	Ligatures for f, q, t are intentionally turned off
 % 	because many simpler browsers do not display them correctly.
 % 	Modern full-featured browsers re-create these ligatures on-the-fly.\\
+%
 % Horizontal space: &
 %	\HTML\ output for thin-unbreakable, unbreakable,
 %	\cs{enskip}, \cs{quad}, \cs{qquad}, \cs{hspace}. \\
+%
 % Rules: & \cs{rule} with width, height, raise, text color. \\
+%
 % \HTML\ reserved characters: & \cs{\&}, \cs{textless}, and
 % 	\cs{textgreater} are converted to \HTML\ entities. \\
+%
 % \midrule
+%
 % Fonts: & Used as-is.  Appear in math expressions or embedded image environments. \\
+%
 % Symbols: & Native \LaTeX\ diacriticals, \pkg{textcomp}. \\
+%
 % \midrule
+%
 % Working as-is: & 
 %   Various utility, calculation, file, and text-only packags, such as
 %   \pkg{calc},
@@ -2165,13 +2382,18 @@ This boolean may be tested by the user for later use.
 %   \pkg{somedefs},
 %   \pkg{trace},
 %   \pkg{xspace}. \\
+%
 % \midrule
+%
 % Where: & \\
+%
 % \textbf{Supported:} & The existing \LaTeX{} package is used. \\
 % \textbf{Emulated:} & The \LaTeX{} package is not used, but some/all of its
 % 	functions are emulated.  Null functions, lengths, and counters are provided
 % 	for source compatibility. \\
+%
 % \bottomrule
+%
 % \end{longtable}
 %
 %
@@ -3203,18 +3425,18 @@ This boolean may be tested by the user for later use.
 %	\begin{itemize}
 %	\item To place the entire file into one \HTML\ page, use:
 %		\begin{sourcedisplay}
-%		|\setcounter{FileDepth}{-5}}|
+%		\cs{setcounter}\{FileDepth\}\{-5\}
 %		\end{sourcedisplay}
 %	\item To split the \HTML\ file at \cs{section} depth, use:
 %		\begin{sourcedisplay}
-%		|\setcounter{FileDepth}{1}}|
+%		\cs{setcounter}\{FileDepth\}\{1\}
 %		\end{sourcedisplay}
 %	\item To ensure that the \HTML\ pages/files are accessible:
 %		\watchout\\
 %		Place a \cs{tableofcontents} somewhere before the first section
 %		break (therefore in the ``home page''), and set
 %		\begin{sourcedisplay}
-%		|tocdepth|\,>=\,|FileDepth|
+%		tocdepth\,>=\,FileDepth
 %		\end{sourcedisplay}
 %		\index{file>inaccessible}
 %		\index{page>inacessible}
@@ -3262,7 +3484,7 @@ This boolean may be tested by the user for later use.
 %	\item[Numbered \HTML\ nodes:] \
 %
 %	Example: Homepage |index.html|, and |node-1|, |node-2|.
-%	(See \cs{SetHTMLFileNumber} to number grouped by chapter, for example.)
+%	\footnote{See \cs{SetHTMLFileNumber} to number grouped by chapter, for example.}
 %	\begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
 %	\usepackage[
 %		HomeHTMLFilename=index,
@@ -3738,7 +3960,7 @@ This boolean may be tested by the user for later use.
 % \subsection{Selecting actions for print or HTML output}
 % \label{sec:selectingoutput}
 % \index{settings>selecting output}
-% \changes{v0.15}{2016/04/05}{Docs: Clarify print/HTML output.}
+% \changes{v0.15}{2016/04/05}{Docs: Clarify print/\HTML\ output.}
 %
 % The following environments and macros are used to select actions which only apply
 % to either traditional \LaTeX{} print-formatted PDF generation,
@@ -3829,15 +4051,14 @@ This boolean may be tested by the user for later use.
 % \vspace{-2em}
 % \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
 % \title{Document Title} % One line only
-% \subtitle{Optional Document Subtitle \\ with optional multiple lines}
 % \author{Author One\affiliation{Affiliation One} \and 
 %     Author Two\affiliation{Affiliation Two} }
 % \date{Optional date}
-% \published{Optional Journal Name \\ Optional multiple lines}
 % \end{Verbatim}
 % 
 % The title is used in the meta tags in the \HTML\ files, and the rest are used
 % in |\maketitle|.
+% To use a \cs{subtitle} or \cs{published} field, see \cref{sec:publishedsubtitle}.
 %
 %
 % \DescribeMacro{\maketitle}
@@ -3858,7 +4079,7 @@ This boolean may be tested by the user for later use.
 % Avoid newlines in the |\title|; these will interfere with the
 % file break and \CSS\ detection.
 % \watchout
-% Use the |\subtitle| command instead.
+% Use a |\subtitle| command instead (\cref{sec:publishedsubtitle}).
 % In \HTML, the title will appear in a heading \element{h1}.
 %
 % \DescribeMacro{\author} \marg{author}
@@ -3873,18 +4094,6 @@ This boolean may be tested by the user for later use.
 % |\date| works as expected.
 % In \HTML, this will appear in a \element{div} class |titledate|.
 %
-% \DescribeMacro{\subtitle} \marg{subtitle}
-%
-% A new command which sets a subtitle.  Newlines are allowed.
-% The default is empty.
-% In \HTML, this will appear in a \element{div} class |subtitle|.
-%
-% \DescribeMacro{\published} \marg{published}
-%
-% A new command which sets a publisher.
-% The default is empty.
-% In \HTML, this will appear in a \element{div} class |published|.
-%
 %
 % \DescribeMacro{\thanks} \marg{text}
 %
@@ -4269,6 +4478,11 @@ This boolean may be tested by the user for later use.
 % \limitsabstract
 %
 %
+% \subsubsection{\pkg{titling} and \pkg{authblk}}
+%
+% \limitstitlepage
+%
+%
 % \subsubsection{\pkg{appendix} package}
 %
 % \limitsappendix
@@ -4359,6 +4573,7 @@ This boolean may be tested by the user for later use.
 %
 % \subsection{Tabular}
 % \label{sec:limitstabular}
+% \changes{v0.39}{2017/08/30}{Docs: Reorganized tabular discussion.}
 % \limitstabular
 %
 %
@@ -4367,6 +4582,11 @@ This boolean may be tested by the user for later use.
 % \limitslongtable
 %
 %
+% \subsubsection{\pkg{supertabular} and \pkg{xtab} packages}
+%
+% \limitssupertabular
+%
+%
 %
 % 
 % \subsubsection{\pkg{float}, \pkg{trivfloat}, and/or \pkg{algorithmicx} together}
@@ -4788,12 +5008,7 @@ This boolean may be tested by the user for later use.
 %		at \cref{sec:htmlsettings}.
 %	\end{itemize}
 %
-% \item [Misplaced alignment character \&:] \
-%	\begin{itemize}
-%	\item If using \env{tabular} inside a \cs{fbox} or other macro,
-%		use \cs{StartDefiningTabulars} before the definition, and
-%		\cs{EndDefiningTabulars} after.  See \cref{sec:limitstabular}
-%	\end{itemize}
+% \item [Tabular problems:] See \cref{sec:limitstabular}.
 %
 % \item [Obscure error messages:] ~
 %	\begin{itemize}
@@ -4968,10 +5183,6 @@ This boolean may be tested by the user for later use.
 % Packages with graphical output are allowed as-is, but must be nested inside a
 % \env{lateximage} environment to preserve the graphics.
 %
-% There is still room to improve the factoring of the code, and doing so will become
-% important if support for other output formats is added.  Rather than wait until the
-% code is pristine, the author felt it best to publish early and accept input before
-% pushing on towards a perhaps less-than-ideal solution.
 %
 %
 % Testing has primarily been done with the Iceweasel/Firefox browser.
@@ -5623,27 +5834,37 @@ For a possible alternative, see package(s) #2.}
 %
 % The following packages must be loaded after \pkg{lwarp}:
 %    \begin{macrocode}
+\LWR@loadafter{a4}
+\LWR@loadafter{a4wide}
+\LWR@loadafter{a5comb}
 \LWR@loadafter{abstract}
+\LWR@loadafter{addlines}
 \LWR@loadafter{afterpage}
 \LWR@loadafter{algorithmicx}
 \LWR@loadafter{alltt}
 \LWR@loadafter{amsthm}
+\LWR@loadafter{anysize}
 \LWR@loadafter{appendix}
 \LWR@loadafter{arabicfront}
 \LWR@loadafter{array}
+\LWR@loadafter{authblk}
 \LWR@loadafter{balance}
+\LWR@loadafter{bigdelim}
+\LWR@loadafter{bigstrut}
 \LWR@loadafter{bookmark}
 \LWR@loadafter{booktabs}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{ccaption}
 \LWR@loadafter{changepage}
+\LWR@loadafter{chngpage}
 \LWR@loadafter{chappg}
 \LWR@loadafter{color}
 \LWR@loadafter{crop}
 \LWR@loadafter{cutwin}
 \LWR@loadafter{dcolumn}
 \LWR@loadafter{draftwatermark}
+\LWR@loadafter{ebook}
 \LWR@loadafter{ellipsis}
 \LWR@loadafter{emptypage}
 \LWR@loadafter{enumerate}
@@ -5666,6 +5887,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{fncychap}
 \LWR@loadafter{ftnright}
 \LWR@loadafter{fullpage}
+\LWR@loadafter{fullwidth}
 \LWR@loadafter{geometry}
 \LWR@loadafter{glossaries}
 % \LWR@loadafter{graphics}% pre-loaded by xunicode
@@ -5728,8 +5950,10 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{siunitx}
 \LWR@loadafter{soul}
 \LWR@loadafter{subfig}
+\LWR@loadafter{supertabular}
 \LWR@loadafter{tabularx}
 \LWR@loadafter{tabulary}
+\LWR@loadafter{textarea}
 % \LWR@loadafter{textcomp}% maybe before lwarp with font packages
 \LWR@loadafter{textpos}
 \LWR@loadafter{theorem}
@@ -5738,10 +5962,12 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{titleps}
 \LWR@loadafter{titlesec}
 \LWR@loadafter{titletoc}
+\LWR@loadafter{titling}
 \LWR@loadafter{tocbibind}
 \LWR@loadafter{tocloft}
 \LWR@loadafter{transparent}
 \LWR@loadafter{trivfloat}
+\LWR@loadafter{typearea}
 \LWR@loadafter{ulem}
 \LWR@loadafter{upref}
 \LWR@loadafter{varioref}
@@ -5752,6 +5978,8 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{xfrac}
 \LWR@loadafter{xltxtra}
 \LWR@loadafter{xmpincl}
+\LWR@loadafter{xtab}
+\LWR@loadafter{zwpagelayout}
 %    \end{macrocode}
 
 
@@ -6003,6 +6231,12 @@ top=1in,bottom=1in,%
 \RequirePackage{xparse}
 %    \end{macrocode}
 
+% \DescribePackage{afterpackage}
+% Used to patch \pkg{titling} to add \cs{AddSubtitlePublished}.
+%    \begin{macrocode}
+\RequirePackage{afterpackage}
+%    \end{macrocode}
+
 %    \begin{macrocode}
 \end{warpall}
 %    \end{macrocode}
@@ -6175,12 +6409,6 @@ top=1in,bottom=1in,%
 \begin{warpall}
 %    \end{macrocode}
 
-% \DescribePackage{titling}
-%
-% Used for |\maketitle| and the title page.  See \cref{sec:titles}.
-%    \begin{macrocode}
-\RequirePackage{titling}
-%    \end{macrocode}
 
 % \DescribePackage{environ}
 %
@@ -6759,39 +6987,6 @@ top=1in,bottom=1in,%
 
 
 
-% \section{Textcomp}
-%
-% \codehtml
-%    \begin{macrocode}
-\begin{warpHTML}
-%    \end{macrocode}
-%
-%
-% If \pkg{textcomp} was loaded before \pkg{lwarp},
-% perhaps as part of the font-related packages,
-% explicitly load the lwarp patches now:
-%    \begin{macrocode}
-\@ifpackageloaded{textcomp}
-{
-\LWR@origRequirePackage{lwarp-textcomp}
-}
-%    \end{macrocode}
-% If \pkg{textcomp} is loaded after \pkg{warp},
-% \pkg{lwarp} will automatically load \pkg{lwarp-textcomp}
-% at that time.  Meanwhile, define a null version
-% of \cs{LWR@restoreorigtextcomp} until \pkg{textcomp} is
-% actually loaded, at which point \pkg{lwarp-textcomp} will
-% replaced \cs{LWR@restoreorigtextcomp}.
-%    \begin{macrocode}
-{
-\providecommand*{\LWR@restoreorigtextcomp}{}%
-}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\end{warpHTML}
-%    \end{macrocode}
-
 
 
 
@@ -7467,6 +7662,7 @@ div.abstract {
   padding: 1ex 1em 1ex 1em ;
 /*  font-weight: bold ; */
   font-size: 90% ;
+    text-align: left ;
 }
 
 div.abstract dl {line-height:1.5;}
@@ -7778,6 +7974,8 @@ figure.subfigure, figure.subtable  {
 
 figcaption .minipage { margin:0 ; padding: 0 }
 
+div.minipage figure { border: none ; box-shadow: none ; }
+
 div.floatrow { text-align: center; }
 
 div.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
@@ -7889,6 +8087,9 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule
 .tnoteitemheader {margin-right: 1em;}
 
 
+/* for bigdelim */
+.ldelim, .rdelim { font-size: 200% }
+
 
 /* center, flushleft, flushright environments */
 div.center{text-align:center;}
@@ -7952,12 +8153,19 @@ div.author
     margin: 3ex 0em 3ex 0em ;
 }
 
+div.oneauthor {
+    display: inline-block ;
+    margin: 3ex 1em 0ex 1em ;
+}
+
+/*
 div.author table {
     margin: 3ex auto 0ex auto ;
     background: none ;
 }
 
 div.author table tbody tr td { padding: .25ex ; }
+*/
 
 span.affiliation {font-size: .85em ; font-variant: small-caps; }
 
@@ -8452,12 +8660,18 @@ div.sidebartitle{
 
 
 
-.minipage {
+div.minipage {
     background-color: #eeeee7 ;
     border: 1px solid silver ;
     border-radius: 1ex ;
 }
 
+section.textbody > div.minipage {
+    box-shadow: 3px 3px 3px #808080 ;
+}
+
+div.fboxBlock div.minipage { box-shadow: none ; }
+
 .framed .minipage , .framedleftbar .minipage {
     border: none ;
     background: none ;
@@ -8987,7 +9201,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
 
 -- Print the usage of the lwarpmk command:
 
-printversion = "v0.38"
+printversion = "v0.39"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -10629,7 +10843,7 @@ end -- not --version
 
 
 % \begin{environment}{BlockClass} \oarg{style} \marg{class} \quad
-% High-level interface for div classes.
+% High-level interface for \element{div} classes.
 %
 % \qquad Ex: |\begin{BlockClass}{class}| text |\end{BlockClass}|
 %
@@ -11437,6 +11651,17 @@ end -- not --version
     \protected@edef\@currentlabel
     {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
+%    \end{macrocode}
+% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+%    \begin{macrocode}
+    \ifthenelse{%
+        \boolean{LWR@doingstartpars} \AND%
+        \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
+    }%
+    {}%
+    {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+%    \end{macrocode}
+%    \begin{macrocode}
     \@makefntext{%
         \ignorespaces#1%
     }%
@@ -11456,6 +11681,9 @@ end -- not --version
 % \end{macro}
 %
 %
+%
+% \subsection{Printing pending footnotes}
+%
 % \begin{macro}{\LWR@printpendingfootnotes}
 % Enclose the footnotes in a class, print, then clear.
 %    \begin{macrocode}
@@ -12729,14 +12957,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \mainmatter
 \LWR@origpagenumbering{arabic}
 %    \end{macrocode}
-% Set default titlepage thanks footnote marks.  See \cref{sec:titlehtml}.
-%    \begin{macrocode}
-\if@titlepage
-   \thanksmarkseries{arabic}
-\else
-   \thanksmarkseries{fnsymbol}
-\fi
-%    \end{macrocode}
 %
 % Patch the |itemize|, |enumerate|, and |description| environments and \cs{item}.
 % This works with the native \LaTeX\ environments, as well as
@@ -12868,102 +13088,91 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 
 
-% \section{Titles and the \protect\pkg{titling} package}
+% \section{Title page}
 % \label{sec:titles}
-% Supports and extends the \pkg{titling} package.
 %
-% Additional functions include \cs{published} and \cs{subtitle}, and the
-% \cs{author} command has an additional \cs{affiliation} command to provide
-% an affiliation and other additional information for each author in the
-% title page.  The affiliation information is removed when using \cs{theauthor}
-% in the main text.
+% \limitstitlepage
+%
+% \pkg{lwarp} provides for the \cs{author} macro an additional \cs{affiliation}
+% \margintag{affiliation}
+% macro to provide an affiliation and other additional information
+% for each author in the title page.
+% The affiliation information is removed when using
+% \pkg{titlingpage}'s \cs{theauthor} in the main text.
 %
 % The \pkg{titling} package maintains the definitions of \cs{thetitle},
+% \margintag{reusing titlepage information}
 % \cs{theauthor}, etc., after the title has been typeset.
 % These commands are to be used to refer to the document's title
 % and author, etc., in the main text.
 % These definitions
-% have the \cs{thanks} and \cs{affiliation} removed, and for author the
+% have the \cs{thanks} and \cs{affiliation} removed, and for \cs{author} the
 % \cs{and} is replaced to generate a simple inline list of authors separated
 % by commas.
+% Note: \cs{theauthor} does not work well
+% \watchout[\cs{theauthor}, \pkg{authblk}]
+% with \pkg{authblk} unless the traditional \LaTeX\ syntax is used.
 %
-% \cs{printtitle}, \cs{printauthor}, etc., are provided for use inside
-% the \env{titlepage} or \env{titlingpage} environments, and these retain
+% \cs{printtitle}, \cs{printauthor}, etc., are provided for use inside a custom
+% \margintag{custom titlepages}
+% \env{titlepage} or \env{titlingpage} environment, and these retain
 % the \cs{thanks} and \cs{affiliation}.
 %
-% Several additional hooks are provided in addition to \pkg{titling}:
-% \begin{description}
-% \ItemDescribeMacro{\maketitlehookaa} Between ``published'' and the title.
-% \ItemDescribeMacro{\maketitlehookaaa} Between the title and the subtitle.
-% \ItemDescribeMacro{\prepublished} Before the ``published'' field.
-% \ItemDescribeMacro{\postpublished} After the ``published'' field.
-% \ItemDescribeMacro{\presubtitle} Before the subtitle.
-% \ItemDescribeMacro{\postsubtitle} After the subtitle.
-% \end{description}
-%
 % \DescribeMacro{\printthanks}
 % \cs{printthanks} has been added to force the printing of thanks inside
 % a \env{titlingpage} environment when \cs{maketitle} is not used.
 %
 % Inside a \cs{titlepage} or \cs{titlingpage} environment, use
-% \cs{thanks} for footnotes, do not use \cs{footnote}.
-% \watchout[No footnotes!]
-%
-% At the end of the \env{titlingpage} environment, footnote marks are forced to
-% reset to zero.
+% \watchout
+% \cs{thanks} instead of \cs{footnote} for acknowledgements, etc.
 %
-% Inside a \env{titlingpage} environment with the |article| document class,
-% thanks marks will be |fnsymbol| instead of |arabic|.  |arabic| is usually
-% used when inside \env{titlepage} environments where the title page is
-% on its own page, but is not automatically used
-% inside a \env{titlingpage} environment.
 %
-% To force the thanks marks to
-% be |arabic|:
-% \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
-% \begin{titlingpage}
-% \thanksmarkseries{arabic}
-% ...
-% \end{Verbatim}
+% \subsection{Setting the title, etc.}
 %
+% The following provide setting commands for both \HTML\ and print outputs.
 %
+% \DescribeMacro{\author} \marg{author}
+% \DescribeMacro{\and}
+% While using \cs{maketitle} and print mode,
+% the author is treated as a single-column \env{tabular}
+% and the \cs{and} feature finishes the current \env{tabular} then starts a new one for
+% the next author.  Each author thus is placed into its own \env{tabular}, and an
+% affiliation may be placed on its own line such as
 %
-% \subsection{Setting the title, etc.}
+% |\author{Name \\ Affiliation \and Second Name \\ Second Affiliation}|
 %
-% The following provide setting commands for both \HTML\ and print outputs.
+% For \HTML, the entire author block is placed inside
+% a \element{div} of class \attribute{author},
+% and each individual author is inside a \element{div} of class \attribute{oneauthor}.
 %
-% \DescribeMacro{\@published}
 % \DescribeMacro{\@title}
-% \DescribeMacro{\@subtitle}
 % \DescribeMacro{\@author}
 % \DescribeMacro{\@date}
-% \cs{@title}, \cs{@subtitle}, \cs{@author}, etc.\ store the values
+% \cs{@title}, \cs{@author}, etc.\ store the values
 % as originally assigned, including any \cs{thanks}, \cs{and}, or \cs{affiliation}.
 % These are low-level macros intended to be used by other macros
 % only inside a \env{titlepage} or \env{titlingpage},
 % and are used by \cs{maketitle}.
-% The author is printed inside a single-column table,
-% which becomes multiple single-column tables if multiples authors are included.
+% The author is printed inside a single-column \env{tabular},
+% which becomes multiple single-column \env{tabular}s if multiples authors are included.
+% For \HTML\, these \env{tabular}s become side-by-side \element{div}s
+% of class \attribute{oneauthor}, all of which are combined into one \element{div}
+% of class \attribute{author}.
 %
-% \DescribeMacro{\printpublished}
 % \DescribeMacro{\printtitle}
-% \DescribeMacro{\printsubtitle}
 % \DescribeMacro{\printauthor}
 % \DescribeMacro{\printdate}
-% \cs{printtitle}, \cs{printsubtitle}, etc.\ are user-level macros intended to
-% be used in \env{titlepage} and \env{titlingpage} environments in cases where
+% \cs{printtitle}, etc.\ are user-level macros intended to
+% be used in custom \env{titlepage} or \env{titlingpage} environments in cases where
 % \cs{maketitle} is not desired.  These commands preserve the \cs{thanks}, etc.,
 % and should not be used in the main text.
-% The author is printed inside a single-column table,
-% which becomes multiple single-column tables if multiples authors are included.
 %
-% \DescribeMacro{\thepublished}
 % \DescribeMacro{\thetitle}
-% \DescribeMacro{\thesubtitle}
 % \DescribeMacro{\theauthor}
 % \DescribeMacro{\thedate}
-% \cs{thetitle}, \cs{thesubtitle}, \cs{theauthor}, etc.\ are user-level
-% sanitized versions which have removed the \cs{thanks} and \cs{affiliation},
+% \cs{thetitle}, \cs{theauthor}, and \cs{thedate} are available
+% if \pkg{titling} has been loaded, and are sanitized user-level
+% versions from which have been removed the \cs{thanks} and \cs{affiliation},
 % and \cs{and} is changed for inline text usage.
 % The author is printed inline without \cs{affiliation} or \cs{thanks},
 % with \cs{and} placing commas between multiple authors.
@@ -12977,173 +13186,105 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % \begin{center}\textcopyright~2016 \theauthor\end{center}
 % }
 % \end{Verbatim}
-
-
 %
-% \DescribeMacro{\author} \marg{author}
-% \DescribeMacro{\and}
-% While using \cs{maketitle}, the author is treated as a single-column table
-% and the \cs{and} feature finishes the current table then starts a new one for
-% the next author.  Each author thus is placed into its own table, and an
-% affiliation may be placed on its own line such as
-%
-% |\author{Name \\ Affiliation \and Second Name \\ Second Affiliation}|
+% \cs{theauthor} does not work well if \pkg{authblk} is used.
+% \watchout[\cs{theauthor}]
+% If \cs{theauthor} is important, it is recommended to use the standard
+% \LaTeX\ syntax for \cs{author}, optionally with
+% \pkg{lwarp}'s \cs{affiliation} macro as well.
 %
 % After \cs{maketitle} has completed, \cs{theauthor} retains the definition of
+% \watchout[affiliations]
 % the author, but \cs{and} is changed to become a comma and a space, intending to
 % print the authors names separated by spaces.  This fails when affiliations are
 % included on their own table rows.
 %
-% A solution, provide here, is to define a macro \cs{affiliation} which
-% during \cs{maketitle} starts a new table row and adds the affiliation,
+% A solution, provide here, is to define a macro \cs{affiliation} which,
+% \margintag{\cs{affiliation}}
+% during \cs{maketitle}, starts a new row and adds the affiliation,
 % but after \cs{maketitle} is finished \cs{affiliation} is re-defined
-% to throw away its argument, thus printing only the author names
+% to discard its argument, thus printing only the author names
 % when \cs{author} is later used inline.
 %
 %
-% \begin{macro}{\affiliation} \marg{text}
-%
-% Adds the affiliation to the author for use in \cs{maketitle}.
-% Nullified when later used for inline use of \cs{theauthor}.
-%
-% \codehtml
-%    \begin{macrocode}
-\begin{warpHTML}
-\newrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{#1}}
-\end{warpHTML}
-%    \end{macrocode}
-% \codeprint
-%    \begin{macrocode}
-\begin{warpprint}
-\newrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
-\end{warpprint}
-%    \end{macrocode}
-% \end{macro}
 %
+% \subsection{Changes for \cs{affiliation}}
 %
 %
-% The following are based on the original \pkg{titling} code:
+% \begin{macro}{\affiliation} \marg{text}
 %
+% Adds the affiliation to the author for use in \cs{maketitle}.
 %
+% Inside \env{titlepage}, this macro prints its argument.
+% Outside, it is null.
 %
 % \codeall
 %    \begin{macrocode}
 \begin{warpall}
+\newrobustcmd{\affiliation}[1]{}
+\end{warpall}
 %    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\author} \marg{text}
 %
-% Redefined to nullify \cs{affiliation}, etc.\ before printing the authors inline.
 %
-% \cs{@author} retains the entire author with its \cs{thanks}, while
-% \cs{theauthor} will have \cs{thanks} removed and \cs{and} simplified.
+% \codeprint
 %    \begin{macrocode}
-\renewcommand{\author}[1]{%
-\gdef\@author{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\and}{\unskip, }
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \renewcommand{\affiliation}[1]{}
-  \protected@xdef\theauthor{#1}
-\endgroup}
+\begin{warpprint}
 %    \end{macrocode}
-% \end{macro}
 %
-%
-% \begin{macro}{\published} \marg{text}
-% \changes{v0.13}{2016/03/23}{Default to empty published.}
 %    \begin{macrocode}
-\newcommand{\published}[1]{%
-\gdef\@published{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \protected@xdef\thepublished{#1}
-\endgroup
+\AtBeginEnvironment{titlepage}{
+\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
 }
-\newcommand{\@published}{}
-\newcommand{\thepublished}{}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\subtitle} \marg{text}
-% \changes{v0.13}{2016/03/23}{Default to empty subtitle.}
-%    \begin{macrocode}
-\newcommand{\subtitle}[1]{%
-\gdef\@subtitle{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \protected@xdef\thesubtitle{#1}
-\endgroup
+
+\AtBeginDocument{
+\@ifpackageloaded{titling}{
+\AtBeginEnvironment{titlingpage}{
+\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
 }
-\newcommand{\@subtitle}{}
-\newcommand{\thesubtitle}{}
+}{}% titling loaded
+}% AtBeginDocument
 %    \end{macrocode}
-% \end{macro}
-%
 %
 %    \begin{macrocode}
-\end{warpall}
+\end{warpprint}
 %    \end{macrocode}
 %
 %
-% \subsection{Changes to HTML titlepage and titlingpage}
-%
 % \codehtml
 %    \begin{macrocode}
 \begin{warpHTML}
 %    \end{macrocode}
 %
-%
 % \begin{environment}{titlepage}
-% Sets up a titlepage div with a \LaTeX{} \PDF\ minipage inside.
+% Sets up a \element{div} of class \attribute{titlepage}.
+%
+% \changes{v0.39}{2017/09/02}{Clear pending footnotes.}
+% \changes{v0.39}{2017/09/03}{Removed minipages.}
 %    \begin{macrocode}
 \renewenvironment*{titlepage}
 {
+\renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}}
+\LWR@printpendingfootnotes
 \LWR@forcenewpage
-\BlockClass{titlepage}\LWR@subminipage
-}
-{\LWR@endsubminipage\endBlockClass}
-%    \end{macrocode}
-% \end{environment}
-%
-% \begin{environment}{titlingpage}
-%    \begin{macrocode}
-\renewenvironment*{titlingpage}
-{%
-%    \end{macrocode}
-% Start an \HTML\ titlepage div:
-%    \begin{macrocode}
-\begin{titlepage}
-%    \end{macrocode}
-% Prepare for a custom version of \cs{maketitle} inside the \env{titlingpage}:
-%    \begin{macrocode}
-\LWR@maketitlesetup
-\let\maketitle\LWR@titlingmaketitle
+\BlockClass{titlepage}
 }
 {
-%    \end{macrocode}
-% At the end of the environment,
-% end the \HTML\ titlepage div:
-%    \begin{macrocode}
-\end{titlepage}
-%    \end{macrocode}
-% Reset the footnote counter:
-%    \begin{macrocode}
-\@bscontmark
+\endBlockClass
+\LWR@printpendingfootnotes
 }
 %    \end{macrocode}
 % \end{environment}
 %
+%
 %    \begin{macrocode}
 \end{warpHTML}
 %    \end{macrocode}
-
+%
+%
+% \subsection{Printing the thanks}
+%
 % \codeall
 %    \begin{macrocode}
 \begin{warpall}
@@ -13156,13 +13297,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \newcommand*{\printthanks}{\@thanks}
 %    \end{macrocode}
 %
-% \begin{environment}{titlingpage}
-% At the end of the titlingpage for both print and HTML,
-% reset footnote markers to zero.
-%    \begin{macrocode}
-\AtEndEnvironment{titlingpage}{\@bscontmark}
-%    \end{macrocode}
-% \end{environment}
 %
 %    \begin{macrocode}
 \end{warpall}
@@ -13170,7 +13304,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 
 
-
 % \subsection{Printing the title, etc.\ in HTML}
 %
 % \changes{v0.20}{2017/01/21}{Enhanced \pkg{titling} support.}
@@ -13186,83 +13319,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %
 %
 %
-% Patch the pre/post title/author/date to add \HTML\ tags,
-% then initilize:
-%    \begin{macrocode}
-\newcommand{\prepublished}[1]{%
-\def\@bsprepublished{\BlockClass{published}#1}%
-}
-
-\newcommand{\postpublished}[1]{%
-\def\@bspostpublished{#1\endBlockClass}%
-}
-
-\renewcommand{\pretitle}[1]{%
-\def\@bspretitle{#1\LWR@stoppars\LWR@htmltag{h1}}%
-}
-
-\renewcommand{\posttitle}[1]{%
-\def\@bsposttitle{\LWR@htmltag{/h1}\LWR@startpars#1}%
-}
-
-\newcommand{\presubtitle}[1]{%
-\def\@bspresubtitle{\BlockClass{subtitle}#1}%
-}
-
-\newcommand{\postsubtitle}[1]{%
-\def\@bspostsubtitle{#1\endBlockClass}%
-}
-
-\renewcommand{\preauthor}[1]{%
-\def\@bspreauthor{\BlockClass{author}#1}%
-}
-
-\renewcommand{\postauthor}[1]{%
-\def\@bspostauthor{#1\endBlockClass}%
-}
-
-\renewcommand{\predate}[1]{%
-\def\@bspredate{#1\BlockClass{titledate}}%
-}
-
-\renewcommand{\postdate}[1]{%
-\def\@bspostdate{\endBlockClass#1}%
-}
-
-\prepublished{\begin{center}}
-\postpublished{\par\end{center}}
-
-\pretitle{\begin{center}}
-\posttitle{\par\end{center}}
-
-\presubtitle{\begin{center}}
-\postsubtitle{\par\end{center}}
-
-\preauthor{\begin{center}%
-\begin{tabular}[t]{c}%
-}
-\postauthor{\end{tabular}\par\end{center}}
-
-\predate{\begin{center}}
-\postdate{\par\end{center}}
-%    \end{macrocode}
-%
-%
-% \begin{macro}{\printpublished}
-% \changes{v0.15}{2015/04/05}{No div if empty.}
-%    \begin{macrocode}
-\newcommand*{\printpublished}{
-\ifthenelse{\equal{\thepublished}{}}
-{}
-{
-    \begin{BlockClass}{published}
-    \@published
-    \end{BlockClass}
-}
-}
-%    \end{macrocode}
-% \end{macro}
-
 % \begin{macro}{\printtitle}
 %    \begin{macrocode}
 \newcommand*{\printtitle}
@@ -13291,26 +13347,32 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % \end{macro}
 
-% \begin{macro}{\printsubtitle}
-% \changes{v0.15}{2015/04/05}{No div if empty.}
-%    \begin{macrocode}
-\newcommand*{\printsubtitle}{
-\ifthenelse{\equal{\thesubtitle}{}}
-{}
-{
-    \begin{BlockClass}{subtitle}
-    \@subtitle
-    \end{BlockClass}
-}
-}
-%    \end{macrocode}
-% \end{macro}
-
 % \begin{macro}{\printauthor}
+%   \HTML\ version.
+%
+% \changes{v0.39}{2017/09/01}{Supports \protect\pkg{authblk} with
+% \element{div}s of class \attribute{oneauthor} instead of tabular.}
+% \changes{v0.39}{2017/09/03}{Removed minipages.}
+%
 %    \begin{macrocode}
 \newcommand*{\printauthor}{
+%    \end{macrocode}
+% The entire author block is contained in a \element{div} named \attribute{author}:
+%    \begin{macrocode}
 \begin{BlockClass}{author}
-\begin{tabular}{c}\@author\end{tabular}
+%    \end{macrocode}
+% \cs{and} finishes one author and starts the next:
+%    \begin{macrocode}
+\renewcommand{\and}{%
+\end{BlockClass}
+\begin{BlockClass}{oneauthor}
+}
+%    \end{macrocode}
+% Individual authors are contained in a \element{div} named \attribute{oneauthor}:
+%    \begin{macrocode}
+\begin{BlockClass}{oneauthor}
+\@author
+\end{BlockClass}
 \end{BlockClass}
 }
 %    \end{macrocode}
@@ -13346,11 +13408,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 % \changes{v0.16}{2016/04/07}{\cs{titlingpage}: Improved print-output spacing.}
 % \changes{v0.16}{2016/04/07}{Test Suite: Improved titlingpage.}
-% \begin{macro}{\printpublished}
-%    \begin{macrocode}
-\newcommand*{\printpublished}{{\Large\scshape\@published}}
-%    \end{macrocode}
-% \end{macro}
+%
 
 % \begin{macro}{\printtitle}
 %    \begin{macrocode}
@@ -13358,13 +13416,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % \end{macro}
 
-% \begin{macro}{\printsubtitle}
-%    \begin{macrocode}
-\newcommand*{\printsubtitle}{{\Large\itshape\@subtitle\bigskip}}
-%    \end{macrocode}
-% \end{macro}
-
 % \begin{macro}{\printauthor}
+%   Print mode.
 %    \begin{macrocode}
 \newcommand*{\printauthor}
     {{\large\begin{tabular}[t]{c}\@author\end{tabular}}}
@@ -13377,150 +13430,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % \end{macro}
 %
-%
-% \subsection{\cs{maketitle} for print output}
-%
-%
-% \DescribeMacro{\maketitle}
-% From the \pkg{titling} package, patched to add the publisher and subtitle.
-%
-%    \begin{macrocode}
-\providecommand{\maketitle}{}
-\if@titlepage
-  \renewcommand{\maketitle}{\begin{titlepage}%
-    \let\footnotesize\small
-    \let\footnoterule\relax
-    \LetLtxMacro{\footnote}{\thanks}
-    \@bsmarkseries
-      \def\@makefnmark{\rlap{\@textsuperscript{%
-         \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}%
-      \long\def\@makefntext##1{\makethanksmark ##1}
-    \null\vfil
-    \vskip 60\p@
-    \vspace*{\droptitle}
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
-    \par
-    \@thanks
-    \vfil\null
-    \end{titlepage}%
-    \@bscontmark  %  \setcounter{footnote}{0}%
-%%%    \@bsmtitlempty
-  } % end titlepage defs
-\else
-  \renewcommand{\maketitle}{\par
-    \begingroup
-      \@bsmarkseries
-      \def\@makefnmark{\rlap{\@textsuperscript{%
-         \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}%
-      \long\def\@makefntext##1{\makethanksmark ##1}
-      \if@twocolumn
-        \ifnum \col@number=\@ne
-          \@maketitle
-        \else
-          \twocolumn[\@maketitle]%
-        \fi
-      \else
-        \newpage
-        \global\@topnum\z@
-        \@maketitle
-      \fi
-      \thispagestyle{plain}\@thanks
-    \endgroup
-    \@bscontmark  %  \setcounter{footnote}{0}%
-%%%    \@bsmtitlempty
-  } % end non-titlepage
-
-  \def\@maketitle{%
-    \newpage
-    \null
-    \vskip 2em%
-          \vspace*{\droptitle}
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
-    \par
-    \vskip 1.5em}
-\fi
-
-\providecommand{\maketitlehookaa}{}
-
-\providecommand{\maketitlehookaaa}{}
-
-\newcommand{\prepublished}[1]{%
-\def\@bsprepublished{#1}%
-}
-
-\newcommand{\postpublished}[1]{%
-\def\@bspostpublished{#1}%
-}
-
-\newcommand{\presubtitle}[1]{%
-\def\@bspresubtitle{#1}%
-}
-%    \end{macrocode}
-%
-% \DescribeMacro{\presubtitle} Hook after printing the subtitle.
-%    \begin{macrocode}
-\newcommand{\postsubtitle}[1]{%
-\def\@bspostsubtitle{#1}%
-}
-%    \end{macrocode}
-%
-% Initial settings:
-%
-%    \begin{macrocode}
-\if@titlepage
-\prepublished{
-\vspace*{-\baselineskip}\vspace*{-\medskipamount}\vspace*{-2em}
-\begin{center}}
-\postpublished{\par\end{center}\vskip 2em}
-
-\presubtitle{\unskip\begin{center}\unskip}
-\postsubtitle{\par\end{center}\vskip 2em}
-\else
-\prepublished{\begin{center}}
-\postpublished{\par\end{center}\vskip 0.5em}
-
-\presubtitle{\begin{center}\unskip}
-\postsubtitle{\par\end{center}\vskip 0.5em}
-\fi
-%    \end{macrocode}
-%
 %    \begin{macrocode}
 \end{warpprint}
 %    \end{macrocode}
 %
 %
-% \subsection{\protect\textbackslash{}maketitle for HTML output}
+%
+% \subsection{\cs{maketitle} for HTML output}
 % \label{sec:titlehtml}
 %
-% An \HTML\ div of class |titlepage| is created, inside of which
-% a \LaTeX{} \PDF\ minipage is generated (without \HTML\ tags),
-% allowing the |\thanks| footnotes to be generated immediately at the end
-% of the title page during \HTML\ output.  This is desirable when
-% a large table of contents immediately follows the title.
+% An \HTML\ \element{div} of class \attribute{titlepage} is used.
 %
 % |\thanks| are a form of footnotes used in the title page.
 % See \cref{sec:footnotes} for other kinds of footnotes.
@@ -13532,21 +13451,30 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \begin{warpHTML}
 %    \end{macrocode}
 %
-%\begin{macro}{\LWR@maketitlesetup} Patches \cs{thanks} macros to
-% use \LaTeX{} minipage footnotes.
 %
 %    \begin{macrocode}
-\newcommand*{\LWR@maketitlesetup}{%
+\if@titlepage
+\newcommand{\LWR@setfootnoteseries}{%
+    \renewcommand\thefootnote{\@arabic\c@footnote}%
+}
+\else
+\newcommand{\LWR@setfootnoteseries}{%
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+}
+\fi
 %    \end{macrocode}
-% Select which kind of footnote marks to use:
+%
+%
+%\begin{macro}{\LWR@maketitlesetup} Patches \cs{thanks} macros.
+%
 %    \begin{macrocode}
-\@bsmarkseries
-\@mpbsmarkseries
+\newcommand*{\LWR@maketitlesetup}{%
 %    \end{macrocode}
 %
 % Redefine the footnote mark:
 %
 %    \begin{macrocode}
+\LWR@setfootnoteseries%
 \def\@makefnmark{\textsuperscript{\thefootnote}}
 %    \end{macrocode}
 %
@@ -13565,7 +13493,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % Make the footnote mark and some extra horizontal space for the tags:
 %    \begin{macrocode}
-\makethanksmark \LWR@orighspace{1in}
+\textsuperscript{\@thefnmark} \LWR@orighspace{1in}
 %    \end{macrocode}
 % \begin{center}
 % \begin{minipage}{.7\linewidth}
@@ -13586,7 +13514,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % \begin{macro}{\@fnsymbol} \marg{counter}
 %
 % Re-defined to use an \HTML\ entity for the double vertical bar symbol.
-% The original definition used \cs{\textbar} which was not being found by \cmds{pdftotext}.
+% The original definition used \cs{\textbar} which was not being seen by \cmds{pdftotext}.
 %
 % \changes{v0.34}{2017/08/07}{Text symbols instead of math.}
 %
@@ -13598,7 +13526,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % \end{macro}
 %
-%\begin{macro}{\maketitle} Creates an \HTML\ titlepage div
+%
+%
+%\begin{macro}{\maketitle}
+%   \HTML\ mode.
+%   Creates an \HTML\ titlepage div
 %	and typesets the title, etc.
 %
 % Code from the \pkg{titling} package is adapted, simplified, and
@@ -13607,7 +13539,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \begin{macrocode}
 \renewcommand*{\maketitle}{%
 %    \end{macrocode}
-% An \HTML\ titlepage div is used for all classes.
+% An \HTML\ titlepage \element{div} is used for all classes.
 %    \begin{macrocode}
 \begin{titlepage}
 %    \end{macrocode}
@@ -13623,49 +13555,70 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \begin{macrocode}
 \@thanks
 %    \end{macrocode}
-% Close the \HTML\ titlepage div:
+% Close the \HTML\ titlepage div and cleanup:
 %    \begin{macrocode}
 \end{titlepage}
-%    \end{macrocode}
-% Reset the footnote counter:
-%    \begin{macrocode}
-\@bscontmark
+\setcounter{footnote}{0}%
+\global\let\thanks\relax
+\global\let\maketitle\relax
+\global\let\@maketitle\relax
+\global\let\@thanks\@empty
+\global\let\@author\@empty
+\global\let\@date\@empty
+\global\let\@title\@empty
+\global\let\title\relax
+\global\let\author\relax
+\global\let\date\relax
+\global\let\and\relax
 }
 %    \end{macrocode}
 % \end{macro}
-
-% \begin{macro}{\@maketitle} Typesets the title, etc. for \HTML:
+%
+%
+% \begin{macro}{\@maketitle}
+%   \HTML\ mode.  Typesets the title, etc.:
+%
+% \changes{v0.39}{2017/09/01}{Supports \protect\pkg{authblk} with
+% \element{div}s of class \attribute{oneauthor} instead of tabular.}
+% \changes{v0.39}{2017/09/03}{Removed minipages.}
+% \changes{v0.39}{2017/09/04}{Native \protect\LaTeX\ version.}
+%
 %    \begin{macrocode}
 \DeclareDocumentCommand{\@maketitle}{}{%
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
+    \LWR@stoppars\LWR@htmltag{h1}
+    \@title
+    \LWR@htmltag{/h1}\LWR@startpars
+    \begin{BlockClass}{author}
+        \renewcommand{\and}{
+            \end{BlockClass}
+            \begin{BlockClass}{oneauthor}
+        }
+        \begin{BlockClass}{oneauthor}
+            \@author
+        \end{BlockClass}
+    \end{BlockClass}
+    \begin{BlockClass}{titledate}
+    \@date
+    \end{BlockClass}
 }
 %    \end{macrocode}
 % \end{macro}
 
 
-%    \begin{macrocode}
-\providecommand{\maketitlehookaa}{}
-\providecommand{\maketitlehookaaa}{}
-%    \end{macrocode}
-
 
 % \begin{macro}{\LWR@titlingmaketitle}
 % \cs{maketitle} for use inside an \HTML\ \env{titlingpage} environment.
 %    \begin{macrocode}
 \newcommand*{\LWR@titlingmaketitle}{%
 %    \end{macrocode}
+% Keep pending footnotes out of the title block:
+%    \begin{macrocode}
+\@thanks
+%    \end{macrocode}
+% Set up special patches:
+%    \begin{macrocode}
+\LWR@maketitlesetup
+%    \end{macrocode}
 % Typeset the title, etc:
 %    \begin{macrocode}
 \@maketitle
@@ -13676,32 +13629,95 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 %    \end{macrocode}
 % \end{macro}
+%
+%    \begin{macrocode}
+\end{warpHTML}
+%    \end{macrocode}
+%
+%
+%
+% \subsection{\cs{published} and \cs{subtitle}}
+%
+% \label{sec:publishedsubtitle}
+%
+% \changes{v0.39}{2017/09/05}{Titlepage \cs{published} and \cs{subtitle} removed.
+%   \cs{AddSubtitlePublished} restores.}
+%
+% To add \cs{subtitle} and \cs{published} to the titlepage,
+% \margintag{\cs{subtitle} and \cs{published}}
+% \index{subtitle}\index{published}\index{titlepage>subtitle and published}
+% load the \pkg{titling} package and use \cs{AddSubtitlePublished}
+% in the preamble.
+%
+% The default |lwarp.css| has definitions for the |published| and |subtitle| classes.
+%
+% After \pkg{titling} is loaded, \cs{AddSubtitlePublished} is created,
+% which when used then creates a number of additional macros,
+% and also assigns some of the \pkg{titling} hooks.
+% Do not use \cs{AddSubtitlePublished} if the user has patched the \pkg{titling}
+% \watchout[\pkg{titling} hooks]
+% hooks for some other reason.
+% Portions are marked \cs{warpprintonly} to reduce extra tags in \HTML.
+% Similarly, \env{BlockClass} has no effect in print mode.
+% Thus, the following may be marked \env{warpall}.
+%
+%
+% \codeall
+%    \begin{macrocode}
+\begin{warpall}
+%    \end{macrocode}
 
-
+% \begin{macro}{\AddSubtitlePublished}
+% Adds \cs{published} and \cs{subtitle}, and related.
 %
-% \begin{macro}{\thanksmarkseries} \marg{series}
+% \changes{v0.39}{2017/09/05}{Added.}
 %
-% Sets the type of footnote marks used by |\thanks|,
-% where type is `arabic', `roman', `fnsymbol', etc.  Modified to
-% use the \LaTeX{} \PDF\ minipage which is included with the title page.
 %    \begin{macrocode}
-\renewcommand{\thanksmarkseries}[1]{%
-\def\@mpbsmarkseries{%
-\renewcommand*{\thempfootnote}{\@nameuse{#1}{mpfootnote}}}%
-\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}%
+\AfterPackage{titling}{
+\newcommand*{\AddSubtitlePublished}{%
+
+\newcommand{\@published}{}
+
+\newcommand{\published}[1]{\gdef\@published{##1}}
+
+\renewcommand*{\maketitlehooka}{\printpublished}
+
+\newcommand*{\printpublished}{%
+\warpprintonly{\begin{center}\unskip}%
+\begin{BlockClass}{published}%
+\warpprintonly{\large\itshape}%
+\@published%
+\end{BlockClass}%
+\warpprintonly{\end{center}}%
+}
+
+\newcommand{\@subtitle}{}
+
+\newcommand{\subtitle}[1]{\gdef\@subtitle{##1}}
+
+\renewcommand*{\maketitlehookb}{\printsubtitle}
+
+\newcommand*{\printsubtitle}{%
+\warpprintonly{\begin{center}\unskip}%
+\begin{BlockClass}{subtitle}%
+\warpprintonly{\Large\itshape}%
+\@subtitle%
+\end{BlockClass}%
+\warpprintonly{\end{center}}%
 }
+
+}% \AddSubtitlePublished
+}% AfterPackage
 %    \end{macrocode}
 % \end{macro}
-%
+
 %    \begin{macrocode}
-\end{warpHTML}
+\end{warpall}
 %    \end{macrocode}
 
 
 
 
-
-
 % \section{Abstract}
 %
 % The following code replaces the \LaTeX\ default,
@@ -14017,9 +14033,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % A few minor changes are made to supply \HTML\ tags.
 %
 % \begin{itemize}
-% \item The entire theorem is placed into a div of class |theoremcontents|.
-% \item The label for each theorem is placed inside a span of class |theoremlabel|.
-% \item The contents are placed inside a div of class |theoremcontents|.
+% \item The entire theorem is placed into a \element{div} of class \attribute{theoremcontents}.
+% \item The label for each theorem is placed inside a \element{span} of class \attribute{theoremlabel}.
+% \item The contents are placed inside a \element{div} of class {theoremcontents}.
 % \end{itemize}
 
 % \codehtml
@@ -14253,7 +14269,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % This is arguably the most complicated part of the entire package.
 % Numerous tricks are employed to handle the syntax which is involved.
 %
-% Limitations:
+% \subsection{Limitations}
+%
 % \limitstabular
 %
 % \changes{v0.20}{2017/01/07}{Added @, \protect\textless, \protect\textgreater\ columns.}
@@ -14455,6 +14472,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % \changes{v0.33}{2017/06/20}{Add: Avoids error: \protect\texttt{misplaced alignment tab character \&}.}
 %    \begin{macrocode}
 \newcommand{\StartDefiningTabulars}{%
+\LWR@traceinfo{StartDefiningTabulars}
 \warpHTMLonly{\catcode`\&=\active}%
 }
 %    \end{macrocode}
@@ -14463,6 +14481,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % \begin{macro}{\EndDefiningTabulars} Place after defining something with |&| in it.
 %    \begin{macrocode}
 \newcommand{\EndDefiningTabulars}{%
+\LWR@traceinfo{EndDefiningTabulars}
 \warpHTMLonly{\catcode`\&=4}%
 }
 %    \end{macrocode}
@@ -15450,7 +15469,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 
 
-% \subsubsection{High-level multicolumn interface}
+% \subsubsection{Multicolumn factored code}
 
 
 %    \begin{macrocode}
@@ -15458,17 +15477,20 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 
 
-% \begin{macro}{\LWR@domulticolumn} \marg{1: numcols} \marg{2: colspec} \marg{3: text}
+% \begin{macro}{\LWR@domulticolumn}
+%   \oarg{1: vpos} \oarg{2: \#rows} \marg{3: numcols} \marg{4: colspec} \marg{5: text}
+%
+% \changes{v0.39}{2017/08/30}{Add: Optional \protect\texttt{vpos} and \# rows.}
 %
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@domulticolumn}{m m +m}{%
-\LWR@traceinfo{lwr@domulticolumn -#1- -#2-}%
+\NewDocumentCommand{\LWR@domulticolumn}{o o m m +m}{%
+\LWR@traceinfo{lwr@domulticolumn -#1- -#2- -#3- -#4-}%
 %    \end{macrocode}
 % Remember the text to be inserted, and
 % remember that a valid column type was found:
 %    \begin{macrocode}
 \renewcommand{\LWR@multicoltext}{%
-#3%
+#5%
 \booltrue{LWR@validtablecol}%
 }%
 %    \end{macrocode}
@@ -15478,12 +15500,28 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 % Begin the opening table data tag:
 %    \begin{macrocode}
-\LWR@htmltag{td colspan="#1"
+\LWR@htmltag{td colspan="#3" %
+%    \end{macrocode}
+% 
+%    \begin{macrocode}
+\IfValueTF{#2}{ % rows?
+rowspan="#2" %
+%    \end{macrocode}
+% 
+%    \begin{macrocode}
+\IfValueT{#1}{% vpos?
+\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
+\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+}% vpos?
+}{}% rows?
+%    \end{macrocode}
+% 
+%    \begin{macrocode}
  class="td%
 %    \end{macrocode}
 % Print the column type:
 %    \begin{macrocode}
-\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoltype}%
+\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoltype}%
 %    \end{macrocode}
 % If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag.
 %
@@ -15496,13 +15534,45 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 "%
 }% end of the opening table data tag
 \global\boolfalse{LWR@intabularmetadata}%
-\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoldata}%
+\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoldata}%
 }
 %    \end{macrocode}
 % \end{macro}
 
 
+% \subsubsection{Multicolumn}
+
+% \begin{macro}{\LWR@htmlmulticolumn} \marg{numcols} \marg{alignment} \marg{text}
+%    \begin{macrocode}
+\NewDocumentCommand{\LWR@htmlmulticolumn}{m m +m}%
+{%
+%    \end{macrocode}
+% Figure out how many extra \HTML\ columns to add for |@| and |!| columns:
+%    \begin{macrocode}
+\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+%    \end{macrocode}
+% Create the multicolumn tag:
+%    \begin{macrocode}
+\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}%
+%    \end{macrocode}
+% Move to the next \LaTeX\ column:
+%    \begin{macrocode}
+\addtocounter{LWR@tablecolspos}{#1}%
+\addtocounter{LWR@tablecolspos}{-1}%
+%    \end{macrocode}
+% Skip any trailing |@| or |!| columns for this cell:
+%    \begin{macrocode}
+\booltrue{LWR@skipatbang}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%
+%
 % \subsubsection{Longtable captions}
+%
+% \pkg{longtable} captions use \cs{multicolumn}.
 
 % \DescribeBoolean{LWR@starredlongtable}
 % Per the \pkg{caption} pacakge, step the counter if |longtable*|.
@@ -15653,7 +15723,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 %    \end{macrocode}
 
 % \begin{macro}{\LWR@tabularhtmlcolumns}
-%	\marg{starting \LaTeX\ column} \marg{number \LaTeX\ columns}
+%   \marg{starting \LaTeX\ column} \marg{number \LaTeX\ columns}
 %
 % Compute the total number of \HTML\ columns being spanned, considering the
 % starting \LaTeX\ table column and the number of \LaTeX\ tabular columns being
@@ -15704,90 +15774,155 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 %    \end{macrocode}
 % \end{macro}
-
-
-
-% \subsubsection{\textbackslash{}tabledatamulticolumntag}
-
-% \begin{macro}{\LWR@tabledatamulticolumntag} \marg{numcols} \marg{alignment} \marg{text}
+%
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@tabledatamulticolumntag}{m m +m}%
-{%
+\end{warpHTML}
 %    \end{macrocode}
-% Figure out how many extra \HTML\ columns to add for |@| and |!| columns:
+%
+%
+%
+%
+% \subsection{Multicolumnrow}
+%
+% \label{sec:printmultirow}
+%
+% A print-mode version is defined here, and is also used during \HTML\ output
+% while inside a \env{lateximage}.
+%
+% See \cref{sec:multirow} for the \HTML\ versions.
+%
+% \codeall
 %    \begin{macrocode}
-\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+\begin{warpall}
 %    \end{macrocode}
-% Create the multicolumn tag:
+%
+% \begin{macro}{\multicolumnrow}
+%   \marg{1:cols} \marg{2:halign}
+%   \oarg{3:vpos} \marg{4:numrows} \oarg{5:bigstruts}
+%       \marg{6:width} \oarg{7:fixup} \marg{8:text}
+%
+% For discussion of the use of \cs{DeclareExpandableDocumentCommand}, see: \\
+%   \href
+%    {https://tex.stackexchange.com/questions/168434/problem-with-abbreviation-of-multirow-and-multicolumn-latex}
+%    {https://tex.stackexchange.com/questions/168434/\\%
+%       problem-with-abbreviation-of-multirow-and-multicolumn-latex}
+%
+% \changes{v0.39}{2017/08/31}{Added.}
+%
 %    \begin{macrocode}
-\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}%
+\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}{m m O{c} m O{0} m O{0pt} +m}{%
+\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}}
+}
+
+\newcommand*{\multicolumnrow}{\LWR@origmulticolumnrow}
 %    \end{macrocode}
-% Move to the next \LaTeX\ column:
+% \end{macro}
+%
 %    \begin{macrocode}
-\addtocounter{LWR@tablecolspos}{#1}%
-\addtocounter{LWR@tablecolspos}{-1}%
+\end{warpall}
 %    \end{macrocode}
-% Skip any trailing |@| or |!| columns for this cell:
+%
+%
+%
+% \subsection{Utility macros inside a table}
+%
+% \codehtml
 %    \begin{macrocode}
-\booltrue{LWR@skipatbang}%
-}
+\begin{warpHTML}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*{\LWR@donothing}{}
+\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}}
+\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}}
 %    \end{macrocode}
-% \end{macro}
 
+%    \begin{macrocode}
+\end{warpHTML}
+%    \end{macrocode}
 
 
-% \subsection{Multirow}
+% \subsection{Special-case tabular markers}
 
-% \DescribePackage{multirow}
+% \codeall
+%    \begin{macrocode}
+\begin{warpall}
+%    \end{macrocode}
+%
+% \begin{macro}{\TabularMacro}
+% Place this just before inserting a custom macro in a table data cell.
+% Doing so tells \pkg{lwarp} not to automatcally start a new \HTML\ table data cell yet.
+% See \cref{sec:limitstabular}.
+%
+% \changes{v0.39}{2017/08/29}{Added.}
+%
+%    \begin{macrocode}
+\let\TabularMacro\relax
+%    \end{macrocode}
+% \end{macro}
 
+%    \begin{macrocode}
+\end{warpall}
+%    \end{macrocode}
 
 
-% \begin{macro}{\LWR@tabledatamultirowtag}
-%	\marg{numrows} \oarg{bigstruts} \marg{width} \oarg{fixup} \marg{text}
-% \changes{v0.19}{2015/05/28}{Added optional args.}
+
+% \begin{macro}{\ResumeTabular} Used to resume tabular entries after resuming
+%   an environment.
+%
+% \changes{v0.39}{2017/08/29}{Added.}
+%
+% \limitsresumetabular
+% \bigskip
+%
+% \codehtml
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@tabledatamultirowtag}{m o m o m}%
-{%
-\LWR@maybenewtablerow%
+\begin{warpHTML}
 %    \end{macrocode}
-% Print the start of a new table data cell:
+
 %    \begin{macrocode}
-\LWR@htmltag{td rowspan="#1" class="td%
+\newcommand*{\ResumeTabular}{%
+\global\boolfalse{LWR@exitingtabular}%
+\LWR@getmynexttoken%
+}
 %    \end{macrocode}
-% Append this column's spec:
+% \end{macro}
+
 %    \begin{macrocode}
-\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}%
+\end{warpHTML}
 %    \end{macrocode}
-% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag:
+
+
+
+% \codeprint
 %    \begin{macrocode}
-\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
-"{}}
+\begin{warpprint}
 %    \end{macrocode}
-% While printing the text, redefine |\\| to generate a new line
+
 %    \begin{macrocode}
-\begingroup \LetLtxMacro{\\}{\LWR@endofline} #5 \endgroup
-\LWR@stoppars%
-\global\boolfalse{LWR@intabularmetadata}%
-}%
+\newcommand*{\ResumeTabular}{}
 %    \end{macrocode}
-% \end{macro}
 
-
-% \subsection{Utility macros inside a table}
 %    \begin{macrocode}
-\newcommand*{\LWR@donothing}{}
-\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}}
-\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}}
+\end{warpprint}
 %    \end{macrocode}
 
 
+
 % \subsection{Checking for a new table cell}
 
+
+% \codehtml
+%    \begin{macrocode}
+\begin{warpHTML}
+%    \end{macrocode}
+
 % \begin{macro}{\LWR@tabledatacolumntag}
 % Open a new \HTML\ table cell unless the next token is for a macro
 % which does not create data, such as |\hline|, |\toprule|, etc:
 %
 % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
+% \changes{v0.39}{2017/08/29}{Don't start a data cell if see \cs{TabularMacro}.}
 %
 %    \begin{macrocode}
 \newbool{LWR@exitingtabular}
@@ -15819,12 +15954,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 {\let\mynext\LWR@donothing}{}%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multirow}}%
 {\let\mynext\LWR@donothing}{}%
+\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumnrow}}%
+{\let\mynext\LWR@donothing}{}%
 %    \end{macrocode}
 % if come to an |\mrowcell|, this is a cell to be skipped over
 %    \begin{macrocode}
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\mrowcell}}%
 {\let\mynext\LWR@donothing}{}%
 %
+\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\TabularMacro}}%
+{\let\mynext\LWR@donothing}{}%
+%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}%
 {\let\mynext\LWR@donothing}{}%
 %
@@ -15999,8 +16139,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 % so we do not want to look ahead for a possible data cell,
 % so do not want to use |\LWR@getmynexttoken|.
 %    \begin{macrocode}
-\LetLtxMacro{\multicolumn}{\LWR@tabledatamulticolumntag}%
-\LetLtxMacro{\multirow}{\LWR@tabledatamultirowtag}%
+\renewcommand{\multicolumn}{\LWR@htmlmulticolumn}%
 \renewcommand*{\mrowcell}{\global\booltrue{LWR@skippingmrowcell}}%
 \LetLtxMacro{\caption}{\LWR@longtabledatacaptiontag}%
 %    \end{macrocode}
@@ -17006,16 +17145,17 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 % \section{Table of Contents, LOF, LOT}
 %
-% This section controls the generation of the TOC, LOF, LOT.
+% This section controls the generation of the \TOC, \LOF, and \LOT.
 %
 % The |.toc|, |.lof|, and |.lot| files are named by the source code \cs{jobname}.
 %
-% In \HTML, the printed tables are placed inside a div of class |.toc|, |.lof|, or |.lot|.
+% In \HTML, the printed tables are placed inside a \element{div}
+%   of class \attribute{toc}, \attribute{lof}, or \attribute{lot}.
 %
-% A ``sidetoc'' is provided which prints a subset of the TOC on the side of each page other
+% A ``sidetoc'' is provided which prints a subset of the \TOC\ on the side of each page other
 % than the homepage.
 %
-% The regular \LaTeX{} infrastructure is used for TOC,
+% The regular \LaTeX{} infrastructure is used for \TOC,
 % along with some patches to generate \HTML\ output.
 
 % \codehtml
@@ -17247,14 +17387,14 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \setcounter{tocdepth}{\value{SideTOCDepth}}
 
 %    \end{macrocode}
-% The title is placed into a div of class |sidetoctitle|, and may
+% The title is placed into a \element{div} of class \attribute{sidetoctitle}, and may
 % contain paragraphs.
 %    \begin{macrocode}
 \begin{BlockClass}{sidetoctitle}
 \sidetocname
 \end{BlockClass}
 %    \end{macrocode}
-% The table of contents is placed into a div of class |sidetoccontents|.
+% The table of contents is placed into a \element{div} of class \attribute{sidetoccontents}.
 %    \begin{macrocode}
 \begin{BlockClass}{sidetoccontents}
 \LinkHome
@@ -17804,21 +17944,20 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 %
 %
 %
-% \begin{macro}{\LWR@restoreorigrelsize} Patched by \pkg{lwarp-relsize} if loaded.
-%    \begin{macrocode}
-\newcommand*{\LWR@restoreorigrelsize}{}
-%    \end{macrocode}
-% \end{macro}
-%
-%
 %
 % \begin{macro}{\LWR@restoreorigformatting}
 % While producing \SVG\ math or a \env{lateximage},
 %	use regular \LaTeX\ formatting instead of \HTML\ tags.
+%
+% Various packages add to this macro using \cs{appto}.
+%
 % \label{sec:restoreorigformatting}
+%
 % \changes{v0.34}{2017/08/05}{Improved font control.}
 % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
 % \changes{v0.36}{2017/08/16}{\pkg{siunitx}: Improved super/subscripts in a \env{lateximage}.}
+% \changes{v0.39}{2017/09/01}{Appended with \cs{appto} instead of calling various macros.}
+%
 %    \begin{macrocode}
 \newcommand*{\LWR@restoreorigformatting}{%
 \LWR@traceinfo{LWR@restoreorigformatting}%
@@ -17878,12 +18017,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LetLtxMacro{\minipage}{\LWR@origminipage}%
 \let\endminipage\LWR@endminipage%
 \LetLtxMacro{\parbox}{\LWR@origparbox}%
-\LWR@restoreorigxcolor%
-\LWR@restoremoreorigxcolor%
 %
-\LWR@restoreorigtextcomp%
 \LWR@restoreorigaccents%
-\LWR@restoreorigrelsize%
 %
 \LWR@FBcancel%
 }
@@ -18927,6 +19062,29 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 
 
+% \section{Textcomp}
+%
+% \codehtml
+%    \begin{macrocode}
+\begin{warpHTML}
+%    \end{macrocode}
+%
+%
+% If \pkg{textcomp} was loaded before \pkg{lwarp},
+% perhaps as part of the font-related packages,
+% explicitly load the lwarp patches now:
+%    \begin{macrocode}
+\@ifpackageloaded{textcomp}
+{
+\LWR@origRequirePackage{lwarp-textcomp}
+}
+{}
+%    \end{macrocode}
+
+%    \begin{macrocode}
+\end{warpHTML}
+%    \end{macrocode}
+
 
 
 
@@ -19585,32 +19743,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 %    \end{macrocode}
 
 
-% \section{Xcolor defaults}
-%
-% The following are used when \pkg{xcolor} is not loaded:
-
-% \subsection{Defaults without \protect\pkg{xcolor}}
-% \label{sec:xcolordefaults}
-%
-% \codeall
-%
-%    \begin{macrocode}
-\begin{warpall}
-%    \end{macrocode}
-
-% The following is used if \pkg{xcolor} is not loaded, and is
-% replaced when \pkg{lwarp-xcolor} is loaded.
-%
-% If \pkg{xcolor} is not loaded, there is no \pkg{xcolor} formatting to restore:
-%    \begin{macrocode}
-\newcommand*{\LWR@restoreorigxcolor}{}
-\newcommand*{\LWR@restoremoreorigxcolor}{}
-%    \end{macrocode}
-
-%    \begin{macrocode}
-\end{warpall}
-%    \end{macrocode}
-
 
 % \subsection{\protect\pkg{xcolor} print-mode additions}
 % \label{sec:xcolorpatches}
@@ -19619,7 +19751,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 % These are defined inside \env{warpall} because they are also used
 % for \HTML\ while inside a \env{lateximage}.
 % They are defined \cs{AtBeginDocument} so that the \pkg{xcolor} originals
-% may first be saved for reuse.
+% may first be loaded and saved for reuse.
 %
 % The framed versions are modified to allow a background color of |none|, in which
 % case only the frame is drawn, allowing the background page color to show.
@@ -19781,28 +19913,32 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 %    \end{macrocode}
 % \end{environment}
 
-% \begin{macro}{\LWR@restoremoreorigxcolor}
+% \begin{macro}{\LWR@restoreorigprintxcolor}
 % Used to activate print-mode additions for \pkg{xcolor}.
 % In print mode, this is used immediately following.
 % In \HTML\ mode, this is used inside a \env{lateximage}.
 %    \begin{macrocode}
-\renewcommand*{\LWR@restoremoreorigxcolor}{%
-\LWR@traceinfo{LWR@restoremoreorigxcolorformatting}%
+\newcommand*{\LWR@restoreorigprintxcolor}{%
+\LWR@traceinfo{LWR@restoreorigprintxcolor}%
 \LetLtxMacro\colorboxBlock\LWRprint@colorboxBlock%
 \LetLtxMacro\fcolorbox\LWRprint@fcolorbox%
 \LetLtxMacro\fcolorboxBlock\LWRprint@fcolorboxBlock%
 \LetLtxMacro\fcolorminipage\LWRprint@fcolorminipage%
 \LetLtxMacro\endfcolorminipage\endLWRprint@fcolorminipage%
 }
+
+\appto{\LWR@restoreorigformatting}{%
+\LWR@restoreorigprintxcolor%
+}
 %    \end{macrocode}
 % \end{macro}
 %
 % If print mode, immediately activate the print-mode enhancements for \pkg{xcolor}:
 %    \begin{macrocode}
-\warpprintonly{\LWR@restoremoreorigxcolor}
+\warpprintonly{\LWR@restoreorigprintxcolor}
 
 \LWR@traceinfo{xcolor patches done}
-}{}% xcolor
+}{}% xcolor loaded
 }% AtBeginDocument
 %    \end{macrocode}
 %
@@ -20032,7 +20168,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 % \begin{macro}{\LWR@endminipage}
 % Used to close a minipage.
 %
-% Copied the \LaTeX{} definition and modified to create a |mpfootnotes| div class:
+% Copied the \LaTeX{} definition and modified to create a \element{div} of class  \attribute{mpfootnotes}:
 %    \begin{macrocode}
 \def\LWR@endminipage{%
     \par
@@ -21536,19 +21672,116 @@ width:\rndprintlength{\LWR@tempwidth}%
 %
 % \changes{v0.20}{2016/12/12}{Code factored into independent \texttt{lwarp\_html} files.}
 %
+% \titleformat{\part}[hang]
+%     {\hrule\nopagebreak[4]\large\ttfamily\bfseries}{}{0pt}{}[\marginpar{\hfill{}File\,\thepart}]
+% \titlespacing*{\part}{0pt}{*4}{0ex}
+% 
+% \titleformat{\section}[hang]
+%     {\LARGE\sffamily\bfseries}{}{0pt}{}[\marginpar{\hfill\textsection\,\thesection \qquad Package}]
+% \titlespacing*{\section}{0pt}{0ex}{0ex}
 %
+% \titleformat{\subsection}[hang]
+%     {\large\rmfamily\bfseries}{}{0pt}{}[\marginpar{\hfill\textsection\,\thesubsection}]
+% \titlespacing*{\subsection}{0pt}{0ex}{0ex}
 %
+% \renewcommand{\bottomtitlespace}{.5\textheight}
 %
 %
 % \clearpage
 %
+%
+%
+% \iffalse
+%<*a4>
+% \fi
+%
+% \part{lwarp-a4.sty}
+%
+% \section{a4}
+%
+% \DescribePackage{a4}
+% \pkg{a4} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{a4}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{a4}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*{\WideMargins}{}
+%    \end{macrocode}
+%
+% \iffalse
+%</a4>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*a4wide>
+% \fi
+%
+% \part{lwarp-a4wide.sty}
+%
+% \section{a4wide}
+%
+% \DescribePackage{a4wide}
+% \pkg{a4wide} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{a4wide}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{a4wide}
+%    \end{macrocode}
+%
+%
+% \iffalse
+%</a4wide>
+% \fi
+%
+%
+%
+% \iffalse
+%<*a5comb>
+% \fi
+%
+% \part{lwarp-a5comb.sty}
+%
+% \section{a5comb}
+%
+% \DescribePackage{a5comb}
+% \pkg{a5comb} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{a5comb}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{a5comb}
+%    \end{macrocode}
+%
+%
+% \iffalse
+%</a5comb>
+% \fi
+%
+%
+%
+%
+%
 % \iffalse
 %<*abstract>
 % \fi
 %
 % \part{lwarp-abstract.sty}
 %
-% \section{Abstract}
+% \section{abstract}
 %
 % \credits{Peter Wilson}
 %
@@ -21641,7 +21874,41 @@ width:\rndprintlength{\LWR@tempwidth}%
 %
 %
 %
-% \clearpage
+%
+%
+% \iffalse
+%<*addlines>
+% \fi
+%
+% \part{lwarp-addlines.sty}
+%
+% \section{addlines}
+%
+% \DescribePackage{addlines}
+% \pkg{addlines} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{addlines}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{addlines}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*\addlines[1][1]{}
+\let\addline\addlines
+\newcommand*\removelines[1][1]{}
+\let\removeline\removelines
+%    \end{macrocode}
+%
+% \iffalse
+%</addlines>
+% \fi
+%
+%
+%
+%
 %
 % \iffalse
 %<*afterpage>
@@ -21649,7 +21916,7 @@ width:\rndprintlength{\LWR@tempwidth}%
 %
 % \part{lwarp-afterpage.sty}
 %
-% \section{Afterpage}
+% \section{afterpage}
 %
 % \DescribePackage{afterpage} Emulated.
 %
@@ -21672,7 +21939,6 @@ width:\rndprintlength{\LWR@tempwidth}%
 %
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*algorithmicx>
@@ -21680,7 +21946,7 @@ width:\rndprintlength{\LWR@tempwidth}%
 %
 % \part{lwarp-algorithmicx.sty}
 %
-% \section{Algorithmicx}
+% \section{algorithmicx}
 % \label{sec:algorithmicx}
 %
 % \DescribePackage{algorithmicx}
@@ -21732,13 +21998,14 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+%
 % \iffalse
 %<*alltt>
 % \fi
 %
 % \part{lwarp-alltt.sty}
 
-% \section{Alltt}
+% \section{alltt}
 %
 % \DescribePackage{alltt}
 % \pkg{alltt} is patched for use by \pkg{lwarp}.
@@ -21768,7 +22035,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*amsthm>
@@ -21776,7 +22042,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-amsthm.sty}
 
-% \section{AMSthm}
+% \section{amsthm}
 %
 % \credits{Publications Technical Group --- American Mathematical Society}
 %
@@ -21923,15 +22189,46 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+% \iffalse
+%<*anysize>
+% \fi
+%
+% \part{lwarp-anysize.sty}
+%
+% \section{anysize}
+%
+% \DescribePackage{anysize}
+% \pkg{anysize} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{anysize}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{anysize}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\papersize#1#2{}
+\def\marginsize#1#2#3#4{}
+%    \end{macrocode}
+%
+% \iffalse
+%</anysize>
+% \fi
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*appendix>
 % \fi
 %
 % \part{lwarp-appendix.sty}
-
-% \section{Appendix}
+%
+% \section{appendix}
 %
 % \DescribePackage{appendix}
 % \pkg{appendix} is patched for use by \pkg{lwarp}.
@@ -21945,7 +22242,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %    \begin{macrocode}
 \LWR@ProvidesPackagePass{appendix}
 %    \end{macrocode}
-
+%
 %    \begin{macrocode}
 \renewcommand*{\@chap@pppage}{%
 \part*{\appendixpagename}
@@ -21960,9 +22257,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
  \addappheadtotoc
  \fi
 }
-
 %    \end{macrocode}
-
+%
 % \iffalse
 %</appendix>
 % \fi
@@ -21970,7 +22266,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*arabicfront>
@@ -21978,7 +22273,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-arabicfront.sty}
 %
-% \section{Arabicfront}
+% \section{arabicfront}
 %
 % \DescribePackage{arabicfront}
 % \pkg{arabicfront} is ignored.
@@ -21998,6 +22293,61 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+% \iffalse
+%<*authblk>
+% \fi
+%
+% \part{lwarp-authblk.sty}
+%
+% \section{authblk}
+%
+% \DescribePackage{authblk}
+% \pkg{authblk} is patched for \HTML.
+%
+% \changes{v0.39}{2017/08/31}{\pkg{authblk}: Added.}
+%
+% \limitstitlepage
+%
+% \credits{Patrick W. Daly}
+%
+% \codehtml
+%
+% Require that \pkg{authblk} be loaded before \pkg{titling}:
+%    \begin{macrocode}
+\@ifpackageloaded{titling}{
+\PackageError{lwarp-authblk}
+{Package authblk must be loaded before titling}
+{Titling appends authblk's author macro, so authblk must be loaded first.}
+}
+{}
+%    \end{macrocode}
+%
+% Load \pkg{authblk}:
+%    \begin{macrocode}
+\LWR@ProvidesPackagePass{authblk}
+%    \end{macrocode}
+%
+% Patch to add a class for the affiliation:
+%    \begin{macrocode}
+\LetLtxMacro\LWRAB@affil\affil
+
+\renewcommand{\affil}[2][]{%
+\LWRAB@affil[#1]{\protect\InlineClass{affiliation}{#2}}
+}
+%    \end{macrocode}
+% Create an \HTML\ break for an \cs{authorcr}:
+%    \begin{macrocode}
+\renewcommand*{\authorcr}{\protect\LWR@newlinebr}
+%    \end{macrocode}
+%
+%
+%
+% \iffalse
+%</authblk>
+% \fi
+%
+%
+%
 %
 % \iffalse
 %<*balance>
@@ -22005,7 +22355,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-balance.sty}
 %
-% \section{Balance}
+% \section{balance}
 %
 % \DescribePackage{balance} Emulated.
 %
@@ -22031,9 +22381,105 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+% \iffalse
+%<*bigdelim>
+% \fi
+%
+% \part{lwarp-bigdelim.sty}
+%
+% \section{bigdelim}
+%
+% \DescribePackage{bigdelim}
+% \pkg{bigdelim} is used as-is for print or \env{lateximage}, and
+% patched for \HTML.
+%
+% The delimiters are displayed in \HTML\
+% by printing the delimiter, the text, and a thick border across the side of
+% the \cs{multirow} which indicates the actual height of the delimiter.
+% The delimiter character is given a \element{span} class of \attribute{ldelim} or
+% \attribute{rdelim}, and the default \CSS\ sets this to \attribute{font-size:200\%}
+%
+% \changes{v0.39}{2017/08/31}{\pkg{bigdelim}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackagePass{bigdelim}
+%    \end{macrocode}
+%
+% Remember the print-mode versions:
+%    \begin{macrocode}
+\LetLtxMacro\LWR@origldelim\ldelim
+\LetLtxMacro\LWR@origrdelim\rdelim
+%    \end{macrocode}
+%
+% \marg{1:delimiter} \marg{2:\#rows} \marg{3:width} \oarg{4:text}
+% \marginpar{\hfill\cs{ldelim}}\marginpar{\hfill\cs{rdelim}}
+%    \begin{macrocode}
+\RenewDocumentCommand{\ldelim}{m m m O{}}{%
+\renewcommand{\LWR@multirowborder}{right}%
+\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}%
+}
+
+\RenewDocumentCommand{\rdelim}{m m m O{}}{%
+\renewcommand{\LWR@multirowborder}{left}%
+\multirow{#2}{#3}{\InlineClass{rdelim}{#1} #4}%
+}
+%    \end{macrocode}
+% When entering a \env{lateximage}, restore the print-mode versions:
+%    \begin{macrocode}
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro{\ldelim}{\LWR@origldelim}%
+\LetLtxMacro{\rdelim}{\LWR@origrdelim}%
+}
+%    \end{macrocode}
+%
+%
+% \iffalse
+%</bigdelim>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
+%<*bigstrut>
+% \fi
+%
+% \part{lwarp-bigstrut.sty}
+%
+% \section{bigstrut}
+%
+% \DescribePackage{bigstrut}
+% \pkg{bigstrut} is used as-is for print or \env{lateximage}, and
+% patched for \HTML.
+%
+% \changes{v0.39}{2017/08/31}{\pkg{bigstrut}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackagePass{bigstrut}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\LetLtxMacro\LWR@origbigstrut\bigstrut
+
+\renewcommand\bigstrut[1][x]{}
+
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro{\bigstrut}{\LWR@origbigstrut}%
+}
+%    \end{macrocode}
+%
+%
+% \iffalse
+%</bigstrut>
+% \fi
+%
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*bookmark>
@@ -22041,7 +22487,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-bookmark.sty}
 
-% \section{Bookmark}
+% \section{bookmark}
 %
 % \DescribePackage{bookmark}
 % \pkg{bookmark} is emulated during \HTML\ output, and
@@ -22055,7 +22501,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %    \begin{macrocode}
 \LWR@ProvidesPackageDrop{bookmark}
 %    \end{macrocode}
-
+%
 %    \begin{macrocode}
 \newcommand*{\bookmarksetup}[1]{}
 \newcommand*{\bookmarksetupnext}[1]{}
@@ -22064,7 +22510,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 \newcommand*{\bookmarkget}[1]{}
 \newcommand{\BookmarkAtEnd}[1]{}
 %    \end{macrocode}
-
+%
 % \iffalse
 %</bookmark>
 % \fi
@@ -22072,14 +22518,13 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-%
 % \iffalse
 %<*booktabs>
 % \fi
-
+%
 % \part{lwarp-booktabs.sty}
-
-% \section{Booktabs}
+%
+% \section{booktabs}
 % \label{sec:booktabs}
 %
 %
@@ -22108,7 +22553,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 \LetLtxMacro\LWR@origmorecmidrules\morecmidrules
 \LetLtxMacro\LWR@origspecialrule\specialrule
 %    \end{macrocode}
-
+%
 % \iffalse
 %</booktabs>
 % \fi
@@ -22116,7 +22561,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 %
 % \iffalse
@@ -22125,7 +22570,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-boxedminipage.sty}
 %
-% \section{Boxedminipage}
+% \section{boxedminipage}
 %
 % \DescribePackage{boxedminipage}
 % \pkg{boxedminipage} is superceded by \pkg{boxedminipage2e}.
@@ -22150,7 +22595,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-boxedminipage2e.sty}
 
-% \section{Boxedminipage2e}
+% \section{boxedminipage2e}
 %
 % \DescribePackage{boxedminipage2e}
 % \pkg{boxedminipage2e} is emulated.
@@ -22182,7 +22627,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*caption2>
@@ -22190,7 +22635,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-caption2.sty}
 %
-% \section{Caption2}
+% \section{caption2}
 %
 % \DescribePackage{caption2}
 % \pkg{caption2} is not used.
@@ -22210,15 +22655,13 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
-%
 % \iffalse
 %<*ccaption>
 % \fi
 
 % \part{lwarp-ccaption.sty}
 
-% \section{Ccaption}
+% \section{ccaption}
 %
 % \DescribePackage{ccaption}
 % \pkg{ccaption} is not used.
@@ -22239,13 +22682,15 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+%
+%
 % \iffalse
 %<*changepage>
 % \fi
 
 % \part{lwarp-changepage.sty}
 
-% \section{Changepage}
+% \section{changepage}
 %
 % \DescribePackage{changepage}
 % \pkg{changepage} is ignored.
@@ -22274,7 +22719,35 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
+%
+% \iffalse
+%<*chngpage>
+% \fi
+%
+% \part{lwarp-chngpage.sty}
+%
+% \section{chngpage}
+%
+% \DescribePackage{chngpage}
+% \pkg{chngpage} is superceded by \pkg{changepage}.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{chngpage}: Prevented.}
+%
+% \codehtml
+%    \begin{macrocode}
+\LWR@loadnever{chngpage}{changepage}
+%    \end{macrocode}
+%
+% \iffalse
+%</chngpage>
+% \fi
+%
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*chappg>
@@ -22282,7 +22755,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-chappg.sty}
 %
-% \section{Chappg}
+% \section{chappg}
 %
 % \DescribePackage{chappg}
 % \pkg{chappg} is ignored.
@@ -22307,7 +22780,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 %
 % \iffalse
@@ -22316,7 +22789,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-color.sty}
 %
-% \section{Color}
+% \section{color}
 %
 % \DescribePackage{color}  Allowed but ignored.
 % \pkg{xcolor} is then required as well.
@@ -22347,7 +22820,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-crop.sty}
 %
-% \section{Crop}
+% \section{crop}
 %
 % \DescribePackage{crop} Emulated.
 %
@@ -22371,7 +22844,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*cutwin>
@@ -22379,7 +22852,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-cutwin.sty}
 %
-% \section{Cutwin}
+% \section{cutwin}
 %
 % \DescribePackage{cutwin} Emulated.
 %
@@ -22435,7 +22908,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-dcolumn.sty}
 %
-% \section{Dcolumn}
+% \section{dcolumn}
 % \label{sec:dcolumn}
 %
 % \changes{v0.22}{2017/02/24}{\pkg{dcolumn}: Added.}
@@ -22456,15 +22929,13 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
-%
 % \iffalse
 %<*draftwatermark>
 % \fi
 
 % \part{lwarp-draftwatermark.sty}
 
-% \section{Draftwatermark}
+% \section{draftwatermark}
 % \label{sec:draftwatermark}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{draftwatermark}: Added.}
@@ -22496,13 +22967,54 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+%
+%
+%
+% \iffalse
+%<*ebook>
+% \fi
+%
+% \part{lwarp-ebook.sty}
+%
+% \section{ebook}
+%
+% \DescribePackage{ebook}
+% \pkg{ebook} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{ebook}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{ebook}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\setcounter{secnumdepth}{0}
+\setcounter{tocdepth}{2}
+
+\providecommand{\pagefill}[1][0.001mm]{\noindent}
+
+\providecommand{\ebook}{
+\setcounter{secnumdepth}{0}
+\setcounter{tocdepth}{2}
+}
+%    \end{macrocode}
+%
+% \iffalse
+%</ebook>
+% \fi
+%
+%
+%
+%
 % \iffalse
 %<*ellipsis>
 % \fi
 
 % \part{lwarp-ellipsis.sty}
 
-% \section{Ellipsis}
+% \section{ellipsis}
 % \label{sec:ellipsis}
 %
 % \changes{v0.25}{2017/03/16}{\pkg{ellipsis}: Added.}
@@ -22524,7 +23036,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*emptypage>
@@ -22532,7 +23044,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-emptypage.sty}
 
-% \section{Emptypage}
+% \section{emptypage}
 %
 % \DescribePackage{emptypage}
 % \pkg{emptypage} is ignored.
@@ -22553,7 +23065,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*endnotes>
@@ -22561,7 +23073,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-endnotes.sty}
 %
-% \section{Endnotes}
+% \section{endnotes}
 %
 % \credits{John Lavagnino}
 %
@@ -22599,7 +23111,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*enumerate>
@@ -22607,7 +23119,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-enumerate.sty}
 %
-% \section{Enumerate}
+% \section{enumerate}
 % \label{sec:enumerate}
 %
 % \DescribePackage{enumerate}
@@ -22635,7 +23147,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*enumitem>
@@ -22643,7 +23155,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-enumitem.sty}
 %
-% \section{Enumitem}
+% \section{enumitem}
 % \label{sec:enumitem}
 %
 % \DescribePackage{enumitem}
@@ -22694,7 +23206,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*epigraph>
@@ -22702,7 +23214,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-epigraph.sty}
 
-% \section{Epigraph}
+% \section{epigraph}
 % \label{sec:epigraph}
 %
 %
@@ -22760,7 +23272,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 \newcommand*{\undodrop}{}
 \newcommand{\cleartoevenpage}[1][]{}
 %    \end{macrocode}
-
+%
 % \iffalse
 %</epigraph>
 % \fi
@@ -22768,13 +23280,15 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
+%
+%
 % \iffalse
 %<*eso-pic>
 % \fi
-
+%
 % \part{lwarp-eso-pic.sty}
 
-% \section{Eso-pic}
+% \section{eso-pic}
 % \label{sec:eso-pic}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{eso-pic}: Added.}
@@ -22815,7 +23329,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*everypage>
@@ -22823,7 +23336,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-everypage.sty}
 
-% \section{Everypage}
+% \section{everypage}
 % \label{sec:everypage}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{everypage}: Added.}
@@ -22849,7 +23362,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*everyshi>
@@ -22857,7 +23370,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-everyshi.sty}
 %
-% \section{Everyshi}
+% \section{everyshi}
 %
 % \DescribePackage{everyshi} Emulated.
 %
@@ -22890,7 +23403,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-extramarks.sty}
 
-% \section{Extramarks}
+% \section{extramarks}
 %
 % \DescribePackage{extramarks}
 % \pkg{extramarks} is not used.
@@ -22925,7 +23438,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*fancybox>
@@ -22933,7 +23446,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-fancybox.sty}
 %
-% \section{Fancybox}
+% \section{fancybox}
 % \label{sec:fancybox}
 %
 % \credits{Timothy Van Zandt}
@@ -23107,7 +23620,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 
 % \part{lwarp-fancyhdr.sty}
 
-% \section{Fancyhdr}
+% \section{fancyhdr}
 %
 % \DescribePackage{fancyhdr}
 % \pkg{fancyhdr} is nullified.
@@ -23152,7 +23665,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*fancyvrb>
@@ -23160,7 +23673,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
 %
 % \part{lwarp-fancyvrb.sty}
 %
-% \section{Fancyvrb}
+% \section{fancyvrb}
 % \label{sec:fancyvrb}
 %
 % \credits{Timothy Van Zandt}
@@ -23456,7 +23969,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*figcaps>
@@ -23464,7 +23977,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-figcaps.sty}
 %
-% \section{Figcaps}
+% \section{figcaps}
 %
 % \DescribePackage{figcaps} Emulated.
 %
@@ -23501,7 +24014,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-fix2col.sty}
 %
-% \section{Fix2col}
+% \section{fix2col}
 %
 % \DescribePackage{fix2col}
 % \pkg{fix2col} is ignored.
@@ -23522,7 +24035,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*float>
@@ -23530,7 +24043,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-float.sty}
 
-% \section{Float and \cs{newfloat}}
+% \section{float and \cs{newfloat}}
 % \label{sec:newfloat}
 % \label{sec:float}
 %
@@ -23620,7 +24133,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*floatflt>
@@ -23628,7 +24141,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-floatflt.sty}
 %
-% \section{Floatflt}
+% \section{floatflt}
 %
 % \DescribePackage{floatflt} Emulated.
 %
@@ -23674,7 +24187,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*floatpag>
@@ -23682,7 +24195,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-floatpag.sty}
 %
-% \section{Floatpag}
+% \section{floatpag}
 %
 % \DescribePackage{floatpag} Emulated.
 %
@@ -23707,7 +24220,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*floatrow>
@@ -23715,7 +24228,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-floatrow.sty}
 
-% \section{Floatrow}
+% \section{floatrow}
 % \label{sec:floatrow}
 %
 % \DescribePackage{floatrow}
@@ -24047,7 +24560,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*flushend>
@@ -24055,7 +24568,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-flushend.sty}
 %
-% \section{Flushend}
+% \section{flushend}
 %
 % \DescribePackage{flushend} Emulated.
 %
@@ -24084,7 +24597,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*fncychap>
@@ -24092,7 +24605,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-fncychap.sty}
 
-% \section{Fncychap}
+% \section{fncychap}
 %
 % \DescribePackage{fncychap}
 % \pkg{fncychap} is ignored.
@@ -24139,7 +24652,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*fontenc>
@@ -24147,7 +24660,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-fontenc.sty}
 %
-% \section{Fontenc}
+% \section{fontenc}
 %
 % \DescribePackage{fontenc}
 % Error if \pkg{fontenc} is loaded after \pkg{lwarp}.
@@ -24179,7 +24692,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-fontspec.sty}
 %
-% \section{Fontspec}
+% \section{fontspec}
 %
 % \DescribePackage{fontspec}
 % Error if \pkg{fontspec} is loaded after \pkg{lwarp}.
@@ -24205,7 +24718,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*footmisc>
@@ -24213,7 +24726,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-footmisc.sty}
 %
-% \section{Footmisc}
+% \section{footmisc}
 % \label{sec:footmisc}
 %
 % \credits{Robin Fairbairns}
@@ -24279,7 +24792,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*footnote>
@@ -24287,7 +24800,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-footnote.sty}
 %
-% \section{Footnote}
+% \section{footnote}
 %
 % \DescribePackage{footnote}
 % \pkg{footnote} is used with minor patches.
@@ -24362,7 +24875,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-footnotehyper.sty}
 
-% \section{Footnotehyper}
+% \section{footnotehyper}
 %
 % \DescribePackage{footnotehyper}
 % \pkg{footnotehyper} is a \pkg{hyperref}-safe version of \pkg{footnote}.
@@ -24387,7 +24900,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*framed>
@@ -24395,7 +24908,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-framed.sty}
 %
-% \section{Framed}
+% \section{framed}
 %
 % \credits{Donald Arseneau}
 %
@@ -24545,7 +25058,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*ftnright>
@@ -24553,7 +25066,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-ftnright.sty}
 
-% \section{Ftnright}
+% \section{ftnright}
 %
 % \DescribePackage{ftnright}
 % \pkg{ftnright} is ignored.
@@ -24583,7 +25096,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-fullpage.sty}
 %
-% \section{Fullpage}
+% \section{fullpage}
 %
 % \DescribePackage{fullpage} Emulated.
 %
@@ -24603,7 +25116,47 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
+%
+% \iffalse
+%<*fullwidth>
+% \fi
+%
+% \part{lwarp-fullwidth.sty}
+%
+% \section{fullwidth}
+%
+% \DescribePackage{fullwidth}
+% \pkg{fullwidth} is emulated.
+%
+% A minipage is used, of no \HTML\ width.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{fullwidth}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{fullwidth}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newenvironment*{fullwidth}[1][]{%
+\minipagefullwidth%
+\minipage{\linewidth}%
+}
+{%
+\endminipage%
+}
+%    \end{macrocode}
+%
+% \iffalse
+%</fullwidth>
+% \fi
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*geometry>
@@ -24611,7 +25164,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-geometry.sty}
 
-% \section{Geometry}
+% \section{geometry}
 %
 % \DescribePackage{geometry}
 % \pkg{geometry} is preloaded by \pkg{lwarp}, but must be nullified
@@ -24641,7 +25194,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*glossaries>
@@ -24649,7 +25202,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-glossaries.sty}
 
-% \section{Glossaries}
+% \section{glossaries}
 %
 % \DescribePackage{glossaries}
 % \limitsglossaries
@@ -24694,7 +25247,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*graphics>
@@ -24702,7 +25255,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-graphics.sty}
 
-% \section{Graphics}
+% \section{graphics}
 %
 % \DescribePackage{graphics}
 % \pkg{graphics} is emulated.
@@ -24728,7 +25281,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-graphicx.sty}
 
-% \section{Graphicx}
+% \section{graphicx}
 %
 % \DescribePackage{graphicx}
 % \pkg{graphicx} is emulated.
@@ -24747,7 +25300,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*grffile>
@@ -24755,7 +25308,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-grffile.sty}
 %
-% \section{Grffile}
+% \section{grffile}
 %
 % \DescribePackage{grffile}
 % \limitsgrffile
@@ -24786,7 +25339,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*hyperref>
@@ -24794,7 +25347,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-hyperref.sty}
 
-% \section{Hyperref}
+% \section{hyperref}
 %
 % \DescribePackage{hyperref}
 % \pkg{hyperref} is emulated during \HTML\ output, and
@@ -25130,7 +25683,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*hyperxmp>
@@ -25138,7 +25691,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-hyperxmp.sty}
 %
-% \section{Hyperxmp}
+% \section{hyperxmp}
 %
 % \DescribePackage{hyperxmp} Emulated.
 %
@@ -25159,7 +25712,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*idxlayout>
@@ -25167,7 +25720,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-idxlayout.sty}
 %
-% \section{Idxlayout}
+% \section{idxlayout}
 %
 % \DescribePackage{idxlayout} Emulated.
 %
@@ -25208,7 +25761,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*indentfirst>
@@ -25216,7 +25769,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-indentfirst.sty}
 
-% \section{Indentfirst}
+% \section{indentfirst}
 %
 % \DescribePackage{indentfirst}
 % \pkg{indentfirst} is ignored.
@@ -25244,7 +25797,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-inputenc.sty}
 %
-% \section{Inputenc}
+% \section{inputenc}
 %
 % \DescribePackage{inputenc}
 % Error if \pkg{inputenc} is loaded after \pkg{lwarp}.
@@ -25270,7 +25823,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*keyfloat>
@@ -25278,7 +25831,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-keyfloat.sty}
 
-% \section{Keyfloat}
+% \section{keyfloat}
 % \label{sec:keyfloat}
 %
 % \DescribePackage{keyfloat}
@@ -25428,7 +25981,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*layout>
@@ -25436,7 +25989,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-layout.sty}
 
-% \section{Layout}
+% \section{layout}
 %
 % \DescribePackage{layout}
 % \pkg{layout} is ignored.
@@ -25467,7 +26020,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-letterspace.sty}
 
-% \section{Letterspace}
+% \section{letterspace}
 %
 % \DescribePackage{letterspace}
 % \pkg{letterspace} is a subset of microtype, which is pre-loaded by \pkg{lwarp}.
@@ -25496,7 +26049,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*lettrine>
@@ -25504,7 +26057,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-lettrine.sty}
 %
-% \section{Lettrine}
+% \section{lettrine}
 %
 % \credits{Daniel Flipo}
 %
@@ -25547,9 +26100,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 \newif\ifLettrineRealHeight
 
 \newcommand*{\LettrineTextFont}{\scshape}
-
 \newcommand*{\LettrineFontHook}{}
-
 \newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}}
 \newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}}
 %    \end{macrocode}
@@ -25562,7 +26113,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*lips>
@@ -25570,7 +26121,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-lips.sty}
 
-% \section{Lips}
+% \section{lips}
 % \label{sec:lips}
 %
 % \changes{v0.25}{2017/03/16}{\pkg{lips}: Added.}
@@ -25606,7 +26157,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*listings>
@@ -25614,7 +26165,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-listings.sty}
 
-% \section{Listings}
+% \section{listings}
 % \label{sec:listings}
 %
 % \credits{Carsten Heinz, Brooks Moses, Jobst Hoffmann}
@@ -25853,7 +26404,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*longtable>
@@ -25861,7 +26412,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-longtable.sty}
 
-% \section{Longtable}
+% \section{longtable}
 % \label{sec:longtable}
 %
 %
@@ -25943,7 +26494,11 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*lscape>
@@ -25951,7 +26506,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-lscape.sty}
 
-% \section{Lscape}
+% \section{lscape}
 %
 % \DescribePackage{lscape}
 % \pkg{lscape} is nullified.
@@ -25981,7 +26536,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-ltcaption.sty}
 
-% \section{Ltcaption}
+% \section{ltcaption}
 % \label{sec:ltcaption}
 %
 %
@@ -26016,7 +26571,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*marginfit>
@@ -26024,7 +26579,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-marginfit.sty}
 %
-% \section{Marginfit}
+% \section{marginfit}
 %
 % \DescribePackage{marginfit} Emulated.
 %
@@ -26051,7 +26606,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-marginfix.sty}
 %
-% \section{Marginfix}
+% \section{marginfix}
 %
 % \DescribePackage{marginfix} Emulated.
 %
@@ -26085,7 +26640,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*marginnote>
@@ -26093,7 +26648,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 % \part{lwarp-marginnote.sty}
 %
-% \section{Marginnote}
+% \section{marginnote}
 %
 % \DescribePackage{marginnote} Emulated.
 %
@@ -26131,7 +26686,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-mcaption.sty}
 
-% \section{Mcaption}
+% \section{mcaption}
 %
 % \DescribePackage{mcaption}
 % \pkg{mcaption} is nullified.
@@ -26158,7 +26713,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*mdframed>
@@ -26166,7 +26721,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 
 % \part{lwarp-mdframed.sty}
 
-% \section{Mdframed}
+% \section{mdframed}
 % \label{sec:mdframed}
 %
 %
@@ -26191,7 +26746,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor
 % \element{div} of class |md<environmentname>|, or |mdframed| otherwise.
 %
 % Frame titles are placed into a \element{span} of class |mdframedtitle|.
-% Subtitles are in a \element{span} of class |mdframedsubtitle|, and likewise for subsubtitles.
+% Subtitles are in a \element{span} of class |mdframedsubtitle|,
+% and likewise for subsubtitles.
 %
 % Pre-existing hooks are used to patch extra functions before and after the frames.
 %
@@ -26657,7 +27213,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*metalogo>
@@ -26665,7 +27221,7 @@ background:
 %
 % \part{lwarp-metalogo.sty}
 %
-% \section{Metalogo}
+% \section{metalogo}
 %
 % \DescribePackage{metalogo}
 % \pkg{metalogo} is ignored.
@@ -26695,7 +27251,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*microtype>
@@ -26703,7 +27259,7 @@ background:
 
 % \part{lwarp-microtype.sty}
 
-% \section{Microtype}
+% \section{microtype}
 %
 % \DescribePackage{microtype}
 % \pkg{microtype} is pre-loaded by \pkg{lwarp}.
@@ -26759,7 +27315,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*moreverb>
@@ -26767,7 +27323,7 @@ background:
 %
 % \part{lwarp-moreverb.sty}
 %
-% \section{Moreverb}
+% \section{moreverb}
 % \label{sec:moreverb}
 %
 %
@@ -26878,7 +27434,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*mparhack>
@@ -26886,7 +27442,7 @@ background:
 %
 % \part{lwarp-mparhack.sty}
 %
-% \section{Mparhack}
+% \section{mparhack}
 %
 % \DescribePackage{mparhack} Emulated.
 %
@@ -26906,7 +27462,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*multicol>
@@ -26914,7 +27470,7 @@ background:
 
 % \part{lwarp-multicol.sty}
 
-% \section{Multicol}
+% \section{multicol}
 % \label{sec:multicol}
 %
 %
@@ -26941,17 +27497,17 @@ background:
 %    \begin{macrocode}
 \NewDocumentEnvironment{multicols}{s m o}
 %    \end{macrocode}
-% \HTML\ div class to contain everything:
+% \HTML\ \element{div} class to contain everything:
 %    \begin{macrocode}
 {
 \LWR@forcenewpage
 \BlockClass{multicols}
 %    \end{macrocode}
-% Optional \HTML\ div class for the heading:
+% Optional \HTML\ \element{div} class for the heading:
 %    \begin{macrocode}
 \IfValueTF{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}{}}
 %    \end{macrocode}
-% When done with the environment, close the div:
+% When done with the environment, close the \element{div}:
 %    \begin{macrocode}
 {\endBlockClass}
 %    \end{macrocode}
@@ -26990,7 +27546,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*multirow>
@@ -26998,31 +27554,158 @@ background:
 
 % \part{lwarp-multirow.sty}
 
-% \section{Multirow}
+% \section{multirow}
 % \label{sec:multirow}
 %
 % \DescribePackage{multirow}
 % \pkg{multirow} is emulated during \HTML\ output, and
-% the \pkg{multirow} package is ignored.
-
+% used as-is while inside a \env{lateximage}.
+%
+% In a \env{lateximage}, the original print-mode versions are temporarily restored
+% by \cs{LWR@restoreorigformatting}.
+%
+% See \cref{sec:printmultirow} for the print-mode versions.
+%
 % \codehtml
 %    \begin{macrocode}
-\LWR@ProvidesPackageDrop{multirow}
+\LWR@ProvidesPackagePass{multirow}
 %    \end{macrocode}
-
+%
+% Remember the print-mode version:
+%    \begin{macrocode}
+\LetLtxMacro\LWR@origmultirow\multirow
+%    \end{macrocode}
+%
+% \begin{macro}{\LWR@multirowborder}
+% Set to |left| or |right| to create a thick border for the cell,
+% for use by \pkg{bigdelim}:
+%    \begin{macrocode}
+\newcommand{\LWR@multirowborder}{}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{Multirow}
+%
+% \begin{macro}{\LWR@tabledatamultirowtag}
+%   \oarg{vpos} \marg{numrows} \oarg{bigstruts} \marg{width} \oarg{fixup} \marg{text}
+% \changes{v0.19}{2015/05/28}{Added optional args.}
+% \changes{v0.39}{2017/08/30}{Add: New optional \protect\texttt{vpos} argument.}
+% \changes{v0.39}{2017/08/30}{Add: Supports left/right border for \pkg{bigdelim}.}
+% \changes{v0.39}{2017/08/30}{Fix: Long text argument.}
+%    \begin{macrocode}
+\RenewDocumentCommand{\multirow}{O{c} m o m o +m}%
+{%
+\LWR@traceinfo{*** multirow #1 #2 #4}
+\LWR@maybenewtablerow%
+%    \end{macrocode}
+% Print the start of a new table data cell:
+%    \begin{macrocode}
+\LWR@htmltag{td rowspan="#2" %
+%    \end{macrocode}
+% The vertical alignment, if given:
+%    \begin{macrocode}
+\IfValueT{#1}{%
+\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
+\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+}%
+%    \end{macrocode}
+% The left/right border, if given:
+%    \begin{macrocode}
+\ifdefvoid{\LWR@multirowborder}{}{%
+style="border-\LWR@multirowborder: 2px solid black" %
+}
+%    \end{macrocode}
+% A class adds the column spec and the rule:
+%    \begin{macrocode}
+class="td%
+%    \end{macrocode}
+% Append this column's spec:
+%    \begin{macrocode}
+\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}%
+%    \end{macrocode}
+% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag:
+%    \begin{macrocode}
+\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
+"{}}
+%    \end{macrocode}
+% While printing the text, redefine |\\| to generate a new line
+%    \begin{macrocode}
+\begingroup \LetLtxMacro{\\}{\LWR@endofline} #6 \endgroup
+\LWR@stoppars%
+\global\boolfalse{LWR@intabularmetadata}%
+\renewcommand{\LWR@multirowborder}{}%
+\LWR@traceinfo{*** multirow done}%
+}%
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \subsection{Combined multicolumn and multirow}
+% \label{sec:multicolumnmultirow}
+%
+% \limitsmulticolumnrow
+% \index{multicolumn>with multirow}
+% \index{multirow>with multicolumn}
+% \index{tabular>multicolumn with multirow}
+%
+%
+% \begin{macro}{\multicolumnrow}
+%   \marg{1:cols} \marg{2:halign}
+%   \oarg{3:vpos} \marg{4:numrows} \oarg{5:bigstruts}
+%       \marg{6:width} \oarg{7:fixup} \marg{8:text}
+%
+% \changes{v0.39}{2017/08/30}{Added.}
+%
+%    \begin{macrocode}
+\RenewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{%
+%    \end{macrocode}
+% Figure out how many extra \HTML\ columns to add for |@| and |!| columns:
+%    \begin{macrocode}
+\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+%    \end{macrocode}
+% Create the multicolumn/multirow tag:
+%    \begin{macrocode}
+\begingroup\LetLtxMacro{\\}{\LWR@endofline}%
+\LWR@domulticolumn[#3][#4]{\theLWR@tabhtmlcoltotal}{#2}{#8}%
+\endgroup%
+%    \end{macrocode}
+% Move to the next \LaTeX\ column:
+%    \begin{macrocode}
+\addtocounter{LWR@tablecolspos}{#1}%
+\addtocounter{LWR@tablecolspos}{-1}%
+%    \end{macrocode}
+% Skip any trailing |@| or |!| columns for this cell:
+%    \begin{macrocode}
+\booltrue{LWR@skipatbang}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%    \begin{macrocode}
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro\multirow\LWR@origmultirow%
+\renewcommand{\multicolumnrow}{\LWR@origmulticolumnrow}%
+}
+%    \end{macrocode}
+%
+%
 % \iffalse
 %</multirow>
 % \fi
 %
 %
 %
+%
+%
 % \iffalse
 %<*nameref>
 % \fi
 
 % \part{lwarp-nameref.sty}
 
-% \section{Nameref}
+% \section{nameref}
 %
 % \DescribePackage{nameref}
 % \pkg{nameref} is emulated by \pkg{lwarp}.
@@ -27047,7 +27730,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*needspace>
@@ -27055,7 +27738,7 @@ background:
 
 % \part{lwarp-needspace.sty}
 
-% \section{Needspace}
+% \section{needspace}
 %
 % \DescribePackage{needspace}
 % \pkg{needspace} is not used during \HTML\ conversion.
@@ -27085,7 +27768,7 @@ background:
 %
 % \part{lwarp-newclude.sty}
 %
-% \section{Newclude}
+% \section{newclude}
 %
 % \DescribePackage{newclude}
 % Error if \pkg{newclude} is loaded after \pkg{lwarp}.
@@ -27112,7 +27795,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*newunicodechar>
@@ -27120,7 +27803,7 @@ background:
 %
 % \part{lwarp-newunicodechar.sty}
 %
-% \section{Newunicodechar}
+% \section{newunicodechar}
 %
 % \DescribePackage{newunicodechar}
 % Error if \pkg{newunicodechar} is loaded after \pkg{lwarp}.
@@ -27152,7 +27835,7 @@ background:
 
 % \part{lwarp-nextpage.sty}
 
-% \section{Nextpage}
+% \section{nextpage}
 %
 % \DescribePackage{nextpage}
 % \pkg{nextpage} is nullified.
@@ -27179,7 +27862,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*nonumonpart>
@@ -27187,7 +27870,7 @@ background:
 %
 % \part{lwarp-nonumonpart.sty}
 %
-% \section{Nonumonpart}
+% \section{nonumonpart}
 %
 % \DescribePackage{nonumonpart}
 % \pkg{nonumonpart} is ignored.
@@ -27213,7 +27896,7 @@ background:
 %
 % \part{lwarp-nopageno.sty}
 %
-% \section{Nopageno}
+% \section{nopageno}
 %
 % \DescribePackage{nopageno}
 % \pkg{nopageno} is ignored.
@@ -27236,7 +27919,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*nowidow>
@@ -27244,7 +27927,7 @@ background:
 
 % \part{lwarp-nowidow.sty}
 
-% \section{Nowidow}
+% \section{nowidow}
 %
 % \DescribePackage{nowidow}
 % \pkg{nowidow} is not used during \HTML\ conversion.
@@ -27284,7 +27967,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*ntheorem>
@@ -27292,7 +27975,7 @@ background:
 
 % \part{lwarp-ntheorem.sty}
 %
-% \section{Ntheorem}
+% \section{ntheorem}
 %
 % \label{sec:ntheorem}
 %
@@ -27858,7 +28541,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*pagenote>
@@ -27866,7 +28549,7 @@ background:
 
 % \part{lwarp-pagenote.sty}
 
-% \section{Pagenote}
+% \section{pagenote}
 %
 % \DescribePackage{pagenote}
 % \limitspagenote
@@ -27895,7 +28578,7 @@ background:
 %
 % \part{lwarp-paralist.sty}
 %
-% \section{Paralist}
+% \section{paralist}
 % \label{sec:paralist}
 %
 % \DescribePackage{paralist}
@@ -27926,7 +28609,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*parskip>
@@ -27934,7 +28617,7 @@ background:
 
 % \part{lwarp-parskip.sty}
 
-% \section{Parskip}
+% \section{parskip}
 %
 % \DescribePackage{parskip}
 % \pkg{parskip} is ignored.
@@ -27964,7 +28647,7 @@ background:
 %
 % \part{lwarp-pdflscape.sty}
 %
-% \section{Pdflscape}
+% \section{pdflscape}
 %
 % \DescribePackage{pdflscape} Emulated.
 %
@@ -27986,7 +28669,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*pdfsync>
@@ -27994,7 +28677,7 @@ background:
 %
 % \part{lwarp-pdfsync.sty}
 %
-% \section{Pdfsync}
+% \section{pdfsync}
 %
 % \DescribePackage{pdfsync} Emulated.
 %
@@ -28025,7 +28708,7 @@ background:
 %
 % \part{lwarp-placeins.sty}
 %
-% \section{Placeins}
+% \section{placeins}
 %
 % \DescribePackage{placeins}
 % \pkg{placeins} is not used during \HTML\ conversion.
@@ -28051,7 +28734,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*prelim2e>
@@ -28059,7 +28742,7 @@ background:
 %
 % \part{lwarp-prelim2e.sty}
 %
-% \section{Prelim2e}
+% \section{prelim2e}
 %
 % \DescribePackage{prelim2e} Emulated.
 %
@@ -28085,7 +28768,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*ragged2e>
@@ -28093,7 +28776,7 @@ background:
 %
 % \part{lwarp-ragged2e.sty}
 %
-% \section{Ragged2e}
+% \section{ragged2e}
 %
 % \DescribePackage{ragged2e}
 % \pkg{ragged2e} is not used during \HTML\ conversion.
@@ -28140,7 +28823,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*realscripts>
@@ -28148,7 +28831,7 @@ background:
 %
 % \part{lwarp-realscripts.sty}
 %
-% \section{Realscripts}
+% \section{realscripts}
 %
 % \DescribePackage{realscripts}
 % \pkg{realscripts} is emulated.
@@ -28207,7 +28890,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*relsize>
@@ -28215,7 +28898,7 @@ background:
 %
 % \part{lwarp-relsize.sty}
 
-% \section{Relsize}
+% \section{relsize}
 %
 % \DescribePackage{relsize}
 % \pkg{relsize} is patched for use by \pkg{lwarp}.
@@ -28239,7 +28922,7 @@ background:
 \LetLtxMacro\LWR@origtextsmaller\textsmaller
 \let\LWR@textscale\textscale
 
-\renewcommand*{\LWR@restoreorigrelsize}{%
+\appto{\LWR@restoreorigformatting}{%
 \let\relsize\LWR@origrelsize%
 \LetLtxMacro\larger\LWR@origlarger%
 \LetLtxMacro\smaller\LWR@origsmaller%
@@ -28279,7 +28962,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*romanbar>
@@ -28287,7 +28970,7 @@ background:
 %
 % \part{lwarp-romanbar.sty}
 
-% \section{Romanbar}
+% \section{romanbar}
 %
 % \DescribePackage{romanbar}
 % \pkg{romanbar} is patched for use by \pkg{lwarp}.
@@ -28322,7 +29005,7 @@ background:
 %
 % \part{lwarp-romanbarpagenumber.sty}
 %
-% \section{Romanbarpagenumber}
+% \section{romanbarpagenumber}
 %
 % \DescribePackage{romanbarpagenumber}
 % \pkg{romanbarpagenumber} is ignored.
@@ -28342,7 +29025,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*rotating>
@@ -28350,7 +29033,7 @@ background:
 
 % \part{lwarp-rotating.sty}
 
-% \section{Rotating}
+% \section{rotating}
 %
 % \DescribePackage{rotating}
 % \pkg{rotating} is emulated during \HTML\ output, and
@@ -28387,7 +29070,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*rotfloat>
@@ -28395,7 +29078,7 @@ background:
 
 % \part{lwarp-rotfloat.sty}
 
-% \section{Rotfloat}
+% \section{rotfloat}
 %
 % \DescribePackage{rotfloat}
 % \pkg{rotfloat} is emulated during \HTML\ output, and
@@ -28451,7 +29134,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*savetrees>
@@ -28459,7 +29142,7 @@ background:
 %
 % \part{lwarp-savetrees.sty}
 %
-% \section{Savetrees}
+% \section{savetrees}
 %
 % \DescribePackage{savetrees} Emulated.
 %
@@ -28487,7 +29170,7 @@ background:
 %
 % \part{lwarp-scalefnt.sty}
 
-% \section{Scalefnt}
+% \section{scalefnt}
 %
 % \DescribePackage{scalefnt}
 % \pkg{scalefnt} is ignored.
@@ -28512,7 +29195,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*setspace>
@@ -28520,7 +29203,7 @@ background:
 
 % \part{lwarp-setspace.sty}
 
-% \section{Setspace}
+% \section{setspace}
 %
 % \DescribePackage{setspace}
 % \pkg{setspace} is not used during \HTML\ conversion.
@@ -28587,7 +29270,7 @@ background:
 
 % \part{lwarp-shadow.sty}
 
-% \section{Shadow}
+% \section{shadow}
 %
 % \DescribePackage{shadow}
 % \pkg{shadow} is emulated.
@@ -28620,7 +29303,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*showidx>
@@ -28628,7 +29311,7 @@ background:
 
 % \part{lwarp-showidx.sty}
 
-% \section{Showidx}
+% \section{showidx}
 %
 % \DescribePackage{showidx}
 % \pkg{showidx} is ignored.
@@ -28656,7 +29339,7 @@ background:
 
 % \part{lwarp-showkeys.sty}
 
-% \section{Showkeys}
+% \section{showkeys}
 %
 % \DescribePackage{showkeys}
 % \pkg{showkeys} is ignored.
@@ -28682,7 +29365,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*sidecap>
@@ -28690,7 +29373,7 @@ background:
 
 % \part{lwarp-sidecap.sty}
 
-% \section{Sidecap}
+% \section{sidecap}
 %
 % \DescribePackage{sidecap}
 % \pkg{sidecap} is nullified.
@@ -28742,7 +29425,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*sidenotes>
@@ -28750,7 +29433,7 @@ background:
 %
 % \part{lwarp-sidenotes.sty}
 %
-% \section{Sidenotes}
+% \section{sidenotes}
 %
 % \credits{Andy Thomas, Oliver Schebaum}
 %
@@ -28840,7 +29523,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*siunitx>
@@ -28848,7 +29531,7 @@ background:
 %
 % \part{lwarp-siunitx.sty}
 
-% \section{Siunitx}
+% \section{siunitx}
 %
 % \DescribePackage{siunitx}
 % \pkg{siunitx} is patched for use by \pkg{lwarp}.
@@ -28883,7 +29566,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*soul>
@@ -28891,7 +29574,7 @@ background:
 %
 % \part{lwarp-soul.sty}
 %
-% \section{Soul}
+% \section{soul}
 %
 % \credits{Melchior FRANZ}
 %
@@ -28989,7 +29672,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*subfig>
@@ -28997,7 +29680,7 @@ background:
 
 % \part{lwarp-subfig.sty}
 %
-% \section{Subfig}
+% \section{subfig}
 %
 % \credits{Steven Douglas Cochran}
 %
@@ -29288,7 +29971,96 @@ background:
 %
 %
 %
-% \clearpage
+%
+%
+%
+% \iffalse
+%<*supertabular>
+% \fi
+
+% \part{lwarp-supertabular.sty}
+
+% \section{supertabular}
+% \label{sec:supertabular}
+%
+%
+% \DescribePackage{supertabular}
+% \pkg{supertabular} is emulated during \HTML\ output.
+%
+% \changes{v0.39}{2017/08/30}{\pkg{supertabular}: Added.}
+%
+% \codehtml
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{supertabular}
+%    \end{macrocode}
+%
+% \limitssupertabular
+%
+%
+%    \begin{macrocode}
+\newcommand{\LWRST@firsthead}{}
+
+\newcommand{\tablefirsthead}[1]{%
+    \long\gdef\LWRST@firsthead{#1}%
+}
+
+\newcommand{\tablehead}[1]{}
+\newcommand{\tabletail}[1]{}
+
+\newcommand{\LWRST@lasttail}{}
+
+\newcommand{\tablelasttail}[1]{%
+    \long\gdef\LWRST@lasttail{#1}%
+}
+
+\newcommand{\tablecaption}[2][]{%
+    \long\gdef\LWRST@caption{\caption[#1]{#2}}%
+}
+
+\let\topcaption\tablecaption
+\let\bottomcaption\tablecaption
+
+\global\let\LWRST@caption\relax
+
+\newcommand*{\shrinkheight}[1]{}
+
+\NewDocumentEnvironment{supertabular}{s o m}
+{
+\LWR@traceinfo{supertabular}
+\table
+\LWRST@caption
+\begin{tabular}{#3}
+\TabularMacro\ifdefvoid{\LWRST@firsthead}%
+{\LWR@getmynexttoken}%
+{\expandafter\LWR@getmynexttoken\LWRST@firsthead}%
+}
+{%
+\ifdefvoid{\LWRST@lasttail}%
+{}%
+{%
+\TabularMacro\ResumeTabular%
+\LWRST@lasttail%
+}%
+\end{tabular}
+\endtable
+\LWR@traceinfo{supertabular done}
+}
+
+\NewDocumentEnvironment{mpsupertabular}{s o m}
+{\minipage{\linewidth}\supertabular{#3}}
+{\endsupertabular\endminipage}
+%    \end{macrocode}
+
+
+% \iffalse
+%</supertabular>
+% \fi
+%
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*syntonly>
@@ -29296,7 +30068,7 @@ background:
 %
 % \part{lwarp-syntonly.sty}
 %
-% \section{Syntonly}
+% \section{syntonly}
 %
 % \DescribePackage{syntonly} Emulated.
 %
@@ -29326,7 +30098,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*tabularx>
@@ -29334,7 +30106,7 @@ background:
 
 % \part{lwarp-tabularx.sty}
 
-% \section{Tabularx}
+% \section{tabularx}
 %
 % \DescribePackage{tabularx}
 % \pkg{tabularx} is emulated by \pkg{lwarp}.
@@ -29365,7 +30137,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*tabulary>
@@ -29373,7 +30145,7 @@ background:
 
 % \part{lwarp-tabulary.sty}
 
-% \section{Tabulary}
+% \section{tabulary}
 %
 % \DescribePackage{tabulary}
 % \pkg{tabulary} is emulated by \pkg{lwarp}.
@@ -29410,9 +30182,42 @@ background:
 %
 %
 %
+% \iffalse
+%<*textarea>
+% \fi
+%
+% \part{lwarp-textarea.sty}
+%
+% \section{textarea}
+%
+% \DescribePackage{textarea}
+% \pkg{textarea} is emulated.
+%
+% \changes{v0.39}{2017/08/27}{\pkg{textarea}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{textarea}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand\StartFromTextArea{}
+\newcommand\StartFromHeaderArea{}
+\newcommand*\RestoreTextArea{}
+\newcommand*\ExpandTextArea[1][*]{}
+\let\NCC@restoretextarea\@empty
+%    \end{macrocode}
+%
+% \iffalse
+%</textarea>
+% \fi
+%
+%
+%
+%
 %
 %
-% \clearpage
 %
 % \iffalse
 %<*textcomp>
@@ -29420,7 +30225,7 @@ background:
 %
 % \part{lwarp-textcomp.sty}
 
-% \section{Textcomp}
+% \section{textcomp}
 %
 % \DescribePackage{textcomp}
 % \pkg{textcomp} is patched for use by \pkg{lwarp}.
@@ -29496,12 +30301,9 @@ background:
 }
 %    \end{macrocode}
 %
-% \begin{macro}{\LWR@restoreorigtextcomp}
-% Called from \cs{restoreoriginalformatting} when a \env{lateximage} is begun.
+% When a \env{lateximage} is begun:
 %    \begin{macrocode}
-\let\LWR@restoreorigtextcomp\relax
-
-\newcommand*{\LWR@restoreorigtextcomp}{%
+\appto{\LWR@restoreorigformatting}{%
 \let\textdegree\LWR@origtextdegree%
 \let\textcelsius\LWR@origtextcelsius%
 \let\textohm\LWR@origtextohm%
@@ -29522,7 +30324,6 @@ background:
 \LetLtxMacro\textcircled\LWR@origtextcircled%
 }
 %    \end{macrocode}
-% \end{macro}
 %
 %
 % \iffalse
@@ -29533,7 +30334,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*textpos>
@@ -29541,7 +30342,7 @@ background:
 
 % \part{lwarp-textpos.sty}
 
-% \section{Textpos}
+% \section{textpos}
 % \label{sec:textpos}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{textpos}: Added.}
@@ -29581,7 +30382,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*theorem>
@@ -29589,7 +30390,7 @@ background:
 
 % \part{lwarp-theorem.sty}
 %
-% \section{Theorem}
+% \section{theorem}
 %
 % \credits{Frank Mittelbach}
 %
@@ -29803,7 +30604,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*threeparttable>
@@ -29811,7 +30612,7 @@ background:
 
 % \part{lwarp-threeparttable.sty}
 
-% \section{Threeparttable}
+% \section{threeparttable}
 % \label{sec:threeparttable}
 %
 %
@@ -29881,7 +30682,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*tikz>
@@ -29889,7 +30690,7 @@ background:
 
 % \part{lwarp-tikz.sty}
 %
-% \section{Tikz}
+% \section{tikz}
 %
 % \DescribePackage{tikz}
 % \pkg{tikz} is supported.
@@ -29969,7 +30770,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*titleps>
@@ -29977,7 +30778,7 @@ background:
 
 % \part{lwarp-titleps.sty}
 
-% \section{Titleps}
+% \section{titleps}
 %
 % \DescribePackage{titleps}
 % \pkg{titleps} is loaded and used by \pkg{lwarp} during \HTML\ output.
@@ -30167,7 +30968,7 @@ background:
 %
 % \part{lwarp-titleref.sty}
 %
-% \section{Titleref}
+% \section{titleref}
 %
 % \DescribePackage{titleref}
 % \pkg{titleref} is superceded by \pkg{hyperref} and \pkg{nameref}.
@@ -30188,7 +30989,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*titlesec>
@@ -30196,7 +30997,7 @@ background:
 
 % \part{lwarp-titlesec.sty}
 
-% \section{Titlesec}
+% \section{titlesec}
 %
 % \DescribePackage{titlesec}
 % \pkg{titlesec} is emulated.
@@ -30290,22 +31091,16 @@ background:
 % ^^A \end{macro}
 
 % ^^A \begin{macro}{\iftitlemeasuring} \marg{true} \marg{false}
-%    \begin{macrocode}
-\newcommand{\iftitlemeasuring}[2]{#2}
-%    \end{macrocode}
-% ^^A \end{macro}
-
 % ^^A \begin{macro}{\assignpagestyle} \marg{command} \marg{pagestyle}
-%    \begin{macrocode}
-\newcommand{\assignpagestyle}[2]{#2}
-%    \end{macrocode}
-% ^^A \end{macro}
-
 % ^^A \begin{macro}{\titleclass} \marg{name} \oarg{startlevel} \marg{class} \oarg{cmd}
 %    \begin{macrocode}
+\newcommand{\iftitlemeasuring}[2]{#2}
+\newcommand{\assignpagestyle}[2]{#2}
 \NewDocumentCommand{\titleclass}{m o m o}
 %    \end{macrocode}
 % ^^A \end{macro}
+% ^^A \end{macro}
+% ^^A \end{macro}
 
 % \iffalse
 %</titlesec>
@@ -30315,7 +31110,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*titletoc>
@@ -30323,7 +31118,7 @@ background:
 
 % \part{lwarp-titletoc.sty}
 
-% \section{Titletoc}
+% \section{titletoc}
 %
 % \DescribePackage{titletoc}
 % \pkg{titletoc} is emulated.
@@ -30436,7 +31231,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*titling>
@@ -30444,17 +31239,16 @@ background:
 
 % \part{lwarp-titling.sty}
 
-% \section{Titling}
+% \section{titling}
 %
 % \DescribePackage{titling}
-% \pkg{titling} is used by \pkg{lwarp}.
-% The following patches are not needed by \pkg{lwarp},
-% but are required if the user requests \pkg{titling}.
+%
+% \limitstitlepage
 %
 % The various \pkg{titling} footnote restyling commands have no effect.
 %
 % \changes{v0.20}{2017/01/22}{\pkg{titling}: Improved compatibility.}
-%
+% \changes{v0.39}{2017/09/05}{\pkg{titling}: Improved compatibility.}
 %
 % Pass all options to \pkg{lwarp-titling}:
 
@@ -30465,38 +31259,270 @@ background:
 %
 %
 % Patch \cs{@bsmtitlempty}:
+% \marginpar{\hfill\cs{@bsmtitlempty}}
 %    \begin{macrocode}
 \let\LWR@orig@bsmtitlempty\@bsmtitlempty
 \renewcommand*{\@bsmtitlempty}{%
 \LWR@orig@bsmtitlempty%
-\global\let\published\relax%
-\global\let\subtitle\relax%
 }
 %    \end{macrocode}
 %
 %
 % Patch \cs{keepthetitle}:
+% \marginpar{\hfill\cs{keepthetitle}}
 %    \begin{macrocode}
 \let\LWR@origkeepthetitle\keepthetitle
 \renewcommand*{\keepthetitle}{%
 \LWR@orig@keepthetitle%
-\global\let\@published\@empty%
-\global\let\@subtitle\@empty%
 }
 %    \end{macrocode}
 %
 %
 % Patch \cs{killtitle}:
+% \marginpar{\hfill\cs{killtitle}}
 %    \begin{macrocode}
 \let\LWR@origkilltitle\killtitle
 \renewcommand*{\killtitle}{%
 \LWR@orig@killtitle%
-\global\let\thepublished\relax%
-\global\let\thesubtitle\relax%
 }
 %    \end{macrocode}
 %
 %
+%
+% \begin{environment}{titlingpage}
+%
+% \changes{v0.39}{2017/09/02}{Clear pending footnotes.}
+%    \begin{macrocode}
+\renewenvironment*{titlingpage}
+{%
+%    \end{macrocode}
+% Start an \HTML\ titlepage div:
+%    \begin{macrocode}
+\LWR@printpendingfootnotes
+\begin{titlepage}
+%    \end{macrocode}
+% Prepare for a custom version of \cs{maketitle} inside the \env{titlingpage}:
+%    \begin{macrocode}
+\LWR@maketitlesetup
+\let\maketitle\LWR@titlingmaketitle
+}
+{
+%    \end{macrocode}
+% At the end of the environment,
+% end the \HTML\ titlepage div:
+%    \begin{macrocode}
+\end{titlepage}
+}
+%    \end{macrocode}
+% \end{environment}
+%
+%
+%
+% Patch the pre/post title/author/date to add \HTML\ tags,
+% then initilize:
+%
+% \changes{v0.39}{2017/09/03}{\pkg{titling}: Removed extraneous \protect\env{center} environments.}
+%    \begin{macrocode}
+
+\pretitle{}
+\posttitle{}
+
+\preauthor{}
+\postauthor{}
+
+\predate{}
+\postdate{}
+%    \end{macrocode}
+%
+%
+%
+%\begin{macro}{\LWR@maketitlesetup} Patches \cs{thanks} macros.
+%
+%    \begin{macrocode}
+\renewcommand*{\LWR@maketitlesetup}{%
+%    \end{macrocode}
+%
+% Redefine the footnote mark:
+%
+%    \begin{macrocode}
+\def\@makefnmark{\textsuperscript{\@thefnmark}}
+%    \end{macrocode}
+%
+% \begin{center}
+% \begin{minipage}{.7\linewidth}
+% \cs{thefootnote} \goesto\ \cs{nameuse}\{arabic\}\{footnote\}, or
+%
+% \cs{thefootnote} \goesto\  \cs{nameuse}\{fnsymbol\}\{footnote\}
+% \end{minipage}
+% \end{center}
+%
+% Redefine the footnote text:
+%
+%    \begin{macrocode}
+\long\def\@makefntext##1{%
+%    \end{macrocode}
+% Make the footnote mark and some extra horizontal space for the tags:
+%    \begin{macrocode}
+\makethanksmark \LWR@orighspace{1in}
+%    \end{macrocode}
+% \begin{center}
+% \begin{minipage}{.7\linewidth}
+% \cs{makethanksmark} \goesto\  \cs{thanksfootmark} \goesto\  \cs{tamark} \goesto\
+%
+% \hfill \cs{@thefnmark} \goesto\  \cs{itshape} a (or similar)
+% \end{minipage}
+% \end{center}
+%
+% Print the text:
+%    \begin{macrocode}
+##1%
+}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%\begin{macro}{\maketitle}
+%   \HTML\ mode.
+%   Creates an \HTML\ titlepage div
+%   and typesets the title, etc.
+%
+% Code from the \pkg{titling} package is adapted, simplified, and
+% modified for \HTML\ output.
+%
+%    \begin{macrocode}
+\renewcommand*{\maketitle}{%
+%    \end{macrocode}
+% An \HTML\ titlepage \element{div} is used for all classes.
+%    \begin{macrocode}
+\begin{titlepage}
+%    \end{macrocode}
+% Select which kind of footnote marks to use:
+%    \begin{macrocode}
+\@bsmarkseries
+%    \end{macrocode}
+% Set up special patches:
+%    \begin{macrocode}
+\LWR@maketitlesetup
+%    \end{macrocode}
+% Typeset the title, etc:
+%    \begin{macrocode}
+\@maketitle
+%    \end{macrocode}
+% Immediately generate any |\thanks| footnotes:
+%    \begin{macrocode}
+\@thanks
+%    \end{macrocode}
+% Close the \HTML\ titlepage div:
+%    \begin{macrocode}
+\end{titlepage}
+%    \end{macrocode}
+% Reset the footnote counter:
+%    \begin{macrocode}
+\@bscontmark
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\@maketitle}
+%  Typesets the title, etc.  Patched for \HTML.
+%
+% \changes{v0.39}{2017/09/01}{Supports \protect\pkg{authblk} with
+% \element{div}s of class \attribute{oneauthor} instead of tabular.}
+% \changes{v0.39}{2017/09/03}{Removed minipages.}
+% \changes{v0.39}{2017/09/04}{\pkg{titling} version.}
+%
+%    \begin{macrocode}
+\DeclareDocumentCommand{\@maketitle}{}{%
+    \maketitlehooka
+    {
+        \LWR@stoppars\LWR@htmltag{h1}
+        \@bspretitle \@title \@bsposttitle
+        \LWR@htmltag{/h1}\LWR@startpars
+    }
+    \maketitlehookb
+    {
+        \begin{BlockClass}{author}
+        \renewcommand{\and}{
+            \end{BlockClass}
+            \begin{BlockClass}{oneauthor}
+        }
+        \begin{BlockClass}{oneauthor}
+        \@bspreauthor \@author  \@bspostauthor
+        \end{BlockClass}
+        \end{BlockClass}
+    }
+    \maketitlehookc
+    {
+        \begin{BlockClass}{titledate}
+        \@bspredate \@date \@bspostdate
+        \end{BlockClass}
+    }
+    \maketitlehookd
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR@titlingmaketitle}
+% \cs{maketitle} for use inside an \HTML\ \env{titlingpage} environment.
+%    \begin{macrocode}
+\renewcommand*{\LWR@titlingmaketitle}{%
+%    \end{macrocode}
+% Keep pending footnotes out of the title block:
+%    \begin{macrocode}
+\@thanks
+%    \end{macrocode}
+% Select which kind of footnote marks to use:
+%    \begin{macrocode}
+\@bsmarkseries
+%    \end{macrocode}
+% Set up special patches:
+%    \begin{macrocode}
+\LWR@maketitlesetup
+%    \end{macrocode}
+% Typeset the title, etc:
+%    \begin{macrocode}
+\@maketitle
+%    \end{macrocode}
+% Immediately generate any |\thanks| footnotes:
+%    \begin{macrocode}
+\@thanks
+%    \end{macrocode}
+% Reset the footnote counter:
+%    \begin{macrocode}
+\@bscontmark
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \begin{macro}{\thanksmarkseries} \marg{series}
+% \changes{v0.39}{2017/09/03}{Removed minipage footnotes.}
+%
+% Sets the type of footnote marks used by |\thanks|,
+% where type is `arabic', `roman', `fnsymbol', etc.
+%    \begin{macrocode}
+\renewcommand{\thanksmarkseries}[1]{%
+\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% Set default titlepage thanks footnote marks.  See \cref{sec:titlehtml}.
+%    \begin{macrocode}
+\if@titlepage
+   \thanksmarkseries{arabic}
+\else
+   \thanksmarkseries{fnsymbol}
+\fi
+%    \end{macrocode}
+%
+%
+%
 % \iffalse
 %</titling>
 % \fi
@@ -30504,7 +31530,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*tocbibind>
@@ -30512,7 +31538,7 @@ background:
 %
 % \part{lwarp-tocbibind.sty}
 
-% \section{Tocbibind}
+% \section{tocbibind}
 %
 % \DescribePackage{tocbibind}
 % \pkg{tocbibind} is patched for use by \pkg{lwarp}.
@@ -30567,7 +31593,7 @@ background:
 
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*tocloft>
@@ -30575,7 +31601,7 @@ background:
 
 % \part{lwarp-tocloft.sty}
 
-% \section{Tocloft}
+% \section{tocloft}
 %
 % \DescribePackage{tocloft}
 % \pkg{tocloft} is emulated.
@@ -30904,7 +31930,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*transparent>
@@ -30912,7 +31938,7 @@ background:
 %
 % \part{lwarp-transparent.sty}
 %
-% \section{Transparent}
+% \section{transparent}
 %
 % \credits{Heiko Oberdiek}
 %
@@ -30950,7 +31976,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*trivfloat>
@@ -30958,7 +31984,7 @@ background:
 
 % \part{lwarp-trivfloat.sty}
 
-% \section{Trivfloat}
+% \section{trivfloat}
 % \label{sec:trivfloat}
 %
 % \DescribePackage{trivfloat}
@@ -31062,7 +32088,42 @@ background:
 %
 %
 %
-% \clearpage
+% \iffalse
+%<*typearea>
+% \fi
+%
+% \part{lwarp-typearea.sty}
+%
+% \section{typearea}
+%
+% \DescribePackage{typearea}
+% \pkg{typearea} is emulated.
+%
+% \changes{v0.39}{2017/08/28}{\pkg{typearea}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{typearea}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*\typearea[2][\z@]{}
+\newcommand*{\recalctypearea}{}
+\@ifundefined{footheight}{\newlength\footheight}{}
+\newcommand*\areaset[3][\z@]{}
+%    \end{macrocode}
+%
+% \iffalse
+%</typearea>
+% \fi
+%
+%
+%
+%
+%
+%
+%
 %
 % \iffalse
 %<*ulem>
@@ -31070,7 +32131,7 @@ background:
 %
 % \part{lwarp-ulem.sty}
 %
-% \section{Ulem}
+% \section{ulem}
 %
 % \credits{Donald Arseneau}
 %
@@ -31167,7 +32228,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*upref>
@@ -31175,7 +32236,7 @@ background:
 %
 % \part{lwarp-upref.sty}
 %
-% \section{Upref}
+% \section{upref}
 %
 % \DescribePackage{upref} Ignored.
 %
@@ -31196,7 +32257,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*verse>
@@ -31204,7 +32265,7 @@ background:
 %
 % \part{lwarp-verse.sty}
 %
-% \section{Verse}
+% \section{verse}
 %
 % \credits{Peter Wilson}
 %
@@ -31282,7 +32343,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*wallpaper>
@@ -31290,7 +32351,7 @@ background:
 
 % \part{lwarp-wallpaper.sty}
 
-% \section{Wallpaper}
+% \section{wallpaper}
 % \label{sec:wallpaper}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{wallpaper}: Added.}
@@ -31331,7 +32392,7 @@ background:
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*wrapfig>
@@ -31339,7 +32400,7 @@ background:
 
 % \part{lwarp-wrapfig.sty}
 
-% \section{Wrapfig}
+% \section{wrapfig}
 % \label{sec:wrapfig}
 %
 % \changes{v0.20}{2017/01/11}{\pkg{wrapfig}: Added.}
@@ -31423,7 +32484,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*xcolor>
@@ -31431,7 +32492,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 
 % \part{lwarp-xcolor.sty}
 
-% \section{Xcolor}
+% \section{xcolor}
 % \label{sec:xcolor}
 %
 % \DescribePackage{xcolor}
@@ -31458,16 +32519,12 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 % are temporary as \env{lateximage} is used.
 %
 % \begin{description}
-% \item [When \pkg{lwarp} is loaded in print or HTML mode:] \hfill
-%	\cs{LWR@restoreorigxcolor} and
-%   \cs{LWR@restoremoreorigxcolor} are defined as null.
-%	\Cref{sec:xcolordefaults}
 % \item [When \pkg{xcolor} is loaded in print mode:] \
 %	No special actions are taken at the time that \pkg{xcolor} is loaded in
 %	print mode, but see \cs{AtBeginDocument} below.
 % \item [When \pkg{lwarp-xcolor} is loaded in HTML mode:] \
 %	\pkg{xcolor}'s original definitions are saved for later restoration.
-%	\cs{LWR@restoreorigxcolor} is defined to restore these definitions
+%	\cs{LWR@restoreorigformatting} is appended to restore these definitions
 %	for use inside a \env{lateximage}.
 %	New \HTML-mode definitions are created for \cs{textcolor}, \cs{pagecolor},
 %	\cs{nopagecolor}, \cs{colorbox}, \cs{colorboxBlock}, \cs{fcolorbox},
@@ -31481,11 +32538,11 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 %	macros will already have been created by \pkg{lwarp-xcolor} if it has been loaded.
 %
 %   For use inside an \HTML\ \env{lateximage},
-%   \cs{LWR@restoremoreorigxcolor} is defined to temporarily set these functions
+%   \cs{LWR@restoreorigformatting} is appended to temporarily set these functions
 %   to their print-mode versions.
 % \item [In a \env{lateximage} in HTML mode:] \
-%	\cs{LWR@restoreorigxcolor} and \\ \cs{LWR@restoremoreorigxcolor} are used to
-%	temporarily restore the print-mode definitions of \pkg{xcolor}'s functions.
+%	\cs{LWR@restoreorigformatting} temporarily restores the
+%   print-mode definitions of \pkg{xcolor}'s functions.
 %	See \cs{LWR@restoreorigformatting} on page \pageref{sec:restoreorigformatting}.
 % \end{description}
 %
@@ -31594,10 +32651,9 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 %
 %
 % Inside a \env{lateximage} the following gets restored to their print-mode actions:
-% \margintag{\cs{LWR@restoreorigxcolor}}
+% \margintag{\cs{LWR@restoreorigformatting}}
 %    \begin{macrocode}
-\renewcommand*{\LWR@restoreorigxcolor}{%
-\LWR@traceinfo{LWR@restoreorigxcolorformatting}%
+\appto{\LWR@restoreorigformatting}{%
 \LetLtxMacro\textcolor\LWRprint@textcolor%
 \LetLtxMacro\pagecolor\LWRprint@pagecolor%
 \LetLtxMacro\nopagecolor\LWRprint@nopagecolor%
@@ -31906,7 +32962,7 @@ height:\rndprintlength{\LWR@tempheight}%
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*xfrac>
@@ -31914,7 +32970,7 @@ height:\rndprintlength{\LWR@tempheight}%
 
 % \part{lwarp-xfrac.sty}
 
-% \section{Xfrac}
+% \section{xfrac}
 % \label{sec:xfrac}
 %
 % \DescribePackage{xfrac} Supported by adding \pkg{xfrac} instances.
@@ -32066,7 +33122,7 @@ scaling = false
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*xltxtra>
@@ -32074,7 +33130,7 @@ scaling = false
 %
 % \part{lwarp-xltxtra.sty}
 %
-% \section{Xltxtra}
+% \section{xltxtra}
 %
 %
 % \DescribePackage{xltxtra}
@@ -32120,7 +33176,7 @@ scaling = false
 %
 %
 %
-% \clearpage
+%
 %
 % \iffalse
 %<*xmpincl>
@@ -32128,7 +33184,7 @@ scaling = false
 %
 % \part{lwarp-xmpincl.sty}
 %
-% \section{Xmpincl}
+% \section{xmpincl}
 %
 % \DescribePackage{xmpincl} Emulated.
 %
@@ -32154,6 +33210,190 @@ scaling = false
 %
 %
 %
+% \iffalse
+%<*xtab>
+% \fi
+
+% \part{lwarp-xtab.sty}
+
+% \section{xtab}
+% \label{sec:xtab}
+%
+%
+% \DescribePackage{xtab}
+% \pkg{xtab} is emulated during \HTML\ output.
+%
+% \changes{v0.39}{2017/08/30}{\pkg{xtabular}: Added.}
+%
+% \codehtml
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{xtab}
+%    \end{macrocode}
+%
+% \limitssupertabular
+%
+%
+%    \begin{macrocode}
+\newcommand{\LWRXT@firsthead}{}
+
+\newcommand{\tablefirsthead}[1]{%
+    \long\gdef\LWRXT@firsthead{#1}%
+}
+
+\newcommand{\tablehead}[1]{}
+
+\newcommand{\tablelasthead}[1]{}
+
+\newcommand{\notablelasthead}{}
+
+\newcommand{\tabletail}[1]{}
+
+\newcommand{\LWRXT@lasttail}{}
+
+\newcommand{\tablelasttail}[1]{%
+    \long\gdef\LWRXT@lasttail{#1}%
+}
+
+\newcommand{\tablecaption}[2][]{%
+    \long\gdef\LWRXT@caption{\caption[#1]{#2}}%
+}
+
+\let\topcaption\tablecaption
+\let\bottomcaption\tablecaption
+
+\global\let\LWRXT@caption\relax
+
+\newcommand*{\shrinkheight}[1]{}
+
+\newcommand*{\xentrystretch}[1]{}
+
+\NewDocumentEnvironment{xtabular}{s o m}
+{
+\LWR@traceinfo{xtabular}
+\table
+\LWRXT@caption
+\begin{tabular}{#3}
+\TabularMacro\ifdefvoid{\LWRXT@firsthead}%
+{\LWR@getmynexttoken}%
+{\expandafter\LWR@getmynexttoken\LWRXT@firsthead}%
+}
+{%
+\ifdefvoid{\LWRXT@lasttail}%
+{}%
+{%
+\TabularMacro\ResumeTabular%
+\LWRXT@lasttail%
+}%
+\end{tabular}
+\endtable
+\LWR@traceinfo{xtabular done}
+}
+
+\NewDocumentEnvironment{mpxtabular}{s o m}
+{\minipage{\linewidth}\xtabular{#3}}
+{\endxtabular\endminipage}
+%    \end{macrocode}
+
+
+% \iffalse
+%</xtab>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
+%<*zwpagelayout>
+% \fi
+%
+% \part{lwarp-zwpagelayout.sty}
+%
+% \section{zwpagelayout}
+%
+% \DescribePackage{zwpagelayout}
+% \pkg{zwpagelayout} is ignored.
+%
+% \changes{v0.39}{2017/08/28}{\pkg{zwpagelayout}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{zwpagelayout}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\noBboxes{}
+\@onlypreamble\noBboxes
+
+\expandafter\ifx\csname definecolor\endcsname\relax \else
+  \definecolor{cmykblack}{cmyk}{0,0,0,1}
+  \definecolor{grblack}{gray}{0}
+%   \ifzwpl@redefineblack
+%     \definecolor{black}{cmyk}{0,0,0,1}\color{black}
+%   \fi
+  \definecolor{cmykred}{cmyk}{0,1,1,0}
+  \definecolor{cmykgreen}{cmyk}{1,0,1,0}
+  \definecolor{cmykblue}{cmyk}{1,1,0,0}
+  \definecolor{rgbred}{rgb}{1,0,0}
+  \definecolor{rgbgreen}{rgb}{0,1,0}
+  \definecolor{rgbblue}{rgb}{0,0,1}
+%   \ifzwpl@redefinetocmyk
+%     \definecolor{red}{cmyk}{0,1,1,0}
+%     \definecolor{green}{cmyk}{1,0,1,0}
+%     \definecolor{blue}{cmyk}{1,1,0,0}
+%   \fi
+\fi
+
+\let\OverprintXeTeXExtGState\relax
+
+\DeclareRobustCommand\SetOverprint{\ignorespaces}
+\DeclareRobustCommand\SetKnockout{\ignorespaces}
+\DeclareRobustCommand\textoverprint[1]{{\SetOverprint#1}}
+\DeclareRobustCommand\textknockout[1]{{\SetKnockout#1}}
+
+\def\SetPDFminorversion#1{}
+\@onlypreamble\SetPDFminorversion
+
+\newcommand*\Vcorr{}
+
+\DeclareRobustCommand\vb[1][]{}
+\NewDocumentCommand{\NewOddPage}{* o}{}
+\NewDocumentCommand{\NewEvenPage}{* o}{}
+\def\SetOddPageMessage#{\gdef\ZW@oddwarning}
+\def\SetEvenPageMessage#{\gdef\Z@@evenwarning}
+\def\ZW@oddwarning{Empty page inserted}\let\ZW@evenwarning\ZW@oddwarning
+
+\def\clap#1{#1}
+
+\def\CropFlap{2in}
+\def\CropSpine{1in}
+\def\CropXSpine{1in}
+\def\CropXtrim{.25in}
+\def\CropYtrim{.25in}
+\def\UserWidth{5in}
+\def\UserLeftMargin{1in}
+\def\UserRightMargin{1in}
+\def\UserTopMargin{1in}
+\def\UserBotMargin{1in}
+\def\thePageNumber{\#\,\arabic{page}}
+\ifXeTeX
+\def\ifcaseZWdriver{\ifcase2}
+\else
+\def\ifcaseZWdriver{\ifcase1}
+\fi
+\DeclareRobustCommand\ZWifdriver[2]{}
+%    \end{macrocode}
+%
+% \iffalse
+%</zwpagelayout>
+% \fi
+%
+%
+%
+%
+%
 %
 %
 %
@@ -32161,6 +33401,14 @@ scaling = false
 % \clearpage
 % \renewcommand*{\partname}{}
 % \renewcommand*{\thepart}{}
+%
+% \titleformat{\part}[hang]
+%     {\needspace{15\baselineskip}\LARGE\rmfamily\bfseries}{}{0pt}{}
+%
+% \titleformat{\section}[hang]
+%     {\Large\rmfamily\bfseries}{}{0pt}{}[\marginpar{\hfill\textsection\,\thesection}\smallskip\hrule]
+% 
+%
 % \part{Change History and Index}
 % \label{sec:changehistory}
 %
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
index 74222f1191e..0b4e7b197b0 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
@@ -33,26 +33,36 @@ version 2005/12/01 or later.
 \askforoverwritefalse
 \generate{
 \file{lwarp.sty}{\from{lwarp.dtx}{package}}
+\file{lwarp-a4.sty}{\from{lwarp.dtx}{a4}}
+\file{lwarp-a4wide.sty}{\from{lwarp.dtx}{a4wide}}
+\file{lwarp-a5comb.sty}{\from{lwarp.dtx}{a5comb}}
 \file{lwarp-abstract.sty}{\from{lwarp.dtx}{abstract}}
+\file{lwarp-addlines.sty}{\from{lwarp.dtx}{addlines}}
 \file{lwarp-afterpage.sty}{\from{lwarp.dtx}{afterpage}}
 \file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}}
 \file{lwarp-alltt.sty}{\from{lwarp.dtx}{alltt}}
 \file{lwarp-amsthm.sty}{\from{lwarp.dtx}{amsthm}}
+\file{lwarp-anysize.sty}{\from{lwarp.dtx}{anysize}}
 \file{lwarp-appendix.sty}{\from{lwarp.dtx}{appendix}}
 \file{lwarp-arabicfront.sty}{\from{lwarp.dtx}{arabicfront}}
+\file{lwarp-authblk.sty}{\from{lwarp.dtx}{authblk}}
 \file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}}
+\file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}}
+\file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}}
 \file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}
 \file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
 \file{lwarp-boxedminipage.sty}{\from{lwarp.dtx}{boxedminipage}}
 \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}}
 \file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}}
 \file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
+\file{lwarp-chngpage.sty}{\from{lwarp.dtx}{chngpage}}
 \file{lwarp-chappg.sty}{\from{lwarp.dtx}{chappg}}
 \file{lwarp-color.sty}{\from{lwarp.dtx}{color}}
 \file{lwarp-crop.sty}{\from{lwarp.dtx}{crop}}
 \file{lwarp-cutwin.sty}{\from{lwarp.dtx}{cutwin}}
 \file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}}
 \file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}}
+\file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}}
 \file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}}
 \file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}}
 \file{lwarp-endnotes.sty}{\from{lwarp.dtx}{endnotes}}
@@ -82,6 +92,7 @@ version 2005/12/01 or later.
 \file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}}
 \file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}}
 \file{lwarp-fullpage.sty}{\from{lwarp.dtx}{fullpage}}
+\file{lwarp-fullwidth.sty}{\from{lwarp.dtx}{fullwidth}}
 \file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}}
 \file{lwarp-glossaries.sty}{\from{lwarp.dtx}{glossaries}}
 \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}}
@@ -146,9 +157,11 @@ version 2005/12/01 or later.
 \file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}}
 \file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}}
 \file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}
+\file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
 \file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}}
 \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
 \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}}
+\file{lwarp-textarea.sty}{\from{lwarp.dtx}{textarea}}
 \file{lwarp-textcomp.sty}{\from{lwarp.dtx}{textcomp}}
 \file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}}
 \file{lwarp-theorem.sty}{\from{lwarp.dtx}{theorem}}
@@ -163,6 +176,7 @@ version 2005/12/01 or later.
 \file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}}
 \file{lwarp-transparent.sty}{\from{lwarp.dtx}{transparent}}
 \file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}
+\file{lwarp-typearea.sty}{\from{lwarp.dtx}{typearea}}
 \file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}}
 \file{lwarp-upref.sty}{\from{lwarp.dtx}{upref}}
 \file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
@@ -172,6 +186,8 @@ version 2005/12/01 or later.
 \file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}}
 \file{lwarp-xltxtra.sty}{\from{lwarp.dtx}{xltxtra}}
 \file{lwarp-xmpincl.sty}{\from{lwarp.dtx}{xmpincl}}
+\file{lwarp-xtab.sty}{\from{lwarp.dtx}{xtab}}
+\file{lwarp-zwpagelayout.sty}{\from{lwarp.dtx}{zwpagelayout}}
 }
 \Msg{*********************************************************}
 \Msg{*}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
new file mode 100644
index 00000000000..1fdee8e575e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-a4.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `a4')
+%% 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{a4}
+\newcommand*{\WideMargins}{}
+
+\endinput
+%%
+%% End of file `lwarp-a4.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
new file mode 100644
index 00000000000..4c3785e4d3e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-a4wide.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `a4wide')
+%% 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{a4wide}
+
+\endinput
+%%
+%% End of file `lwarp-a4wide.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
new file mode 100644
index 00000000000..f16b5db869d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-a5comb.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `a5comb')
+%% 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{a5comb}
+
+\endinput
+%%
+%% End of file `lwarp-a5comb.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
new file mode 100644
index 00000000000..3f9e941976c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-addlines.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `addlines')
+%% 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{addlines}
+\newcommand*\addlines[1][1]{}
+\let\addline\addlines
+\newcommand*\removelines[1][1]{}
+\let\removeline\removelines
+
+\endinput
+%%
+%% End of file `lwarp-addlines.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
new file mode 100644
index 00000000000..75d0c99caba
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-anysize.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `anysize')
+%% 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{anysize}
+\def\papersize#1#2{}
+\def\marginsize#1#2#3#4{}
+
+\endinput
+%%
+%% End of file `lwarp-anysize.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
index e5b11926077..f736ee929d2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
@@ -15,9 +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@ProvidesPackagePass{appendix}
-
 \renewcommand*{\@chap@pppage}{%
 \part*{\appendixpagename}
  \if@dotoc@pp
@@ -32,8 +30,6 @@
  \fi
 }
 
-
-
 \endinput
 %%
 %% End of file `lwarp-appendix.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
new file mode 100644
index 00000000000..9a0ad9cd259
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
@@ -0,0 +1,34 @@
+%%
+%% This is file `lwarp-authblk.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `authblk')
+%% 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.
+\@ifpackageloaded{titling}{
+\PackageError{lwarp-authblk}
+{Package authblk must be loaded before titling}
+{Titling appends authblk's author macro, so authblk must be loaded first.}
+}
+{}
+\LWR@ProvidesPackagePass{authblk}
+\LetLtxMacro\LWRAB@affil\affil
+
+\renewcommand{\affil}[2][]{%
+\LWRAB@affil[#1]{\protect\InlineClass{affiliation}{#2}}
+}
+\renewcommand*{\authorcr}{\protect\LWR@newlinebr}
+
+\endinput
+%%
+%% End of file `lwarp-authblk.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
new file mode 100644
index 00000000000..478302ce1e6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
@@ -0,0 +1,37 @@
+%%
+%% This is file `lwarp-bigdelim.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `bigdelim')
+%% 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{bigdelim}
+\LetLtxMacro\LWR@origldelim\ldelim
+\LetLtxMacro\LWR@origrdelim\rdelim
+\RenewDocumentCommand{\ldelim}{m m m O{}}{%
+\renewcommand{\LWR@multirowborder}{right}%
+\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}%
+}
+
+\RenewDocumentCommand{\rdelim}{m m m O{}}{%
+\renewcommand{\LWR@multirowborder}{left}%
+\multirow{#2}{#3}{\InlineClass{rdelim}{#1} #4}%
+}
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro{\ldelim}{\LWR@origldelim}%
+\LetLtxMacro{\rdelim}{\LWR@origrdelim}%
+}
+
+\endinput
+%%
+%% End of file `lwarp-bigdelim.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
new file mode 100644
index 00000000000..0e306882965
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-bigstrut.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `bigstrut')
+%% 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{bigstrut}
+\LetLtxMacro\LWR@origbigstrut\bigstrut
+
+\renewcommand\bigstrut[1][x]{}
+
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro{\bigstrut}{\LWR@origbigstrut}%
+}
+
+\endinput
+%%
+%% End of file `lwarp-bigstrut.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
index b0a7733a568..a8ef86cfa92 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
@@ -19,7 +19,6 @@
 
 
 \LWR@ProvidesPackageDrop{bookmark}
-
 \newcommand*{\bookmarksetup}[1]{}
 \newcommand*{\bookmarksetupnext}[1]{}
 \newcommand*{\bookmark}[2][]{}
@@ -27,7 +26,6 @@
 \newcommand*{\bookmarkget}[1]{}
 \newcommand{\BookmarkAtEnd}[1]{}
 
-
 \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 52db9e80c70..5f1bf1940f6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
@@ -15,8 +15,6 @@
 %%   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{booktabs}
 \LetLtxMacro\LWR@origtoprule\toprule
 \LetLtxMacro\LWR@origmidrule\midrule
@@ -26,7 +24,6 @@
 \LetLtxMacro\LWR@origmorecmidrules\morecmidrules
 \LetLtxMacro\LWR@origspecialrule\specialrule
 
-
 \endinput
 %%
 %% End of file `lwarp-booktabs.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
new file mode 100644
index 00000000000..5e86fcce90b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-chngpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `chngpage')
+%% 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{chngpage}{changepage}
+
+\endinput
+%%
+%% End of file `lwarp-chngpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
new file mode 100644
index 00000000000..11cfd9ae8f1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
@@ -0,0 +1,31 @@
+%%
+%% This is file `lwarp-ebook.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `ebook')
+%% 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{ebook}
+\setcounter{secnumdepth}{0}
+\setcounter{tocdepth}{2}
+
+\providecommand{\pagefill}[1][0.001mm]{\noindent}
+
+\providecommand{\ebook}{
+\setcounter{secnumdepth}{0}
+\setcounter{tocdepth}{2}
+}
+
+\endinput
+%%
+%% End of file `lwarp-ebook.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
index daaf4d54057..aad18d31908 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
@@ -56,7 +56,6 @@
 \newcommand*{\undodrop}{}
 \newcommand{\cleartoevenpage}[1][]{}
 
-
 \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 68f5c330dfd..aa28b1dd489 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
@@ -18,7 +18,6 @@
 
 
 
-
 \LWR@ProvidesPackageDrop{eso-pic}
 
 \newcommand*{\LenToUnit}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
new file mode 100644
index 00000000000..3cdb22928d2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-fullwidth.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `fullwidth')
+%% 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{fullwidth}
+\newenvironment*{fullwidth}[1][]{%
+\minipagefullwidth%
+\minipage{\linewidth}%
+}
+{%
+\endminipage%
+}
+
+\endinput
+%%
+%% End of file `lwarp-fullwidth.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
index b5ea89ea622..ed0cbcbee95 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
@@ -40,9 +40,7 @@
 \newif\ifLettrineRealHeight
 
 \newcommand*{\LettrineTextFont}{\scshape}
-
 \newcommand*{\LettrineFontHook}{}
-
 \newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}}
 \newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index f5bdf090c19..15c7bc93b4a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -17,9 +17,44 @@
 %% version 2005/12/01 or later.
 
 
-
-\LWR@ProvidesPackageDrop{multirow}
-
+\LWR@ProvidesPackagePass{multirow}
+\LetLtxMacro\LWR@origmultirow\multirow
+\newcommand{\LWR@multirowborder}{}
+\RenewDocumentCommand{\multirow}{O{c} m o m o +m}%
+{%
+\LWR@traceinfo{*** multirow #1 #2 #4}
+\LWR@maybenewtablerow%
+\LWR@htmltag{td rowspan="#2" %
+\IfValueT{#1}{%
+\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
+\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+}%
+\ifdefvoid{\LWR@multirowborder}{}{%
+style="border-\LWR@multirowborder: 2px solid black" %
+}
+class="td%
+\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}%
+\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
+"{}}
+\begingroup \LetLtxMacro{\\}{\LWR@endofline} #6 \endgroup
+\LWR@stoppars%
+\global\boolfalse{LWR@intabularmetadata}%
+\renewcommand{\LWR@multirowborder}{}%
+\LWR@traceinfo{*** multirow done}%
+}%
+\RenewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{%
+\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+\begingroup\LetLtxMacro{\\}{\LWR@endofline}%
+\LWR@domulticolumn[#3][#4]{\theLWR@tabhtmlcoltotal}{#2}{#8}%
+\endgroup%
+\addtocounter{LWR@tablecolspos}{#1}%
+\addtocounter{LWR@tablecolspos}{-1}%
+\booltrue{LWR@skipatbang}%
+}
+\appto{\LWR@restoreorigformatting}{%
+\LetLtxMacro\multirow\LWR@origmultirow%
+\renewcommand{\multicolumnrow}{\LWR@origmulticolumnrow}%
+}
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
index d268bea0edb..65f129dd11b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
@@ -25,7 +25,7 @@
 \LetLtxMacro\LWR@origtextsmaller\textsmaller
 \let\LWR@textscale\textscale
 
-\renewcommand*{\LWR@restoreorigrelsize}{%
+\appto{\LWR@restoreorigformatting}{%
 \let\relsize\LWR@origrelsize%
 \LetLtxMacro\larger\LWR@origlarger%
 \LetLtxMacro\smaller\LWR@origsmaller%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
new file mode 100644
index 00000000000..16349be9ddd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
@@ -0,0 +1,76 @@
+%%
+%% This is file `lwarp-supertabular.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `supertabular')
+%% 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{supertabular}
+\newcommand{\LWRST@firsthead}{}
+
+\newcommand{\tablefirsthead}[1]{%
+    \long\gdef\LWRST@firsthead{#1}%
+}
+
+\newcommand{\tablehead}[1]{}
+\newcommand{\tabletail}[1]{}
+
+\newcommand{\LWRST@lasttail}{}
+
+\newcommand{\tablelasttail}[1]{%
+    \long\gdef\LWRST@lasttail{#1}%
+}
+
+\newcommand{\tablecaption}[2][]{%
+    \long\gdef\LWRST@caption{\caption[#1]{#2}}%
+}
+
+\let\topcaption\tablecaption
+\let\bottomcaption\tablecaption
+
+\global\let\LWRST@caption\relax
+
+\newcommand*{\shrinkheight}[1]{}
+
+\NewDocumentEnvironment{supertabular}{s o m}
+{
+\LWR@traceinfo{supertabular}
+\table
+\LWRST@caption
+\begin{tabular}{#3}
+\TabularMacro\ifdefvoid{\LWRST@firsthead}%
+{\LWR@getmynexttoken}%
+{\expandafter\LWR@getmynexttoken\LWRST@firsthead}%
+}
+{%
+\ifdefvoid{\LWRST@lasttail}%
+{}%
+{%
+\TabularMacro\ResumeTabular%
+\LWRST@lasttail%
+}%
+\end{tabular}
+\endtable
+\LWR@traceinfo{supertabular done}
+}
+
+\NewDocumentEnvironment{mpsupertabular}{s o m}
+{\minipage{\linewidth}\supertabular{#3}}
+{\endsupertabular\endminipage}
+
+
+\endinput
+%%
+%% End of file `lwarp-supertabular.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
new file mode 100644
index 00000000000..6b7ffb4bdbe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
@@ -0,0 +1,27 @@
+%%
+%% This is file `lwarp-textarea.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `textarea')
+%% 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{textarea}
+\newcommand\StartFromTextArea{}
+\newcommand\StartFromHeaderArea{}
+\newcommand*\RestoreTextArea{}
+\newcommand*\ExpandTextArea[1][*]{}
+\let\NCC@restoretextarea\@empty
+
+\endinput
+%%
+%% End of file `lwarp-textarea.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
index b858e141ee8..e25de7f94a5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
@@ -62,9 +62,7 @@
 \renewcommand*{\textcircled}[1]{%
 \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}%
 }
-\let\LWR@restoreorigtextcomp\relax
-
-\newcommand*{\LWR@restoreorigtextcomp}{%
+\appto{\LWR@restoreorigformatting}{%
 \let\textdegree\LWR@origtextdegree%
 \let\textcelsius\LWR@origtextcelsius%
 \let\textohm\LWR@origtextohm%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
index 0992011348d..de999d7cd94 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
@@ -51,9 +51,7 @@
 \newcommand*{\ttl@row}[2][]{}
 
 \newcommand{\iftitlemeasuring}[2]{#2}
-
 \newcommand{\assignpagestyle}[2]{#2}
-
 \NewDocumentCommand{\titleclass}{m o m o}
 
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index 2237dba15aa..18e14d45c9e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -22,21 +22,93 @@
 \let\LWR@orig@bsmtitlempty\@bsmtitlempty
 \renewcommand*{\@bsmtitlempty}{%
 \LWR@orig@bsmtitlempty%
-\global\let\published\relax%
-\global\let\subtitle\relax%
 }
 \let\LWR@origkeepthetitle\keepthetitle
 \renewcommand*{\keepthetitle}{%
 \LWR@orig@keepthetitle%
-\global\let\@published\@empty%
-\global\let\@subtitle\@empty%
 }
 \let\LWR@origkilltitle\killtitle
 \renewcommand*{\killtitle}{%
 \LWR@orig@killtitle%
-\global\let\thepublished\relax%
-\global\let\thesubtitle\relax%
 }
+\renewenvironment*{titlingpage}
+{%
+\LWR@printpendingfootnotes
+\begin{titlepage}
+\LWR@maketitlesetup
+\let\maketitle\LWR@titlingmaketitle
+}
+{
+\end{titlepage}
+}
+
+\pretitle{}
+\posttitle{}
+
+\preauthor{}
+\postauthor{}
+
+\predate{}
+\postdate{}
+\renewcommand*{\LWR@maketitlesetup}{%
+\def\@makefnmark{\textsuperscript{\@thefnmark}}
+\long\def\@makefntext##1{%
+\makethanksmark \LWR@orighspace{1in}
+##1%
+}%
+}
+\renewcommand*{\maketitle}{%
+\begin{titlepage}
+\@bsmarkseries
+\LWR@maketitlesetup
+\@maketitle
+\@thanks
+\end{titlepage}
+\@bscontmark
+}
+\DeclareDocumentCommand{\@maketitle}{}{%
+    \maketitlehooka
+    {
+        \LWR@stoppars\LWR@htmltag{h1}
+        \@bspretitle \@title \@bsposttitle
+        \LWR@htmltag{/h1}\LWR@startpars
+    }
+    \maketitlehookb
+    {
+        \begin{BlockClass}{author}
+        \renewcommand{\and}{
+            \end{BlockClass}
+            \begin{BlockClass}{oneauthor}
+        }
+        \begin{BlockClass}{oneauthor}
+        \@bspreauthor \@author  \@bspostauthor
+        \end{BlockClass}
+        \end{BlockClass}
+    }
+    \maketitlehookc
+    {
+        \begin{BlockClass}{titledate}
+        \@bspredate \@date \@bspostdate
+        \end{BlockClass}
+    }
+    \maketitlehookd
+}
+\renewcommand*{\LWR@titlingmaketitle}{%
+\@thanks
+\@bsmarkseries
+\LWR@maketitlesetup
+\@maketitle
+\@thanks
+\@bscontmark
+}
+\renewcommand{\thanksmarkseries}[1]{%
+\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}%
+}
+\if@titlepage
+   \thanksmarkseries{arabic}
+\else
+   \thanksmarkseries{fnsymbol}
+\fi
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
new file mode 100644
index 00000000000..c4a81e065f0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-typearea.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `typearea')
+%% 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{typearea}
+\newcommand*\typearea[2][\z@]{}
+\newcommand*{\recalctypearea}{}
+\@ifundefined{footheight}{\newlength\footheight}{}
+\newcommand*\areaset[3][\z@]{}
+\endinput
+%%
+%% End of file `lwarp-typearea.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 260274c55f6..25cf80d7a8f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -30,8 +30,7 @@
 \LetLtxMacro\LWRorigprint@fcolorbox\fcolorbox
 \LetLtxMacro\LWRorigprint@fcolorboxBlock\fcolorbox
 \LetLtxMacro\LWRorigprint@boxframe\boxframe
-\renewcommand*{\LWR@restoreorigxcolor}{%
-\LWR@traceinfo{LWR@restoreorigxcolorformatting}%
+\appto{\LWR@restoreorigformatting}{%
 \LetLtxMacro\textcolor\LWRprint@textcolor%
 \LetLtxMacro\pagecolor\LWRprint@pagecolor%
 \LetLtxMacro\nopagecolor\LWRprint@nopagecolor%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
new file mode 100644
index 00000000000..6798e112027
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
@@ -0,0 +1,83 @@
+%%
+%% This is file `lwarp-xtab.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `xtab')
+%% 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{xtab}
+\newcommand{\LWRXT@firsthead}{}
+
+\newcommand{\tablefirsthead}[1]{%
+    \long\gdef\LWRXT@firsthead{#1}%
+}
+
+\newcommand{\tablehead}[1]{}
+
+\newcommand{\tablelasthead}[1]{}
+
+\newcommand{\notablelasthead}{}
+
+\newcommand{\tabletail}[1]{}
+
+\newcommand{\LWRXT@lasttail}{}
+
+\newcommand{\tablelasttail}[1]{%
+    \long\gdef\LWRXT@lasttail{#1}%
+}
+
+\newcommand{\tablecaption}[2][]{%
+    \long\gdef\LWRXT@caption{\caption[#1]{#2}}%
+}
+
+\let\topcaption\tablecaption
+\let\bottomcaption\tablecaption
+
+\global\let\LWRXT@caption\relax
+
+\newcommand*{\shrinkheight}[1]{}
+
+\newcommand*{\xentrystretch}[1]{}
+
+\NewDocumentEnvironment{xtabular}{s o m}
+{
+\LWR@traceinfo{xtabular}
+\table
+\LWRXT@caption
+\begin{tabular}{#3}
+\TabularMacro\ifdefvoid{\LWRXT@firsthead}%
+{\LWR@getmynexttoken}%
+{\expandafter\LWR@getmynexttoken\LWRXT@firsthead}%
+}
+{%
+\ifdefvoid{\LWRXT@lasttail}%
+{}%
+{%
+\TabularMacro\ResumeTabular%
+\LWRXT@lasttail%
+}%
+\end{tabular}
+\endtable
+\LWR@traceinfo{xtabular done}
+}
+
+\NewDocumentEnvironment{mpxtabular}{s o m}
+{\minipage{\linewidth}\xtabular{#3}}
+{\endxtabular\endminipage}
+
+\endinput
+%%
+%% End of file `lwarp-xtab.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
new file mode 100644
index 00000000000..7bb7b849e4a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
@@ -0,0 +1,74 @@
+%%
+%% This is file `lwarp-zwpagelayout.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `zwpagelayout')
+%% 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{zwpagelayout}
+\def\noBboxes{}
+\@onlypreamble\noBboxes
+
+\expandafter\ifx\csname definecolor\endcsname\relax \else
+  \definecolor{cmykblack}{cmyk}{0,0,0,1}
+  \definecolor{grblack}{gray}{0}
+  \definecolor{cmykred}{cmyk}{0,1,1,0}
+  \definecolor{cmykgreen}{cmyk}{1,0,1,0}
+  \definecolor{cmykblue}{cmyk}{1,1,0,0}
+  \definecolor{rgbred}{rgb}{1,0,0}
+  \definecolor{rgbgreen}{rgb}{0,1,0}
+  \definecolor{rgbblue}{rgb}{0,0,1}
+\fi
+
+\let\OverprintXeTeXExtGState\relax
+
+\DeclareRobustCommand\SetOverprint{\ignorespaces}
+\DeclareRobustCommand\SetKnockout{\ignorespaces}
+\DeclareRobustCommand\textoverprint[1]{{\SetOverprint#1}}
+\DeclareRobustCommand\textknockout[1]{{\SetKnockout#1}}
+
+\def\SetPDFminorversion#1{}
+\@onlypreamble\SetPDFminorversion
+
+\newcommand*\Vcorr{}
+
+\DeclareRobustCommand\vb[1][]{}
+\NewDocumentCommand{\NewOddPage}{* o}{}
+\NewDocumentCommand{\NewEvenPage}{* o}{}
+\def\SetOddPageMessage#{\gdef\ZW@oddwarning}
+\def\SetEvenPageMessage#{\gdef\Z@@evenwarning}
+\def\ZW@oddwarning{Empty page inserted}\let\ZW@evenwarning\ZW@oddwarning
+
+\def\clap#1{#1}
+
+\def\CropFlap{2in}
+\def\CropSpine{1in}
+\def\CropXSpine{1in}
+\def\CropXtrim{.25in}
+\def\CropYtrim{.25in}
+\def\UserWidth{5in}
+\def\UserLeftMargin{1in}
+\def\UserRightMargin{1in}
+\def\UserTopMargin{1in}
+\def\UserBotMargin{1in}
+\def\thePageNumber{\#\,\arabic{page}}
+\ifXeTeX
+\def\ifcaseZWdriver{\ifcase2}
+\else
+\def\ifcaseZWdriver{\ifcase1}
+\fi
+\DeclareRobustCommand\ZWifdriver[2]{}
+\endinput
+%%
+%% End of file `lwarp-zwpagelayout.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 124f1e70a7d..33c49ac4737 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/08/27 v0.38  Allows LaTeX to directly produce HTML5 output.]
+    [2017/09/05 v0.39  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -196,27 +196,37 @@ or is superceded by another package.
 For a possible alternative, see package(s) #2.}
 }
 
+\LWR@loadafter{a4}
+\LWR@loadafter{a4wide}
+\LWR@loadafter{a5comb}
 \LWR@loadafter{abstract}
+\LWR@loadafter{addlines}
 \LWR@loadafter{afterpage}
 \LWR@loadafter{algorithmicx}
 \LWR@loadafter{alltt}
 \LWR@loadafter{amsthm}
+\LWR@loadafter{anysize}
 \LWR@loadafter{appendix}
 \LWR@loadafter{arabicfront}
 \LWR@loadafter{array}
+\LWR@loadafter{authblk}
 \LWR@loadafter{balance}
+\LWR@loadafter{bigdelim}
+\LWR@loadafter{bigstrut}
 \LWR@loadafter{bookmark}
 \LWR@loadafter{booktabs}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
 \LWR@loadafter{ccaption}
 \LWR@loadafter{changepage}
+\LWR@loadafter{chngpage}
 \LWR@loadafter{chappg}
 \LWR@loadafter{color}
 \LWR@loadafter{crop}
 \LWR@loadafter{cutwin}
 \LWR@loadafter{dcolumn}
 \LWR@loadafter{draftwatermark}
+\LWR@loadafter{ebook}
 \LWR@loadafter{ellipsis}
 \LWR@loadafter{emptypage}
 \LWR@loadafter{enumerate}
@@ -239,6 +249,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{fncychap}
 \LWR@loadafter{ftnright}
 \LWR@loadafter{fullpage}
+\LWR@loadafter{fullwidth}
 \LWR@loadafter{geometry}
 \LWR@loadafter{glossaries}
 \LWR@loadafter{grffile}
@@ -297,8 +308,10 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{siunitx}
 \LWR@loadafter{soul}
 \LWR@loadafter{subfig}
+\LWR@loadafter{supertabular}
 \LWR@loadafter{tabularx}
 \LWR@loadafter{tabulary}
+\LWR@loadafter{textarea}
 \LWR@loadafter{textpos}
 \LWR@loadafter{theorem}
 \LWR@loadafter{threeparttable}
@@ -306,10 +319,12 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{titleps}
 \LWR@loadafter{titlesec}
 \LWR@loadafter{titletoc}
+\LWR@loadafter{titling}
 \LWR@loadafter{tocbibind}
 \LWR@loadafter{tocloft}
 \LWR@loadafter{transparent}
 \LWR@loadafter{trivfloat}
+\LWR@loadafter{typearea}
 \LWR@loadafter{ulem}
 \LWR@loadafter{upref}
 \LWR@loadafter{varioref}
@@ -320,6 +335,8 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{xfrac}
 \LWR@loadafter{xltxtra}
 \LWR@loadafter{xmpincl}
+\LWR@loadafter{xtab}
+\LWR@loadafter{zwpagelayout}
 
 
 
@@ -374,6 +391,8 @@ top=1in,bottom=1in,%
 
 \RequirePackage{xparse}
 
+\RequirePackage{afterpackage}
+
 \end{warpall}
 
 \begin{warpHTML}
@@ -425,8 +444,6 @@ top=1in,bottom=1in,%
 
 \begin{warpall}
 
-\RequirePackage{titling}
-
 \RequirePackage{environ}
 
 \end{warpall}
@@ -697,17 +714,6 @@ top=1in,bottom=1in,%
 \end{warpHTML}
 
 \begin{warpHTML}
-\@ifpackageloaded{textcomp}
-{
-\LWR@origRequirePackage{lwarp-textcomp}
-}
-{
-\providecommand*{\LWR@restoreorigtextcomp}{}%
-}
-
-\end{warpHTML}
-
-\begin{warpHTML}
 \AtBeginDocument{
 \LetLtxMacro{\LWR@origt}{\t}
 \ifPDFTeX
@@ -1238,6 +1244,7 @@ div.abstract {
   padding: 1ex 1em 1ex 1em ;
 /*  font-weight: bold ; */
   font-size: 90% ;
+    text-align: left ;
 }
 
 div.abstract dl {line-height:1.5;}
@@ -1531,6 +1538,8 @@ figure.subfigure, figure.subtable  {
 
 figcaption .minipage { margin:0 ; padding: 0 }
 
+div.minipage figure { border: none ; box-shadow: none ; }
+
 div.floatrow { text-align: center; }
 
 div.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
@@ -1639,6 +1648,9 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule
 
 .tnoteitemheader {margin-right: 1em;}
 
+/* for bigdelim */
+.ldelim, .rdelim { font-size: 200% }
+
 /* center, flushleft, flushright environments */
 div.center{text-align:center;}
 div.center table {margin-left:auto;margin-right:auto;}
@@ -1695,12 +1707,19 @@ div.author
     margin: 3ex 0em 3ex 0em ;
 }
 
+div.oneauthor {
+    display: inline-block ;
+    margin: 3ex 1em 0ex 1em ;
+}
+
+/*
 div.author table {
     margin: 3ex auto 0ex auto ;
     background: none ;
 }
 
 div.author table tbody tr td { padding: .25ex ; }
+*/
 
 span.affiliation {font-size: .85em ; font-variant: small-caps; }
 
@@ -2145,12 +2164,18 @@ div.sidebartitle{
     text-shadow: 1px 1px 2px #808080;
 }
 
-.minipage {
+div.minipage {
     background-color: #eeeee7 ;
     border: 1px solid silver ;
     border-radius: 1ex ;
 }
 
+section.textbody > div.minipage {
+    box-shadow: 3px 3px 3px #808080 ;
+}
+
+div.fboxBlock div.minipage { box-shadow: none ; }
+
 .framed .minipage , .framedleftbar .minipage {
     border: none ;
     background: none ;
@@ -2575,7 +2600,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
 
 -- Print the usage of the lwarpmk command:
 
-printversion = "v0.38"
+printversion = "v0.39"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -3925,6 +3950,12 @@ end -- not --version
     \protected@edef\@currentlabel
     {\csname p@mpfootnote\endcsname\@thefnmark}%
     \color@begingroup
+    \ifthenelse{%
+        \boolean{LWR@doingstartpars} \AND%
+        \cnttest{\value{LWR@lateximagedepth}}{=}{0}%
+    }%
+    {}%
+    {\LWR@htmltagc{\LWR@tagregularparagraph}}%
     \@makefntext{%
         \ignorespaces#1%
     }%
@@ -4487,11 +4518,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@htmltag{section class="textbody"{}}
 \mainmatter
 \LWR@origpagenumbering{arabic}
-\if@titlepage
-   \thanksmarkseries{arabic}
-\else
-   \thanksmarkseries{fnsymbol}
-\fi
 \LWR@patchlists
 \catcode`\$=\active
 \LWR@startpars
@@ -4541,138 +4567,40 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \end{warpHTML}
 
-
-\begin{warpHTML}
-\newrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{#1}}
-\end{warpHTML}
-\begin{warpprint}
-\newrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
-\end{warpprint}
 \begin{warpall}
-\renewcommand{\author}[1]{%
-\gdef\@author{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\and}{\unskip, }
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \renewcommand{\affiliation}[1]{}
-  \protected@xdef\theauthor{#1}
-\endgroup}
-\newcommand{\published}[1]{%
-\gdef\@published{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \protected@xdef\thepublished{#1}
-\endgroup
+\newrobustcmd{\affiliation}[1]{}
+\end{warpall}
+\begin{warpprint}
+\AtBeginEnvironment{titlepage}{
+\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
 }
-\newcommand{\@published}{}
-\newcommand{\thepublished}{}
-\newcommand{\subtitle}[1]{%
-\gdef\@subtitle{#1}
-\begingroup
-  \renewcommand{\thanks}[1]{}
-  \renewcommand{\thanksmark}[1]{}
-  \renewcommand{\thanksgap}[1]{}
-  \protected@xdef\thesubtitle{#1}
-\endgroup
+
+\AtBeginDocument{
+\@ifpackageloaded{titling}{
+\AtBeginEnvironment{titlingpage}{
+\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
 }
-\newcommand{\@subtitle}{}
-\newcommand{\thesubtitle}{}
-\end{warpall}
+}{}% titling loaded
+}% AtBeginDocument
+\end{warpprint}
 \begin{warpHTML}
 \renewenvironment*{titlepage}
 {
+\renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}}
+\LWR@printpendingfootnotes
 \LWR@forcenewpage
-\BlockClass{titlepage}\LWR@subminipage
-}
-{\LWR@endsubminipage\endBlockClass}
-\renewenvironment*{titlingpage}
-{%
-\begin{titlepage}
-\LWR@maketitlesetup
-\let\maketitle\LWR@titlingmaketitle
+\BlockClass{titlepage}
 }
 {
-\end{titlepage}
-\@bscontmark
+\endBlockClass
+\LWR@printpendingfootnotes
 }
 \end{warpHTML}
-
 \begin{warpall}
 \newcommand*{\printthanks}{\@thanks}
-\AtEndEnvironment{titlingpage}{\@bscontmark}
 \end{warpall}
 
 \begin{warpHTML}
-\newcommand{\prepublished}[1]{%
-\def\@bsprepublished{\BlockClass{published}#1}%
-}
-
-\newcommand{\postpublished}[1]{%
-\def\@bspostpublished{#1\endBlockClass}%
-}
-
-\renewcommand{\pretitle}[1]{%
-\def\@bspretitle{#1\LWR@stoppars\LWR@htmltag{h1}}%
-}
-
-\renewcommand{\posttitle}[1]{%
-\def\@bsposttitle{\LWR@htmltag{/h1}\LWR@startpars#1}%
-}
-
-\newcommand{\presubtitle}[1]{%
-\def\@bspresubtitle{\BlockClass{subtitle}#1}%
-}
-
-\newcommand{\postsubtitle}[1]{%
-\def\@bspostsubtitle{#1\endBlockClass}%
-}
-
-\renewcommand{\preauthor}[1]{%
-\def\@bspreauthor{\BlockClass{author}#1}%
-}
-
-\renewcommand{\postauthor}[1]{%
-\def\@bspostauthor{#1\endBlockClass}%
-}
-
-\renewcommand{\predate}[1]{%
-\def\@bspredate{#1\BlockClass{titledate}}%
-}
-
-\renewcommand{\postdate}[1]{%
-\def\@bspostdate{\endBlockClass#1}%
-}
-
-\prepublished{\begin{center}}
-\postpublished{\par\end{center}}
-
-\pretitle{\begin{center}}
-\posttitle{\par\end{center}}
-
-\presubtitle{\begin{center}}
-\postsubtitle{\par\end{center}}
-
-\preauthor{\begin{center}%
-\begin{tabular}[t]{c}%
-}
-\postauthor{\end{tabular}\par\end{center}}
-
-\predate{\begin{center}}
-\postdate{\par\end{center}}
-\newcommand*{\printpublished}{
-\ifthenelse{\equal{\thepublished}{}}
-{}
-{
-    \begin{BlockClass}{published}
-    \@published
-    \end{BlockClass}
-}
-}
-
 \newcommand*{\printtitle}
 {
 \LWR@stoppars
@@ -4690,19 +4618,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@startpars
 }
 
-\newcommand*{\printsubtitle}{
-\ifthenelse{\equal{\thesubtitle}{}}
-{}
-{
-    \begin{BlockClass}{subtitle}
-    \@subtitle
-    \end{BlockClass}
-}
-}
-
 \newcommand*{\printauthor}{
 \begin{BlockClass}{author}
-\begin{tabular}{c}\@author\end{tabular}
+\renewcommand{\and}{%
+\end{BlockClass}
+\begin{BlockClass}{oneauthor}
+}
+\begin{BlockClass}{oneauthor}
+\@author
+\end{BlockClass}
 \end{BlockClass}
 }
 
@@ -4716,136 +4640,29 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \begin{warpprint}
 
-\newcommand*{\printpublished}{{\Large\scshape\@published}}
 
 \newcommand*{\printtitle}{{\Huge\@title}}
 
-\newcommand*{\printsubtitle}{{\Large\itshape\@subtitle\bigskip}}
-
 \newcommand*{\printauthor}
     {{\large\begin{tabular}[t]{c}\@author\end{tabular}}}
 
 \newcommand*{\printdate}{{\small\textit{\@date}}}
-\providecommand{\maketitle}{}
+\end{warpprint}
+\begin{warpHTML}
 \if@titlepage
-  \renewcommand{\maketitle}{\begin{titlepage}%
-    \let\footnotesize\small
-    \let\footnoterule\relax
-    \LetLtxMacro{\footnote}{\thanks}
-    \@bsmarkseries
-      \def\@makefnmark{\rlap{\@textsuperscript{%
-         \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}%
-      \long\def\@makefntext##1{\makethanksmark ##1}
-    \null\vfil
-    \vskip 60\p@
-    \vspace*{\droptitle}
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
-    \par
-    \@thanks
-    \vfil\null
-    \end{titlepage}%
-    \@bscontmark  %  \setcounter{footnote}{0}%
-%%%    \@bsmtitlempty
-  } % end titlepage defs
-\else
-  \renewcommand{\maketitle}{\par
-    \begingroup
-      \@bsmarkseries
-      \def\@makefnmark{\rlap{\@textsuperscript{%
-         \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}%
-      \long\def\@makefntext##1{\makethanksmark ##1}
-      \if@twocolumn
-        \ifnum \col@number=\@ne
-          \@maketitle
-        \else
-          \twocolumn[\@maketitle]%
-        \fi
-      \else
-        \newpage
-        \global\@topnum\z@
-        \@maketitle
-      \fi
-      \thispagestyle{plain}\@thanks
-    \endgroup
-    \@bscontmark  %  \setcounter{footnote}{0}%
-%%%    \@bsmtitlempty
-  } % end non-titlepage
-
-  \def\@maketitle{%
-    \newpage
-    \null
-    \vskip 2em%
-          \vspace*{\droptitle}
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
-    \par
-    \vskip 1.5em}
-\fi
-
-\providecommand{\maketitlehookaa}{}
-
-\providecommand{\maketitlehookaaa}{}
-
-\newcommand{\prepublished}[1]{%
-\def\@bsprepublished{#1}%
-}
-
-\newcommand{\postpublished}[1]{%
-\def\@bspostpublished{#1}%
-}
-
-\newcommand{\presubtitle}[1]{%
-\def\@bspresubtitle{#1}%
-}
-\newcommand{\postsubtitle}[1]{%
-\def\@bspostsubtitle{#1}%
+\newcommand{\LWR@setfootnoteseries}{%
+    \renewcommand\thefootnote{\@arabic\c@footnote}%
 }
-\if@titlepage
-\prepublished{
-\vspace*{-\baselineskip}\vspace*{-\medskipamount}\vspace*{-2em}
-\begin{center}}
-\postpublished{\par\end{center}\vskip 2em}
-
-\presubtitle{\unskip\begin{center}\unskip}
-\postsubtitle{\par\end{center}\vskip 2em}
 \else
-\prepublished{\begin{center}}
-\postpublished{\par\end{center}\vskip 0.5em}
-
-\presubtitle{\begin{center}\unskip}
-\postsubtitle{\par\end{center}\vskip 0.5em}
+\newcommand{\LWR@setfootnoteseries}{%
+    \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+}
 \fi
-\end{warpprint}
-\begin{warpHTML}
 \newcommand*{\LWR@maketitlesetup}{%
-\@bsmarkseries
-\@mpbsmarkseries
+\LWR@setfootnoteseries%
 \def\@makefnmark{\textsuperscript{\thefootnote}}
 \long\def\@makefntext##1{%
-\makethanksmark \LWR@orighspace{1in}
+\textsuperscript{\@thefnmark} \LWR@orighspace{1in}
 ##1%
 }%
 }
@@ -4860,39 +4677,83 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \@maketitle
 \@thanks
 \end{titlepage}
-\@bscontmark
+\setcounter{footnote}{0}%
+\global\let\thanks\relax
+\global\let\maketitle\relax
+\global\let\@maketitle\relax
+\global\let\@thanks\@empty
+\global\let\@author\@empty
+\global\let\@date\@empty
+\global\let\@title\@empty
+\global\let\title\relax
+\global\let\author\relax
+\global\let\date\relax
+\global\let\and\relax
 }
-
 \DeclareDocumentCommand{\@maketitle}{}{%
-    \maketitlehooka
-    \ifcsempty{@published}
-        {}
-        {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-    {\@bspretitle \@title \@bsposttitle}
-    \ifcsempty{@subtitle}
-        {}
-        {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-    \maketitlehookb
-    {\@bspreauthor \@author \@bspostauthor}
-    \maketitlehookc
-    {\@bspredate \@date \@bspostdate}
-    \maketitlehookd
-}
-
-\providecommand{\maketitlehookaa}{}
-\providecommand{\maketitlehookaaa}{}
+    \LWR@stoppars\LWR@htmltag{h1}
+    \@title
+    \LWR@htmltag{/h1}\LWR@startpars
+    \begin{BlockClass}{author}
+        \renewcommand{\and}{
+            \end{BlockClass}
+            \begin{BlockClass}{oneauthor}
+        }
+        \begin{BlockClass}{oneauthor}
+            \@author
+        \end{BlockClass}
+    \end{BlockClass}
+    \begin{BlockClass}{titledate}
+    \@date
+    \end{BlockClass}
+}
 
 \newcommand*{\LWR@titlingmaketitle}{%
+\@thanks
+\LWR@maketitlesetup
 \@maketitle
 \@thanks
 }
+\end{warpHTML}
+\begin{warpall}
+
+\AfterPackage{titling}{
+\newcommand*{\AddSubtitlePublished}{%
+
+\newcommand{\@published}{}
+
+\newcommand{\published}[1]{\gdef\@published{##1}}
+
+\renewcommand*{\maketitlehooka}{\printpublished}
+
+\newcommand*{\printpublished}{%
+\warpprintonly{\begin{center}\unskip}%
+\begin{BlockClass}{published}%
+\warpprintonly{\large\itshape}%
+\@published%
+\end{BlockClass}%
+\warpprintonly{\end{center}}%
+}
+
+\newcommand{\@subtitle}{}
 
-\renewcommand{\thanksmarkseries}[1]{%
-\def\@mpbsmarkseries{%
-\renewcommand*{\thempfootnote}{\@nameuse{#1}{mpfootnote}}}%
-\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}%
+\newcommand{\subtitle}[1]{\gdef\@subtitle{##1}}
+
+\renewcommand*{\maketitlehookb}{\printsubtitle}
+
+\newcommand*{\printsubtitle}{%
+\warpprintonly{\begin{center}\unskip}%
+\begin{BlockClass}{subtitle}%
+\warpprintonly{\Large\itshape}%
+\@subtitle%
+\end{BlockClass}%
+\warpprintonly{\end{center}}%
 }
-\end{warpHTML}
+
+}% \AddSubtitlePublished
+}% AfterPackage
+
+\end{warpall}
 
 \begin{warpHTML}
 
@@ -5190,9 +5051,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \end{warpHTML}
 \begin{warpall}
 \newcommand{\StartDefiningTabulars}{%
+\LWR@traceinfo{StartDefiningTabulars}
 \warpHTMLonly{\catcode`\&=\active}%
 }
 \newcommand{\EndDefiningTabulars}{%
+\LWR@traceinfo{EndDefiningTabulars}
 \warpHTMLonly{\catcode`\&=4}%
 }
 
@@ -5584,24 +5447,40 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand{\LWR@multicoltext}{}
 
-\NewDocumentCommand{\LWR@domulticolumn}{m m +m}{%
-\LWR@traceinfo{lwr@domulticolumn -#1- -#2-}%
+\NewDocumentCommand{\LWR@domulticolumn}{o o m m +m}{%
+\LWR@traceinfo{lwr@domulticolumn -#1- -#2- -#3- -#4-}%
 \renewcommand{\LWR@multicoltext}{%
-#3%
+#5%
 \booltrue{LWR@validtablecol}%
 }%
 \LWR@maybenewtablerow%
-\LWR@htmltag{td colspan="#1"
+\LWR@htmltag{td colspan="#3" %
+\IfValueTF{#2}{ % rows?
+rowspan="#2" %
+\IfValueT{#1}{% vpos?
+\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
+\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+}% vpos?
+}{}% rows?
  class="td%
-\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoltype}%
+\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoltype}%
 \ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
 "%
 }% end of the opening table data tag
 \global\boolfalse{LWR@intabularmetadata}%
-\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoldata}%
+\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoldata}%
 }
 
 
+\NewDocumentCommand{\LWR@htmlmulticolumn}{m m +m}%
+{%
+\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}%
+\addtocounter{LWR@tablecolspos}{#1}%
+\addtocounter{LWR@tablecolspos}{-1}%
+\booltrue{LWR@skipatbang}%
+}
+
 \newbool{LWR@starredlongtable}
 \boolfalse{LWR@starredlongtable}
 \providecommand*{\LTcaptype}{table}
@@ -5694,35 +5573,44 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     \ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}%
 }{}%
 }
+\end{warpHTML}
+\begin{warpall}
+\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}{m m O{c} m O{0} m O{0pt} +m}{%
+\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}}
+}
 
+\newcommand*{\multicolumnrow}{\LWR@origmulticolumnrow}
+\end{warpall}
+\begin{warpHTML}
+\newcommand*{\LWR@donothing}{}
+\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}}
+\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}}
 
-\NewDocumentCommand{\LWR@tabledatamulticolumntag}{m m +m}%
-{%
-\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
-\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}%
-\addtocounter{LWR@tablecolspos}{#1}%
-\addtocounter{LWR@tablecolspos}{-1}%
-\booltrue{LWR@skipatbang}%
+\end{warpHTML}
+
+
+\begin{warpall}
+\let\TabularMacro\relax
+
+\end{warpall}
+
+\begin{warpHTML}
+
+\newcommand*{\ResumeTabular}{%
+\global\boolfalse{LWR@exitingtabular}%
+\LWR@getmynexttoken%
 }
 
+\end{warpHTML}
 
+\begin{warpprint}
 
-\NewDocumentCommand{\LWR@tabledatamultirowtag}{m o m o m}%
-{%
-\LWR@maybenewtablerow%
-\LWR@htmltag{td rowspan="#1" class="td%
-\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}%
-\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
-"{}}
-\begingroup \LetLtxMacro{\\}{\LWR@endofline} #5 \endgroup
-\LWR@stoppars%
-\global\boolfalse{LWR@intabularmetadata}%
-}%
+\newcommand*{\ResumeTabular}{}
+
+\end{warpprint}
 
-\newcommand*{\LWR@donothing}{}
-\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}}
-\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}}
 
+\begin{warpHTML}
 
 \newbool{LWR@exitingtabular}
 
@@ -5738,8 +5626,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 {\let\mynext\LWR@donothing}{}%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multirow}}%
 {\let\mynext\LWR@donothing}{}%
+\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumnrow}}%
+{\let\mynext\LWR@donothing}{}%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\mrowcell}}%
 {\let\mynext\LWR@donothing}{}%
+\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\TabularMacro}}%
+{\let\mynext\LWR@donothing}{}%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}%
 {\let\mynext\LWR@donothing}{}%
 \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\toprule}}%
@@ -5814,8 +5706,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \DeclareDocumentCommand{\addlinespace}{o}{}
 \DeclareDocumentCommand{\morecmidrules}{}{}
 \DeclareDocumentCommand{\specialrule}{m m m}{\LWR@domidrule\LWR@getmynexttoken}
-\LetLtxMacro{\multicolumn}{\LWR@tabledatamulticolumntag}%
-\LetLtxMacro{\multirow}{\LWR@tabledatamultirowtag}%
+\renewcommand{\multicolumn}{\LWR@htmlmulticolumn}%
 \renewcommand*{\mrowcell}{\global\booltrue{LWR@skippingmrowcell}}%
 \LetLtxMacro{\caption}{\LWR@longtabledatacaptiontag}%
 \global\boolfalse{LWR@tableparcell}%
@@ -6510,7 +6401,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
     }
 }{}% not eq > 0
 }
-\newcommand*{\LWR@restoreorigrelsize}{}
 \newcommand*{\LWR@restoreorigformatting}{%
 \LWR@traceinfo{LWR@restoreorigformatting}%
 \LetLtxMacro{\hspace}{\LWR@orighspace}%
@@ -6569,11 +6459,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LetLtxMacro{\minipage}{\LWR@origminipage}%
 \let\endminipage\LWR@endminipage%
 \LetLtxMacro{\parbox}{\LWR@origparbox}%
-\LWR@restoreorigxcolor%
-\LWR@restoremoreorigxcolor%
-\LWR@restoreorigtextcomp%
 \LWR@restoreorigaccents%
-\LWR@restoreorigrelsize%
 \LWR@FBcancel%
 }
 
@@ -7081,6 +6967,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 \end{warpHTML}
 
+\begin{warpHTML}
+\@ifpackageloaded{textcomp}
+{
+\LWR@origRequirePackage{lwarp-textcomp}
+}
+{}
+
+\end{warpHTML}
+
 
 
 \begin{warpHTML}
@@ -7385,14 +7280,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 
 \end{warpHTML}
 
-
-\begin{warpall}
-
-\newcommand*{\LWR@restoreorigxcolor}{}
-\newcommand*{\LWR@restoremoreorigxcolor}{}
-
-\end{warpall}
-
 \begin{warpall}
 \AtBeginDocument{
 \@ifpackageloaded{xcolor}{
@@ -7480,18 +7367,22 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
 \LWR@traceinfo{*** finished end fcolorminipage}%
 }
 
-\renewcommand*{\LWR@restoremoreorigxcolor}{%
-\LWR@traceinfo{LWR@restoremoreorigxcolorformatting}%
+\newcommand*{\LWR@restoreorigprintxcolor}{%
+\LWR@traceinfo{LWR@restoreorigprintxcolor}%
 \LetLtxMacro\colorboxBlock\LWRprint@colorboxBlock%
 \LetLtxMacro\fcolorbox\LWRprint@fcolorbox%
 \LetLtxMacro\fcolorboxBlock\LWRprint@fcolorboxBlock%
 \LetLtxMacro\fcolorminipage\LWRprint@fcolorminipage%
 \LetLtxMacro\endfcolorminipage\endLWRprint@fcolorminipage%
 }
-\warpprintonly{\LWR@restoremoreorigxcolor}
+
+\appto{\LWR@restoreorigformatting}{%
+\LWR@restoreorigprintxcolor%
+}
+\warpprintonly{\LWR@restoreorigprintxcolor}
 
 \LWR@traceinfo{xcolor patches done}
-}{}% xcolor
+}{}% xcolor loaded
 }% AtBeginDocument
 \end{warpall}