lwarp (9nov17)

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

6 files changed, 334 insertions, 159 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
new file mode 100644
index 00000000000..0e2ea60d61a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-breakurl.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `breakurl')
+%% 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{breakurl}
+\LetLtxMacro\burl\url
+
+\NewDocumentCommand{\LWR@burlaltb}{O{} +m m}{%
+\LWR@subhyperref{#3}{#2}% order reversed from \href
+\endgroup%
+\LWR@ensuredoingapar%
+}
+
+\DeclareRobustCommand*{\burlalt}{%
+\LWR@ensuredoingapar%
+\begingroup%
+\catcode`\_=12
+\LWR@burlaltb%
+}
+\LetLtxMacro\urlalt\burlalt
+\endinput
+%%
+%% End of file `lwarp-breakurl.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
index b9882e5fc06..e59293feab1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
@@ -33,7 +33,7 @@
 \LWR@ensuredoingapar%
 }
 
-\newcommand{\hyperimage}{%
+\DeclareRobustCommand*{\hyperimage}{%
 \LWR@ensuredoingapar%
 \begingroup\catcode`\_=12
 \LWR@hyperimageb%
@@ -57,7 +57,7 @@
 \endgroup%
 }
 
-\newcommand{\hyperref}{%
+\DeclareRobustCommand*{\hyperref}{%
 \LWR@ensuredoingapar%
 \begingroup\catcode`\_=12
 \@ifnextchar[\LWR@hyperrefc\LWR@hyperrefb%
@@ -97,17 +97,19 @@
 
 \newcommand{\Acrobatmenu}[2]{}
 
-\newcommand*{\TextField}[2][]{}
+\DeclareRobustCommand{\TextField}[2][]{}
 
-\newcommand*{\CheckBox}[2][]{}
+\DeclareRobustCommand{\CheckBox}[2][]{}
 
-\newcommand{\ChoiceMenu}[3][]{}
+\DeclareRobustCommand{\ChoiceMenu}[3][]{}
 
-\newcommand*{\PushButton}[2][]{}
+\DeclareRobustCommand{\PushButton}[2][]{}
 
-\newcommand*{\Submit}[2][]{}
+\DeclareRobustCommand{\Submit}[2][]{}
 
-\newcommand*{\Reset}[2][]{}
+\DeclareRobustCommand{\Reset}[2][]{}
+
+\DeclareRobustCommand{\Gauge}[2][]{}
 
 \newcommand*{\LayoutTextField}[2]{}
 
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
new file mode 100644
index 00000000000..fe717da7589
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
@@ -0,0 +1,26 @@
+%%
+%% This is file `lwarp-luatodonotes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `luatodonotes')
+%% 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{luatodonotes}
+\newcommand{\listoftodos}[1][]{}
+\newcommand{\todo}[2][]{}
+\newcommand{\missingfigure}[2][]{}
+\newcommand{\todototoc}{}
+\newcommand{\todoarea}[3][]{}%
+\endinput
+%%
+%% End of file `lwarp-luatodonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index 6dcd5d69290..b52c068a6df 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -35,17 +35,17 @@ style="border-\LWR@multirowborder: 2px dotted black ; %
 padding-\LWR@multirowborder: 2px" %
 }%
 class="td%
-\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}%
+\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}%
 \LWR@addcmidruletrim%
 \LWR@addleftmostbartag%
-\LWR@printbartag{\theLWR@tablecolspos}%
+\LWR@printbartag{\arabic{LWR@tablecolindex}}%
 "%
 \LWR@tdstartstyles%
 \LWR@addcmidrulewidth%
 \LWR@addformatwpalignment%
 \LWR@tdendstyles%
 }%
-\LWR@getexparray{LWR@colbeforespec}{\theLWR@tablecolspos}%
+\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}%
 \begingroup\LetLtxMacro{\\}{\LWR@endofline}#6\endgroup%
 \LWR@stoppars%
 \global\boolfalse{LWR@intabularmetadata}%
@@ -53,12 +53,13 @@ class="td%
 \LWR@traceinfo{*** multirow done}%
 }%
 \NewDocumentCommand{\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}%
