diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/lwarp/README.txt | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/lwarp/lwarp.pdf | bin | 1306288 -> 1306472 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/lwarp/lwarpmk.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 9 |
7 files changed, 34 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index 71f801fae2b..071152fdac4 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -4,7 +4,7 @@ -- Print the usage of the lwarpmk command: -printversion = "v0.22" +printversion = "v0.23" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 6586df258a0..5f64cf8b32f 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.22 README.txt +LaTeX lwarp package v0.23 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 1f380715632..5c8677d69f1 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 71f801fae2b..071152fdac4 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -4,7 +4,7 @@ -- Print the usage of the lwarpmk command: -printversion = "v0.22" +printversion = "v0.23" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index 8ee0d889517..d3ff89f4f86 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2017/03/02 v0.22 Allows LaTeX to directly produce HTML5 output.] +%<package> [2017/03/02 v0.23 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -787,7 +787,7 @@ operating-system path separator used by \pkg{lwarp}. %<*package> % \fi % -% \CheckSum{8578} +% \CheckSum{8584} % % \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 @@ -847,6 +847,7 @@ operating-system path separator used by \pkg{lwarp}. % \changes{v0.20}{2017/01/25}{\pkg{caption} and \pkg{subcaption} supported.} % \changes{v0.21}{2017/02/23}{\ 2017/02/23} % \changes{v0.22}{2017/03/02}{\ 2017/03/02} +% \changes{v0.23}{2017/03/02}{\ 2017/03/02} @@ -9516,7 +9517,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \begin{macro}{\LWR@parseskipcolumn} % -% Handles columns to skip, such as !. +% Handles columns to skip, such as the vertical bar. % % \begin{macrocode} \newcommand*{\LWR@parseskipcolumn}{% @@ -9677,6 +9678,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \changes{v0.22}{2017/02/28}{Unknown table column types become \texttt{l}. % Added tabular \texttt{D}, \texttt{!!}, \texttt{X} columns.} % +% \changes{v0.23}{2017/03/02}{Fix for vert bar column type.} +% % \begin{macrocode} \newcommand*{\LWR@parsetablecols}[1]{% \LWR@traceinfo{LWR@parsetablecols started}% @@ -9748,7 +9751,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \IfStrEq{\LWR@strresult}{!}{\LWR@parsebangcolumn}{}% \IfStrEq{\LWR@strresult}{>}{\LWR@parsebeforecolumn}{}% \IfStrEq{\LWR@strresult}{<}{\LWR@parseaftercolumn}{}% -\IfStrEq{\LWR@strresult}{!}{\LWR@parseskipcolumn}{}% +\IfStrEq{\LWR@strresult}{|}{\LWR@parseskipcolumn}{}% \IfStrEq{\LWR@strresult}{p}{\LWR@parsepcolumn{p}}{}% \IfStrEq{\LWR@strresult}{m}{\LWR@parsepcolumn{m}}{}% \IfStrEq{\LWR@strresult}{b}{\LWR@parsepcolumn{b}}{}% @@ -10014,12 +10017,26 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % \end{macro} +% \begin{macro}{\LWR@multicolskip} +% Nothing to print for this column type. +% \begin{macrocode} +\newcommand*{\LWR@multicolskip}{% +% \end{macrocode} +% A valid column data type was found: +% \begin{macrocode} +\booltrue{LWR@validtablecol}% +} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\LWR@printmccoldata} \marg{colspec} % Print the data for any valid column type found. % % \changes{v0.22}{2017/02/28}{Added tabular \texttt{D}, \texttt{!!}, % and \texttt{X} columns.} % +% \changes{v0.23}{2017/03/02}{Fix for vert bar column type.} +% % \begin{macrocode} \newcommand*{\LWR@printmccoldata}[1]{% \LWR@traceinfo{lwr@printmccoldata -#1}% @@ -10050,6 +10067,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext}{}% \IfStrEq{\LWR@strresult}{S}{\LWR@multicolpartext}{}% \IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext}{}% +\IfStrEq{\LWR@strresult}{|}{\LWR@multicolskip}{}% \IfStrEq{\LWR@strresult}{\detokenize{@}}{\LWR@multicolother{#1}}{}% \IfStrEq{\LWR@strresult}{\detokenize{!}}{\LWR@multicolother{#1}}{}% \IfStrEq{\LWR@strresult}{\detokenize{>}}{\LWR@multicolother{#1}}{}% @@ -17050,7 +17068,7 @@ MathJax.Hub.Config({ -- Print the usage of the lwarpmk command: -printversion = "v0.22" +printversion = "v0.23" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty index 9740ce80d0a..adfe6de3e14 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty @@ -1576,7 +1576,7 @@ MathJax.Hub.Config({ -- Print the usage of the lwarpmk command: -printversion = "v0.22" +printversion = "v0.23" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index dd31708c123..9ab86bf0d27 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2017/03/02 v0.22 Allows LaTeX to directly produce HTML5 output.] + [2017/03/02 v0.23 Allows LaTeX to directly produce HTML5 output.] @@ -2627,7 +2627,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \IfStrEq{\LWR@strresult}{!}{\LWR@parsebangcolumn}{}% \IfStrEq{\LWR@strresult}{>}{\LWR@parsebeforecolumn}{}% \IfStrEq{\LWR@strresult}{<}{\LWR@parseaftercolumn}{}% -\IfStrEq{\LWR@strresult}{!}{\LWR@parseskipcolumn}{}% +\IfStrEq{\LWR@strresult}{|}{\LWR@parseskipcolumn}{}% \IfStrEq{\LWR@strresult}{p}{\LWR@parsepcolumn{p}}{}% \IfStrEq{\LWR@strresult}{m}{\LWR@parsepcolumn{m}}{}% \IfStrEq{\LWR@strresult}{b}{\LWR@parsepcolumn{b}}{}% @@ -2759,6 +2759,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \booltrue{LWR@validtablecol}% } +\newcommand*{\LWR@multicolskip}{% +\booltrue{LWR@validtablecol}% +} + \newcommand*{\LWR@printmccoldata}[1]{% \LWR@traceinfo{lwr@printmccoldata -#1}% \boolfalse{LWR@validtablecol}% @@ -2778,6 +2782,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext}{}% \IfStrEq{\LWR@strresult}{S}{\LWR@multicolpartext}{}% \IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext}{}% +\IfStrEq{\LWR@strresult}{|}{\LWR@multicolskip}{}% \IfStrEq{\LWR@strresult}{\detokenize{@}}{\LWR@multicolother{#1}}{}% \IfStrEq{\LWR@strresult}{\detokenize{!}}{\LWR@multicolother{#1}}{}% \IfStrEq{\LWR@strresult}{\detokenize{>}}{\LWR@multicolother{#1}}{}% |