summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-13 23:05:35 +0000
committerKarl Berry <karl@freefriends.org>2017-07-13 23:05:35 +0000
commita7ecf3589db1dd3722fda599c2ac8e80ac17b6ad (patch)
tree8f2f4636e1e0ce9a3f96f06d5b666702b02e6a9d /Master/texmf-dist/tex/latex/lwarp
parentf08c5282873636378a865aa48c1c9fcdd6d00365 (diff)
lwarp (11jul17)
git-svn-id: svn://tug.org/texlive/trunk@44781 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty12
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty247
5 files changed, 187 insertions, 81 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
index 6dea9a9a53c..a0cd928d430 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
@@ -21,9 +21,9 @@
\AfterEndPreamble{
\AtBeginEnvironment{alltt}{%
\LWR@forcenewpage
-\LWR@atbeginverbatim{alltt}\unskip\vspace*{-\baselineskip}%
+\LWR@atbeginverbatim{alltt}\unskip\LWR@origvspace*{-\baselineskip}%
}
-\AfterEndEnvironment{alltt}{\unskip\vspace*{-\baselineskip}\LWR@afterendverbatim}
+\AfterEndEnvironment{alltt}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim}
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
index 87ddbe03c4e..48933536a65 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
@@ -23,12 +23,12 @@
\newcommand*{\fancyfoot}[2][]{}
\newcommand*{\fancyhf}[2][]{}
\newcommand*{\fancypagestyle}[2]{}
-\newcommand*{\lhead}[1]{}
-\newcommand*{\chead}[1]{}
-\newcommand*{\rhead}[1]{}
-\newcommand*{\lfoot}[1]{}
-\newcommand*{\cfoot}[1]{}
-\newcommand*{\rfoot}[1]{}
+\newcommand*{\lhead}[2][]{}
+\newcommand*{\chead}[2][]{}
+\newcommand*{\rhead}[2][]{}
+\newcommand*{\lfoot}[2][]{}
+\newcommand*{\cfoot}[2][]{}
+\newcommand*{\rfoot}[2][]{}
\newcommand*{\headrulewidth}{}
\newcommand*{\footrulewidth}{}
\newcommand*{\fancyheadoffset}[2][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
index 24d8a2c0f25..01fbf6add9a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
@@ -25,7 +25,6 @@
\newlength{\LTcapleft}
\newlength{\LTcapright}
\newcommand*{\LTcapmarginsfalse}{}
-
\endinput
%%
%% End of file `lwarp-ltcaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
index b739f34b90b..e2e20c7ccee 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
@@ -26,10 +26,10 @@
}{}
\LWR@forcenewpage
\LWR@atbeginverbatim{verse}
-\unskip\vspace{-\baselineskip}
+\unskip\LWR@origvspace{-\baselineskip}
}
\AfterEndEnvironment{verse}{
-\unskip\vspace{-\baselineskip}
+\unskip\LWR@origvspace{-\baselineskip}
\LWR@afterendverbatim
}
\ifdef{\poemtitle}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index bad047aecbf..e50befca6dd 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/06/09 v0.32 Allows LaTeX to directly produce HTML5 output.]
+ [2017/07/10 v0.33 Allows LaTeX to directly produce HTML5 output.]
@@ -161,10 +161,14 @@ after lwarp.}
}
\newcommand*{\LWR@loadbefore}[1]{%
+\@ifpackageloaded{#1}
+{}
+{
\PackageError{lwarp}
{Package #1 must be loaded before lwarp}
{Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.}
}
+}
\newcommand*{\LWR@loadnever}[2]{%
\PackageError{lwarp}
@@ -361,7 +365,7 @@ top=1in,bottom=1in,%
\RequirePackage{zref}
-\PassOptionsToPackage{leqno,fleqn}{amsmath}
+\PassOptionsToPackage{leqno}{amsmath}
\RequirePackage{amsmath}
\RequirePackage{environ}
@@ -1304,6 +1308,8 @@ td {padding: 1ex .5em 1ex .5em ;}
table td.tdl { text-align: left ; vertical-align: middle ; }
table td.tdc { text-align: center ; vertical-align: middle ; }
+table td.tdat { text-align: center ; vertical-align: middle ; padding: 0px ; margin: 0px ; }
+table td.tdbang { text-align: center ; vertical-align: middle ; }
table td.tdr { text-align: right ; vertical-align: middle ; }
table td.tdp { text-align: left ; vertical-align: bottom ; }
table td.tdm { text-align: left ; vertical-align: middle ; }
@@ -1315,6 +1321,10 @@ table td.tdlrule { text-align: left ; border-top: 1px solid silver ;
vertical-align: middle ; } /* for cmidrule */
table td.tdcrule { text-align: center ; border-top: 1px solid silver ;
vertical-align: middle ; }
+table td.tdatrule { text-align: center ; border-top: 1px solid silver ;
+ vertical-align: middle ; padding: 0px ; margin: 0px ; }
+table td.tdbangrule { text-align: center ; border-top: 1px solid silver ;
+ vertical-align: middle ; } /* for cmidrule */
table td.tdrrule { text-align: right ; border-top: 1px solid silver ;
vertical-align: middle ; }
table td.tdprule { text-align: left ; border-top: 1px solid silver ;
@@ -2287,7 +2297,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-
-- Print the usage of the lwarpmk command:
-printversion = "v0.32"
+printversion = "v0.33"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -2903,7 +2913,9 @@ end -- not --version
\begin{warpHTML}
\NewDocumentCommand{\LWR@setexparray}{m m m}{%
-\expandafter\edef\csname #1#2\endcsname{\expandonce#3}%
+\ifthenelse{\isempty{#3}}%
+{\csdef{#1#2}{}}
+{\expandafter\edef\csname #1#2\endcsname{\expandonce#3}}%
}
\newcommand*{\LWR@getexparray}[2]{\csuse{#1#2}}
@@ -3438,6 +3450,7 @@ end -- not --version
\begin{warpall}
+\providecommand{\theauthor}{}
\newcommand{\theHTMLAuthor}{\theauthor}
\newcommand{\HTMLAuthor}[1]{\renewcommand{\theHTMLAuthor}{#1}}
@@ -3831,6 +3844,7 @@ end -- not --version
\LWR@traceinfo{chapter #3}%
\LWR@epubprintpendingfootnotes%
\LWR@stoppars%
+
\LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}%
\LWR@traceinfo{chapter: about to LWR@section}%
@@ -4020,7 +4034,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\thanksmarkseries{fnsymbol}
\fi
\fvset{frame=none}%
-\catcode`\&=\active
\LWR@startpars
}
@@ -4486,9 +4499,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\AfterEndPreamble{
\AtBeginEnvironment{verbatim}{%
\LWR@forcenewpage
-\LWR@atbeginverbatim{verbatim}\unskip\vspace*{-\baselineskip}%
+\LWR@atbeginverbatim{verbatim}\unskip\LWR@origvspace*{-\baselineskip}%
}
-\AfterEndEnvironment{verbatim}{\unskip\vspace*{-\baselineskip}\LWR@afterendverbatim}
+\AfterEndEnvironment{verbatim}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim}
}
\end{warpHTML}
@@ -4669,7 +4682,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\AfterEndEnvironment{BVerbatim}
{
-\leavevmode\par\vspace{-\baselineskip}
+\leavevmode\par\LWR@origvspace{-\baselineskip}
\LWR@afterendverbatim
}
@@ -4832,6 +4845,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\newbool{LWR@skippingmrowcell}
+\newbool{LWR@skipatbang}
+
\newbool{LWR@intabularmetadata}
\boolfalse{LWR@intabularmetadata}
@@ -4844,11 +4859,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
{% not skippingmrowcell
\unskip%
\LWR@getexparray{LWR@colafterspec}{\theLWR@tablecolspos}%
-\LWR@getexparray{LWR@colatspec}{\theLWR@tablecolspos}%
-\LWR@getexparray{LWR@colbangspec}{\theLWR@tablecolspos}%
\ifbool{LWR@tableparcell}{\LWR@stoppars}{}%
\global\boolfalse{LWR@tableparcell}%
-\unskip\LWR@htmltag{/td}\LWR@orignewline%
+\leavevmode\unskip\LWR@htmltag{/td}\LWR@orignewline%
+\ifbool{LWR@skipatbang}%
+{\boolfalse{LWR@skipatbang}}%
+{%
+\LWR@printatbang{at}{\theLWR@tablecolspos}%
+\LWR@printatbang{bang}{\theLWR@tablecolspos}%
+}% not skipping at or bang
}% not skipping mrowcell
}% not exiting tabular
\global\boolfalse{LWR@skippingmrowcell}%
@@ -4857,11 +4876,22 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\newcounter{LWR@tabulardepth}
\setcounter{LWR@tabulardepth}{0}
-\def\LWR@origampmacro{&}
-\begingroup
-\catcode`\&=\active
+\let\LWR@origampmacro&
+
+\end{warpHTML}
+\begin{warpall}
+\newcommand{\StartDefiningTabulars}{%
+\warpHTMLonly{\catcode`\&=\active}%
+}
+\newcommand{\EndDefiningTabulars}{%
+\warpHTMLonly{\catcode`\&=4}%
+}
+
+\end{warpall}
+\begin{warpHTML}
-\gdef&{%
+\newcommand*{\LWR@tabularampersand}{%
+\LWR@traceinfo{LWR@tabularampersand}%
\ifthenelse{\cnttest{\value{LWR@tabulardepth}}{>}{0}}%
{%
\unskip%
@@ -4871,7 +4901,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
}%
{\LWR@origampmacro}%
}
-\endgroup
\NewDocumentCommand{\LWR@tabularendofline}{s o}
@@ -4909,65 +4938,68 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\newcounter{LWR@tabletotalcolsnext}
+\newcommand*{\LWR@colparameter}{}
\newcommand*{\LWR@parseatcolumn}{%
\LWR@traceinfo{at column}%
\addtocounter{LWR@tablecolspos}{1}%
\LWR@traceinfo{about to read the next token:}%
\expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@strresult]
+\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]
\fullexpandarg%
\LWR@traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
{% left edge of the table:
\LWR@traceinfo{at the left edge}%
-\LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@strresult}%
+\LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@colparameter}%
+\LWR@traceinfo{at the left edge: %
+ \LWR@getexparray{LWR@colatspec}{leftedge}}%
}%
{% not at the left edge:
\LWR@traceinfo{not at the left edge}%
-\LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcols}{\LWR@strresult}%
+\LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
\LWR@traceinfo{at \theLWR@tabletotalcols: %
- \LWR@getexparray{LWR@colatspec}{\theLWR@tabletotalcols})!}%
-\let\LWR@strresult\relax%
-\booltrue{LWR@validtablecol}%
+ \LWR@getexparray{LWR@colatspec}{\theLWR@tabletotalcols}}%
}%
+\let\LWR@colparameter\relax%
+\booltrue{LWR@validtablecol}%
}
\newcommand*{\LWR@parsebangcolumn}{%
\LWR@traceinfo{bang column}%
\addtocounter{LWR@tablecolspos}{1}%
\LWR@traceinfo{about to read the next token:}%
\expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@strresult]
+\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]
\fullexpandarg%
\LWR@traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}
{% left edge of the table:
\LWR@traceinfo{at the left edge}%
-\LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@strresult}%
+\LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@colparameter}%
}%
{% not at the left edge:
\LWR@traceinfo{not at the left edge}%
-\LWR@setexparray{LWR@colbangspec}{\theLWR@tabletotalcols}{\LWR@strresult}%
-\LWR@traceinfo{bang \theLWR@tabletotalcols: \LWR@colbangspec(\theLWR@tabletotalcols)!}%
+\LWR@setexparray{LWR@colbangspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
+\LWR@traceinfo{bang \theLWR@tabletotalcols: \LWR@colparameter!}%
}%
-\let\LWR@strresult\relax%
+\let\LWR@colparameter\relax%
\booltrue{LWR@validtablecol}%
}
\newcommand*{\LWR@parsebeforecolumn}{%
\addtocounter{LWR@tablecolspos}{1}%
\expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@strresult]%
+\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]%
\fullexpandarg%
-\LWR@setexparray{LWR@colbeforespec}{\theLWR@tabletotalcolsnext}{\LWR@strresult}%
-\let\LWR@strresult\relax%
+\LWR@setexparray{LWR@colbeforespec}{\theLWR@tabletotalcolsnext}{\LWR@colparameter}%
+\let\LWR@colparameter\relax%
\booltrue{LWR@validtablecol}%
}
\newcommand*{\LWR@parseaftercolumn}{%
\addtocounter{LWR@tablecolspos}{1}%
\expandarg%
-\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@strresult]%
+\StrChar{\LWR@origcolspec}{\theLWR@tablecolspos}[\LWR@colparameter]%
\fullexpandarg%
-\LWR@setexparray{LWR@colafterspec}{\theLWR@tabletotalcols}{\LWR@strresult}%
-\let\LWR@strresult\relax%
+\LWR@setexparray{LWR@colafterspec}{\theLWR@tabletotalcols}{\LWR@colparameter}%
+\let\LWR@colparameter\relax%
\booltrue{LWR@validtablecol}%
}
\newcommand*{\LWR@parseskipcolumn}{%
@@ -4977,10 +5009,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\appto\LWR@tablecolspec{#1}%
\addtocounter{LWR@tabletotalcols}{1}%
\addtocounter{LWR@tabletotalcolsnext}{1}%
-\LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcolsnext}{\relax}%
-\LWR@setexparray{LWR@colbangspec}{\theLWR@tabletotalcolsnext}{\relax}%
-\LWR@setexparray{LWR@colbeforespec}{\theLWR@tabletotalcolsnext}{\relax}%
-\LWR@setexparray{LWR@colafterspec}{\theLWR@tabletotalcolsnext}{\relax}%
+\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}{}%
\booltrue{LWR@validtablecol}%
}
@@ -5002,20 +5035,20 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\renewcommand*{\LWR@tablecolspec}{}%
\setcounter{LWR@tabletotalcols}{0}%
\setcounter{LWR@tabletotalcolsnext}{1}%
-\LWR@setexparray{LWR@colatspec}{leftedge}{\relax}%
-\LWR@setexparray{LWR@colatspec}{1}{\relax}%
-\LWR@setexparray{LWR@colatspec}{2}{\relax}%
-\LWR@setexparray{LWR@colatspec}{3}{\relax}%
-\LWR@setexparray{LWR@colbangspec}{leftedge}{\relax}%
-\LWR@setexparray{LWR@colbangspec}{1}{\relax}%
-\LWR@setexparray{LWR@colbangspec}{2}{\relax}%
-\LWR@setexparray{LWR@colbangspec}{3}{\relax}%
-\LWR@setexparray{LWR@colbeforespec}{1}{\relax}%
-\LWR@setexparray{LWR@colbeforespec}{2}{\relax}%
-\LWR@setexparray{LWR@colbeforespec}{3}{\relax}%
-\LWR@setexparray{LWR@colafterspec}{1}{\relax}%
-\LWR@setexparray{LWR@colafterspec}{2}{\relax}%
-\LWR@setexparray{LWR@colafterspec}{3}{\relax}%
+\LWR@setexparray{LWR@colatspec}{leftedge}{}%
+\LWR@setexparray{LWR@colatspec}{1}{}%
+\LWR@setexparray{LWR@colatspec}{2}{}%
+\LWR@setexparray{LWR@colatspec}{3}{}%
+\LWR@setexparray{LWR@colbangspec}{leftedge}{}%
+\LWR@setexparray{LWR@colbangspec}{1}{}%
+\LWR@setexparray{LWR@colbangspec}{2}{}%
+\LWR@setexparray{LWR@colbangspec}{3}{}%
+\LWR@setexparray{LWR@colbeforespec}{1}{}%
+\LWR@setexparray{LWR@colbeforespec}{2}{}%
+\LWR@setexparray{LWR@colbeforespec}{3}{}%
+\LWR@setexparray{LWR@colafterspec}{1}{}%
+\LWR@setexparray{LWR@colafterspec}{2}{}%
+\LWR@setexparray{LWR@colafterspec}{3}{}%
\setcounter{LWR@tablecolspos}{1}%
\LWR@traceinfo{about to StrLen}%
\noexpandarg%
@@ -5026,6 +5059,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\whiledo{\not\value{LWR@tablecolspos}>\value{LWR@tablecolswidth}}{%
\noexpandarg%
\StrChar{#1}{\theLWR@tablecolspos}[\LWR@strresult]%
+\LWR@traceinfo{position \arabic{LWR@tablecolspos}: \LWR@strresult}%
\fullexpandarg%
\boolfalse{LWR@validtablecol}%
\IfStrEq{\LWR@strresult}{l}{\LWR@parsenormalcolumn{l}}{}%
@@ -5050,6 +5084,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\IfStrEq{\LWR@strresult}{M}{\LWR@parsepcolumn{M}}{}%
\IfStrEq{\LWR@strresult}{B}{\LWR@parsepcolumn{B}}{}%
\ifbool{LWR@validtablecol}{}{%
+\LWR@traceinfo{invalid column type: \LWR@strresult}%
\LWR@parsenormalcolumn{l}%
}%
\addtocounter{LWR@tablecolspos}{1}%
@@ -5075,11 +5110,33 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
}
+\newcommand*{\LWR@printatbang}[2]{%
+\edef\LWR@atbangspec{\LWR@getexparray{LWR@col#1spec}{#2}}
+\LWR@traceinfo{atbang: !\LWR@atbangspec!}
+\ifdefempty{\LWR@atbangspec}%
+{}%
+{%
+\LWR@htmltag{td class="td#1%
+\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}%
+"}%
+\LWR@atbangspec%
+\LWR@htmltag{/td}\LWR@orignewline%
+}%
+}%
+
+
\newcommand*{\LWR@tabledatasinglecolumntag}%
{%
\LWR@maybenewtablerow%
+\ifbool{LWR@intabularmetadata}{%
\ifbool{LWR@exitingtabular}{}%
{% not exiting tabular
+\ifthenelse{\cnttest{\value{LWR@tablecolspos}}=1}%
+{%
+\LWR@printatbang{at}{leftedge}%
+\LWR@printatbang{bang}{leftedge}%
+}% left edge
+{}% not left edge
\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}[\LWR@strresult]%
\LWR@htmltag{td class="td%
\LWR@strresult%
@@ -5099,15 +5156,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\global\booltrue{LWR@tableparcell}%
}% allow pars
{}% no pars
-\ifthenelse{\cnttest{\value{LWR@tablecolspos}}=1}%
-{%
-\LWR@getexparray{LWR@colatspec}{leftedge}%
-\LWR@getexparray{LWR@colbangspec}{leftedge}%
-}% left edge
-{}% not left edge
\LWR@getexparray{LWR@colbeforespec}{\theLWR@tablecolspos}%
\global\boolfalse{LWR@intabularmetadata}%
}% not exiting tabular
+}{}% in tabular metadata
}%
@@ -5120,7 +5172,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolswidth}}%
}%
{%
-\LWR@setexparray{LWR@midrules}{\theLWR@midrulecounter}{\relax}%
+\LWR@setexparray{LWR@midrules}{\theLWR@midrulecounter}{}%
\addtocounter{LWR@midrulecounter}{1}%
}%
}
@@ -5249,7 +5301,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
{\LWR@setlatestname{#2}}% given and non-empty
}% optional given
{\LWR@setlatestname{#3}}% no optional
-\LWR@domulticolumn{\theLWR@tabletotalcols}{P}{% \LWR@domulticolumn
+\LWR@tabularhtmlcolumns{1}{\theLWR@tabletotalcols}
+\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{P}{% \LWR@domulticolumn
\IfBooleanTF{#1}% star?
{% yes star
\LWR@htmlblocktag{figcaption}%
@@ -5296,6 +5349,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
}% end of yes TOC entry
}% end of TOC entry not empty
}% end of no star
+\booltrue{LWR@skipatbang}%
}% end of \LWR@domulticolumn
\addtocounter{LWR@tablecolspos}{\theLWR@tabletotalcols}
@@ -5304,11 +5358,39 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
}
+
+\newcounter{LWR@tabhtmlcolindex}
+\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}}%
+\ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}%
+\edef\LWR@atbangspec{\LWR@getexparray{LWR@colbangspec}{\theLWR@tabhtmlcolindex}}%
+\ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}%
+\addtocounter{LWR@tabhtmlcolindex}{1}%
+}%
+\ifthenelse{\value{LWR@tablecolspos}=1}{%
+\edef\LWR@atbangspec{\LWR@getexparray{LWR@colatspec}{leftedge}}%
+\ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}%
+\edef\LWR@atbangspec{\LWR@getexparray{LWR@colbangspec}{leftedge}}%
+\ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}%
+}{}%
+}
+
+
\NewDocumentCommand{\LWR@tabledatamulticolumntag}{m m +m}%
{%
-\LWR@domulticolumn{#1}{#2}{#3}%
+\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1}
+\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}%
\addtocounter{LWR@tablecolspos}{#1}%
\addtocounter{LWR@tablecolspos}{-1}%
+\booltrue{LWR@skipatbang}%
}
@@ -5347,8 +5429,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}%
{\let\mynext\LWR@donothing}{}%
\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\toprule}}%
-{%
-\let\mynext\LWR@donothing}{}%
+{\let\mynext\LWR@donothing}{}%
\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\midrule}}%
{\let\mynext\LWR@donothing}{}%
\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cmidrule}}%
@@ -5375,10 +5456,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\begin{warpHTML}
+\StartDefiningTabulars
+
\newenvironment*{LWR@tabular}[2][]
{%
-\LWR@traceinfo{tabular started}%
-\begingroup%
+\LWR@traceinfo{LWR@tabular started}%
\addtocounter{LWR@tabulardepth}{1}%
\global\boolfalse{LWR@startedrow}%
\global\boolfalse{LWR@doinghline}%
@@ -5393,12 +5475,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\LWR@clearmidrules%
\let\\\LWR@tabularendofline%
\renewcommand*{\hline}{\LWR@domidrule\LWR@getmynexttoken}%
+
\newcommand*{\midrule}{\LWR@domidrule\LWR@getmynexttoken}%
+
\NewDocumentCommand{\cmidrule}{o d() m}%
{\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}%
+
\RenewDocumentCommand{\cline}{m}%
{\LWR@docmidrule{##1}\LWR@getmynexttoken}%
+
\newcommand*{\toprule}{\LWR@dotbrule\LWR@getmynexttoken}%
+
\newcommand*{\bottomrule}{\LWR@dotbrule\LWR@getmynexttoken}%
\let\multicolumn\LWR@tabledatamulticolumntag%
\let\multirow\LWR@tabledatamultirowtag%
@@ -5406,17 +5493,25 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\let\caption\LWR@longtabledatacaptiontag%
\global\boolfalse{LWR@tableparcell}%
\global\boolfalse{LWR@skippingmrowcell}%
+\global\boolfalse{LWR@skipatbang}%
+\StartDefiningTabulars%
+\protected\gdef&{\LWR@tabularampersand}%
\LWR@getmynexttoken%
}%
{%
+\LWR@traceinfo{LWR@tabular ending}%
\LWR@closetabledatacell%
\LWR@htmlblocktag{/tr}%
\LWR@htmlblocktag{/table}%
\global\boolfalse{LWR@intabularmetadata}%
\addtocounter{LWR@tabulardepth}{-1}%
-\endgroup%
+\protected\gdef&{\LWR@origampmacro}%
+\EndDefiningTabulars%
+\LWR@traceinfo{LWR@tabular finished ending}%
}
+\EndDefiningTabulars
+
\end{warpHTML}
@@ -5706,7 +5801,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
\newcommand{\LWR@caption@end}
{%
\LWR@origcaption@end%
-\vspace*{\baselineskip}%
+\LWR@origvspace*{\baselineskip}%
\LWR@htmlblocktag{/figcaption}%
\endgroup%
\LWR@traceinfo{LWR@caption@end: done}%
@@ -6178,8 +6273,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
-
\BeforeBeginEnvironment{multline}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6204,6 +6299,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{multline*}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6229,6 +6325,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
\BeforeBeginEnvironment{gather}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6252,6 +6349,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{gather*}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6275,6 +6373,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{align}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6298,6 +6397,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{align*}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6321,6 +6421,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{flalign}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6344,6 +6445,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
}
\BeforeBeginEnvironment{flalign*}{
+
\ifbool{mathjax}
{
\LWR@syncmathjax
@@ -6831,8 +6933,9 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
\begin{warpHTML}
-
-
+\AtEndPreamble{
+\RequirePackage{cleveref}
+}
\AfterEndPreamble{
@@ -6979,7 +7082,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
\LWR@endminipage% The following empty line is required:
\LWR@htmldivclassend{minipage}%
-\vspace{1\baselineskip}% required for subcaption
+\LWR@origvspace{1\baselineskip}% required for subcaption
\addtocounter{LWR@minipagedepth}{-1}%
\LWR@startpars%
\global\booltrue{LWR@minipagethispar}%
@@ -7081,6 +7184,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
\let\LWR@origquad\quad
\let\LWR@origqquad\qquad
\let\LWR@orighspace\hspace
+\let\LWR@origvspace\vspace
\let\LWR@origrule\rule
\let\LWR@origmedskip\medskip
@@ -7180,6 +7284,9 @@ span style="width:\printlength{\LWR@tempwidth}; display:inline-block;"%
}
\let\hspace\LWR@hspace
+\NewDocumentCommand{\LWR@vspace}{s m}{}
+\let\vspace\LWR@vspace
+
\renewcommand*{\linebreak}[1][]{\newline}
\renewcommand*{\nolinebreak}[1][]{}