+\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1}
+\begingroup%
+\LetLtxMacro{\\}{\LWR@endofline}%
+\LWR@domulticolumn[#3][#4]{#1}{\arabic{LWR@tabhtmlcoltotal}}{#2}{#8}%
 \endgroup%
-\addtocounter{LWR@tablecolspos}{#1}%
-\addtocounter{LWR@tablecolspos}{-1}%
+\addtocounter{LWR@tablecolindex}{#1}%
+\addtocounter{LWR@tablecolindex}{-1}%
 \booltrue{LWR@skipatbang}%
 }
 \appto{\LWR@restoreorigformatting}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
new file mode 100644
index 00000000000..5fc3e762dcc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-todonotes.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx  (with options: `todonotes')
+%% 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{todonotes}
+\newcommand{\listoftodos}[1][]{}
+\newcommand{\todo}[2][]{}
+\newcommand{\missingfigure}[2][]{}
+\newcommand{\todototoc}{}
+\endinput
+%%
+%% End of file `lwarp-todonotes.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 333d89cbbad..195c33a9dd0 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/10/30 v0.42  Allows LaTeX to directly produce HTML5 output.]
+    [2017/11/08 v0.43  Allows LaTeX to directly produce HTML5 output.]
 
 
 
@@ -220,6 +220,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{booktabs}
 \LWR@loadafter{boxedminipage}
 \LWR@loadafter{boxedminipage2e}
+\LWR@loadafter{breakurl}
 \LWR@loadafter{ccaption}
 \LWR@loadafter{changepage}
 \LWR@loadafter{chngpage}
@@ -272,6 +273,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{longtable}
 \LWR@loadafter{lscape}
 \LWR@loadafter{ltcaption}
+\LWR@loadafter{luatodonotes}
 \LWR@loadafter{marginfit}
 \LWR@loadafter{marginfix}
 \LWR@loadafter{marginnote}
@@ -335,6 +337,7 @@ For a possible alternative, see package(s) #2.}
 \LWR@loadafter{titling}
 \LWR@loadafter{tocbibind}
 \LWR@loadafter{tocloft}
+\LWR@loadafter{todonotes}
 \LWR@loadafter{transparent}
 \LWR@loadafter{trivfloat}
 \LWR@loadafter{typearea}
@@ -2603,7 +2606,7 @@ nav.botnavigation {
 \begin{warpprint}
 \begin{filecontents*}{sample_project.css}
 /* ( --- Start of project.css --- ) */
-/* A sample project-specific CSS file for lwarp --- ) */
+/* ( --- A sample project-specific CSS file for lwarp --- ) */
 
 /* Load default lwarp settings: */
 @import url("lwarp.css") ;
@@ -2739,7 +2742,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.42"
+printversion = "v0.43"
 
 function printhelp ()
 print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -4076,6 +4079,13 @@ end -- not --version
 
 \end{warpall}
 
+\begin{warpall}
+
+\newcounter{FootnoteDepth}
+\setcounter{FootnoteDepth}{5}
+
+\end{warpall}
+
 \begin{warpHTML}
 
 \newbox\LWR@footnotes
@@ -4147,8 +4157,12 @@ end -- not --version
     \end{BlockClass}
 \fi
 }
-\newcommand*{\LWR@epubprintpendingfootnotes}{%
-\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWP}}%
+\newcommand*{\LWR@maybeprintpendingfootnotes}[1]{%
+\ifboolexpr{
+    not test{\ifnumcomp{#1}{>}{\value{FootnoteDepth}}} or
+    bool{FormatEPUB} or
+    bool{FormatWP}
+}%
 {\LWR@printpendingfootnotes}%
 {}%
 }
@@ -4280,7 +4294,7 @@ end -- not --version
 
 \ifbool{FileSectionNames}%
 {\LWR@filenamenoblanks{#1}}
-{\renewcommand*{\LWR@thisfilename}{\theLWR@htmlfilenumber}}
+{\renewcommand*{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}}
 
 \LWR@htmlblockcomment{%
 |Start file|%
@@ -4373,6 +4387,7 @@ end -- not --version
 \def\@seccntformat#1{\csname the#1\endcsname\protect\quad}
 \newcommand*{\simplechapterdelim}{}
 \let\@chapcntformat\@seccntformat
+\newcounter{LWR@currentautosec}
 \DeclareDocumentCommand{\LWR@section}{m m m m}{%
 \LWR@traceinfo{LWR@section |#2| |#3|}%
 \LWR@traceinfo{LWR@section: not an empty section}%
@@ -4395,7 +4410,7 @@ end -- not --version
         \cnttest{\csuse{LWR@depth#4}}{<=}{\value{LWR@prevFileDepth}}%
     \)%
     \AND%
-    \NOT\equal{#3}{}% phantomsection
+    \NOT\isempty{#3}% phantomsection
 }%
 {% new file
     \LWR@traceinfo{LWR@section: new HTML file}%
@@ -4414,7 +4429,10 @@ end -- not --version
 }%
 
 \ifbool{HTMLDebugComments}{%
+    \begingroup%
+    \LWR@nullfonts%
     \LWR@htmlcomment{Opening #4 ``#3''{}}%
+    \endgroup%
 }{}%
 
 \ifthenelse{%
@@ -4423,6 +4441,7 @@ end -- not --version
 {\LWR@startpars}%
 {}%
 \LWR@createautosec{\csuse{LWR@tag#4}}%
+\setcounter{LWR@currentautosec}{\value{page}}
 \IfBooleanTF{#1}%
 {%
 \ifbool{LWR@forcinghtmltoc}%
@@ -4479,7 +4498,7 @@ end -- not --version
 }% end of not starred
 #3%
 \LWR@htmltag{\csuse{LWR@tag#4end}}%
-\label{autopage-\thepage}%
+\label{autopage-\theLWR@currentautosec}%
 \ifthenelse{%
     \cnttest{\csuse{LWR@depth#4}}{<}{\LWR@depthparagraph}%
 }%
@@ -4504,7 +4523,7 @@ end -- not --version
 
 
 \DeclareDocumentCommand{\part}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthpart}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}%
@@ -4519,7 +4538,7 @@ end -- not --version
 {%
 \DeclareDocumentCommand{\chapter}{s o m}{%
 \LWR@traceinfo{chapter #3}%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthchapter}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}%
@@ -4530,7 +4549,7 @@ end -- not --version
 }
 
 \DeclareDocumentCommand{\section}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthsection}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthsection}{\LWR@printclosesection}%
@@ -4539,7 +4558,7 @@ end -- not --version
 }
 
 \DeclareDocumentCommand{\subsection}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthsubsection}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthsubsection}{\LWR@printclosesubsection}%
@@ -4548,7 +4567,7 @@ end -- not --version
 }
 
 \DeclareDocumentCommand{\subsubsection}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthsubsubsection}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthsubsubsection}%
@@ -4558,7 +4577,7 @@ end -- not --version
 }
 
 \DeclareDocumentCommand{\paragraph}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthparagraph}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthparagraph}{\LWR@printcloseparagraph}%
@@ -4567,7 +4586,7 @@ end -- not --version
 }
 
 \DeclareDocumentCommand{\subparagraph}{s o m}{%
-\LWR@epubprintpendingfootnotes%
+\LWR@maybeprintpendingfootnotes{\LWR@depthsubparagraph}%
 \LWR@stoppars%
 
 \LWR@startnewdepth{\LWR@depthsubparagraph}{\LWR@printclosesubparagraph}%
@@ -5198,6 +5217,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \newbool{LWR@startedrow}
 \boolfalse{LWR@startedrow}
 
+\newbool{LWR@tabularcelladded}
+\boolfalse{LWR@tabularcelladded}
+
 \newbool{LWR@doinghline}
 \boolfalse{LWR@doinghline}
 
@@ -5225,8 +5247,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \ifbool{LWR@skipatbang}%
 {}%
 {%
-    \LWR@printatbang{at}{\theLWR@tablecolspos}%
-    \LWR@printatbang{bang}{\theLWR@tablecolspos}%
+    \LWR@printatbang{at}{\arabic{LWR@tablecolindex}}%
+    \LWR@printatbang{bang}{\arabic{LWR@tablecolindex}}%
 }%
 }
 
@@ -5248,10 +5270,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
             bool{LWR@emptyatbang}
         }%
         {}%
-        {\LWR@getexparray{LWR@colafterspec}{\theLWR@tablecolspos}}%
+        {\LWR@getexparray{LWR@colafterspec}{\arabic{LWR@tablecolindex}}}%
         \ifbool{LWR@tableparcell}{\LWR@stoppars}{}%
         \global\boolfalse{LWR@tableparcell}%
         \leavevmode\unskip\LWR@htmltag{/td}\LWR@orignewline%
+        \global\booltrue{LWR@tabularcelladded}%
         \LWR@insertatbangcols%
     }% not skipping mrowcell
 }% not exiting tabular
@@ -5285,7 +5308,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 {%
     \unskip%
     \LWR@closetabledatacell%
-    \addtocounter{LWR@tablecolspos}{1}%
+    \addtocounter{LWR@tablecolindex}{1}%
+\boolfalse{LWR@tabularcelladded}%
     \LWR@getmynexttoken%
 }%
 {\LWR@origampmacro}%
@@ -5304,15 +5328,26 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \ifbool{LWR@exitingtabular}{%
     \booltrue{LWR@tabularmutemods}%
 }{}%
-\boolfalse{LWR@exitingtabular}%
-\whiledo{\value{LWR@tablecolspos}<\value{LWR@tabletotalcols}}{%
-\LWR@tabledatasinglecolumntag%
+\global\boolfalse{LWR@exitingtabular}%
+\whiledo{%
+    \(%
+        \boolean{LWR@intabularmetadata} \AND%
+        \NOT\boolean{LWR@tabularcelladded} \AND%
+        \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}%
+    \) \OR%
+    \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
+}{%
+    \LWR@tabledatasinglecolumntag%
     \LWR@closetabledatacell%
-    \addtocounter{LWR@tablecolspos}{1}%
+    \addtocounter{LWR@tablecolindex}{1}%
+    \boolfalse{LWR@tabularcelladded}%
     \global\booltrue{LWR@emptyatbang}%
-    \LWR@getmynexttoken%
+    \ifthenelse{%
+        \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
+    }%
+    {\LWR@getmynexttoken}%
+    {}%
 }%
-\LWR@closetabledatacell%
 \endgroup%
 \global\boolfalse{LWR@emptyatbang}%
 }{}% ifboolexpr
@@ -5321,7 +5356,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \NewDocumentCommand{\LWR@tabularendofline}{s o}
 {%
-\ifthenelse{\value{LWR@tablecolspos}<\value{LWR@tabletotalcols}}{%
+\ifthenelse{\value{LWR@tablecolindex}<\value{LWR@tabletotalcols}}{%
     \LWR@tabularfinishrow%
 }%
 {%
@@ -5334,7 +5369,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \global\boolfalse{LWR@doingtbrule}%
 \global\boolfalse{LWR@doingcmidrule}%
 \LWR@clearmidrules%
-\setcounter{LWR@tablecolspos}{1}
+\setcounter{LWR@tablecolindex}{1}%
+\boolfalse{LWR@tabularcelladded}%
 \LWR@getmynexttoken%
 }
 
@@ -5351,9 +5387,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@origcolspec}{}
 
-\newcounter{LWR@tablecolswidth}
+\newcounter{LWR@tablecolspecwidth}
+
+\newcounter{LWR@tablecolspecindex}
 
-\newcounter{LWR@tablecolspos}
+\newcounter{LWR@tablecolindex}
 
 \newcounter{LWR@tabletotalcols}
 
@@ -5363,10 +5401,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \newcommand*{\LWR@colparameter}{}
 \newcommand*{\LWR@parseatcolumn}{%
 \LWR@traceinfo{at column}%
-\addtocounter{LWR@tablecolspos}{1}%
+\addtocounter{LWR@tablecolspecindex}{1}%
 \LWR@traceinfo{about to read the next token:}%
 \expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]
+\StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]
 \fullexpandarg%
 \LWR@traceinfo{have now read the next token}%
 \ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
@@ -5378,19 +5416,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }%
 {% not at the left edge:
     \LWR@traceinfo{not at the left edge}%
-    \LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
-    \LWR@traceinfo{at \theLWR@tabletotalcols: %
-    \LWR@getexparray{LWR@colatspec}{\theLWR@tabletotalcols}}%
+    \LWR@setexparray{LWR@colatspec}{\arabic{LWR@tabletotalcols}}{\LWR@colparameter}%
+    \LWR@traceinfo{at \arabic{LWR@tabletotalcols}: %
+    \LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalcols}}}%
 }%
 \let\LWR@colparameter\relax%
 \booltrue{LWR@validtablecol}%
 }
 \newcommand*{\LWR@parsebangcolumn}{%
 \LWR@traceinfo{bang column}%
-\addtocounter{LWR@tablecolspos}{1}%
+\addtocounter{LWR@tablecolspecindex}{1}%
 \LWR@traceinfo{about to read the next token:}%
 \expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]
