diff options
| author | Karl Berry <karl@freefriends.org> | 2018-09-19 21:27:24 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-09-19 21:27:24 +0000 |
| commit | c4cd2799fbf89ae70bc03fd56c85029fccff4226 (patch) | |
| tree | 3b0c0aa6e0a293a50d27b1568ae70f216a59a44a /Master | |
| parent | fd09f0183da0c8d80efc777f3bcc4e311a871495 (diff) | |
lwarp (19sep18)
git-svn-id: svn://tug.org/texlive/trunk@48702 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
27 files changed, 1415 insertions, 447 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index d12d5293fb0..f979ec07d3f 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.59 README.txt +LaTeX lwarp package v0.60 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf Binary files differindex c9d1e8f2cd5..66247c72037 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 964be836537..d53cd67cccb 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2018 Brian Dunn -printversion = "v0.59" +printversion = "v0.60" requiredconfversion = "1" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index 24cbe06ee11..91b0a80cab9 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2018/09/07 v0.59 Allows LaTeX to directly produce HTML5 output.] +%<package> [2018/09/19 v0.60 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -2352,7 +2352,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{25635} +% \CheckSum{25889} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -2454,6 +2454,7 @@ This boolean may be tested by the user for later use. % \changes{v0.58}{2018/07/07}{\ 2018/07/07} % \changes{v0.58}{2018/06/07}{Replaced each \cs{csuse} with \cs{@nameuse} to force error if undefined.} % \changes{v0.59}{2018/09/07}{\ 2018/09/07} +% \changes{v0.60}{2018/09/19}{\ 2018/09/19} @@ -2651,6 +2652,19 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.60:] Fixes for \pkg{longtable}, \pkg{listings}. +% \begin{itemize} +% \item \pkg{longtable}, etc.: Fixes for slowdown and memory management for very long tables. +% \item \pkg{listings}: Fix for \HTML\ entities, and also when used inside a list. +% \item \pkg{diagbox}: Fix for incorrect \HTML\ par tags. +% \item Added \pkg{2up}, \pkg{twoup-gen}, \pkg{booklet}. +% \margintag{packages} +% \item Added \pkg{bophook}, \pkg{draftfigure}, \pkg{fullminipage}, +% \pkg{grid-system}, \pkg{layaureo}. +% \item Added \pkg{leading}, \pkg{widows-and-orphans}. +% \item Added \pkg{fancytabs}, \pkg{thumb}, \pkg{thumbs}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.59:] \DVI\ \prog{latex}, \brand{MathJax}, \pkg{asymptote}, % \pkg{pdftricks} and \pkg{pstricks}, \pkg{epstopdf}, \pkg{brqen}. % \begin{itemize} @@ -3857,19 +3871,25 @@ This boolean may be tested by the user for later use. % % \midrule % -% Page layout: & \pkg{a4}, \pkg{a4wide}, \pkg{a5comb}, +% Page layout: & \pkg{2up}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb}, % \pkg{addlines}, \pkg{anysize}, \pkg{atbegshi}, -% \pkg{blowup}, \pkg{bxpapersize}, \pkg{canoniclayout}, \pkg{clrdblpg}, -% \pkg{continue}, \pkg{draftcopy}, \pkg{draftwatermark}, +% \pkg{blowup}, \pkg{booklet}, \pkg{bophook}, \pkg{bxpapersize}, +% \pkg{canoniclayout}, \pkg{clrdblpg}, +% \pkg{continue}, \pkg{draftcopy}, \pkg{draftfigure}, \pkg{draftwatermark}, % \pkg{ebook}, \pkg{everyshi}, -% \pkg{fancyhdr}, \pkg{fwlw}, \pkg{geometry}, \pkg{grid}, \pkg{gridset}, +% \pkg{fancyhdr}, \pkg{fancytabs}, \pkg{fullminipage}, \pkg{fullpage}, +% \pkg{fwlw}, \pkg{geometry}, \pkg{grid}, \pkg{grid-system}, \pkg{gridset}, +% \pkg{layaureo}, \pkg{leading}, % \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{pagegrid}, \pkg{pagesel}, \pkg{preview}, -% \pkg{scrlayer-scrpage}, \pkg{textarea}, \pkg{titleps}, \pkg{tocenter}, -% \pkg{turnthepage}, \pkg{typearea}, \pkg{vmargin}, +% \pkg{scrlayer-scrpage}, +% \pkg{textarea}, \pkg{thumb}, \pkg{thumbs}, \pkg{titleps}, \pkg{tocenter}, +% \pkg{turnthepage}, \pkg{twoup-gen}, \pkg{typearea}, \pkg{vmargin}, % \pkg{watermark}, \pkg{zwpagelayout}. % % Tested to work as-is: \pkg{underlin}.\\ % +% \midrule +% % Sectioning: & Adds \progcode{FileDepth} for splitting the \HTML\ output. % Files may be numbered sequentially or named according to section name. % Common short words and punctuation are removed from the filenames. @@ -4032,9 +4052,10 @@ This boolean may be tested by the user for later use. % \cs{bfseries}, etc.\ are only supported in some cases. % \pkg{cancel}, \pkg{ellipsis}, \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips}, % \pkg{lua-check-hyphen}, \pkg{luacolor}, -% \pkg{magaz}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize}, +% \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize}, % \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8}, -% \pkg{textfit}, \pkg{trimclip}, \pkg{ulem}, \pkg{underscore}, \pkg{xellipsis}. \\ +% \pkg{textfit}, \pkg{trimclip}, \pkg{ulem}, \pkg{underscore}, +% \pkg{widows-and-orphans}, \pkg{xellipsis}. \\ % % Ordinals: & \pkg{engord}, \pkg{fmtcount}, \pkg{nth}. \\ % @@ -4057,7 +4078,10 @@ This boolean may be tested by the user for later use. % Fonts: & Used as-is. Appear in \SVG\ math expressions or embedded image environments. \\ % % Symbols: & Native \LaTeX\ diacriticals, -% \pkg{chemgreek}, \pkg{textalpha}, \pkg{textcomp}, \pkg{textgreek}, \pkg{xunicode}. \\ +% \pkg{chemgreek}, \pkg{textalpha}, \pkg{textcomp}, \pkg{textgreek}, \pkg{xunicode}. +% +% Tested to work as-is: +% \pkg{gensymb}. \\ % % \midrule % @@ -4434,15 +4458,21 @@ This boolean may be tested by the user for later use. % \item Download the zip archive \filenm{lwarp.zip} into your own \filenm{lwarp} directory. % \item Unpack \filenm{lwarp.zip}. % \item Locate the contents \filenm{lwarp.dtx} and \filenm{lwarp.ins} -% \item Create the documentation: \userentry{pdflatex lwarp.dtx} (several times) -% \item Create the |.sty| files: \userentry{pdflatex lwarp.ins} +% \item Create the |.sty| files: \userentry{pdflatex lwarp.ins} +% \item Create the documentation: +% \begin{Verbatim}[gobble=2,obeytabs,tabsize=4,frame=lines] +% pdflatex lwarp.dtx (several times) +% makeindex -s gglo.ist -o lwarp.gls lwarp.glo +% makeindex -s gind.ist lwarp.idx +% pdflatex lwarp.dtx (several times) +% \end{Verbatim} % \item Copy the |.sty| files somewhere such as the \TeX\ Live local tree % found in the previous \CTAN\ \TDS\ section, under the subdirectory: % \begin{sourcedisplay} % |<texlocal>/tex/latex/local/lwarp| % \end{sourcedisplay} -% \item Copy \filenm{lwarp\_baseline\_marker.png} to the same place -% as the \filenm{.sty} files. +% \item Copy \filenm{lwarp\_baseline\_marker.png} and \filenm{lwarp\_baseline\_marker.eps} +% to the same place as the \filenm{.sty} files. % \changes{v0.52}{2018/03/24}{Docs: Improved install instructions.} % \item Copy the documentation \filenm{lwarp.pdf} to a \filenm{source} directory in the local tree, % such as: @@ -4466,7 +4496,8 @@ This boolean may be tested by the user for later use. % document source files. The resultant |*.sty| and \filenm{lwarpmk.lua} files % may be used as-is, so long as they are in the same directory % as the document source. -% The file \filenm{lwarp\_baseline\_marker.png} must also be copied as well. +% The files \filenm{lwarp\_baseline\_marker.png} and +% \filenm{lwarp\_baseline\_marker.eps} must also be copied as well. % \changes{v0.52}{2018/03/24}{Docs: Improved install instructions.} % This approach is especially useful if % you would like to temporarily test\margintag{Just testing!}\ @@ -9860,6 +9891,7 @@ For a possible alternative, see package(s) #2.} % The following packages must be loaded after \pkg{lwarp}: % ^^A *loadafter % \begin{macrocode} +\LWR@loadafter{2up} \LWR@loadafter{a4} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} @@ -9895,8 +9927,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} @@ -9931,6 +9965,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} @@ -9953,6 +9988,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} @@ -9979,6 +10015,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} @@ -9989,6 +10026,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} @@ -10007,7 +10045,9 @@ For a possible alternative, see package(s) #2.} % inputenx must be loaded before lwarp \LWR@loadafter{intopdf} \LWR@loadafter{keyfloat} +\LWR@loadafter{layaureo} \LWR@loadafter{layout} +\LWR@loadafter{leading} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} \LWR@loadafter{lineno} @@ -10128,6 +10168,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} @@ -10144,6 +10186,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{trimclip} \LWR@loadafter{trivfloat} \LWR@loadafter{turnthepage} +\LWR@loadafter{twoup-gen} % \end{macrocode} % \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.} % \begin{macrocode} @@ -10162,6 +10205,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} @@ -14559,7 +14603,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 () @@ -15655,16 +15699,19 @@ end -- not --version % \begin{macro}{\LWR@setexparray} \marg{name} \marg{index} \marg{contents} % \begin{macrocode} \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}}% } % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@getexparray} \marg{name} \marg{index} % \begin{macrocode} -\newcommand*{\LWR@getexparray}[2]{\@nameuse{#1#2}} +\newcommand*{\LWR@getexparray}[2]{% + \@nameuse{#1#2}% +} % \end{macrocode} % \end{macro} @@ -21186,6 +21233,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \DescribeBoolean{LWR@tabularcelladded} % True if have added a data cell for this position. +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Global boolean.} % \begin{macrocode} \newbool{LWR@tabularcelladded} \boolfalse{LWR@tabularcelladded} @@ -21205,6 +21253,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \DescribeBoolean{LWR@doingtbrule} % True if the next row will have a top/bottom rule above it. +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Global boolean.} % \begin{macrocode} \newbool{LWR@doingtbrule} \boolfalse{LWR@doingtbrule} @@ -21295,16 +21344,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@pright}{} % \end{macrocode} -% \begin{macro}{\LWR@tablecolspec} Holds the parsed column specification, -% of total width |LWR@tabletotalcols|, not counting |@| and |!| columns. + +% \DescribeObject{LWR@tablecolspec} Holds the parsed column specification, +% of total width |LWR@tabletotalLaTeXcols|, not counting |@| and |!| columns. % % Will contain a string such as |llrrccpc|, exactly one letter per \LaTeX\ table column, % without |@|, |!|, |>|, |<|, or the vertical bar. -% -% \begin{macrocode} -\newcommand*{\LWR@tablecolspec}{} -% \end{macrocode} -% \end{macro} +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.} + % \begin{macro}{\LWR@strresult} Holds the result of |Str| functions. % \changes{v0.44}{2017/11/19}{Fix: \cs{providecommand}.} @@ -21336,37 +21383,33 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \DescribeCounter{LWR@tablecolspecindex} % While parsing the \LaTeX\ table column specification, % starts at 1 and is incremented per token of the specification. -% While producing the table, resets to 1 at the start of the table and -% also at each end of line, and is incremented by 1 by each ampersand. % \begin{macrocode} \newcounter{LWR@tablecolspecindex} % \end{macrocode} -% \DescribeCounter{LWR@tablecolindex} -% While parsing the \LaTeX\ table column specification, -% starts at 1 and is incremented per token of the specification. +% \DescribeCounter{LWR@tableLaTeXcolindex} % While producing the table, resets to 1 at the start of the table and % also at each end of line, and is incremented by 1 by each ampersand. % \begin{macrocode} -\newcounter{LWR@tablecolindex} +\newcounter{LWR@tableLaTeXcolindex} % \end{macrocode} -% \DescribeCounter{LWR@tabletotalcols} +% \DescribeCounter{LWR@tabletotalLaTeXcols} % While parsing a table column specification, % begins at 0 and increments by 1 per \LaTeX\ table column. % Eventually holds the final number of \LaTeX\ table columns in each row, % not counting |@| and |!| columns. % (In \HTML, |@| and |!| cells become their own columns, but are not included in -% |LWR@tabletotalcols|.) +% |LWR@tabletotalLaTeXcols|.) % \begin{macrocode} -\newcounter{LWR@tabletotalcols} +\newcounter{LWR@tabletotalLaTeXcols} % \end{macrocode} -% \DescribeCounter{LWR@tabletotalcolsnext} +% \DescribeCounter{LWR@tabletotalLaTeXcolsnext} % Holds the next \LaTeX\ table column index while parsing, -% equal to one more than |LWR@tabletotalcols|. +% equal to one more than |LWR@tabletotalLaTeXcols|. % \begin{macrocode} -\newcounter{LWR@tabletotalcolsnext} +\newcounter{LWR@tabletotalLaTeXcolsnext} % \end{macrocode} % \DescribeObject{LWR@colatspec} A data array of specifications for |@| columns. @@ -21399,8 +21442,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}}% }% } % \end{macrocode} @@ -21427,8 +21470,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \changes{v0.41}{2017/10/03}{Fix: At/bang column with \cs{multirow}.} % \begin{macrocode} \ifbool{LWR@skippingmcolrowcell}% - {}% - {\LWR@insertatbangcols}% + {}% + {\LWR@insertatbangcols}% }% {% not skippingmrowcell % \end{macrocode} @@ -21443,7 +21486,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}}}% % \end{macrocode} % Close paragraphs: % \begin{macrocode} @@ -21475,8 +21518,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Color control. Column is set by |>{}| for each cell, so it must be cleared here. % \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.} % \begin{macrocode} -\renewcommand*{\LWR@cellHTMLcolor}{} -\renewcommand*{\LWR@columnHTMLcolor}{} +\gdef\LWR@cellHTMLcolor{} +\gdef\LWR@columnHTMLcolor{} \setcounter{LWR@cellcolordepth}{0} } % \end{macrocode} @@ -21523,11 +21566,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Move to the next column. % \begin{macrocode} - \addtocounter{LWR@tablecolindex}{1}% + \addtocounter{LWR@tableLaTeXcolindex}{1}% % \end{macrocode} % Have not yet added data in this column: % \begin{macrocode} - \boolfalse{LWR@tabularcelladded}% + \global\boolfalse{LWR@tabularcelladded}% % \end{macrocode} % Look at the next token to decide multi or single column data tag. % \begin{macrocode} @@ -21577,19 +21620,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% bool{LWR@startedrow}% }{% % \end{macrocode} -% To locally temporarily turn off |LWR@exitingtabular| so that +% To temporarily turn off |LWR@exitingtabular| so that % table data tags will still be generated: -% \begin{macrocode} -\begingroup% -% \end{macrocode} +% % If generating a final row for the \cs{bottomrule} borders, % turn off the |@|, |!|, |<|, and |>| column output: % \begin{macrocode} \ifbool{LWR@exitingtabular}{% - \booltrue{LWR@tabularmutemods}% -}{}% + \global\booltrue{LWR@tabularmutemods}% +}{% + \global\boolfalse{LWR@tabularmutemods}% +}% % \end{macrocode} -% Reenable the table data tags until finished with the final row: +% Locally reenable the table data tags until finished with the final row: % \begin{macrocode} \global\boolfalse{LWR@exitingtabular}% % \end{macrocode} @@ -21597,13 +21640,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \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}} }% )% }% @@ -21614,20 +21657,27 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % |LWR@emptyatbang| added to empty the following cells: % \begin{macrocode} \LWR@closetabledatacell% - \addtocounter{LWR@tablecolindex}{1}% - \boolfalse{LWR@tabularcelladded}% + \addtocounter{LWR@tableLaTeXcolindex}{1}% + \global\boolfalse{LWR@tabularcelladded}% \global\booltrue{LWR@emptyatbang}% % \end{macrocode} % Starts the next cell: % \begin{macrocode} - \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% - {\LWR@getmynexttoken}% - {}% + \ifnumcomp{\value{LWR@tableLaTeXcolindex}}{<}{\value{LWR@tabletotalLaTeXcols}}% + {\LWR@getmynexttoken}% + {}% }% % \end{macrocode} % Reenable the original |LWR@exitingtabular| to close the entire table: % \begin{macrocode} -\endgroup% +\ifbool{LWR@tabularmutemods}{% + \global\booltrue{LWR@exitingtabular}% +}{% + \global\boolfalse{LWR@exitingtabular}% +}% +\global\boolfalse{LWR@tabularmutemods}% +% \end{macrocode} +% \begin{macrocode} \global\boolfalse{LWR@emptyatbang}% }{}% ifboolexpr } @@ -21649,9 +21699,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Finish the row: % \begin{macrocode} -\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% % \end{macrocode} % \pkg{xcolor} row color support: @@ -21673,15 +21723,22 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{}% +\gdef\LWR@rowHTMLcolor{}% % \end{macrocode} % Start at first column: % \begin{macrocode} -\setcounter{LWR@tablecolindex}{1}% +\setcounter{LWR@tableLaTeXcolindex}{1}% % \end{macrocode} % Have not yet added data in this column: % \begin{macrocode} -\boolfalse{LWR@tabularcelladded}% +\global\boolfalse{LWR@tabularcelladded}% +% \end{macrocode} +% Allow \TeX\ to flush the pending paragraph. +% Not doing so causes a slowdown for very large tables. +% \changes{v0.60}{2018/09/17}{Fix: Slowdown for long tables.} +% \begin{macrocode} +\LWR@stoppars +\LWR@origpar % \end{macrocode} % Look at the next token to decide between single column data tag % or a special case: @@ -21750,7 +21807,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Store the result into a data array, expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \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}% @@ -21760,12 +21817,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}% } % \end{macrocode} % \end{macro} @@ -21796,7 +21853,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \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}% @@ -21804,11 +21861,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}% } % \end{macrocode} % \end{macro} @@ -21836,9 +21893,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Store the result into a data array, expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \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}% } % \end{macrocode} % \end{macro} @@ -21864,9 +21921,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Store the result into a data array, expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \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}% } % \end{macrocode} % \end{macro} @@ -21883,7 +21940,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Remember the bar at this position: % \begin{macrocode} -\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}% @@ -21892,19 +21949,19 @@ 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}% } % \end{macrocode} % \end{macro} @@ -21919,7 +21976,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Remember the bar at this position: % \begin{macrocode} -\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}% @@ -21928,15 +21985,15 @@ 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}% } % \end{macrocode} % \end{macro} @@ -21968,16 +22025,21 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % and pre-clear another column of at, before, and after specs. % \begin{macrocode} \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}% +% \end{macrocode} +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.} +% \begin{macrocode} +\LWR@setexparray{LWR@tablecolspec}{\arabic{LWR@tabletotalLaTeXcols}}{#1}% +% \end{macrocode} +% \begin{macrocode} +\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}% } % \end{macrocode} % \end{macro} @@ -22132,8 +22194,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Scans the column specification left to right. % % Builds \cs{LWR@tablecolspec} with the final specification, -% one column per entry. The final number of cells in each row is -% stored in |LWR@tabletotalcols|. +% one \LaTeX\ column per entry. The final number of \LaTeX\ columns in each row is +% stored in |LWR@tabletotalLaTeXcols|, +% which is the number of |&| and |\\| in each line, but +% which does not include |@|, |!|, |<|, |>| specifications in the count. % % \changes{v0.22}{2017/02/28}{Unknown table column types become \progcode{l}. % Added tabular \progcode{D}, \progcode{!!}, \progcode{X} columns.} @@ -22155,15 +22219,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \expandarg% \StrSubstitute{\LWR@origcolspec}{ }{}[\LWR@origcolspec]% % \end{macrocode} -% Clear the parsed resulting column spec: -% \begin{macrocode} -\renewcommand*{\LWR@tablecolspec}{}% -% \end{macrocode} +% +% The parsed column spec data array, |LWR@tablecolspec|, +% will be overwritten with new values. +% % Total number of columns found so far. % Also pre-initialize the first several columns of specs: % \begin{macrocode} -\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}{}% @@ -22198,7 +22262,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Haven't seen any optional arguments so far % \begin{macrocode} -\boolfalse{LWR@opttablecol}% +\global\boolfalse{LWR@opttablecol}% % \end{macrocode} % Scan through the column specifications: % \begin{macrocode} @@ -22219,13 +22283,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Not yet found a valid column type: % \begin{macrocode} -\boolfalse{LWR@validtablecol}% +\global\boolfalse{LWR@validtablecol}% % \end{macrocode} % % Skip over any optional arguments, such as \pkg{siunitx} |S| column: % \changes{v0.48}{2018/02/04}{Fix: Ignore optional tabular column arguments.} % \begin{macrocode} -\IfStrEq{\LWR@strresult}{[}{\booltrue{LWR@opttablecol}}{}% +\IfStrEq{\LWR@strresult}{[}{\global\booltrue{LWR@opttablecol}}{}% % \end{macrocode} % % Throw away anything found inside the optional argument: @@ -22298,13 +22362,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % If read the closing bracket, no longer inside the optional argument: % \begin{macrocode} -\IfStrEq{\LWR@strresult}{]}{\boolfalse{LWR@opttablecol}}{}% +\IfStrEq{\LWR@strresult}{]}{\global\boolfalse{LWR@opttablecol}}{}% % \end{macrocode} % Move to the next character: % \begin{macrocode} \addtocounter{LWR@tablecolspecindex}{1}% }% whiledo -\LWR@traceinfo{LWR@parsetablecols: Final table column spec: !\LWR@tablecolspec!}% }% % \end{macrocode} % \end{macro} @@ -22350,19 +22413,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \begin{macro}{\LWR@columnHTMLcolor} \HTML style code for the column color. % \begin{macrocode} -\newcommand*{\LWR@columnHTMLcolor}{} +\def\LWR@columnHTMLcolor{} % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@rowHTMLcolor} \HTML style code for the row color. % \begin{macrocode} -\newcommand*{\LWR@rowHTMLcolor}{} +\def\LWR@rowHTMLcolor{} % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@cellHTMLcolor} \HTML style code for the cell color. % \begin{macrocode} -\newcommand*{\LWR@cellHTMLcolor}{} +\def\LWR@cellHTMLcolor{} % \end{macrocode} % \end{macro} % @@ -22488,7 +22551,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Fetch the column at or bang spec: % \begin{macrocode} -\edef\LWR@atbangspec{\LWR@getexparray{LWR@col#1spec}{#2}}% +\xdef\LWR@atbangspec{\LWR@getexparray{LWR@col#1spec}{#2}}% \LWR@traceinfo{atbang: #2 !\LWR@atbangspec!}% % \end{macrocode} % Only generate if is not empty; @@ -22525,7 +22588,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@addleftmostbartag} % \begin{macrocode} \newcommand*{\LWR@addleftmostbartag}{% -\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}{% +\ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{1}{% \LWR@printbartag{leftedge}% }{}% } @@ -22536,7 +22599,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@tabularleftedge} % \begin{macrocode} \newcommand*{\LWR@tabularleftedge}{% -\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}% +\ifnumcomp{\value{LWR@tableLaTeXcolindex}}{=}{1}% {% \LWR@printatbang{at}{leftedge}% \LWR@printatbang{bang}{leftedge}% @@ -22586,9 +22649,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@tabularleftedge% % \end{macrocode} % Fetch the current column's alignment character into \cs{LWR@strresult}: +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.} % \begin{macrocode} - \StrChar{\LWR@tablecolspec}% - {\arabic{LWR@tablecolindex}}[\LWR@strresult]% + \xdef\LWR@strresult{% + \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% + }% % \end{macrocode} % print the start of a new table data cell: % \begin{macrocode} @@ -22604,7 +22669,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \LWR@addcmidruletrim% \LWR@addleftmostbartag% - \LWR@printbartag{\arabic{LWR@tablecolindex}}% + \LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% "% % \end{macrocode} % Add styles for rules, alignment: @@ -22613,8 +22678,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@tdstartstyles% \LWR@addcmidrulewidth% \LWR@addcdashline% - \StrChar{\LWR@tablecolspec}% - {\arabic{LWR@tablecolindex}}[\LWR@thiscolspec]% +% \end{macrocode} +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.} +% \begin{macrocode} + \xdef\LWR@thiscolspec{% + \LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% + }% \LWR@addformatwpalignment{\LWR@thiscolspec}% % \end{macrocode} % Add styles for cell and rule colors: @@ -22625,7 +22694,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % \begin{macrocode} \LWR@tdendstyles% - }% + }% HTML td \LWR@traceinfo{LWR@tabledatasinglecolumntag: done printing td tag}% % \end{macrocode} % If this is a |p|, |m|, |b|, or X column, allow paragraphs: @@ -22652,7 +22721,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 @@ -22735,6 +22804,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Clears all |LWR@midrules| and |LWR@trimrules| markers for this line. % % \changes{v0.41}{2017/09/28}{Add: \cs{cmidrule} trims.} +% \changes{v0.60}{2018/09/17}{\env{tabular}: Fix for midrules.} % \begin{macrocode} \newcommand*{\LWR@clearmidrules} {% @@ -22742,16 +22812,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}% }% } % \end{macrocode} @@ -22783,7 +22853,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}% } % \end{macrocode} % \end{macro} @@ -22823,7 +22893,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}% } % \end{macrocode} % \end{macro} @@ -22856,7 +22926,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Used to add a style to a table data cell: % \begin{macrocode} -\newboolean{LWR@tdhavecellstyle} +\newbool{LWR@tdhavecellstyle} % \end{macrocode} % \begin{macro}{\LWR@tdstartstyles} @@ -22901,7 +22971,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \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}% {% @@ -22930,8 +23000,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \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}}}% } % \end{macrocode} % \end{macro} @@ -23013,7 +23083,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \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% @@ -23181,7 +23251,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % If at the leftmost cell, possibly add a leftmost vertical rule: % \begin{macrocode} - \ifnumequal{\value{LWR@tablecolindex}}{1}{% + \ifnumequal{\value{LWR@tableLaTeXcolindex}}{1}{% % \end{macrocode} % Fetch the left edge's vertical bar specification: % \begin{macrocode} @@ -23214,7 +23284,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Possibly add a right vertical rule for this cell: % \begin{macrocode} \edef\LWR@tempone{% - \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tablecolindex}}% + \LWR@getexparray{LWR@colbarspec}{\arabic{LWR@tableLaTeXcolindex}}% }% \ifdefstring{\LWR@tempone}{tvertbarr}{% % \end{macrocode} @@ -23303,7 +23373,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}% % \end{macrocode} % \begin{macro}{\LWR@printmccoltype} \marg{colspec} @@ -23367,7 +23437,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}% @@ -23398,7 +23468,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % A valid column data type was found: % \begin{macrocode} -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } % \end{macrocode} % \end{macro} @@ -23410,7 +23480,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % A valid column data type was found: % \begin{macrocode} -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% } % \end{macrocode} % \end{macro} @@ -23429,7 +23499,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Not yet found a valid column type: % \begin{macrocode} -\boolfalse{LWR@validtablecol}% +\global\boolfalse{LWR@validtablecol}% % \end{macrocode} % Get one token of the column spec: % \begin{macrocode} @@ -23611,14 +23681,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \renewcommand{\LWR@multicoltext}{% #6% -\booltrue{LWR@validtablecol}% +\global\booltrue{LWR@validtablecol}% }% % \end{macrocode} % Compute the rightmost column to be included. % This is used to create the right trim. % \changes{v0.43}{2017/11/07}{Fix: Multicolumn trim.} % \begin{macrocode} -\setcounter{LWR@lastmulticolumn}{\value{LWR@tablecolindex}}% +\setcounter{LWR@lastmulticolumn}{\value{LWR@tableLaTeXcolindex}}% \addtocounter{LWR@lastmulticolumn}{#3}% \addtocounter{LWR@lastmulticolumn}{-1}% % \end{macrocode} @@ -23654,7 +23724,7 @@ 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}% % \end{macrocode} % If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag. @@ -23663,7 +23733,7 @@ rowspan="#2" % % \changes{v0.43}{2017/11/07}{Fix: Multicolumn trim.} % \begin{macrocode} \LWR@subaddcmidruletrim% -{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tablecolindex}}}% +{\LWR@getexparray{LWR@trimlrules}{\arabic{LWR@tableLaTeXcolindex}}}% {\LWR@getexparray{LWR@trimrrules}{\arabic{LWR@lastmulticolumn}}}% % \end{macrocode} % Also add vertical bar class. @@ -23718,7 +23788,7 @@ rowspan="#2" % % \end{macrocode} % Figure out how many extra \HTML\ columns to add for |@| and |!| columns: % \begin{macrocode} -\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1} +\LWR@tabularhtmlcolumns{\arabic{LWR@tableLaTeXcolindex}}{#1} % \end{macrocode} % Create the multicolumn tag: % \begin{macrocode} @@ -23726,12 +23796,12 @@ rowspan="#2" % % \end{macrocode} % Move to the next \LaTeX\ column: % \begin{macrocode} -\addtocounter{LWR@tablecolindex}{#1}% -\addtocounter{LWR@tablecolindex}{-1}% +\addtocounter{LWR@tableLaTeXcolindex}{#1}% +\addtocounter{LWR@tableLaTeXcolindex}{-1}% % \end{macrocode} % Skip any trailing |@| or |!| columns for this cell: % \begin{macrocode} -\booltrue{LWR@skipatbang}% +\global\booltrue{LWR@skipatbang}% } % \end{macrocode} % \end{macro} @@ -23780,11 +23850,11 @@ rowspan="#2" % % Figure out how many extra \HTML\ columns to add for |@| and |!| columns % found between the first and the last column: % \begin{macrocode} -\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalcols}} +\LWR@tabularhtmlcolumns{1}{\arabic{LWR@tabletotalLaTeXcols}} % \end{macrocode} % Create the multicolumn tag: % \begin{macrocode} -\LWR@domulticolumn{\arabic{LWR@tabletotalcols}}% +\LWR@domulticolumn{\arabic{LWR@tabletotalLaTeXcols}}% {\arabic{LWR@tabhtmlcoltotal}}% {P}% {% \LWR@domulticolumn @@ -23864,11 +23934,11 @@ rowspan="#2" % % \end{macrocode} % Skip any trailing |@| or |!| columns for this cell: % \begin{macrocode} -\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} } % \end{macrocode} @@ -24217,7 +24287,7 @@ rowspan="#2" % % \end{macrocode} % If not any of the below, start a new table cell: % \begin{macrocode} -\let\mynext\LWR@tabledatasinglecolumntag% +\global\let\LWR@mynextaction\LWR@tabledatasinglecolumntag% % \end{macrocode} % If exiting the tabular: % \begin{macrocode} @@ -24227,124 +24297,124 @@ rowspan="#2" % % \env{longtable} can have a caption in a cell % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\caption}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % Look for other things which would not start a table cell: % \begin{macrocode} \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}{}% % \end{macrocode} % If an \cs{mrowcell}, this is a cell to be skipped over: % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\mrowcell}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % If an \cs{mcolrowcell}, this is a cell to be skipped over: % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\mcolrowcell}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\TabularMacro}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\hline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\firsthline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\lasthline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\toprule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\midrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\cmidrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \changes{v0.56}{2018/05/02}{Fix: \cs{morecmidrules}} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\morecmidrules}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\specialrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\cline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\bottomrule}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\rowcolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\arrayrulecolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\doublerulesepcolor}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\warpprintonly}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\warpHTMLonly}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\ldelim}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\rdelim}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % For \pkg{arydshln}: % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\hdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\cdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\firsthdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\lasthdashline}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % Ignore an empty line between rows: % \changes{v0.45}{2017/12/06}{Fix: Empty line between rows.} % \begin{macrocode} \ifdefequal{\LWR@mynexttoken}{\par}% - {\let\mynext\LWR@donothing}{}% + {\global\let\LWR@mynextaction\LWR@donothing}{}% % \end{macrocode} % % No action for an \cs{end} token. @@ -24355,7 +24425,7 @@ rowspan="#2" % % Start the new table cell if was not any of the above: % \begin{macrocode} \LWR@traceinfo{LWR@tabledatacolumntag: about to do mynext}% -\mynext% +\LWR@mynextaction% \LWR@traceinfo{LWR@tabledatacolumntag: done}% } % \end{macrocode} @@ -24453,7 +24523,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% % \@rowc@lors% \LWR@getmynexttoken% @@ -24474,14 +24544,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}% } @@ -24585,11 +24655,11 @@ rowspan="#2" % % \end{macrocode} % Track column \#: % \begin{macrocode} -\setcounter{LWR@tablecolindex}{1}% +\setcounter{LWR@tableLaTeXcolindex}{1}% % \end{macrocode} % Have not yet added data in this column: % \begin{macrocode} -\boolfalse{LWR@tabularcelladded}% +\global\boolfalse{LWR@tabularcelladded}% % \end{macrocode} % Start looking for midrules: % \begin{macrocode} @@ -24605,9 +24675,9 @@ rowspan="#2" % % \begin{macrocode} \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% % \end{macrocode} % The vertical rules are set to the color active at the start of the tabular. @@ -24635,7 +24705,7 @@ rowspan="#2" % % \begin{macrocode} \DeclareDocumentCommand{\hdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% @@ -24648,7 +24718,7 @@ rowspan="#2" % % \begin{macrocode} \DeclareDocumentCommand{\firsthdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% @@ -24656,7 +24726,7 @@ rowspan="#2" % % \begin{macrocode} \DeclareDocumentCommand{\lasthdashline}{o}{% \ifbool{FormatWP}% - {\LWR@docdashline{1-\arabic{LWR@tabletotalcols}}}% + {\LWR@docdashline{1-\arabic{LWR@tabletotalLaTeXcols}}}% {\addtocounter{LWR@hdashedlines}{1}}% \LWR@getmynexttoken% }% @@ -24712,13 +24782,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}}% }% )% }% @@ -31630,6 +31700,50 @@ width:\LWR@printlength{\LWR@tempwidth}% % % % \iffalse +%<*2up> +% \fi +% +% \part{lwarp-2up.sty} +% +% \section{2up} +% +% \DescribePackage{2up} +% \pkg{2up} is ignored. +% +% \changes{v0.60}{2018/09/18}{\pkg{2up}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{2up}[2010/05/15] +% \end{macrocode} +% +% \begin{macrocode} +\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{} +% \end{macrocode} +% +% \iffalse +%</2up> +% \fi +% +% +% +% +% +% \iffalse %<*a4> % \fi % @@ -34224,6 +34338,55 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% +% \iffalse +%<*booklet> +% \fi +% +% \part{lwarp-booklet.sty} +% +% \section{booklet} +% +% \credits{Peter Wilson} +% +% \DescribePackage{booklet} +% \pkg{booklet} is nullified. +% +% \changes{v0.60}{2018/09/18}{\pkg{booklet}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{booklet}[2009/09/02] +% \end{macrocode} +% +% \begin{macrocode} +\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}{} +% \end{macrocode} +% +% \iffalse +%</booklet> +% \fi +% +% +% +% % \iffalse %<*bookmark> % \fi @@ -34300,11 +34463,11 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \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} @@ -34313,10 +34476,10 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \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} @@ -34332,11 +34495,11 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \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% }% @@ -34352,7 +34515,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% \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} % \end{macrocode} @@ -34364,6 +34527,37 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% \iffalse +%<*bophook> +% \fi +% +% \part{lwarp-bophook.sty} +% +% \section{bophook} +% +% \DescribePackage{bophook} +% \pkg{bophook} is ignored. +% +% \changes{v0.60}{2018/09/19}{\pkg{bophook}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{bophook} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\AtBeginPage}[1]{} +\newcommand*{\PageLayout}[1]{} +% \end{macrocode} +% +% \iffalse +%</bophook> +% \fi +% +% +% +% % % \iffalse %<*boxedminipage> @@ -37361,6 +37555,7 @@ name = \chemmacros_translate:n {scheme-name} % \end{noindmacro} % Likewise for NE, SW, SE: +% \changes{v0.60}{2018/09/17}{\pkg{diagbox}: Fix for par tags.} % \begin{macrocode} \newcommand{\LWR@diagboxTNE}[3]{% \BlockClassSingle{diagboxtitleN}{#1} @@ -37370,11 +37565,13 @@ name = \chemmacros_translate:n {scheme-name} \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% } % \end{macrocode} % @@ -37434,6 +37631,44 @@ name = \chemmacros_translate:n {scheme-name} % % % +% +% \iffalse +%<*draftfigure> +% \fi +% +% \part{lwarp-draftfigure.sty} +% +% \section{draftfigure} +% +% \DescribePackage{draftfigure} +% \pkg{draftfigure} is ignored. +% +% \changes{v0.60}{2018/09/18}{\pkg{draftfigure}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{draftfigure}[2017/07/19] +\RequirePackage{xkeyval} +% \end{macrocode} +% +% \begin{macrocode} +\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}} +% \end{macrocode} +% +% \iffalse +%</draftfigure> +% \fi +% +% +% % \iffalse %<*draftwatermark> % \fi @@ -38754,6 +38989,48 @@ name = \chemmacros_translate:n {scheme-name} % % % +% \iffalse +%<*fancytabs> +% \fi +% +% \part{lwarp-fancytabs.sty} +% +% \section{fancytabs} +% +% \DescribePackage{fancytabs} +% \pkg{fancytabs} is ignored. +% +% \changes{v0.60}{2018/09/19}{\pkg{fancytabs}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fancytabs} +% \end{macrocode} +% +% \begin{macrocode} +\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]{} +% \end{macrocode} +% +% \iffalse +%</fancytabs> +% \fi +% +% +% +% % % % \iffalse @@ -40691,6 +40968,35 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% \iffalse +%<*fullminipage> +% \fi +% +% \part{lwarp-fullminipage.sty} +% +% \section{fullminipage} +% +% \DescribePackage{fullminipage} +% \pkg{fullminipage} is nullified. +% +% \changes{v0.60}{2018/09/18}{\pkg{fullminipage}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fullminipage}[2014/07/06] +% \end{macrocode} +% +% \begin{macrocode} +\newenvironment{fullminipage}[1][]{}{} +% \end{macrocode} +% +% \iffalse +%</fullminipage> +% \fi +% +% +% % % % \iffalse @@ -40709,7 +41015,7 @@ solid \LWR@origpound\LWR@tempcolor ; % % % Discard all options for \pkg{lwarp-fullpage}: % \begin{macrocode} -\LWR@ProvidesPackageDrop{fullpage} +\LWR@ProvidesPackageDrop{fullpage}[1994/06/01] % \end{macrocode} % % @@ -41346,9 +41652,9 @@ solid \LWR@origpound\LWR@tempcolor ; % % If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax: % \begin{macrocode} \IfValueF{#3}{% -\IfValueTF{#2}% -{\setkeys{igraph}{#2}}% -{\setkeys{igraph}{}}% + \IfValueTF{#2}% + {\setkeys{igraph}{#2}}% + {\setkeys{igraph}{}}% }% % \end{macrocode} % @@ -41781,6 +42087,46 @@ img src="% % % % \iffalse +%<*grid-system> +% \fi +% +% \part{lwarp-grid-system.sty} +% +% \section{grid-system} +% +% \credits{Marcus Bitzl} +% +% \DescribePackage{grid-system} +% \pkg{grid-system} is patched for use by \pkg{lwarp}. +% +% \changes{v0.60}{2018/09/18}{\pkg{grid-system}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{grid-system}[2014/02/16] +% \end{macrocode} +% +% (\cs{ifdef} is in case the older syntax is removed.) +% +% \begin{macrocode} +\AtBeginEnvironment{Row}{\setlength{\linewidth}{6in}} + +\ifdef{\endrow}{ + \AtBeginEnvironment{row}{\setlength{\linewidth}{6in}} +}{} + +\renewcommand{\gridsystem@finishcell}{\hspace{\gridsystem@cellsep}} +% \end{macrocode} +% +% \iffalse +%</grid-system> +% \fi +% +% +% +% +% \iffalse %<*gridset> % \fi % @@ -43407,6 +43753,30 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % +% \iffalse +%<*layaureo> +% \fi +% +% \part{lwarp-layaureo.sty} +% +% \section{layaureo} +% +% \DescribePackage{layaureo} +% \pkg{layaureo} is ignored. +% +% \changes{v0.60}{2018/09/18}{\pkg{layaureo}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{layaureo}[2004/09/16] +% \end{macrocode} +% +% \iffalse +%</layaureo> +% \fi +% +% % % \iffalse %<*layout> @@ -43442,6 +43812,35 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % \iffalse +%<*leading> +% \fi +% +% \part{lwarp-leading.sty} +% +% \section{leading} +% +% \DescribePackage{leading} +% \pkg{leading} is ignored. +% +% \changes{v0.60}{2018/09/18}{\pkg{leading}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{leading}[2008/12/11] +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\leading[1]{} +% \end{macrocode} +% +% \iffalse +%</leading> +% \fi +% +% +% +% \iffalse %<*letterspace> % \fi @@ -43769,7 +44168,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % ^^A \hspace*{3em}how-to-pass-an-optional-argument-to-\\ % ^^A \hspace*{3em}an-environment-with-verbatim-content}} % -% Force flexible columns: +% Force flexible columns. Fixed columns inserts spaces in the \PDF\ output. % \changes{v0.50}{2018/03/02}{\pkg{listings}: Force flexible columns.} % \begin{macrocode} \lst@column@flexible @@ -43787,6 +44186,28 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \renewcommand{\l@lstlisting}[2]{\hypertocfloat{1}{lstlisting}{lol}{#1}{#2}} % \end{macrocode} % +% \begin{noindmacro}{\lstset} \marg{options} +% +% Use the \pkg{listings} \optn{literate} option to replace +% \HTML\ entities: +% \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix for \HTML\ entities.} +% \begin{macrocode} +\def\lstset@#1{\endgroup% +% \ifx\@empty#1% +% \@empty% +% \else% + \setkeys{lst}{% + #1% + ,literate=% + {<}{\HTMLentity{lt}}{4}% + {>}{\HTMLentity{gt}}{4}% + {\&}{\HTMLentity{amp}}{5}% + }% +% \fi% +} +% \end{macrocode} +% \end{noindmacro} +% % % \begin{noindmacro}{\lst@Init} \marg{backslash-processing} \quad % Done at the start of a listing. @@ -43794,7 +44215,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \renewcommand{\lst@Init}[1]{% % \end{macrocode} % -% First, perform the \pkg{listings} initialization: +% Perform the \pkg{listings} initialization: % % \changes{v0.51}{2018/03/17}{\pkg{listings}: Forces cleared options.} % \begin{macrocode} @@ -43810,6 +44231,13 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \lstframe@\lst@frameround ffff\relax% \lst@multicols\@empty% \LWR@origlst@Init{#1}\relax% +% \end{macrocode} +% Avoids extra horizontal space: +% \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix if inside a list.} +% \begin{macrocode} +\def\lst@framelr{}% +% \end{macrocode} +% \begin{macrocode} \LWR@traceinfo{finished origlst@Init}% \lst@ifdisplaystyle% % \end{macrocode} @@ -43832,6 +44260,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \ifbool{LWR@verbtags}{\LWR@htmltag{span class="inlineprogramlisting"}}{}% \fi% } + % \end{macrocode} % \end{noindmacro} % @@ -43963,8 +44392,11 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % Patched to keep left line numbers outside of the left margin, and +% \margintag{line numbers} % place right line numbers in a field \cs{VerbatimHTMLWidth} wide. % +% \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix if inside a list.} +% % ^^A \DescribeKey[listings]{numbers} Activates line numbers. % \begin{macrocode} \lst@Key{numbers}{none}{% @@ -43972,14 +44404,18 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \lstKV@SwitchCases{#1}% {none&\\% left&\def\lst@PlaceNumber{% -% \llap{ -\LWR@orignormalfont% -\lst@numberstyle{\thelstnumber}\kern\lst@numbersep% -% } -} -\\% - right&\def\lst@PlaceNumber{\rlap{\LWR@orignormalfont - \kern\VerbatimHTMLWidth \kern\lst@numbersep +% \end{macrocode} +% For now, \pkg{lwarp} places left line numbers inline. +% Ideally the entire line would be moved to the right, but +% conflicts with list indenting occurs. +% \begin{macrocode} +% \LWR@origllap{ + \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{macrocode} @@ -46047,8 +46483,9 @@ style="\LWR@print@mbox{border-\LWR@multirowborder:} 2px dotted black ; % class="td% % \end{macrocode} % Append this column's spec: +% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.} % \begin{macrocode} -\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}% +\LWR@getexparray{LWR@tablecolspec}{\arabic{LWR@tableLaTeXcolindex}}% % \end{macrocode} % If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag. % Also add the vertical bar class. @@ -46056,7 +46493,7 @@ class="td% % \begin{macrocode} \LWR@addcmidruletrim% \LWR@addleftmostbartag% -\LWR@printbartag{\arabic{LWR@tablecolindex}}% +\LWR@printbartag{\arabic{LWR@tableLaTeXcolindex}}% "% % \end{macrocode} % \changes{v0.42}{2017/10/26}{\pkg{multirow}: If \progcode{FormatWP} add cell alignment.} @@ -46071,7 +46508,7 @@ class="td% % \changes{v0.41}{2017/10/05}{Fix: \protect\textless\ spec.} % The column's |<| spec: % \begin{macrocode} -\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}% +\LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tableLaTeXcolindex}}% % \end{macrocode} % While printing the text, redefine |\\| to generate a new line % \begin{macrocode} @@ -46118,7 +46555,7 @@ class="td% % \end{macrocode} % Figure out how many extra \HTML\ columns to add for |@| and |!| columns: % \begin{macrocode} -\LWR@tabularhtmlcolumns{\arabic{LWR@tablecolindex}}{#1} +\LWR@tabularhtmlcolumns{\arabic{LWR@tableLaTeXcolindex}}{#1} % \end{macrocode} % Create the multicolumn/multirow tag: % \begin{macrocode} @@ -46129,12 +46566,12 @@ class="td% % \end{macrocode} % Move to the next \LaTeX\ column: % \begin{macrocode} -\addtocounter{LWR@tablecolindex}{#1}% -\addtocounter{LWR@tablecolindex}{-1}% +\addtocounter{LWR@tableLaTeXcolindex}{#1}% +\addtocounter{LWR@tableLaTeXcolindex}{-1}% % \end{macrocode} % Skip any trailing |@| or |!| columns for this cell: % \begin{macrocode} -\booltrue{LWR@skipatbang}% +\global\booltrue{LWR@skipatbang}% } \LWR@expandableformatted{multicolumnrow} @@ -48565,8 +49002,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \xpatchcmd{\register} {\centering} {\begin{center}\begin{lateximage}[-register-~\packagediagramname]} - {\typeout{Patch register success.}} - {\typeout{Patch register failure.}} + {} + {\LWR@patcherror{register}{register}} \xpatchcmd{\endregister} {\leftskip} @@ -48574,8 +49011,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \end{lateximage}\end{center}% \leftskip% }% - {\typeout{Patch endregister success.}} - {\typeout{Patch endregister failure.}} + {} + {\LWR@patcherror{register}{endregister}} \setlength{\regWidth}{5in} % \end{macrocode} @@ -49603,8 +50040,6 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % -% -% % \iffalse %<*setspace> % \fi @@ -51925,6 +52360,76 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% \iffalse +%<*thumb> +% \fi +% +% \part{lwarp-thumb.sty} +% +% \section{thumb} +% +% \DescribePackage{thumb} +% \pkg{thumb} is ignored. +% +% \changes{v0.60}{2018/09/19}{\pkg{thumb}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{thumb} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\Overviewpage}{} +\newlength{\thumbheight} +\newlength{\thumbwidth} +% \end{macrocode} +% +% \iffalse +%</thumb> +% \fi +% +% +% +% +% \iffalse +%<*thumbs> +% \fi +% +% \part{lwarp-thumbs.sty} +% +% \section{thumbs} +% +% \DescribePackage{thumbs} +% \pkg{thumbs} is ignored. +% +% \changes{v0.60}{2018/09/19}{\pkg{thumbs}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{thumbs} +% \end{macrocode} +% +% \begin{macrocode} +\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}{} +% \end{macrocode} +% +% \iffalse +%</thumbs> +% \fi +% +% % % % @@ -51968,7 +52473,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \begin{macrocode} -\newboolean{LWR@tikzbabel} +\newbool{LWR@tikzbabel} \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 {\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} @@ -53945,6 +54450,36 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % \iffalse +%<*twoup-gen> +% \fi +% +% \part{lwarp-twoup-gen.sty} +% +% \section{twoup-gen} +% +% \DescribePackage{twoup-gen} +% \pkg{twoup-gen} is ignored. +% +% This package is used by MikTeX for \pkg{lwarp-2up}. +% +% \changes{v0.60}{2018/09/18}{\pkg{twoup-gen}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{twoup-gen} + +\LWR@origRequirePackage{lwarp-2up} +% \end{macrocode} +% +% +% \iffalse +%</twoup-gen> +% \fi +% +% +% +% \iffalse %<*typearea> % \fi % @@ -54746,6 +55281,36 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% \iffalse +%<*widows-and-orphans> +% \fi +% +% \part{lwarp-widows-and-orphans.sty} +% +% \section{widows-and-orphans} +% +% \DescribePackage{widows-and-orphans} +% \pkg{widows-and-orphans} is ignored. +% +% \changes{v0.60}{2018/09/17}{\pkg{widows-and-orphans}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{widows-and-orphans}[2018/09/01] +% \end{macrocode} +% +% \begin{macrocode} +\NewDocumentCommand\WaOsetup{m}{} +\NewDocumentCommand\WaOparameters{}{} +\NewDocumentCommand\WaOignorenext{}{} +% \end{macrocode} +% +% \iffalse +%</widows-and-orphans> +% \fi +% +% % % % \iffalse diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 661b5c8d70b..4b71684a5fc 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -33,6 +33,7 @@ version 2005/12/01 or later. \askforoverwritefalse \generate{ \file{lwarp.sty}{\from{lwarp.dtx}{package}} +\file{lwarp-2up.sty}{\from{lwarp.dtx}{2up}} \file{lwarp-a4.sty}{\from{lwarp.dtx}{a4}} \file{lwarp-a4wide.sty}{\from{lwarp.dtx}{a4wide}} \file{lwarp-a5comb.sty}{\from{lwarp.dtx}{a5comb}} @@ -69,8 +70,10 @@ version 2005/12/01 or later. \file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}} \file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}} \file{lwarp-blowup.sty}{\from{lwarp.dtx}{blowup}} +\file{lwarp-booklet.sty}{\from{lwarp.dtx}{booklet}} \file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}} \file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}} +\file{lwarp-bophook.sty}{\from{lwarp.dtx}{bophook}} \file{lwarp-boxedminipage.sty}{\from{lwarp.dtx}{boxedminipage}} \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}} \file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}} @@ -106,6 +109,7 @@ version 2005/12/01 or later. \file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}} \file{lwarp-diagbox.sty}{\from{lwarp.dtx}{diagbox}} \file{lwarp-draftcopy.sty}{\from{lwarp.dtx}{draftcopy}} +\file{lwarp-draftfigure.sty}{\from{lwarp.dtx}{draftfigure}} \file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}} \file{lwarp-easy-todo.sty}{\from{lwarp.dtx}{easy-todo}} \file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}} @@ -128,6 +132,7 @@ version 2005/12/01 or later. \file{lwarp-fancyheadings.sty}{\from{lwarp.dtx}{fancyheadings}} \file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}} \file{lwarp-fancyref.sty}{\from{lwarp.dtx}{fancyref}} +\file{lwarp-fancytabs.sty}{\from{lwarp.dtx}{fancytabs}} \file{lwarp-fancyvrb.sty}{\from{lwarp.dtx}{fancyvrb}} \file{lwarp-figcaps.sty}{\from{lwarp.dtx}{figcaps}} \file{lwarp-figsize.sty}{\from{lwarp.dtx}{figsize}} @@ -154,6 +159,7 @@ version 2005/12/01 or later. \file{lwarp-footnpag.sty}{\from{lwarp.dtx}{footnpag}} \file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}} \file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}} +\file{lwarp-fullminipage.sty}{\from{lwarp.dtx}{fullminipage}} \file{lwarp-fullpage.sty}{\from{lwarp.dtx}{fullpage}} \file{lwarp-fullwidth.sty}{\from{lwarp.dtx}{fullwidth}} \file{lwarp-fwlw.sty}{\from{lwarp.dtx}{fwlw}} @@ -164,6 +170,7 @@ version 2005/12/01 or later. \file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}} \file{lwarp-grffile.sty}{\from{lwarp.dtx}{grffile}} \file{lwarp-grid.sty}{\from{lwarp.dtx}{grid}} +\file{lwarp-grid-system.sty}{\from{lwarp.dtx}{grid-system}} \file{lwarp-gridset.sty}{\from{lwarp.dtx}{gridset}} \file{lwarp-hang.sty}{\from{lwarp.dtx}{hang}} \file{lwarp-hanging.sty}{\from{lwarp.dtx}{hanging}} @@ -182,7 +189,9 @@ version 2005/12/01 or later. \file{lwarp-inputenx.sty}{\from{lwarp.dtx}{inputenx}} \file{lwarp-intopdf.sty}{\from{lwarp.dtx}{intopdf}} \file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}} +\file{lwarp-layaureo.sty}{\from{lwarp.dtx}{layaureo}} \file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}} +\file{lwarp-leading.sty}{\from{lwarp.dtx}{leading}} \file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}} \file{lwarp-lettrine.sty}{\from{lwarp.dtx}{lettrine}} \file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}} @@ -303,6 +312,8 @@ version 2005/12/01 or later. \file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}} \file{lwarp-theorem.sty}{\from{lwarp.dtx}{theorem}} \file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}} +\file{lwarp-thumb.sty}{\from{lwarp.dtx}{thumb}} +\file{lwarp-thumbs.sty}{\from{lwarp.dtx}{thumbs}} \file{lwarp-tikz.sty}{\from{lwarp.dtx}{tikz}} \file{lwarp-titleps.sty}{\from{lwarp.dtx}{titleps}} \file{lwarp-titleref.sty}{\from{lwarp.dtx}{titleref}} @@ -320,6 +331,7 @@ version 2005/12/01 or later. \file{lwarp-trimclip.sty}{\from{lwarp.dtx}{trimclip}} \file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}} \file{lwarp-turnthepage.sty}{\from{lwarp.dtx}{turnthepage}} +\file{lwarp-twoup-gen.sty}{\from{lwarp.dtx}{twoup-gen}} \file{lwarp-typearea.sty}{\from{lwarp.dtx}{typearea}} \file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}} \file{lwarp-underscore.sty}{\from{lwarp.dtx}{underscore}} @@ -334,6 +346,7 @@ version 2005/12/01 or later. \file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}} \file{lwarp-wasysym.sty}{\from{lwarp.dtx}{wasysym}} \file{lwarp-watermark.sty}{\from{lwarp.dtx}{watermark}} +\file{lwarp-widows-and-orphans.sty}{\from{lwarp.dtx}{widows-and-orphans}} \file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}} \file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}} \file{lwarp-xellipsis.sty}{\from{lwarp.dtx}{xellipsis}} 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}}% }% )% }% |