From c4cd2799fbf89ae70bc03fd56c85029fccff4226 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Sep 2018 21:27:24 +0000 Subject: lwarp (19sep18) git-svn-id: svn://tug.org/texlive/trunk@48702 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty | 35 ++ .../texmf-dist/tex/latex/lwarp/lwarp-booklet.sty | 37 +++ .../texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty | 18 +- .../texmf-dist/tex/latex/lwarp/lwarp-bophook.sty | 23 ++ .../texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty | 2 + .../tex/latex/lwarp/lwarp-draftfigure.sty | 30 ++ .../texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty | 34 ++ .../tex/latex/lwarp/lwarp-fullminipage.sty | 22 ++ .../texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 6 +- .../tex/latex/lwarp/lwarp-grid-system.sty | 28 ++ .../texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty | 21 ++ .../texmf-dist/tex/latex/lwarp/lwarp-leading.sty | 22 ++ .../texmf-dist/tex/latex/lwarp/lwarp-listings.sty | 22 +- .../texmf-dist/tex/latex/lwarp/lwarp-multirow.sty | 14 +- .../texmf-dist/tex/latex/lwarp/lwarp-register.sty | 8 +- Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty | 24 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty | 32 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty | 23 ++ .../tex/latex/lwarp/lwarp-widows-and-orphans.sty | 24 ++ Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 361 +++++++++++---------- 22 files changed, 590 insertions(+), 200 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty new file mode 100644 index 00000000000..73ca9c52241 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty @@ -0,0 +1,35 @@ +%% +%% This is file `lwarp-2up.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `2up') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{2up}[2010/05/15] +\def\source#1#2#3{} +\def\target#1#2#3{} +\def\targetlayout#1{} +\newdimen\pageseplength +\newdimen\pagesepwidth +\newdimen\pagesepoffset +\def\twoupemptypage{} +\def\twoupclearpage{} +\def\twoupeject{} +\def\twouparticle{} +\def\twoupplain{} +\def\twouplegaltarget{} +\def\twouplandscape{} +\def\TwoupWrites{} +\endinput +%% +%% End of file `lwarp-2up.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty new file mode 100644 index 00000000000..35a0f81ef9a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty @@ -0,0 +1,37 @@ +%% +%% This is file `lwarp-booklet.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `booklet') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{booklet}[2009/09/02] +\newdimen\pageseplength +\newdimen\pagesepwidth +\newdimen\pagesepoffset +\newif\ifsidebyside \sidebysidetrue +\newif\ifuselandscape \uselandscapefalse +\newif\ifprintoption \printoptionfalse +\newcommand*{\pagespersignature}[1]{} +\def\magstepminus#1{} +\newcommand*{\target}[3]{} +\newcommand*{\source}[3]{} +\newcommand*{\setpdftargetpages}{} +\newcommand*{\setdvipstargetpages}{} +\newcommand*{\targettopbottom}{} +\newcommand*{\twoupemptypage}{} +\newcommand*{\twoupclearpage}{} +\newcommand*{\checkforlandscape}{} +\endinput +%% +%% End of file `lwarp-booklet.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index e05f2dfd0d2..62aec695049 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -27,11 +27,11 @@ \DeclareDocumentCommand{\LWR@HTML@toprule}{o d()}% {% \IfValueTF{#1}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% {% \ifbool{FormatWP}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% - {\booltrue{LWR@doingtbrule}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% + {\global\booltrue{LWR@doingtbrule}}% }% \LWR@getmynexttoken} @@ -40,10 +40,10 @@ \DeclareDocumentCommand{\LWR@HTML@midrule}{o d()}% {% \IfValueTF{#1}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% {% \ifbool{FormatWP}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hlines}{1}}% }% \LWR@getmynexttoken} @@ -59,11 +59,11 @@ \DeclareDocumentCommand{\LWR@HTML@bottomrule}{o d()}{% \IfValueTF{#1}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% {% \ifbool{FormatWP}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}}% - {\booltrue{LWR@doingtbrule}}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}}% + {\global\booltrue{LWR@doingtbrule}}% }% \LWR@getmynexttoken% }% @@ -79,7 +79,7 @@ \LWR@expandableformatted{morecmidrules} \DeclareDocumentCommand{\LWR@HTML@specialrule}{m m m d()}% - {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalcols}}\LWR@getmynexttoken}% + {\LWR@docmidrule[#1](){1-\arabic{LWR@tabletotalLaTeXcols}}\LWR@getmynexttoken}% \LWR@expandableformatted{specialrule} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty new file mode 100644 index 00000000000..cbdb943378d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-bophook.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bophook') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{bophook} +\newcommand*{\AtBeginPage}[1]{} +\newcommand*{\PageLayout}[1]{} +\endinput +%% +%% End of file `lwarp-bophook.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty index 9167558c84c..8c227a07c15 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty @@ -63,11 +63,13 @@ \newcommand{\LWR@diagboxTSW}[3]{% \LWR@diagboxSW{#2}{#3} \BlockClassSingle{diagboxtitleS}{#1} +\LWR@stoppars% } \newcommand{\LWR@diagboxTSE}[3]{% \LWR@diagboxSE{#2}{#3} \BlockClassSingle{diagboxtitleS}{#1} +\LWR@stoppars% } \def\diagbox@triple#1#2#3#4{% \setkeys{diagbox}{dir=NW,#1}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty new file mode 100644 index 00000000000..5616cbe6d0a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-draftfigure.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `draftfigure') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{draftfigure}[2017/07/19] +\RequirePackage{xkeyval} +\define@key{draftfigure}{code}{} +\define@key{draftfigure}{noframe}[true]{} +\define@key{draftfigure}{filename}[true]{} +\define@key{draftfigure}{content}[]{} +\define@key{draftfigure}{style}[normal]{} +\define@key{draftfigure}{position}[left]{} +\define@key{draftfigure}{size}[normal]{} +\newcommand\setdf[1]{\setkeys{draftfigure}{#1}} +\endinput +%% +%% End of file `lwarp-draftfigure.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty new file mode 100644 index 00000000000..8e930d8a1fe --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty @@ -0,0 +1,34 @@ +%% +%% This is file `lwarp-fancytabs.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fancytabs') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{fancytabs} +\newcommand{\fancytab}[3][RIGHT]{} +\newcommand{\fancytabsStyle}[1]{} +\newcommand{\fancytabsHeight}[1]{} +\newcommand{\fancytabsWidth}[1]{} +\newcommand{\fancytabsCount}[1]{} +\newcommand{\fancytabsLeftColor}[1]{} +\newcommand{\fancytabsRightColor}[1]{} +\newcommand{\fancytabsTop}[1]{} +\newcommand{\fancytabsTextVPos}[1]{} +\newcommand{\fancytabsTextHPos}[1]{} +\newcommand{\fancytabsGap}[1]{} +\newcommand{\fancytabsFloor}[1]{} +\newcommand{\fancytabsRotate}[1]{} +\endinput +%% +%% End of file `lwarp-fancytabs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty new file mode 100644 index 00000000000..75f63d39644 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-fullminipage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fullminipage') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{fullminipage}[2014/07/06] +\newenvironment{fullminipage}[1][]{}{} +\endinput +%% +%% End of file `lwarp-fullminipage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty index d5240e57333..f6bf091f0ee 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty @@ -15,7 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{fullpage} +\LWR@ProvidesPackageDrop{fullpage}[1994/06/01] \endinput %% %% End of file `lwarp-fullpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index deaef2c9227..9c3588bb24a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -187,9 +187,9 @@ \renewcommand*{\LWR@igyscale}{1}% \renewcommand*{\LWR@igclass}{inlineimage}% \IfValueF{#3}{% -\IfValueTF{#2}% -{\setkeys{igraph}{#2}}% -{\setkeys{igraph}{}}% + \IfValueTF{#2}% + {\setkeys{igraph}{#2}}% + {\setkeys{igraph}{}}% }% \ifbool{FormatWP}{% \begingroup% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty new file mode 100644 index 00000000000..fec3fb1b480 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty @@ -0,0 +1,28 @@ +%% +%% This is file `lwarp-grid-system.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `grid-system') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{grid-system}[2014/02/16] +\AtBeginEnvironment{Row}{\setlength{\linewidth}{6in}} + +\ifdef{\endrow}{ + \AtBeginEnvironment{row}{\setlength{\linewidth}{6in}} +}{} + +\renewcommand{\gridsystem@finishcell}{\hspace{\gridsystem@cellsep}} +\endinput +%% +%% End of file `lwarp-grid-system.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty new file mode 100644 index 00000000000..e3e0c6dd959 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-layaureo.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `layaureo') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{layaureo}[2004/09/16] +\endinput +%% +%% End of file `lwarp-layaureo.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty new file mode 100644 index 00000000000..7bf91170dfb --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-leading.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `leading') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{leading}[2008/12/11] +\newcommand\leading[1]{} +\endinput +%% +%% End of file `lwarp-leading.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 58f2e42109c..e108ce3eb2b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -27,6 +27,15 @@ \let\LWR@origlsthkEveryPar\lsthk@EveryPar \renewcommand{\l@lstlisting}[2]{\hypertocfloat{1}{lstlisting}{lol}{#1}{#2}} +\def\lstset@#1{\endgroup% + \setkeys{lst}{% + #1% + ,literate=% + {<}{\HTMLentity{lt}}{4}% + {>}{\HTMLentity{gt}}{4}% + {\&}{\HTMLentity{amp}}{5}% + }% +} \renewcommand{\lst@Init}[1]{% \LWR@traceinfo{lst@Init}% \renewcommand*{\@captype}{lstlisting}% @@ -40,6 +49,7 @@ \lstframe@\lst@frameround ffff\relax% \lst@multicols\@empty% \LWR@origlst@Init{#1}\relax% +\def\lst@framelr{}% \LWR@traceinfo{finished origlst@Init}% \lst@ifdisplaystyle% \LWR@traceinfo{About to create verbatim.}% @@ -52,6 +62,7 @@ \ifbool{LWR@verbtags}{\LWR@htmltag{span class="inlineprogramlisting"}}{}% \fi% } + \renewcommand*{\lst@DeInit}{% \lst@ifdisplaystyle% \let\lsthk@EveryPar\relax% @@ -124,12 +135,11 @@ \lstKV@SwitchCases{#1}% {none&\\% left&\def\lst@PlaceNumber{% -\LWR@orignormalfont% -\lst@numberstyle{\thelstnumber}\kern\lst@numbersep% -} -\\% - right&\def\lst@PlaceNumber{\rlap{\LWR@orignormalfont - \kern\VerbatimHTMLWidth \kern\lst@numbersep + \LWR@orignormalfont% + \lst@numberstyle{\thelstnumber}\kern\lst@numbersep% + }\\% + right&\def\lst@PlaceNumber{\LWR@origrlap{\LWR@orignormalfont + \kern 6in \kern\lst@numbersep \lst@numberstyle{\thelstnumber}}}% }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}} \end{warpHTML} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index 28dc558d3bb..6e1356070d2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -35,10 +35,10 @@ style="\LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % \LWR@print@mbox{padding-\LWR@multirowborder:} 2px" % }% class="td% -\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}% +\LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% \LWR@addcmidruletrim% \LWR@addleftmostbartag% -\LWR@printbartag{\arabic{LWR@tablecolindex}}% +\LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% "% \LWR@tdstartstyles% \LWR@addcmidrulewidth% @@ -46,7 +46,7 @@ class="td% \LWR@addtabularrulecolors% \LWR@tdendstyles% }% -\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}% +\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% \begingroup\LetLtxMacro{\\}{\LWR@endofline}#6\endgroup% \LWR@stoppars% \global\boolfalse{LWR@intabularmetadata}% @@ -58,14 +58,14 @@ class="td% \AtBeginDocument{ \NewExpandableDocumentCommand{\LWR@HTML@multicolumnrow}{m m O{} m O{} m O{} +m}{% -\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1} +\LWR@tabularhtmlcolumns{\arabic{LWR@tableLaTeXcolindex}}{#1} \begingroup% \LetLtxMacro{\\}{\LWR@endofline}% \LWR@domulticolumn[#3][#4]{#1}{\arabic{LWR@tabhtmlcoltotal}}{#2}{#8}% \endgroup% -\addtocounter{LWR@tablecolindex}{#1}% -\addtocounter{LWR@tablecolindex}{-1}% -\booltrue{LWR@skipatbang}% +\addtocounter{LWR@tableLaTeXcolindex}{#1}% +\addtocounter{LWR@tableLaTeXcolindex}{-1}% +\global\booltrue{LWR@skipatbang}% } \LWR@expandableformatted{multicolumnrow} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty index 8b9f58362aa..7ecce7475af 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty @@ -21,8 +21,8 @@ \xpatchcmd{\register} {\centering} {\begin{center}\begin{lateximage}[-register-~\packagediagramname]} - {\typeout{Patch register success.}} - {\typeout{Patch register failure.}} + {} + {\LWR@patcherror{register}{register}} \xpatchcmd{\endregister} {\leftskip} @@ -30,8 +30,8 @@ \end{lateximage}\end{center}% \leftskip% }% - {\typeout{Patch endregister success.}} - {\typeout{Patch endregister failure.}} + {} + {\LWR@patcherror{register}{endregister}} \setlength{\regWidth}{5in} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty new file mode 100644 index 00000000000..f26ef6f1973 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-thumb.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thumb') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{thumb} +\newcommand*{\Overviewpage}{} +\newlength{\thumbheight} +\newlength{\thumbwidth} +\endinput +%% +%% End of file `lwarp-thumb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty new file mode 100644 index 00000000000..0a8a80cd82b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-thumbs.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `thumbs') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{thumbs} +\newcommand{\addthumb}[4]{} +\newcommand{\addtitlethumb}[5]{} +\newcommand{\stopthumb}{} +\newcommand{\continuethumb}{} +\newcommand{\thumbsoverview}[1]{} +\newcommand{\thumbsoverviewback}[1]{} +\newcommand{\thumbsoverviewverso}[1]{} +\newcommand{\thumbsoverviewdouble}[1]{} +\newcommand{\thumbnewcolumn}{} +\newcommand{\addthumbsoverviewtocontents}[2]{} +\newcommand{\thumbsnophantom}{} +\endinput +%% +%% End of file `lwarp-thumbs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 12d5fd7c790..3bedd9e3e15 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -19,7 +19,7 @@ \LWR@ProvidesPackagePass{tikz}[2015/08/07] -\newboolean{LWR@tikzbabel} +\newbool{LWR@tikzbabel} \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 {\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty new file mode 100644 index 00000000000..783ddc54a22 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup-gen.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-twoup-gen.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `twoup-gen') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{twoup-gen} + +\LWR@origRequirePackage{lwarp-2up} +\endinput +%% +%% End of file `lwarp-twoup-gen.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty new file mode 100644 index 00000000000..bc35aa95d2f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-widows-and-orphans.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `widows-and-orphans') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{widows-and-orphans}[2018/09/01] +\NewDocumentCommand\WaOsetup{m}{} +\NewDocumentCommand\WaOparameters{}{} +\NewDocumentCommand\WaOignorenext{}{} +\endinput +%% +%% End of file `lwarp-widows-and-orphans.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 719adc22c37..8f664fc5138 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/09/07 v0.59 Allows LaTeX to directly produce HTML5 output.] + [2018/09/19 v0.60 Allows LaTeX to directly produce HTML5 output.] @@ -337,6 +337,7 @@ For a possible alternative, see package(s) #2.} \LWR@earlyloadnever{glossary}{glossaries} \LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx} \LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol} +\LWR@loadafter{2up} \LWR@loadafter{a4} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} @@ -371,8 +372,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{bigdelim} \LWR@loadafter{bigstrut} \LWR@loadafter{blowup} +\LWR@loadafter{booklet} \LWR@loadafter{bookmark} \LWR@notmemoirloadafter{booktabs} +\LWR@loadafter{bophook} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} @@ -406,6 +409,7 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{dcolumn} \LWR@loadafter{diagbox} \LWR@loadafter{draftcopy} +\LWR@loadafter{draftfigure} \LWR@loadafter{draftwatermark} \LWR@loadafter{easy-todo} \LWR@loadafter{ebook} @@ -428,6 +432,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyhdr} \LWR@loadafter{fancyheadings} \LWR@loadafter{fancyref} +\LWR@loadafter{fancytabs} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} \LWR@loadafter{figsize} @@ -452,6 +457,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{forest} \LWR@loadafter{framed} \LWR@loadafter{ftnright} +\LWR@loadafter{fullminipage} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} \LWR@loadafter{fwlw} @@ -460,6 +466,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{glossary} \LWR@loadafter{grffile} \LWR@loadafter{grid} +\LWR@loadafter{grid-system} \LWR@loadafter{gridset} \LWR@loadafter{hang} \LWR@loadafter{hanging} @@ -476,7 +483,9 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{index} \LWR@loadafter{intopdf} \LWR@loadafter{keyfloat} +\LWR@loadafter{layaureo} \LWR@loadafter{layout} +\LWR@loadafter{leading} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} \LWR@loadafter{lineno} @@ -591,6 +600,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{textpos} \LWR@loadafter{theorem} \LWR@loadafter{threeparttable} +\LWR@loadafter{thumb} +\LWR@loadafter{thumbs} \LWR@loadafter{tikz} \LWR@loadafter{titleps} \LWR@loadafter{titlesec} @@ -606,6 +617,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{trimclip} \LWR@loadafter{trivfloat} \LWR@loadafter{turnthepage} +\LWR@loadafter{twoup-gen} \LWR@loadafter{ulem} \LWR@loadafter{underscore} \LWR@loadafter{units} @@ -620,6 +632,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{wallpaper} \LWR@loadafter{wasysym} \LWR@loadafter{watermark} +\LWR@loadafter{widows-and-orphans} \LWR@loadafter{wrapfig} \LWR@loadafter{xcolor} \LWR@loadafter{xellipsis} @@ -3456,7 +3469,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.59" +printversion = "v0.60" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () @@ -4397,11 +4410,14 @@ end -- not --version \begin{warpHTML} \NewDocumentCommand{\LWR@setexparray}{m m m}{% -\ifstrempty{#3}% -{\csdef{#1#2}{}}% -{\expandafter\edef\csname #1#2\endcsname{\expandonce#3}}% + \xdef\LWR@thisexparrayname{#1#2}% + \ifstrempty{#3}% + {\csgdef{\LWR@thisexparrayname}{}}% + {\csxdef{\LWR@thisexparrayname}{#3}}% +} +\newcommand*{\LWR@getexparray}[2]{% + \@nameuse{#1#2}% } -\newcommand*{\LWR@getexparray}[2]{\@nameuse{#1#2}} \end{warpHTML} @@ -6641,7 +6657,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@pleft}{} \newcommand*{\LWR@pright}{} -\newcommand*{\LWR@tablecolspec}{} \providecommand*{\LWR@strresult}{} \providecommand*{\LWR@strresulttwo}{} @@ -6652,11 +6667,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcounter{LWR@tablecolspecindex} -\newcounter{LWR@tablecolindex} +\newcounter{LWR@tableLaTeXcolindex} -\newcounter{LWR@tabletotalcols} +\newcounter{LWR@tabletotalLaTeXcols} -\newcounter{LWR@tabletotalcolsnext} +\newcounter{LWR@tabletotalLaTeXcolsnext} @@ -6664,8 +6679,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifbool{LWR@skipatbang}% {}% {% - \LWR@printatbang{at}{\arabic{LWR@tablecolindex}}% - \LWR@printatbang{bang}{\arabic{LWR@tablecolindex}}% + \LWR@printatbang{at}{\arabic{LWR@tableLaTeXcolindex}}% + \LWR@printatbang{bang}{\arabic{LWR@tableLaTeXcolindex}}% }% } @@ -6676,8 +6691,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifboolexpr{bool{LWR@skippingmrowcell} or bool{LWR@skippingmcolrowcell}}% {% \ifbool{LWR@skippingmcolrowcell}% - {}% - {\LWR@insertatbangcols}% + {}% + {\LWR@insertatbangcols}% }% {% not skippingmrowcell \unskip% @@ -6687,7 +6702,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% bool{LWR@emptyatbang} }% {}% - {\LWR@getexparray{LWR@colafterspec}{\arabic{LWR@tablecolindex}}}% + {\LWR@getexparray{LWR@colafterspec}{\arabic{LWR@tableLaTeXcolindex}}}% \ifbool{LWR@tableparcell}{\LWR@stoppars}{}% \global\boolfalse{LWR@tableparcell}% \whileboolexpr{test {\ifnumcomp{\value{LWR@cellcolordepth}}{>}{0}}}{% @@ -6702,8 +6717,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@skippingmrowcell}% \global\boolfalse{LWR@skippingmcolrowcell}% \global\boolfalse{LWR@skipatbang}% -\renewcommand*{\LWR@cellHTMLcolor}{} -\renewcommand*{\LWR@columnHTMLcolor}{} +\gdef\LWR@cellHTMLcolor{} +\gdef\LWR@columnHTMLcolor{} \setcounter{LWR@cellcolordepth}{0} } \let\LWR@origampmacro& @@ -6716,8 +6731,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \unskip% \LWR@closetabledatacell% - \addtocounter{LWR@tablecolindex}{1}% - \boolfalse{LWR@tabularcelladded}% + \addtocounter{LWR@tableLaTeXcolindex}{1}% + \global\boolfalse{LWR@tabularcelladded}% \LWR@getmynexttoken% }% {\LWR@origampmacro}% @@ -6733,43 +6748,49 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% test{\ifnumcomp{\value{LWR@hdashedlines}}{>}{0}} or% bool{LWR@startedrow}% }{% -\begingroup% \ifbool{LWR@exitingtabular}{% - \booltrue{LWR@tabularmutemods}% -}{}% + \global\booltrue{LWR@tabularmutemods}% +}{% + \global\boolfalse{LWR@tabularmutemods}% +}% \global\boolfalse{LWR@exitingtabular}% \whileboolexpr{% test { - \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{<}{\value{LWR@tabletotalLaTeXcols}} } or % (% bool{LWR@intabularmetadata} and% not bool{LWR@tabularcelladded} and% test { - \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}} + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{\value{LWR@tabletotalLaTeXcols}} }% )% }% {% \LWR@tabledatasinglecolumntag% \LWR@closetabledatacell% - \addtocounter{LWR@tablecolindex}{1}% - \boolfalse{LWR@tabularcelladded}% + \addtocounter{LWR@tableLaTeXcolindex}{1}% + \global\boolfalse{LWR@tabularcelladded}% \global\booltrue{LWR@emptyatbang}% - \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% - {\LWR@getmynexttoken}% - {}% + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{<}{\value{LWR@tabletotalLaTeXcols}}% + {\LWR@getmynexttoken}% + {}% }% -\endgroup% +\ifbool{LWR@tabularmutemods}{% + \global\booltrue{LWR@exitingtabular}% +}{% + \global\boolfalse{LWR@exitingtabular}% +}% +\global\boolfalse{LWR@tabularmutemods}% \global\boolfalse{LWR@emptyatbang}% }{}% ifboolexpr } \NewDocumentCommand{\LWR@tabularendofline}{s o}{% -\ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% -{\LWR@tabularfinishrow}% -{\LWR@closetabledatacell}% +\ifnumcomp{\value{LWR@tableLaTeXcolindex}}{<}{\value{LWR@tabletotalLaTeXcols}}% + {\LWR@tabularfinishrow}% + {\LWR@closetabledatacell}% \LWR@htmltag{/tr}\LWR@orignewline% \@rowc@lors% \global\booltrue{LWR@intabularmetadata}% @@ -6779,9 +6800,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{}% -\setcounter{LWR@tablecolindex}{1}% -\boolfalse{LWR@tabularcelladded}% +\gdef\LWR@rowHTMLcolor{}% +\setcounter{LWR@tableLaTeXcolindex}{1}% +\global\boolfalse{LWR@tabularcelladded}% +\LWR@stoppars +\LWR@origpar \LWR@getmynexttoken% } @@ -6805,7 +6828,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter] \fullexpandarg% \LWR@traceinfo{have now read the next token}% -\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% +\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@colparameter}% @@ -6815,12 +6838,12 @@ 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}% - {\arabic{LWR@tabletotalcols}}{\LWR@colparameter}% - \LWR@traceinfo{at \arabic{LWR@tabletotalcols}: % - \LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalcols}}}% + {\arabic{LWR@tabletotalLaTeXcols}}{\LWR@colparameter}% + \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}: % + \LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalLaTeXcols}}}% }% \let\LWR@colparameter\relax% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsebangcolumn}{% \LWR@traceinfo{bang column}% @@ -6831,7 +6854,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter] \fullexpandarg% \LWR@traceinfo{have now read the next token}% -\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% +\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@colparameter}% @@ -6839,11 +6862,11 @@ 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}% - {\arabic{LWR@tabletotalcols}}{\LWR@colparameter}% - \LWR@traceinfo{bang \arabic{LWR@tabletotalcols}: \LWR@colparameter!}% + {\arabic{LWR@tabletotalLaTeXcols}}{\LWR@colparameter}% + \LWR@traceinfo{bang \arabic{LWR@tabletotalLaTeXcols}: \LWR@colparameter!}% }% \let\LWR@colparameter\relax% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsebeforecolumn}{% \addtocounter{LWR@tablecolspecindex}{1}% @@ -6852,9 +6875,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]% \fullexpandarg% \LWR@setexparray{LWR@colbeforespec}% - {\arabic{LWR@tabletotalcolsnext}}{\LWR@colparameter}% + {\arabic{LWR@tabletotalLaTeXcolsnext}}{\LWR@colparameter}% \let\LWR@colparameter\relax% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parseaftercolumn}{% \addtocounter{LWR@tablecolspecindex}{1}% @@ -6863,13 +6886,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\arabic{LWR@tablecolspecindex}}[\LWR@colparameter]% \fullexpandarg% \LWR@setexparray{LWR@colafterspec}% - {\arabic{LWR@tabletotalcols}}{\LWR@colparameter}% + {\arabic{LWR@tabletotalLaTeXcols}}{\LWR@colparameter}% \let\LWR@colparameter\relax% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsebarcolumn}{% \LWR@traceinfo{LWR@parsebarcolumn}% -\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% +\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: \edef\LWR@tempone{\LWR@getexparray{LWR@colbarspec}{leftedge}}% \ifdefstring{\LWR@tempone}{tvertbarl}% @@ -6878,23 +6901,23 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% {% not at the left edge: \edef\LWR@tempone{% - \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tabletotalcols}}% + \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tabletotalLaTeXcols}}% }% \ifdefstring{\LWR@tempone}{tvertbarr}% {% \LWR@setexparray{LWR@colbarspec}% - {\arabic{LWR@tabletotalcols}}{tvertbarrdouble}% + {\arabic{LWR@tabletotalLaTeXcols}}{tvertbarrdouble}% }% {% \LWR@setexparray{LWR@colbarspec}% - {\arabic{LWR@tabletotalcols}}{tvertbarr}% + {\arabic{LWR@tabletotalLaTeXcols}}{tvertbarr}% }% }% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsecoloncolumn}{% \LWR@traceinfo{LWR@parsecoloncolumn}% -\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% +\ifnumcomp{\value{LWR@tabletotalLaTeXcols}}{=}{0}% {% left edge of the table: \edef\LWR@tempone{\LWR@getexparray{LWR@colbarspec}{leftedge}}% \ifdefstring{\LWR@tempone}{tvertbarldash}% @@ -6903,31 +6926,31 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% {% not at the left edge: \edef\LWR@tempone{% - \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tabletotalcols}}% + \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tabletotalLaTeXcols}}% }% \ifdefstring{\LWR@tempone}{tvertbarrdash}% {\LWR@setexparray{LWR@colbarspec}% - {\arabic{LWR@tabletotalcols}}{tvertbarrdoubledash}}% + {\arabic{LWR@tabletotalLaTeXcols}}{tvertbarrdoubledash}}% {\LWR@setexparray{LWR@colbarspec}% - {\arabic{LWR@tabletotalcols}}{tvertbarrdash}}% + {\arabic{LWR@tabletotalLaTeXcols}}{tvertbarrdash}}% }% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsesemicoloncolumn}{% \LWR@parsecoloncolumn% \addtocounter{LWR@tablecolspecindex}{1}% } \newcommand*{\LWR@parsenormalcolumn}[1]{% -\appto\LWR@tablecolspec{#1}% -\addtocounter{LWR@tabletotalcols}{1}% -\addtocounter{LWR@tabletotalcolsnext}{1}% -\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}% +\addtocounter{LWR@tabletotalLaTeXcols}{1}% +\addtocounter{LWR@tabletotalLaTeXcolsnext}{1}% +\LWR@setexparray{LWR@tablecolspec}{\arabic{LWR@tabletotalLaTeXcols}}{#1}% +\LWR@traceinfo{normal column \arabic{LWR@tabletotalLaTeXcols}: #1}% +\LWR@setexparray{LWR@colatspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% +\LWR@setexparray{LWR@colbangspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% +\LWR@setexparray{LWR@colbeforespec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% +\LWR@setexparray{LWR@colafterspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% +\LWR@setexparray{LWR@colbarspec}{\arabic{LWR@tabletotalLaTeXcolsnext}}{}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@parsepcolumn}[1]{% @@ -6954,9 +6977,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \renewcommand*{\LWR@origcolspec}{#1}% \expandarg% \StrSubstitute{\LWR@origcolspec}{ }{}[\LWR@origcolspec]% -\renewcommand*{\LWR@tablecolspec}{}% -\setcounter{LWR@tabletotalcols}{0}% -\setcounter{LWR@tabletotalcolsnext}{1}% +\setcounter{LWR@tabletotalLaTeXcols}{0}% +\setcounter{LWR@tabletotalLaTeXcolsnext}{1}% \LWR@setexparray{LWR@colatspec}{leftedge}{}% \LWR@setexparray{LWR@colatspec}{1}{}% \LWR@setexparray{LWR@colatspec}{2}{}% @@ -6981,7 +7003,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \fullexpandarg% \LWR@traceinfo{original column spec length: \LWR@strresult}% \setcounter{LWR@tablecolspecwidth}{\LWR@strresult}% -\boolfalse{LWR@opttablecol}% +\global\boolfalse{LWR@opttablecol}% \whileboolexpr{% not test{% \ifnumcomp{\value{LWR@tablecolspecindex}}{>}% @@ -6993,8 +7015,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@strresult]% \LWR@traceinfo{position \arabic{LWR@tablecolspecindex}: \LWR@strresult}% \fullexpandarg% -\boolfalse{LWR@validtablecol}% -\IfStrEq{\LWR@strresult}{[}{\booltrue{LWR@opttablecol}}{}% +\global\boolfalse{LWR@validtablecol}% +\IfStrEq{\LWR@strresult}{[}{\global\booltrue{LWR@opttablecol}}{}% \ifbool{LWR@opttablecol}% {}% inside an optional argument {% not an optional tabular argument @@ -7029,19 +7051,18 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@parsenormalcolumn{l}% }% }% not an optional column argument -\IfStrEq{\LWR@strresult}{]}{\boolfalse{LWR@opttablecol}}{}% +\IfStrEq{\LWR@strresult}{]}{\global\boolfalse{LWR@opttablecol}}{}% \addtocounter{LWR@tablecolspecindex}{1}% }% whiledo -\LWR@traceinfo{LWR@parsetablecols: Final table column spec: !\LWR@tablecolspec!}% }% \@ifundefined{rownum}{\newcount\rownum}{} \newcommand*{\@rowcolors}{} \newcommand*{\@rowc@lors}{} \newcommand*{\LWR@xcolorrowHTMLcolor}{} -\newcommand*{\LWR@columnHTMLcolor}{} -\newcommand*{\LWR@rowHTMLcolor}{} -\newcommand*{\LWR@cellHTMLcolor}{} +\def\LWR@columnHTMLcolor{} +\def\LWR@rowHTMLcolor{} +\def\LWR@cellHTMLcolor{} \newcommand*{\LWR@ruleHTMLcolor}{} \newcommand*{\rowcolor}{\LWR@getmynexttoken}% @@ -7100,7 +7121,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@printatbang}[2]{% -\edef\LWR@atbangspec{\LWR@getexparray{LWR@col#1spec}{#2}}% +\xdef\LWR@atbangspec{\LWR@getexparray{LWR@col#1spec}{#2}}% \LWR@traceinfo{atbang: #2 !\LWR@atbangspec!}% \ifdefempty{\LWR@atbangspec}% {}% @@ -7125,13 +7146,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% \newcommand*{\LWR@addleftmostbartag}{% -\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}{% +\ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{1}{% \LWR@printbartag{leftedge}% }{}% } \newcommand*{\LWR@tabularleftedge}{% -\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}% +\ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{1}% {% \LWR@printatbang{at}{leftedge}% \LWR@printatbang{bang}{leftedge}% @@ -7151,25 +7172,27 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifbool{LWR@exitingtabular}{}% {% not exiting tabular \LWR@tabularleftedge% - \StrChar{\LWR@tablecolspec}% - {\arabic{LWR@tablecolindex}}[\LWR@strresult]% + \xdef\LWR@strresult{% + \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% + }% \LWR@traceinfo{LWR@tabledatasinglecolumntag: about to print td tag}% \LWR@htmltag{td class="td% \LWR@strresult% \LWR@addcmidruletrim% \LWR@addleftmostbartag% - \LWR@printbartag{\arabic{LWR@tablecolindex}}% + \LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% "% \LWR@tdstartstyles% \LWR@addcmidrulewidth% \LWR@addcdashline% - \StrChar{\LWR@tablecolspec}% - {\arabic{LWR@tablecolindex}}[\LWR@thiscolspec]% + \xdef\LWR@thiscolspec{% + \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% + }% \LWR@addformatwpalignment{\LWR@thiscolspec}% \LWR@addtabularrowcolor% \LWR@addtabularrulecolors% \LWR@tdendstyles% - }% + }% HTML td \LWR@traceinfo{LWR@tabledatasinglecolumntag: done printing td tag}% \ifboolexpr{% test{ \ifdefstring{\LWR@strresult}{p} } or @@ -7190,7 +7213,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifboolexpr{bool{LWR@tabularmutemods} or bool{LWR@emptyatbang}}% {}% {% - \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}% + \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% }% \global\boolfalse{LWR@intabularmetadata}% }% not exiting tabular @@ -7222,16 +7245,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \whileboolexpr{% not test{% \ifnumcomp{\value{LWR@midrulecounter}}{>}% - {\value{LWR@tablecolspecwidth}}% + {\value{LWR@tabletotalLaTeXcols}}% }% }% {% -\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}% -\setlength{\LWR@thiscmidrulewidth}{\LWR@cmidrulewidth}% -\LWR@setexparray{LWR@trimlrules}{\arabic{LWR@midrulecounter}}{}% -\LWR@setexparray{LWR@trimrrules}{\arabic{LWR@midrulecounter}}{}% -\LWR@setexparray{LWR@cdashlines}{\arabic{LWR@midrulecounter}}{N}% -\addtocounter{LWR@midrulecounter}{1}% + \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}% + \setlength{\LWR@thiscmidrulewidth}{\LWR@cmidrulewidth}% + \LWR@setexparray{LWR@trimlrules}{\arabic{LWR@midrulecounter}}{}% + \LWR@setexparray{LWR@trimrrules}{\arabic{LWR@midrulecounter}}{}% + \LWR@setexparray{LWR@cdashlines}{\arabic{LWR@midrulecounter}}{N}% + \addtocounter{LWR@midrulecounter}{1}% }% } @@ -7248,7 +7271,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% whiledo \IfSubStr{#2}{l}{\LWR@setexparray{LWR@trimlrules}{#3}{l}}{}% \IfSubStr{#2}{r}{\LWR@setexparray{LWR@trimrrules}{#4}{r}}{}% -\booltrue{LWR@doingcmidrule}% +\global\booltrue{LWR@doingcmidrule}% } \NewDocumentCommand{\LWR@docmidrule} @@ -7266,7 +7289,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@setexparray{LWR@cdashlines}{\arabic{LWR@midrulecounter}}{Y}% \addtocounter{LWR@midrulecounter}{1}% }% whiledo -\booltrue{LWR@doingcmidrule}% +\global\booltrue{LWR@doingcmidrule}% } \NewDocumentCommand{\LWR@docdashline} @@ -7280,7 +7303,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newlength{\LWR@templengththree} \newcounter{LWR@tempcountone} -\newboolean{LWR@tdhavecellstyle} +\newbool{LWR@tdhavecellstyle} \newcommand*{\LWR@tdstartstyles}{\global\boolfalse{LWR@tdhavecellstyle}} @@ -7300,7 +7323,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@subaddcmidruletrim}[2]{% \setlength{\LWR@templengthone}{% - \LWR@getexparray{LWR@midrules}{\arabic{LWR@tablecolindex}}% + \LWR@getexparray{LWR@midrules}{\arabic{LWR@tableLaTeXcolindex}}% }% \ifdimcomp{\LWR@templengthone}{>}{0pt}% {% @@ -7314,8 +7337,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@addcmidruletrim}{% \LWR@subaddcmidruletrim% -{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tablecolindex}}}% -{\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@tablecolindex}}}% +{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tableLaTeXcolindex}}}% +{\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@tableLaTeXcolindex}}}% } \newcommand{\LWR@addrulewidth}[2]{% @@ -7351,7 +7374,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand{\LWR@addcdashline}{% \edef\LWR@tempone{% - \LWR@getexparray{LWR@cdashlines}{\arabic{LWR@tablecolindex}}% + \LWR@getexparray{LWR@cdashlines}{\arabic{LWR@tableLaTeXcolindex}}% }% \ifdefstring{\LWR@tempone}{Y}{% \LWR@tdaddstyle% @@ -7448,7 +7471,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@addtabularrulecolors}{% \LWR@addtabularhrulecolor% \ifbool{LWR@tabularmutemods}{}{% - \ifnumequal{\value{LWR@tablecolindex}}{1}{% + \ifnumequal{\value{LWR@tableLaTeXcolindex}}{1}{% \edef\LWR@tempone{\LWR@getexparray{LWR@colbarspec}{leftedge}}% \ifdefstring{\LWR@tempone}{tvertbarl}{% \LWR@tdaddstyle% @@ -7472,7 +7495,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }{}% }{}% \edef\LWR@tempone{% - \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tablecolindex}}% + \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tableLaTeXcolindex}}% }% \ifdefstring{\LWR@tempone}{tvertbarr}{% \LWR@tdaddstyle% @@ -7529,7 +7552,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcounter{LWR@mcolvertbarsr} \newcounter{LWR@mcolvertbarsldash} \newcounter{LWR@mcolvertbarsrdash} -\newboolean{LWR@mcolvertbaronleft}% +\newbool{LWR@mcolvertbaronleft}% \newcommand*{\LWR@printmccoltype}[1]{% \LWR@traceinfo{lwr@printmccoltype -#1-}% @@ -7568,7 +7591,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\addtocounter{LWR@mcolvertbarsldash}{1}}% left edge {\addtocounter{LWR@mcolvertbarsrdash}{1}}% not left edge }% - {\setboolean{LWR@mcolvertbaronleft}{false}}% + {\boolfalse{LWR@mcolvertbaronleft}}% }% }% \LWR@traceinfo{lwr@printmccoltype done}% @@ -7585,16 +7608,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \addtocounter{LWR@tablemulticolspos}{1}% \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% \LWR@strresult% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@multicolskip}{% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } \newcommand*{\LWR@printmccoldata}[1]{% \LWR@traceinfo{lwr@printmccoldata -#1}% -\boolfalse{LWR@validtablecol}% +\global\boolfalse{LWR@validtablecol}% \StrChar{#1}{\arabic{LWR@tablemulticolspos}}[\LWR@strresult]% \IfStrEq{\LWR@strresult}{l}{\LWR@multicoltext}{}% \IfStrEq{\LWR@strresult}{c}{\LWR@multicoltext}{}% @@ -7690,9 +7713,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@traceinfo{LWR@domulticolumn -#1- -#2- -#4- -#5-}% \renewcommand{\LWR@multicoltext}{% #6% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% }% -\setcounter{LWR@lastmulticolumn}{\value{LWR@tablecolindex}}% +\setcounter{LWR@lastmulticolumn}{\value{LWR@tableLaTeXcolindex}}% \addtocounter{LWR@lastmulticolumn}{#3}% \addtocounter{LWR@lastmulticolumn}{-1}% \LWR@maybenewtablerow% @@ -7709,10 +7732,10 @@ rowspan="#2" % \setcounter{LWR@mcolvertbarsr}{0}% \setcounter{LWR@mcolvertbarsldash}{0}% \setcounter{LWR@mcolvertbarsrdash}{0}% -\setboolean{LWR@mcolvertbaronleft}{true}% +\booltrue{LWR@mcolvertbaronleft}% \LWR@parsemulticolumnalignment{#5}{\LWR@printmccoltype}% \LWR@subaddcmidruletrim% -{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tablecolindex}}}% +{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tableLaTeXcolindex}}}% {\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@lastmulticolumn}}}% \ifnumcomp{\value{LWR@mcolvertbarsl}}{=}{1}{ tvertbarl}{}% \ifnumcomp{\value{LWR@mcolvertbarsl}}{>}{1}{ tvertbarldouble}{}% @@ -7739,11 +7762,11 @@ rowspan="#2" % \NewDocumentCommand{\LWR@htmlmulticolumn}{m m +m}% {% -\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1} +\LWR@tabularhtmlcolumns{\arabic{LWR@tableLaTeXcolindex}}{#1} \LWR@domulticolumn{#1}{\arabic{LWR@tabhtmlcoltotal}}{#2}{#3}% -\addtocounter{LWR@tablecolindex}{#1}% -\addtocounter{LWR@tablecolindex}{-1}% -\booltrue{LWR@skipatbang}% +\addtocounter{LWR@tableLaTeXcolindex}{#1}% +\addtocounter{LWR@tableLaTeXcolindex}{-1}% +\global\booltrue{LWR@skipatbang}% } \newbool{LWR@starredlongtable} @@ -7757,8 +7780,8 @@ rowspan="#2" % {\LWR@setlatestname{#2}}% given and non-empty }% optional given {\LWR@setlatestname{#3}}% no optional -\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalcols}} -\LWR@domulticolumn{\arabic{LWR@tabletotalcols}}% +\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalLaTeXcols}} +\LWR@domulticolumn{\arabic{LWR@tabletotalLaTeXcols}}% {\arabic{LWR@tabhtmlcoltotal}}% {P}% {% \LWR@domulticolumn @@ -7809,11 +7832,11 @@ rowspan="#2" % }% end of yes TOC entry }% end of TOC entry not empty }% end of no star -\booltrue{LWR@skipatbang}% +\global\booltrue{LWR@skipatbang}% }% end of \LWR@domulticolumn -\addtocounter{LWR@tablecolindex}{\arabic{LWR@tabletotalcols}} -\addtocounter{LWR@tablecolindex}{-1} +\addtocounter{LWR@tableLaTeXcolindex}{\arabic{LWR@tabletotalLaTeXcols}} +\addtocounter{LWR@tableLaTeXcolindex}{-1} } @@ -7933,71 +7956,71 @@ rowspan="#2" % \newcommand*{\LWR@tabledatacolumntag}% {% \LWR@traceinfo{LWR@tabledatacolumntag}% -\let\mynext\LWR@tabledatasinglecolumntag% +\global\let\LWR@mynextaction\LWR@tabledatasinglecolumntag% \ifdefequal{\LWR@mynexttoken}{\end}% {\global\booltrue{LWR@exitingtabular}}{}% \ifdefequal{\LWR@mynexttoken}{\caption}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumn}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multirow}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\noalign}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mrowcell}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mcolrowcell}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\TabularMacro}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\hline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\firsthline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\lasthline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\toprule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\midrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\cmidrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\morecmidrules}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\specialrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\cline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\bottomrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\rowcolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\arrayrulecolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\doublerulesepcolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\warpprintonly}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\warpHTMLonly}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\ldelim}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\rdelim}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\hdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\cdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\firsthdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\lasthdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\par}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% \LWR@traceinfo{LWR@tabledatacolumntag: about to do mynext}% -\mynext% +\LWR@mynextaction% \LWR@traceinfo{LWR@tabledatacolumntag: done}% } @@ -8040,7 +8063,7 @@ rowspan="#2" % \begingroup% \global\advance\rownum\m@ne% \renewcommand*{\LWR@xcolorrowHTMLcolor}{}% -\multicolumn{\value{LWR@tabletotalcols}}{l}{#1} \\ +\multicolumn{\value{LWR@tabletotalLaTeXcols}}{l}{#1} \\ \endgroup% \LWR@getmynexttoken% } @@ -8049,14 +8072,14 @@ rowspan="#2" % { \newcommand*{\LWR@HTMLhline}[1][]{% \ifbool{FormatWP}% - {\LWR@docmidrule{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hlines}{1}}% \LWR@getmynexttoken}% } { \newcommand*{\LWR@HTMLhline}{% \ifbool{FormatWP}% - {\LWR@docmidrule{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docmidrule{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hlines}{1}}% \LWR@getmynexttoken}% } @@ -8099,15 +8122,15 @@ rowspan="#2" % \LWR@htmlblocktag{table}% \LWR@parsetablecols{#2}% \LWR@stoppars% -\setcounter{LWR@tablecolindex}{1}% -\boolfalse{LWR@tabularcelladded}% +\setcounter{LWR@tableLaTeXcolindex}{1}% +\global\boolfalse{LWR@tabularcelladded}% \LWR@clearmidrules% \LetLtxMacro{\\}{\LWR@tabularendofline}% \LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken% \LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken% -\renewcommand*{\LWR@columnHTMLcolor}{}% -\renewcommand*{\LWR@rowHTMLcolor}{}% -\renewcommand*{\LWR@cellHTMLcolor}{}% +\gdef\LWR@columnHTMLcolor{}% +\gdef\LWR@rowHTMLcolor{}% +\gdef\LWR@cellHTMLcolor{}% \@rowcolors% \edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% \setcounter{LWR@cellcolordepth}{0}% @@ -8117,7 +8140,7 @@ rowspan="#2" % \LetLtxMacro\cline\LWR@HTMLcline% \DeclareDocumentCommand{\hdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% @@ -8126,13 +8149,13 @@ rowspan="#2" % }% \DeclareDocumentCommand{\firsthdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% \DeclareDocumentCommand{\lasthdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% @@ -8163,13 +8186,13 @@ rowspan="#2" % \addtocounter{LWR@tabularpardepth}{-1}% \ifboolexpr{% test {% - \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{<}{\value{LWR@tabletotalLaTeXcols}} } or % (% bool{LWR@intabularmetadata} and% not bool{LWR@tabularcelladded} and% test {% - \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{\value{LWR@tabletotalLaTeXcols}}% }% )% }% -- cgit v1.2.3