+\StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]
 \fullexpandarg%
 \LWR@traceinfo{have now read the next token}%
 \ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
@@ -5400,27 +5438,27 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }%
 {% not at the left edge:
     \LWR@traceinfo{not at the left edge}%
-    \LWR@setexparray{LWR@colbangspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
-    \LWR@traceinfo{bang \theLWR@tabletotalcols: \LWR@colparameter!}%
+    \LWR@setexparray{LWR@colbangspec}{\arabic{LWR@tabletotalcols}}{\LWR@colparameter}%
+    \LWR@traceinfo{bang \arabic{LWR@tabletotalcols}: \LWR@colparameter!}%
 }%
 \let\LWR@colparameter\relax%
 \booltrue{LWR@validtablecol}%
 }
 \newcommand*{\LWR@parsebeforecolumn}{%
-\addtocounter{LWR@tablecolspos}{1}%
+\addtocounter{LWR@tablecolspecindex}{1}%
 \expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]%
+\StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]%
 \fullexpandarg%
-\LWR@setexparray{LWR@colbeforespec}{\theLWR@tabletotalcolsnext}{\LWR@colparameter}%
+\LWR@setexparray{LWR@colbeforespec}{\arabic{LWR@tabletotalcolsnext}}{\LWR@colparameter}%
 \let\LWR@colparameter\relax%
 \booltrue{LWR@validtablecol}%
 }
 \newcommand*{\LWR@parseaftercolumn}{%
-\addtocounter{LWR@tablecolspos}{1}%
+\addtocounter{LWR@tablecolspecindex}{1}%
 \expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]%
+\StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]%
 \fullexpandarg%
-\LWR@setexparray{LWR@colafterspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
+\LWR@setexparray{LWR@colafterspec}{\arabic{LWR@tabletotalcols}}{\LWR@colparameter}%
 \let\LWR@colparameter\relax%
 \booltrue{LWR@validtablecol}%
 }
@@ -5431,7 +5469,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     \LWR@setexparray{LWR@colbarspec}{leftedge}{tvertbarl}%
 }%
 {% not at the left edge:
-    \LWR@setexparray{LWR@colbarspec}{\theLWR@tabletotalcols}{tvertbarr}%
+    \LWR@setexparray{LWR@colbarspec}{\arabic{LWR@tabletotalcols}}{tvertbarr}%
 }%
 \booltrue{LWR@validtablecol}%
 }
@@ -5439,23 +5477,23 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \appto\LWR@tablecolspec{#1}%
 \addtocounter{LWR@tabletotalcols}{1}%
 \addtocounter{LWR@tabletotalcolsnext}{1}%
-\LWR@traceinfo{normal column \theLWR@tabletotalcols: #1}%
-\LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcolsnext}{}%
-\LWR@setexparray{LWR@colbangspec}{\theLWR@tabletotalcolsnext}{}%
-\LWR@setexparray{LWR@colbeforespec}{\theLWR@tabletotalcolsnext}{}%
-\LWR@setexparray{LWR@colafterspec}{\theLWR@tabletotalcolsnext}{}%
-\LWR@setexparray{LWR@colbarspec}{\theLWR@tabletotalcolsnext}{}%
+\LWR@traceinfo{normal column \arabic{LWR@tabletotalcols}: #1}%
+\LWR@setexparray{LWR@colatspec}{\arabic{LWR@tabletotalcolsnext}}{}%
+\LWR@setexparray{LWR@colbangspec}{\arabic{LWR@tabletotalcolsnext}}{}%
+\LWR@setexparray{LWR@colbeforespec}{\arabic{LWR@tabletotalcolsnext}}{}%
+\LWR@setexparray{LWR@colafterspec}{\arabic{LWR@tabletotalcolsnext}}{}%
+\LWR@setexparray{LWR@colbarspec}{\arabic{LWR@tabletotalcolsnext}}{}%
 \booltrue{LWR@validtablecol}%
 }
 
 \newcommand*{\LWR@parsepcolumn}[1]{%
 \LWR@parsenormalcolumn{#1}%
-\addtocounter{LWR@tablecolspos}{1}%
+\addtocounter{LWR@tablecolspecindex}{1}%
 }
 
 \newcommand*{\LWR@parseDcolumn}[1]{%
 \LWR@parsenormalcolumn{#1}%
-\addtocounter{LWR@tablecolspos}{3}%
+\addtocounter{LWR@tablecolspecindex}{3}%
 }
 
 
@@ -5463,6 +5501,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \newcommand*{\LWR@parsetablecols}[1]{%
 \LWR@traceinfo{LWR@parsetablecols started}%
 \renewcommand*{\LWR@origcolspec}{#1}%
+\expandarg%
+\StrSubstitute{\LWR@origcolspec}{ }{}[\LWR@origcolspec]%
 \renewcommand*{\LWR@tablecolspec}{}%
 \setcounter{LWR@tabletotalcols}{0}%
 \setcounter{LWR@tabletotalcolsnext}{1}%
@@ -5484,17 +5524,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \LWR@setexparray{LWR@colbarspec}{1}{}%
 \LWR@setexparray{LWR@colbarspec}{2}{}%
 \LWR@setexparray{LWR@colbarspec}{3}{}%
-\setcounter{LWR@tablecolspos}{1}%
+\setcounter{LWR@tablecolspecindex}{1}%
 \LWR@traceinfo{about to StrLen}%
-\noexpandarg%
-\StrLen{#1}[\LWR@strresult]%
+\expandarg%
+\StrLen{\LWR@origcolspec}[\LWR@strresult]%
 \fullexpandarg%
 \LWR@traceinfo{finished StrLen}%
-\setcounter{LWR@tablecolswidth}{\LWR@strresult}%
-\whiledo{\not\value{LWR@tablecolspos}>\value{LWR@tablecolswidth}}{%
-\noexpandarg%
-\StrChar{#1}{\theLWR@tablecolspos}[\LWR@strresult]%
-\LWR@traceinfo{position \arabic{LWR@tablecolspos}: \LWR@strresult}%
+\setcounter{LWR@tablecolspecwidth}{\LWR@strresult}%
+\whiledo{\not\value{LWR@tablecolspecindex}>\value{LWR@tablecolspecwidth}}{%
+\expandarg%
+\StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@strresult]%
+\LWR@traceinfo{position \arabic{LWR@tablecolspecindex}: \LWR@strresult}%
 \fullexpandarg%
 \boolfalse{LWR@validtablecol}%
 \IfStrEq{\LWR@strresult}{l}{\LWR@parsenormalcolumn{l}}{}%
@@ -5522,8 +5562,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     \LWR@traceinfo{invalid column type: \LWR@strresult}%
     \LWR@parsenormalcolumn{l}%
 }%
-\addtocounter{LWR@tablecolspos}{1}%
-}%
+\addtocounter{LWR@tablecolspecindex}{1}%
+}% whiledo
 }%
 
 
@@ -5580,17 +5620,18 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     {}%
     {\LWR@atbangspec}%
     \LWR@htmltag{/td}\LWR@orignewline%
+    \global\booltrue{LWR@tabularcelladded}%
 }% not empty
 }%
 
 \newcommand*{\LWR@addleftmostbartag}{%
-\ifnumcomp{\value{LWR@tablecolspos}}{=}{1}{%
+\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}{%
     \LWR@printbartag{leftedge}%
 }{}%
 }
 
 \newcommand*{\LWR@tabularleftedge}{%
-\ifthenelse{\cnttest{\value{LWR@tablecolspos}}=1}%
+\ifthenelse{\cnttest{\value{LWR@tablecolindex}}=1}%
 {%
     \LWR@printatbang{at}{leftedge}%
     \LWR@printatbang{bang}{leftedge}%
@@ -5607,12 +5648,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
     \ifbool{LWR@exitingtabular}{}%
     {% not exiting tabular
         \LWR@tabularleftedge%
-        \StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}[\LWR@strresult]%
+        \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]%
         \LWR@htmltag{td class="td%
         \LWR@strresult%
         \LWR@addcmidruletrim%
         \LWR@addleftmostbartag%
-        \LWR@printbartag{\theLWR@tablecolspos}%
+        \LWR@printbartag{\arabic{LWR@tablecolindex}}%
         "%
         \LWR@tdstartstyles%
         \LWR@addcmidrulewidth%
@@ -5635,7 +5676,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
         {}% no pars
         \ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}%
         {}%
-        {\LWR@getexparray{LWR@colbeforespec}{\theLWR@tablecolspos}}%
+        {%
+            \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}%
+        }%
         \global\boolfalse{LWR@intabularmetadata}%
     }% not exiting tabular
 }{}% in tabular metadata
@@ -5662,13 +5705,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 {%
 \setcounter{LWR@midrulecounter}{1}%
 \whiledo{%
-\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolswidth}}%
+\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolspecwidth}}%
 }%
 {%
-\LWR@setexparray{LWR@midrules}{\theLWR@midrulecounter}{0pt}%
+\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}%
 \setlength{\LWR@thiscmidrulewidth}{\LWR@cmidrulewidth}%
-\LWR@setexparray{LWR@trimlrules}{\theLWR@midrulecounter}{}%
-\LWR@setexparray{LWR@trimrrules}{\theLWR@midrulecounter}{}%
+\LWR@setexparray{LWR@trimlrules}{\arabic{LWR@midrulecounter}}{}%
+\LWR@setexparray{LWR@trimrrules}{\arabic{LWR@midrulecounter}}{}%
 \addtocounter{LWR@midrulecounter}{1}%
 }%
 }
@@ -5677,7 +5720,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 \setcounter{LWR@midrulecounter}{#3}%
 \whiledo{\cnttest{\value{LWR@midrulecounter}}{<=}{#4}}%
 {%
-\LWR@setexparray{LWR@midrules}{\theLWR@midrulecounter}{#1}%
+\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}%
 \addtocounter{LWR@midrulecounter}{1}%
 }% whiledo
 \IfSubStr{#2}{l}{\LWR@setexparray{LWR@trimlrules}{#3}{l}}{}%
@@ -5710,7 +5753,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 }
 
 \newcommand*{\LWR@subaddcmidruletrim}[2]{%
-\setlength{\LWR@templengthone}{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}%
+\setlength{\LWR@templengthone}{\LWR@getexparray{LWR@midrules}{\arabic{LWR@tablecolindex}}}%
 \ifdimcomp{\LWR@templengthone}{>}{0pt}%
 {%
     \LWR@origtilde tdrule#1#2%
@@ -5723,8 +5766,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
 
 \newcommand*{\LWR@addcmidruletrim}{%
 \LWR@subaddcmidruletrim%
-{\LWR@getexparray{LWR@trimlrules}{\theLWR@tablecolspos}}%
-{\LWR@getexparray{LWR@trimrrules}{\theLWR@tablecolspos}}%
+{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tablecolindex}}}%
+{\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@tablecolindex}}}%
 }
 
 \newcommand{\LWR@addrulewidth}[2]{%
@@ -5759,7 +5802,7 @@ text-align:#1; vertical-align:#2%
 
 \newcommand*{\LWR@addformatwpalignment}{%
 \ifbool{FormatWP}{%
-\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}[\LWR@strresult]%
+\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]%
 \ifdefstring{\LWR@strresult}{l}{\LWR@WPcell{left}{middle}}{}%
 \ifdefstring{\LWR@strresult}{c}{\LWR@WPcell{center}{middle}}{}%
 \ifdefstring{\LWR@strresult}{r}{\LWR@WPcell{right}{middle}}{}%
@@ -5777,9 +5820,12 @@ text-align:#1; vertical-align:#2%
 \newcounter{LWR@tablemulticolswidth}
 \newcounter{LWR@tablemulticolspos}
 
+\newbool{LWR@mcolvertbarl}
+\newbool{LWR@mcolvertbarr}
+
 \newcommand*{\LWR@printmccoltype}[1]{%
 \LWR@traceinfo{lwr@printmccoltype -#1-}%
-\StrChar{#1}{\theLWR@tablemulticolspos}[\LWR@strresult]%
+\StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
 \IfStrEq{\LWR@strresult}{l}{l}{}%
 \IfStrEq{\LWR@strresult}{c}{c}{}%
 \IfStrEq{\LWR@strresult}{r}{r}{}%
@@ -5791,6 +5837,11 @@ text-align:#1; vertical-align:#2%
 \IfStrEq{\LWR@strresult}{B}{B}{}%
 \IfStrEq{\LWR@strresult}{S}{r}{}%
 \IfStrEq{\LWR@strresult}{X}{p}{}%
+\IfStrEq{\LWR@strresult}{|}{%
+    \ifthenelse{\value{LWR@tablemulticolspos}=1}%
+        {\booltrue{LWR@mcolvertbarl}}%
+        {\booltrue{LWR@mcolvertbarr}}%
+}{}%
 \LWR@traceinfo{lwr@printmccoltype done}%
 }
 
@@ -5802,7 +5853,7 @@ text-align:#1; vertical-align:#2%
 
 \newcommand*{\LWR@multicolother}[1]{%
 \addtocounter{LWR@tablemulticolspos}{1}%
-\StrChar{#1}{\theLWR@tablemulticolspos}[\LWR@strresult]%
+\StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
 \LWR@strresult%
 \booltrue{LWR@validtablecol}%
 }
@@ -5814,7 +5865,7 @@ text-align:#1; vertical-align:#2%
 \newcommand*{\LWR@printmccoldata}[1]{%
 \LWR@traceinfo{lwr@printmccoldata -#1}%
 \boolfalse{LWR@validtablecol}%
-\StrChar{#1}{\theLWR@tablemulticolspos}[\LWR@strresult]%
+\StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]%
 \IfStrEq{\LWR@strresult}{l}{\LWR@multicoltext}{}%
 \IfStrEq{\LWR@strresult}{c}{\LWR@multicoltext}{}%
 \IfStrEq{\LWR@strresult}{r}{\LWR@multicoltext}{}%
@@ -5844,7 +5895,7 @@ text-align:#1; vertical-align:#2%
 \StrLen{#1}[\LWR@strresult]%
 \setcounter{LWR@tablemulticolswidth}{\LWR@strresult}%
 \whiledo{%
-\not\value{LWR@tablemulticolspos}>\value{LWR@tablemulticolswidth}%
+    \NOT\value{LWR@tablemulticolspos}>\value{LWR@tablemulticolswidth}%
 }%
 {%
 #2{#1}%
@@ -5855,15 +5906,19 @@ text-align:#1; vertical-align:#2%
 
 \newcommand{\LWR@multicoltext}{}
 
-\NewDocumentCommand{\LWR@domulticolumn}{o o m m +m}{%
-\LWR@traceinfo{lwr@domulticolumn -#1- -#2- -#3- -#4-}%
+\newcounter{LWR@lastmulticolumn}
+
+\NewDocumentCommand{\LWR@domulticolumn}{o o m m m +m}{%
+\LWR@traceinfo{LWR@domulticolumn -#1- -#2- -#4- -#5-}%
 \renewcommand{\LWR@multicoltext}{%
-#5%
+#6%
 \booltrue{LWR@validtablecol}%
 }%
+\setcounter{LWR@lastmulticolumn}{\value{LWR@tablecolindex}}%
+\addtocounter{LWR@lastmulticolumn}{#3}%
+\addtocounter{LWR@lastmulticolumn}{-1}%
 \LWR@maybenewtablerow%
-\LWR@tabularleftedge%
-\LWR@htmltag{td colspan="#3" %
+\LWR@htmltag{td colspan="#4" %
 \IfValueT{#2}{ % rows?
 rowspan="#2" %
 \IfValueT{#1}{% vpos?
@@ -5872,10 +5927,14 @@ rowspan="#2" %
 }% vpos?
 }% rows?
  class="td%
-\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoltype}%
-\LWR@addcmidruletrim%
-\LWR@addleftmostbartag%
-\LWR@printbartag{\theLWR@tablecolspos}%
+\boolfalse{LWR@mcolvertbarl}%
+\boolfalse{LWR@mcolvertbarr}%
+\LWR@parsemulticolumnalignment{#5}{\LWR@printmccoltype}%
+\LWR@subaddcmidruletrim%
+{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tablecolindex}}}%
+{\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@lastmulticolumn}}}%
+\ifbool{LWR@mcolvertbarl}{ tvertbarl}{}%
+\ifbool{LWR@mcolvertbarr}{ tvertbarr}{}%
 "%
 \LWR@tdstartstyles%
 \LWR@addcmidrulewidth%
@@ -5883,16 +5942,16 @@ rowspan="#2" %
 \LWR@tdendstyles%
 }% end of the opening table data tag
 \global\boolfalse{LWR@intabularmetadata}%
-\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoldata}%
+\LWR@parsemulticolumnalignment{#5}{\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}%
+\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1}
+\LWR@domulticolumn{#1}{\arabic{LWR@tabhtmlcoltotal}}{#2}{#3}%
+\addtocounter{LWR@tablecolindex}{#1}%
+\addtocounter{LWR@tablecolindex}{-1}%
 \booltrue{LWR@skipatbang}%
 }
 
@@ -5907,8 +5966,9 @@ rowspan="#2" %
     {\LWR@setlatestname{#2}}% given and non-empty
 }% optional given
 {\LWR@setlatestname{#3}}% no optional
-\LWR@tabularhtmlcolumns{1}{\theLWR@tabletotalcols}
-\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{P}{% \LWR@domulticolumn
+\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalcols}}
+\LWR@domulticolumn{\arabic{LWR@tabletotalcols}}{\arabic{LWR@tabhtmlcoltotal}}{P}%
+{% \LWR@domulticolumn
 \IfBooleanTF{#1}% star?
 {% yes star
     \LWR@figcaption%
@@ -5958,8 +6018,8 @@ rowspan="#2" %
 \booltrue{LWR@skipatbang}%
 }% end of \LWR@domulticolumn
 
-\addtocounter{LWR@tablecolspos}{\theLWR@tabletotalcols}
-\addtocounter{LWR@tablecolspos}{-1}
+\addtocounter{LWR@tablecolindex}{\arabic{LWR@tabletotalcols}}
+\addtocounter{LWR@tablecolindex}{-1}
 
 }
 
@@ -5969,22 +6029,27 @@ rowspan="#2" %
 \newcounter{LWR@tabhtmlcolend}
 \newcounter{LWR@tabhtmlcoltotal}
 
-\newcommand*{\LWR@tabularhtmlcolumns}[2]{%
-\setcounter{LWR@tabhtmlcolindex}{#1}%
-\setcounter{LWR@tabhtmlcoltotal}{#2}%
-\setcounter{LWR@tabhtmlcolend}{#1}%
-\addtocounter{LWR@tabhtmlcolend}{#2}%
-\whiledo{\value{LWR@tabhtmlcolindex}<\value{LWR@tabhtmlcolend}}{%
-    \edef\LWR@atbangspec{\LWR@getexparray{LWR@colatspec}%
-        {\theLWR@tabhtmlcolindex}}%
+\newcommand*{\LWR@subtabularhtmlcolumns}[1]{%
+    \edef\LWR@atbangspec{\LWR@getexparray{LWR@colatspec}{#1}}%
     \ifdefempty{\LWR@atbangspec}%
         {}%
         {\addtocounter{LWR@tabhtmlcoltotal}{1}}%
-    \edef\LWR@atbangspec{\LWR@getexparray{LWR@colbangspec}%
-        {\theLWR@tabhtmlcolindex}}%
+    \edef\LWR@atbangspec{\LWR@getexparray{LWR@colbangspec}{#1}}%
     \ifdefempty{\LWR@atbangspec}%
         {}%
         {\addtocounter{LWR@tabhtmlcoltotal}{1}}%
+}
+
+\newcommand*{\LWR@tabularhtmlcolumns}[2]{%
+\setcounter{LWR@tabhtmlcolindex}{#1}%
+\setcounter{LWR@tabhtmlcoltotal}{#2}%
+\setcounter{LWR@tabhtmlcolend}{#1}%
+\addtocounter{LWR@tabhtmlcolend}{#2}%
+\ifthenelse{\value{LWR@tabhtmlcolindex}=1}{%
+    \LWR@subtabularhtmlcolumns{leftedge}%
+}{}%
+\whiledo{\value{LWR@tabhtmlcolindex}<\value{LWR@tabhtmlcolend}}{%
+    \LWR@subtabularhtmlcolumns{\arabic{LWR@tabhtmlcolindex}}%
     \addtocounter{LWR@tabhtmlcolindex}{1}%
 }% whiledo
 }
@@ -6025,7 +6090,7 @@ rowspan="#2" %
 
 
 \begin{warpall}
-\let\TabularMacro\relax
+\newcommand*{\TabularMacro}{}
 
 \end{warpall}
 
@@ -6057,7 +6122,7 @@ rowspan="#2" %
 \LWR@traceinfo{LWR@tabledatacolumntag}%
 \let\mynext\LWR@tabledatasinglecolumntag%
 \ifdefequal{\LWR@mynexttoken}{\end}%
-    {\booltrue{LWR@exitingtabular}}{}%
+    {\global\booltrue{LWR@exitingtabular}}{}%
 \ifdefequal{\LWR@mynexttoken}{\caption}%
     {\let\mynext\LWR@donothing}{}%
 \ifdefequal{\LWR@mynexttoken}{\multicolumn}%
@@ -6127,14 +6192,14 @@ rowspan="#2" %
 {
 \newcommand*{\LWR@hline}[1][]{%
     \ifbool{FormatWP}%
-    {\LWR@docmidrule{1-\theLWR@tabletotalcols}}%
+    {\LWR@docmidrule{1-\arabic{LWR@tabletotalcols}}}%
     {\booltrue{LWR@doinghline}}%
     \LWR@getmynexttoken}%
 }
 {
 \newcommand*{\LWR@hline}{%
     \ifbool{FormatWP}%
-    {\LWR@docmidrule{1-\theLWR@tabletotalcols}}%
+    {\LWR@docmidrule{1-\arabic{LWR@tabletotalcols}}}%
     {\booltrue{LWR@doinghline}}%
     \LWR@getmynexttoken}%
 }
@@ -6165,14 +6230,15 @@ rowspan="#2" %
 \global\boolfalse{LWR@doingtbrule}%
 \global\boolfalse{LWR@doingcmidrule}%
 \LWR@nullifyNoAutoSpacing%
-\boolfalse{LWR@exitingtabular}%
-\boolfalse{LWR@tabularmutemods}%
+\global\boolfalse{LWR@exitingtabular}%
+\global\boolfalse{LWR@tabularmutemods}%
 \global\booltrue{LWR@intabularmetadata}%
 \LWR@forcenewpage
 \LWR@htmlblocktag{table}%
 \LWR@parsetablecols{#2}%
 \LWR@stoppars%
-\setcounter{LWR@tablecolspos}{1}%
+\setcounter{LWR@tablecolindex}{1}%
+\boolfalse{LWR@tabularcelladded}%
 \LWR@clearmidrules%
 \LetLtxMacro{\\}{\LWR@tabularendofline}%
 \LWR@traceinfo{LWR@tabular: redefining macros}%
@@ -6182,20 +6248,20 @@ rowspan="#2" %
 \DeclareDocumentCommand{\toprule}{o d()}
     {%
         \IfValueTF{##1}%
-            {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+            {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
             {%
                 \ifbool{FormatWP}%
-                {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+                {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
                 {\booltrue{LWR@doingtbrule}}%
             }%
     \LWR@getmynexttoken}%
 \DeclareDocumentCommand{\midrule}{o d()}%
     {%
         \IfValueTF{##1}%
-            {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+            {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
             {%
                 \ifbool{FormatWP}%
-                {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+                {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
                 {\booltrue{LWR@doinghline}}%
             }%
     \LWR@getmynexttoken}%
@@ -6204,17 +6270,17 @@ rowspan="#2" %
 \DeclareDocumentCommand{\bottomrule}{o d()}
     {%
         \IfValueTF{##1}%
-            {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+            {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
             {%
                 \ifbool{FormatWP}%
-                {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}}%
+                {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}%
                 {\booltrue{LWR@doingtbrule}}%
             }%
     \LWR@getmynexttoken}%
 \DeclareDocumentCommand{\addlinespace}{o}{}%
 \DeclareDocumentCommand{\morecmidrules}{}{}%
 \DeclareDocumentCommand{\specialrule}{m m m d()}%
-    {\LWR@docmidrule[##1](){1-\theLWR@tabletotalcols}\LWR@getmynexttoken}%
+    {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}\LWR@getmynexttoken}%
 \renewcommand{\multicolumn}{\LWR@htmlmulticolumn}%
 \renewcommand*{\mrowcell}{%
     \LWR@maybenewtablerow%
@@ -6223,7 +6289,6 @@ rowspan="#2" %
 }%
 \renewcommand*{\mcolrowcell}{%
     \LWR@maybenewtablerow%
-    \LWR@tabularleftedge%
     \global\booltrue{LWR@skippingmcolrowcell}%
 }%
 \LetLtxMacro{\caption}{\LWR@longtabledatacaptiontag}%
@@ -6239,7 +6304,14 @@ rowspan="#2" %
 }%
 {%
 \LWR@traceinfo{LWR@tabular ending}%
-\ifthenelse{\value{LWR@tablecolspos}<\value{LWR@tablecolswidth}}{%
+\ifthenelse{%
+    \(%
+        \boolean{LWR@intabularmetadata} \AND%
+        \NOT\boolean{LWR@tabularcelladded} \AND%
+        \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}%
+    \) \OR%
+    \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}%
+}{%
     \LWR@tabularfinishrow%
 }%
 {%
@@ -6279,7 +6351,7 @@ rowspan="#2" %
 \zref@newlist{special}
 \zref@newprop{zLWR@name}{\@currentlabelname}
 \zref@newprop{zLWR@htmlfilenumber}{%
-\ifbool{FileSectionNames}{\LWR@thisfilename}{\theLWR@htmlfilenumber}%
+\ifbool{FileSectionNames}{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}%
 }%
 \zref@newprop{zLWR@lateximagedepth}{\arabic{LWR@lateximagedepth}}
 \zref@newprop{zLWR@lateximagenumber}{\arabic{LWR@lateximagenumber}}
@@ -6333,7 +6405,7 @@ rowspan="#2" %
 \LWR@origlabel{#1}%
 \LWR@traceinfo{LWR@newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
 \LWR@traceinfo{LWR@newlabel: LWR@thisfilename is !\LWR@thisfilename!}%
-\LWR@traceinfo{LWR@newlabel: LWR@htmlfilenumber is \theLWR@htmlfilenumber}%
+\LWR@traceinfo{LWR@newlabel: LWR@htmlfilenumber is \arabic{LWR@htmlfilenumber}}%
 \LWR@splabel{#1}%
 \LWR@subsublabel{#1}%
 \LWR@traceinfo{LWR@newlabel: done}%
@@ -6393,7 +6465,7 @@ rowspan="#2" %
 {(\cpageref{#2})}%
 }
 
-\newcommand*{\nameref}[1]{%
+\DeclareRobustCommand*{\nameref}[1]{%
 \LWR@traceinfo{nameref A}%
 \LWR@startref{#1}%
 \LWR@traceinfo{nameref B}%
@@ -6426,7 +6498,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LWR@ensuredoingapar%
 }
 
-\newcommand{\href}{%
+\DeclareRobustCommand*{\href}{%
 \LWR@ensuredoingapar%
 \begingroup%
 \catcode`\_=12
@@ -6435,7 +6507,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 \newcommand*{\LWR@nolinkurlb}[1]{#1\endgroup\LWR@ensuredoingapar}
 
-\newcommand{\nolinkurl}{%
+\DeclareRobustCommand*{\nolinkurl}{%
 \LWR@ensuredoingapar%
 \begingroup\catcode`\_=12
 \LWR@nolinkurlb%
@@ -6447,7 +6519,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \LWR@ensuredoingapar%
 }
 
-\newcommand{\LWR@urla}{%
+\DeclareRobustCommand*{\LWR@urla}{%
 \LWR@ensuredoingapar%
 \begingroup\catcode`\_=12
 \LWR@urlb%
@@ -6871,6 +6943,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \newcommand*{\LWR@restoreorigformatting}{%
 \LWR@traceinfo{LWR@restoreorigformatting}%
 \linespread{1}%
+\LetLtxMacro\ref\LWR@origref%{} syntax highlighting
 \RenewDocumentCommand{\InlineClass}{o m +m}{##3}%
 \RenewDocumentEnvironment{BlockClass}{o m}{}{}%
 \renewcommand{\BlockClassSingle}[2]{##2}%
@@ -6943,6 +7016,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \let\LaTeXe\LWR@origLaTeXe%
 \renewcommand*{\Xe}{X\textsubscript{E}}%
 \LetLtxMacro\@ensuredmath\LWR@origensuredmath%
+\csletcs{equation*}{LWR@origequationstar}%
+\csletcs{endequation*}{LWR@origendequationstar}%
 \LWR@restoreorigaccents%
 \LWR@FBcancel%
 }
@@ -6971,7 +7046,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 \catcode`\$=\active%
 \protected\gdef${\@ifnextchar$\LWR@doubledollar\LWR@singledollar}%
 
-\gdef\LWR@doubledollar$#1$${
+\protected\gdef\LWR@doubledollar$#1$${
 \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
 {
 
@@ -6989,7 +7064,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 }% not mathjax
 }%
-\gdef\LWR@subsingledollar#1{%
+\protected\gdef\LWR@subsingledollar#1{%
 \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
 {%
         {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}%
@@ -7002,12 +7077,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 }%
 }
 
-\gdef\LWR@singledollar#1${%
+\protected\gdef\LWR@singledollar#1${%
 \LWR@subsingledollar{#1}%
 }
 
-\gdef\(#1\){$#1$}
-\gdef\[#1\]{$$#1$$}
+\protected\gdef\(#1\){%
+$#1$}
+\protected\gdef\[#1\]{$$#1$$}
 
 \endgroup
 
@@ -7104,6 +7180,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 
 ]
 
+\csletcs{LWR@origequationstar}{equation*}
+\csletcs{LWR@origendequationstar}{endequation*}
+\renewenvironment*{equation*}
+{\displaymath}
+{\enddisplaymath}
+
 \newbool{LWR@amsmultline}
 \boolfalse{LWR@amsmultline}
 
@@ -7540,7 +7622,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
     \LWR@ensuredoingapar%
     \addtocounter{LWR@externalfilecnt}{1}%
     \LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}%
-    \setcounterpageref{LWR@LIpage}{LWRlateximage\theLWR@lateximagenumber}%
+    \setcounterpageref{LWR@LIpage}{LWRlateximage\arabic{LWR@lateximagenumber}}%
     \LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}%
     \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" %
     class="lateximagesource"{}} \LWR@orignewline
@@ -7806,12 +7888,14 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
 #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}}
 }% AfterEndPreamble
 
-\let\LWR@origlabel\label
-\let\label\LWR@newlabel
-\let\LWR@origref\ref
-\let\ref\LWR@newref% \end{ syntax highlighting
-\let\LWR@origpageref\pageref
-\let\pageref\LWR@newpageref
+\LetLtxMacro\LWR@origlabel\label
+\RenewDocumentCommand{\label}{}{\LWR@newlabel}
+
+\LetLtxMacro\LWR@origref\ref
+\RenewDocumentCommand{\ref}{}{\LWR@newref}%
+
+\LetLtxMacro\LWR@origpageref\pageref
+\RenewDocumentCommand{\pageref}{}{\LWR@newpageref}
 
 \end{warpHTML}
 
@@ -8202,6 +8286,7 @@ width:\rndprintlength{\LWR@tempwidth}%
 \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}%
 \DeclareExpandableDocumentCommand{\InlineClass}{+o +m +m}{##3}%
 \DeclareRobustCommand{\LWR@HTMLtextstyle}[3]{##3}%
+\DeclareRobustCommand{\LWR@subsingledollar}[1]{}%
 }
 
 \renewcommand*{\mdseries}{}