From 6e85d755648b6c0966778e6c82dd2fff71c07756 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Feb 2018 21:58:20 +0000 Subject: lwarp (20feb18) git-svn-id: svn://tug.org/texlive/trunk@46689 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/lwarp/lwarp-adjmulticol.sty | 5 +- .../tex/latex/lwarp/lwarp-algorithmicx.sty | 3 +- .../texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-figsize.sty | 30 ++++ .../texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty | 5 +- .../texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty | 21 +++ .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 15 +- Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty | 15 +- .../texmf-dist/tex/latex/lwarp/lwarp-hanging.sty | 5 +- .../tex/latex/lwarp/lwarp-hypdestopt.sty | 21 +++ .../texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty | 52 +++++++ .../texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty | 5 +- Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty | 133 ++++++++++++++++ .../texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty | 22 +++ .../texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty | 8 +- .../texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty | 22 +++ .../texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty | 23 +++ .../texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty | 3 +- .../tex/latex/lwarp/lwarp-resizegather.sty | 22 +++ .../texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty | 9 +- .../texmf-dist/tex/latex/lwarp/lwarp-stabular.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-textfit.sty | 3 +- .../texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty | 36 +++++ Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty | 87 +++++++++++ .../texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty | 5 +- Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty | 78 ++++++++-- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 173 ++++++++++++++------- 27 files changed, 677 insertions(+), 130 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty (limited to 'Master/texmf-dist/tex/latex/lwarp') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty index 91348d0455a..81e0b816adf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty @@ -27,10 +27,9 @@ \newcommand*{\LWR@mcolstype}{multicols}% \ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR@mcolstype}{singlecolumn}}{}% \LWR@forcenewpage% -\uselengthunit{PT}% \BlockClass[% -\LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % -\LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}}% +\LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % +\LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}}% ]{\LWR@mcolstype}% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty index 83d44c47f51..711b7497d64 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -22,9 +22,8 @@ \let\origALG@doentity\ALG@doentity% \renewcommand*{\ALG@doentity}{% \origALG@doentity% -\uselengthunit{PT}% \LWR@htmltagc{% -span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% }% \ifbool{FormatWP}{% \setlength{\LWR@templengthone}{\the\ALG@thistlm}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty index fd3172607d1..80592c200fd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -31,7 +31,7 @@ \newcommand{\AtTextLowerLeft}[1]{} \newcommand{\AtTextCenter}[1]{} \NewDocumentCommand{\AddToShipoutPictureBG}{s +m}{} -\renewcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG} +\newcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG} \NewDocumentCommand{\AddToShipoutPictureFG}{s +m}{} \newcommand*{\ClearShipoutPictureBG}{} \newcommand*{\ClearShipoutPicture}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty new file mode 100644 index 00000000000..3c0b3a5f459 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-figsize.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `figsize') +%% 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{figsize} +\newlength{\figwidth} +\newlength{\figheight} + +\newcommand{\SetFigLayout}[3][0]{% +\setlength{\figheight}{8in}% +\setlength{\figheight}{\figheight / #2}% +\setlength{\figwidth}{5.5in}% +\setlength{\figwidth}{\figwidth / #3}% +} +\endinput +%% +%% End of file `lwarp-figsize.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index 20ebdc37a1e..83898a6830c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -19,13 +19,12 @@ \NewDocumentEnvironment{KFLTfloatflt@marginfloat}{O{-1.2ex} m m} {% \setlength{\LWR@templengthone}{#3}% -\uselengthunit{PT}% \LWR@BlockClassWP{% float:right; % - width:\rndprintlength{\LWR@templengthone}; % + width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }{% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \captionsetup{type=#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty new file mode 100644 index 00000000000..a7fde5ccf40 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-fnlineno.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fnlineno') +%% 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{fnlineno} +\endinput +%% +%% End of file `lwarp-fnlineno.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 73f96d69baf..48d102c1d0e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -30,10 +30,6 @@ } -\AtBeginDocument{ -\renewcommand*{\unitspace}{} -} - \newlength{\LWR@igwidth} \newlength{\LWR@igheight} \newcommand*{\LWR@igwidthstyle}{} @@ -48,8 +44,7 @@ \setlength{\LWR@igwidth}{#1}% \ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% {% - \uselengthunit{PT}% - \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \IfEndWith{#1}{ex}% {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex {}% not ex @@ -68,9 +63,8 @@ \setlength{\LWR@igheight}{#1}% \ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% {% - \uselengthunit{PT}% \renewcommand*{\LWR@igheightstyle}{% - height:\rndprintlength{\LWR@igheight} % + height:\LWR@printlength{\LWR@igheight} % }% \IfEndWith{#1}{ex}% {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex @@ -210,11 +204,10 @@ }% }% not starred \endgroup% - \uselengthunit{PT}% \settowidth{\LWR@igwidth}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \global\renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \settoheight{\LWR@igheight}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igheightstyle}{height:\rndprintlength{\LWR@igheight}}% + \global\renewcommand*{\LWR@igheightstyle}{height:\LWR@printlength{\LWR@igheight}}% }{}% \LWR@traceinfo{LWR@includegraphicsb: about to create href}% \href{\LWR@parsedfilename}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty index 72c21192a19..0e3efd3dece 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty @@ -29,10 +29,9 @@ \newenvironment{hangingpar} { \LWR@findhangingleftmargin% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]% {hangingpar}% } @@ -43,10 +42,9 @@ \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% \renewcommand*{\LWR@printopenlist}{% \LWR@findhangingleftmargin% - \uselengthunit{PT}% ul style="\LWR@origmbox{list-style-type:none;} % - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}"% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}"% }% \let\item\LWR@itemizeitem% \list{}{}% @@ -64,9 +62,8 @@ {% \BlockClass[% \LWR@findhangingleftmargin% - \uselengthunit{PT}% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]{labeledpar}#2% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty index 9dba6a56aa0..2125c8b5b0b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty @@ -27,10 +27,9 @@ \newenvironment*{hangparas}[2] {% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{#1}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{#1}}% + \LWR@origmbox{margin-left:\LWR@printlength{#1}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{#1}}% ]% {hangingpar}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty new file mode 100644 index 00000000000..a63e2b6c112 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-hypdestopt.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `hypdestopt') +%% 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{hypdestopt} +\endinput +%% +%% End of file `lwarp-hypdestopt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty new file mode 100644 index 00000000000..3aff6284869 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty @@ -0,0 +1,52 @@ +%% +%% This is file `lwarp-hyphenat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `hyphenat') +%% 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{hyphenat} +\LetLtxMacro\LWRHYNAT@origtextnhtt\textnhtt +\LetLtxMacro\LWRHYNAT@orignhttfamily\nhttfamily +\LetLtxMacro\LWRHYNAT@orignohyphens\nohyphens +\LetLtxMacro\LWRHYNAT@origbshyp\bshyp +\LetLtxMacro\LWRHYNAT@origfshyp\fshyp +\LetLtxMacro\LWRHYNAT@origdothyp\dothyp +\LetLtxMacro\LWRHYNAT@origcolonhyp\colonhyp +\LetLtxMacro\LWRHYNAT@orighyp\hyp + +\LetLtxMacro\textnhtt\texttt +\LetLtxMacro\nhttfamily\ttfamily + +\renewcommand{\nohyphens}[1]{#1} +\renewrobustcmd{\bshyp}{% + \ifmmode\backslash\else\textbackslash\fi% +} +\renewrobustcmd{\fshyp}{/} +\renewrobustcmd{\dothyp}{.} +\renewrobustcmd{\colonhyp}{:} +\renewrobustcmd{\hyp}{-} + +\appto\LWR@restoreorigformatting{ +\LetLtxMacro\textnhtt\LWRHYNAT@origtextnhtt +\LetLtxMacro\nhttfamily\LWRHYNAT@orignhttfamily +\LetLtxMacro\nohyphens\LWRHYNAT@orignohyphens +\LetLtxMacro\bshyp\LWRHYNAT@origbshyp +\LetLtxMacro\fshyp\LWRHYNAT@origfshyp +\LetLtxMacro\dothyp\LWRHYNAT@origdothyp +\LetLtxMacro\colonhyp\LWRHYNAT@origcolonhyp +\LetLtxMacro\hyp\LWRHYNAT@orighyp +} +\endinput +%% +%% End of file `lwarp-hyphenat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 20124144cfa..0e1ff43a768 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -81,13 +81,12 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% {% \LWR@ensuredoingapar% \setlength{\LWR@templengthone}{#1}% -\uselengthunit{PT}% \begin{LWR@BlockClassWP}{% - float:right; width:\rndprintlength{\LWR@templengthone}; % + float:right; width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \setlength{\linewidth}{.95\LWR@templengthone}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty new file mode 100644 index 00000000000..f9532a910de --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty @@ -0,0 +1,133 @@ +%% +%% This is file `lwarp-lineno.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lineno') +%% 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{lineno} +\newcommand*\resetlinenumber[1][\@ne]{} + +\def\linenumbers{% + \@ifnextchar[{\resetlinenumber}%] + {\@ifstar{\resetlinenumber}{}}% + } + +\newcommand*{\nolinenumbers}{} + +\@namedef{linenumbers*}{\par\linenumbers*} +\@namedef{runninglinenumbers*}{\par\runninglinenumbers*} + +\def\endlinenumbers{\par} +\let\endrunninglinenumbers\endlinenumbers +\let\endpagewiselinenumbers\endlinenumbers +\expandafter\let\csname endlinenumbers*\endcsname\endlinenumbers +\expandafter\let\csname endrunninglinenumbers*\endcsname\endlinenumbers +\let\endnolinenumbers\endlinenumbers + +\def\pagewiselinenumbers{\linenumbers\setpagewiselinenumbers} + +\def\runninglinenumbers{\setrunninglinenumbers\linenumbers} + +\def\setpagewiselinenumbers{} + +\def\setrunninglinenumbers{} + +\def\linenomath{}% +\@namedef{linenomath*}{}% +\def\endlinenomath{} +\expandafter\let\csname endlinenomath*\endcsname\endlinenomath + +\let\linelabel\label + +\def\switchlinenumbers{\@ifstar{}{}} +\def\setmakelinenumbers#1{\@ifstar{}{}} + +\def\leftlinenumbers{\@ifstar{}{}} +\def\rightlinenumbers{\@ifstar{}{}} + +\newcounter{linenumber} +\newcount\c@pagewiselinenumber +\let\c@runninglinenumber\c@linenumber + +\def\runningpagewiselinenumbers{} +\def\realpagewiselinenumbers{} + +\NewDocumentCommand\modulolinenumbers{s o}{} + +\chardef\c@linenumbermodulo=5 +\modulolinenumbers[1] + +\newcommand*\firstlinenumber[1]{} + +\newcommand\internallinenumbers{} +\let\endinternallinenumbers\endlinenumbers +\@namedef{internallinenumbers*}{\internallinenumbers*} +\expandafter\let\csname endinternallinenumbers*\endcsname\endlinenumbers + +\newcommand*{\linenoplaceholder}[1]{% redefine per language + (line number reference for \detokenize\expandafter{#1}) +} + +\newcommand*{\lineref}[2][]{\linenoplaceholder{#2}} +\newcommand*{\linerefp}[2][]{\linenoplaceholder{#2}} +\newcommand*{\linerefr}[2][]{\linenoplaceholder{#2}} + +\newcommand\quotelinenumbers + {\@ifstar\linenumbers{\@ifnextchar[\linenumbers{\linenumbers*}}} + +\newdimen\linenumbersep +\newdimen\linenumberwidth +\newdimen\quotelinenumbersep + +\quotelinenumbersep=\linenumbersep +\let\quotelinenumberfont\linenumberfont + +\def\linenumberfont{\normalfont\tiny\sffamily} + +\linenumberwidth=10pt +\linenumbersep=10pt + +\def\thelinenumber{} + +\def\LineNumber{} +\def\makeLineNumber{} +\def\makeLineNumberLeft{} +\def\makeLineNumberRight{} +\def\makeLineNumberOdd{} +\def\makeLineNumberEven{} +\def\makeLineNumberRunning{} + +\newenvironment{numquote} {\quote}{\endquote} +\newenvironment{numquotation} {\quotation}{\endquotation} +\newenvironment{numquote*} {\quote}{\endquote} +\newenvironment{numquotation*}{\quotation}{\endquotation} + +\newdimen\bframerule +\bframerule=\fboxrule + +\newdimen\bframesep +\bframesep=\fboxsep + +\newenvironment{bframe} +{% + \LWR@forceminwidth{\bframerule}% + \BlockClass[ + border:\LWR@printlength{\LWR@atleastonept} solid black ; % + padding:\LWR@printlength{\bframesep}% + ]{bframe} +} +{\endBlockClass} +\endinput +%% +%% End of file `lwarp-lineno.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty new file mode 100644 index 00000000000..275aec1809b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-luacolor.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `luacolor') +%% 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{luacolor} +\newcommand{\luacolorProcessBox}[1]{} +\endinput +%% +%% End of file `lwarp-luacolor.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 8260d72e3a1..202b4033e09 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -46,12 +46,11 @@ endinnercode={\LWR@stoppars}, } \newcommand*{\LWR@mdfprintlength}[1]{% -\rndprintlength{\csuse{mdf@#1@length}} +\LWR@printlength{\csuse{mdf@#1@length}} } \newcommand*{\LWR@mdframedstart}{% \LWR@traceinfo{LWR@mdframedstart start}% \LWR@stoppars% -\uselengthunit{PT}% \LWR@htmltagc{div class="\LWR@mdthisenv" \LWR@orignewline style=" \LWR@orignewline background: \LWR@mdfprintcolor{backgroundcolor} ; \LWR@orignewline @@ -122,7 +121,6 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \renewrobustcmd\mdfframedtitleenv[1]{% \LWR@traceinfo{LWR@mdframedtitleenv start}% -\uselengthunit{PT}% \LWR@htmltagc{span class="mdframedtitle" \LWR@orignewline style=" \LWR@orignewline background: @@ -138,8 +136,8 @@ background: border-radius: \setlength{\LWR@titleroundcorner} {\maxof{\mdf@roundcorner@length-\mdf@linewidth@length}{0pt}} - \rndprintlength{\LWR@titleroundcorner} - \rndprintlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} 0pt 0pt \LWR@orignewline " \LWR@orignewline diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty new file mode 100644 index 00000000000..31f986e3369 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-pagegrid.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pagegrid') +%% 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{pagegrid} +\newcommand*{\pagegridsetup}[1]{} +\endinput +%% +%% End of file `lwarp-pagegrid.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty new file mode 100644 index 00000000000..9fc86eb4128 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-pdfrender.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pdfrender') +%% 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{pdfrender} +\newcommand*{\pdfrender}[1]{} +\newcommand{\textpdfrender}[2]{#2} +\endinput +%% +%% End of file `lwarp-pdfrender.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty index 58b4e59aa3a..27ec2dba27a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty @@ -22,8 +22,7 @@ \let\@printcites\relax \newcommand*{\@iprintcites}{% -\uselengthunit{PT}% -\begin{BlockClass}[max-width: \rndprintlength{\LWR@quotchapwidth}]{quotchap} +\begin{BlockClass}[max-width: \LWR@printlength{\LWR@quotchapwidth}]{quotchap} \@quotchap \end{BlockClass} \global\let\@printcites\relax diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty new file mode 100644 index 00000000000..80f3c97d1f6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-resizegather.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `resizegather') +%% 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{resizegather} +\newcommand*{\resizegathersetup}[1]{} +\endinput +%% +%% End of file `lwarp-resizegather.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty index fe03c69cebe..277804e8f0d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty @@ -119,20 +119,19 @@ \NewDocumentEnvironment{addmargin}{s O{} m} { -\uselengthunit{PT}% \setlength{\LWR@templengthtwo}{#3} \ifblank{#2} { \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthtwo}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthtwo}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } { \setlength{\LWR@templengthone}{#2} \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty index a05fb970bcc..3b656b2219d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty @@ -18,14 +18,14 @@ \LWR@ProvidesPackageDrop{stabular} \newenvironment{stabular}[2][c] { -\renewcommand{\noalign}[1]{} \begin{tabular}[#1]{#2} +\renewcommand{\noalign}[1]{} } {\end{tabular}} \NewDocumentEnvironment{stabular*}{m o m} { -\renewcommand{\noalign}[1]{} \begin{tabular}[#2]{#3} +\renewcommand{\noalign}[1]{} } {\end{tabular}} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty index 4bf4be4fc9c..41f2231d9b4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty @@ -19,12 +19,11 @@ \newsavebox{\LWR@textfitbox} \newcommand*{\LWR@textfitscale}[2]{% -\uselengthunit{PT}% \setlength{\LWR@templengthone}{#1}% \setlength{\LWR@templengthone}{% 1em*\ratio{\LWR@templengthone}{\LWR@templengthtwo}% }% -\InlineClass[font-size:\rndprintlength{\LWR@templengthone}]{textfit}{#2}% +\InlineClass[font-size:\LWR@printlength{\LWR@templengthone}]{textfit}{#2}% } \newcommand*{\scaletowidth}[2]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty new file mode 100644 index 00000000000..be4ab558b18 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-vertbars.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `vertbars') +%% 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{vertbars} +\newlength{\barwidth} +\setlength{\barwidth}{0.4pt} +\newlength{\barspace} +\setlength{\barspace}{1em} + +\newenvironment{vertbar}{ + \LWR@forcenewpage + \LWR@forceminwidth{\barwidth} + \begin{BlockClass}[% + border-left: \LWR@printlength{\LWR@atleastonept} solid black ; % + padding-left: \LWR@printlength{\barspace}% + ]{vertbar} +}{ + \end{BlockClass} +} +\endinput +%% +%% End of file `lwarp-vertbars.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty new file mode 100644 index 00000000000..e5461c13c06 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty @@ -0,0 +1,87 @@ +%% +%% This is file `lwarp-vwcol.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `vwcol') +%% 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{vwcol} +\newcommand*{\LWR@vwcol@addrule}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@rule} solid \#\LWR@vwcol@rulecolor ; % + }% +} + +\newcommand*{\LWR@vwcol@addgap}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@sep} ; % + }% +} +\renewenvironment*{vwcol}[1][]{% +\par\noindent% +\vwcolsetup{#1}% +\newcommand*{\LWR@vwcolstyle}{} +\if@vwcol@presep + \appto{\LWR@vwcolstyle}{margin-left: 1em ; padding-left: .5em ; } +\fi +\if@vwcol@postsep + \appto{\LWR@vwcolstyle}{margin-right: 1em ; padding-right: .5em ; } +\fi +\ifdimgreater{\vwcol@sep}{1sp}{ + \LWR@vwcol@addgap{column-gap} + \LWR@vwcol@addgap{-moz-column-gap} + \LWR@vwcol@addgap{-webkit-column-gap} +}{} +\convertcolorspec{named}{\vwcol@rulecol}{HTML}\LWR@vwcol@rulecolor% +\ifdimgreater{\vwcol@rule}{0pt}{ + \ifdimless{\vwcol@rule}{1pt}{ + \setlength{\vwcol@rule}{1pt} + }{} + \LWR@vwcol@addrule{column-rule} + \LWR@vwcol@addrule{-moz-column-rule} + \LWR@vwcol@addrule{-webkit-column-rule} + \if@vwcol@prerule\LWR@vwcol@addrule{border-left}\fi + \if@vwcol@postrule\LWR@vwcol@addrule{border-right}\fi +}{} +\ifdefequal{\vwcol@justify}{\RaggedRight}{ + \appto{\LWR@vwcolstyle}{text-align: left ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +\ifdefequal{\vwcol@justify}{\RaggedLeft}{ + \appto{\LWR@vwcolstyle}{text-align: right ; } +}{} +\ifdefequal{\vwcol@justify}{\Centering}{ + \appto{\LWR@vwcolstyle}{text-align: center ; } +}{} +\ifdefequal{\vwcol@justify}{\justifying}{ + \appto{\LWR@vwcolstyle}{text-align: justify ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +\BlockClass[\LWR@vwcolstyle]{multicols} +} +{ +\endBlockClass +} +\endinput +%% +%% End of file `lwarp-vwcol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index 22a508217b4..77ce54b9ce3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -30,13 +30,12 @@ {\renewcommand*{\LWR@wrapposition}{float:right}}% {\renewcommand*{\LWR@wrapposition}{float:left}}% \setlength{\LWR@templengthone}{#2}% -\uselengthunit{PT}% \LWR@BlockClassWP{% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition; % + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition% + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition% }% {marginblock}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 3d862a1aa58..eabfabe7f1e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -75,9 +75,8 @@ \endgroup% } \newcommand*{\LWR@borderpadding}[2]{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % +padding:\LWR@printlength{\fboxsep}% } \RenewDocumentCommand{\textcolor}{O{named} m m}{% \begingroup% @@ -96,10 +95,9 @@ padding:\rndprintlength{\fboxsep}% \RenewDocumentCommand{\colorbox}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \InlineClass[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorbox}{#3}% \endgroup% } @@ -107,10 +105,9 @@ padding:\rndprintlength{\fboxsep}% \NewDocumentCommand{\colorboxBlock}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \begin{BlockClass}[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorboxBlock} #3 \end{BlockClass}% @@ -121,7 +118,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorbox #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -142,7 +138,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -169,8 +164,8 @@ padding:\rndprintlength{\fboxsep}% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % -\IfValueT{#4}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#4}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fcolorminipage}% } \NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m} @@ -178,7 +173,6 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% \IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% \ifthenelse{\equal{#4}{none}}% @@ -194,16 +188,68 @@ width:\rndprintlength{\LWR@tempwidth}% \setlength{\LWR@tempwidth}{#1}% \setlength{\LWR@tempheight}{#2}% \addtolength{\LWR@tempheight}{#3}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \InlineClass[% display:inline-block ; % -border:\rndprintlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % -width:\rndprintlength{\LWR@tempwidth} ; % -height:\rndprintlength{\LWR@tempheight}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % +width:\LWR@printlength{\LWR@tempwidth} ; % +height:\LWR@printlength{\LWR@tempheight}% ]{boxframe}{}% }% } +\newcommand*{\LWR@xcolortempcolor}{} + +\def\rowc@l@rs[#1]#2#3#4% +{ +\global\rownum=1 + \global\@rowcolorstrue + \@ifxempty{#3}% + {\def\@oddrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#3}{HTML}\LWR@xcolortempcolor% + \edef\@oddrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \@ifxempty{#4}% + {\def\@evenrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#4}{HTML}\LWR@xcolortempcolor% + \edef\@evenrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \if@rowcmd + \def\@rowcolors + {% + \if@rowcolors + \relax\ifnum\rownum<#2\@norowcolor\else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi% + \fi% + }% + \else + \def\@rowcolors + {% + \if@rowcolors + \ifnum\rownum<#2% + \@norowcolor + \else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi% + \fi + \fi% + }% + \fi + \ignorespaces% +} +\def\@norowcolor{% +\renewcommand{\LWR@xcolorrowHTMLcolor}{}% +} + +\def\@rowc@lors{% + \global\advance\rownum\@ne% + \@rowcolors% +} + \end{warpHTML} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 8691e932519..930690dcd95 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/02/14 v0.48 Allows LaTeX to directly produce HTML5 output.] + [2018/02/19 v0.49 Allows LaTeX to directly produce HTML5 output.] @@ -272,6 +272,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} +\LWR@loadafter{figsize} \LWR@loadafter{fix2col} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} @@ -283,6 +284,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fltrace} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnlineno} \LWR@loadafter{fnpos} \LWR@loadafter{footmisc} \LWR@loadafter{footnote} @@ -299,9 +301,11 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{hang} \LWR@loadafter{hanging} \LWR@loadafter{hypcap} +\LWR@loadafter{hypdestopt} \LWR@loadafter{hypernat} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} +\LWR@loadafter{hyphenat} \LWR@loadafter{idxlayout} \LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} @@ -309,12 +313,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{layout} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} +\LWR@loadafter{lineno} \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} \LWR@loadafter{ltxtable} +\LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -340,10 +346,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{overpic} +\LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} \LWR@loadafter{pagesel} \LWR@loadafter{paralist} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} @@ -355,6 +363,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} +\LWR@loadafter{resizegather} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -408,7 +417,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{upref} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{vertbars} \LWR@loadafter{vmargin} +\LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} \LWR@loadafter{watermark} \LWR@loadafter{wrapfig} @@ -537,10 +548,24 @@ top=1in,bottom=1in,% \PassOptionsToPackage{leqno}{amsmath} \RequirePackage{amsmath} +\def\maketag@@@#1{#1} +\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}} \RequirePackage{printlen} +\newrobustcmd*{\LWR@printlength}[1]{% +\begingroup% +\uselengthunit{PT}% +\renewcommand*{\unitspace}{}% +\ifdimless{#1}{10pt}{% + \printlength{#1}% +}{% + \rndprintlength{#1}% +}% +\endgroup% +} + \end{warpHTML} \begin{warpprint} @@ -2941,7 +2966,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- Print the usage of the lwarpmk command: -printversion = "v0.48" +printversion = "v0.49" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -5079,7 +5104,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} \begin{warpall} -\newrobustcmd{\affiliation}[1]{} +\ifcsvoid{@titlepagefalse}{ + \newif\if@titlepage + \@titlepagefalse +}{} +\end{warpall} +\begin{warpall} +\providerobustcmd{\affiliation}[1]{} \end{warpall} \begin{warpprint} \AtBeginEnvironment{titlepage}{ @@ -5818,14 +5849,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@tabularfinishrow}% {\LWR@closetabledatacell}% -\LWR@htmltag{/tr}\LWR@orignewline -\global\booltrue{LWR@intabularmetadata} -\global\boolfalse{LWR@startedrow} +\LWR@htmltag{/tr}\LWR@orignewline% +\@rowc@lors% +\global\booltrue{LWR@intabularmetadata}% +\global\boolfalse{LWR@startedrow}% \global\boolfalse{LWR@doinghline}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{} +\renewcommand*{\LWR@rowHTMLcolor}{}% \setcounter{LWR@tablecolindex}{1}% \boolfalse{LWR@tabularcelladded}% \LWR@getmynexttoken% @@ -6012,11 +6044,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@traceinfo{LWR@parsetablecols: done}% }% - -\newcommand{\LWR@columnHTMLcolor}{} -\newcommand{\LWR@rowHTMLcolor}{} -\newcommand{\LWR@cellHTMLcolor}{} -\newcommand{\LWR@ruleHTMLcolor}{} + \@ifundefined{rownum}{\newcount\rownum}{} +\newcommand*{\@rowcolors}{} +\newcommand*{\@rowc@lors}{} +\newcommand*{\LWR@xcolorrowHTMLcolor}{} +\newcommand*{\LWR@columnHTMLcolor}{} +\newcommand*{\LWR@rowHTMLcolor}{} +\newcommand*{\LWR@cellHTMLcolor}{} +\newcommand*{\LWR@ruleHTMLcolor}{} \NewDocumentCommand{\LWR@HTMLcolumncolor}{O{named} m o o}{} \NewDocumentCommand{\LWR@HTMLrowcolor}{O{named} m o o}{\LWR@getmynexttoken} @@ -6284,8 +6319,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% custom width and/or color \LWR@forceminwidth{#1}% \LWR@tdaddstyle% - \uselengthunit{PT}% - border-top:\rndprintlength{\LWR@atleastonept} solid % + border-top:\LWR@printlength{\LWR@atleastonept} solid % \ifdefvoid{\LWR@ruleHTMLcolor}{% \ifdimcomp{#1}{<}{\LWR@lightrulewidth}% {\#A0A0A0}% @@ -6326,11 +6360,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@addtabularrowcolor}{% \ifbool{LWR@tabularmutemods}{}{% - \ifdefvoid{\LWR@rowHTMLcolor}{}% - {% row color + \ifdefvoid{\LWR@rowHTMLcolor}{% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}{}% + {% xcolor row color + \LWR@tdaddstyle% + background:\#\LWR@xcolorrowHTMLcolor% + }% + }% + {% explicit row color \LWR@tdaddstyle% background:\#\LWR@rowHTMLcolor% - }% row color + }% }% } @@ -6379,9 +6419,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \ifdefvoid{\LWR@rowHTMLcolor}% {% - \ifdefvoid{\LWR@columnHTMLcolor}% - {}% - {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}% + {% + \ifdefvoid{\LWR@columnHTMLcolor}% + {}% + {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + }% + {\LWR@subaddtabularcellcolor{\LWR@xcolorrowHTMLcolor}}% }% {\LWR@subaddtabularcellcolor{\LWR@rowHTMLcolor}}% }% @@ -6525,6 +6569,7 @@ rowspan="#2" % \ifbool{LWR@mcolvertbarr}{ tvertbarr}{}% "% \LWR@tdstartstyles% +\LWR@addtabularrowcolor% \LWR@addcmidrulewidth% \LWR@addtabularhrulecolor% \LWR@addmulticolvertrulecolor% @@ -6726,6 +6771,8 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\noalign}% + {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mrowcell}% {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mcolrowcell}% @@ -6796,6 +6843,16 @@ rowspan="#2" % \newcommand*{\LWR@origaddlinespace}[1][]{} \newcommand*{\LWR@origmorecmidrules}{} \newcommand*{\LWR@origspecialrule}[3]{\hline} +\LetLtxMacro\LWR@orignoalign\noalign + +\newcommand{\LWR@tabularnoalign}[1]{% +\begingroup% +\global\advance\rownum\m@ne% +\renewcommand*{\LWR@xcolorrowHTMLcolor}{}% +\multicolumn{\value{LWR@tabletotalcols}}{l}{#1} \\ +\endgroup% +\LWR@getmynexttoken% +} \AtBeginDocument{ \@ifpackageloaded{lwarp-tabls} { @@ -6853,20 +6910,22 @@ rowspan="#2" % \boolfalse{LWR@tabularcelladded}% \LWR@clearmidrules% \LetLtxMacro{\\}{\LWR@tabularendofline}% -\LetLtxMacro\columncolor\LWR@HTMLcolumncolor -\LetLtxMacro\rowcolor\LWR@HTMLrowcolor -\LetLtxMacro\cellcolor\LWR@HTMLcellcolor -\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor -\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor -\renewcommand*{\LWR@columnHTMLcolor}{} -\renewcommand*{\LWR@rowHTMLcolor}{} -\renewcommand*{\LWR@cellHTMLcolor}{} -\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor} -\setcounter{LWR@cellcolordepth}{0} +\LetLtxMacro\columncolor\LWR@HTMLcolumncolor% +\LetLtxMacro\rowcolor\LWR@HTMLrowcolor% +\LetLtxMacro\cellcolor\LWR@HTMLcellcolor% +\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor% +\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor% +\renewcommand*{\LWR@columnHTMLcolor}{}% +\renewcommand*{\LWR@rowHTMLcolor}{}% +\renewcommand*{\LWR@cellHTMLcolor}{}% +\@rowcolors% +\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% +\setcounter{LWR@cellcolordepth}{0}% \LWR@traceinfo{LWR@tabular: redefining macros}% +\LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@HTMLcline% -\DeclareDocumentCommand{\toprule}{o d()} +\DeclareDocumentCommand{\toprule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6888,7 +6947,7 @@ rowspan="#2" % \LWR@getmynexttoken}% \DeclareDocumentCommand{\cmidrule}{O{\LWR@cmidrulewidth} d() m}% {\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% -\DeclareDocumentCommand{\bottomrule}{o d()} +\DeclareDocumentCommand{\bottomrule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6946,6 +7005,7 @@ rowspan="#2" % \LWR@closetabledatacell% }% \LWR@htmlblocktag{/tr}% +\@rowc@lors% \LWR@htmlblocktag{/table}% \global\boolfalse{LWR@intabularmetadata}% \addtocounter{LWR@tabulardepth}{-1}% @@ -7143,7 +7203,7 @@ autopage-\theLWR@currentautosec% \LWR@ensuredoingapar% } -\NewDocumentCommand{\href}{O{} m +m}{% +\DeclareDocumentCommand{\href}{O{} m +m}{% \LWR@ensuredoingapar% \LWR@subhyperref{#2}{#3}% } @@ -7155,7 +7215,7 @@ autopage-\theLWR@currentautosec% \LWR@templink% } -\NewDocumentCommand{\url}{m}{% +\DeclareDocumentCommand{\url}{m}{% \LWR@ensuredoingapar% \def\LWR@templink{#1}% \@onelevel@sanitize\LWR@templink% @@ -7714,6 +7774,7 @@ autopage-\theLWR@currentautosec% \let\qquad\LWR@origqquad% \LetLtxMacro\tabular\LWR@origtabular% \LetLtxMacro\endtabular\LWR@origendtabular% +\LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% \LetLtxMacro\toprule\LWR@origtoprule% \LetLtxMacro\midrule\LWR@origmidrule% @@ -7799,7 +7860,6 @@ autopage-\theLWR@currentautosec% \protected\gdef\LWR@subsingledollar#1{% \begingroup% -\normalsize% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}% @@ -7816,6 +7876,7 @@ autopage-\theLWR@currentautosec% \global\setlength{\LWR@singledollarheight}{\totalheightof{% \LWR@origdollar#1\LWR@origdollar% }*\real{.8}}% + \LWR@origscriptsize% \def\LWR@singledollarstyle{% height:\LWR@convertto{em}{\the\LWR@singledollarheight }em% }% @@ -8780,7 +8841,6 @@ autopage-\theLWR@currentautosec% \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% -\uselengthunit{PT}% \begingroup \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -8790,7 +8850,7 @@ autopage-\theLWR@currentautosec% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% -\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}}% +\LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified \IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% \addtocounter{LWR@minipagedepth}{1}% @@ -8811,17 +8871,16 @@ autopage-\theLWR@currentautosec% \ifthenelse{\equal{#3}{c}}{\LWR@origmbox{justify-content:center} ; }{}% \ifthenelse{\equal{#3}{b}}{\LWR@origmbox{justify-content:flex-end} ; }{}% \ifthenelse{\equal{#3}{s}}{\LWR@origmbox{justify-content:space-between} ; }{}% -\LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}% -\uselengthunit{PT}% +\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}% \ifbool{LWR@minipagefullwidth}% {\boolfalse{LWR@minipagefullwidth}}% {% \ifthenelse{\lengthtest{#4}=\linewidth}% {}% - {width:\rndprintlength{\LWR@minipagewidth} ; }% + {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% +\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% \setlength{\linewidth}{#4}% the original width @@ -8878,11 +8937,10 @@ autopage-\theLWR@currentautosec% \ifstrequal{#3}{r}{\def\LWR@align{right}}{}% \ifstrequal{#3}{s}{\def\LWR@align{justify}}{}% \setlength{\LWR@tempwidth}{#2}% - \uselengthunit{PT}% \InlineClass[% \LWR@origmbox{display:inline-block} ; % \LWR@origmbox{text-align}:\LWR@align\ ; % - width:\rndprintlength{\LWR@tempwidth}% + width:\LWR@printlength{\LWR@tempwidth}% ]% {makebox}% {#4}% @@ -8908,9 +8966,8 @@ autopage-\theLWR@currentautosec% } \newcommand*{\LWR@blackborderpadding}{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid black ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid black ; % +padding:\LWR@printlength{\fboxsep}% } \let\LWRprint@fbox\fbox \newcommand{\LWRhtml@fbox}[1]{% @@ -8939,9 +8996,8 @@ padding:\rndprintlength{\fboxsep}% \IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % -\uselengthunit{PT}% -\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fminipage}% } {% @@ -9197,10 +9253,9 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\LARGE}{} \renewcommand*{\huge}{} \renewcommand*{\Huge}{} +\DeclareDocumentCommand{\onecolumn}{}{} -\renewcommand*{\onecolumn}{} - -\renewcommand{\twocolumn}[1][]{ +\DeclareDocumentCommand{\twocolumn}{O{}}{ #1 @@ -9263,9 +9318,8 @@ width:\rndprintlength{\LWR@tempwidth}% \HTMLunicode{2009}% thin breakable space }% {% - \uselengthunit{PT}% \LWR@htmltagc{% - span style="width:\printlength{\LWR@tempwidth}; % + span style="width:\LWR@printlength{\LWR@tempwidth}; % display:inline-block"% }% \ifbool{FormatWP}{% @@ -9318,23 +9372,22 @@ width:\rndprintlength{\LWR@tempwidth}% }% {\setlength{\LWR@tempheight}{1pt}}{}% \LWR@minipagestoppars% - \uselengthunit{PT}% \LWR@htmltagc{% span style="% \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }% - width:\printlength{\LWR@tempwidth} ; % - height:\printlength{\LWR@tempheight} ; % + width:\LWR@printlength{\LWR@tempwidth} ; % + height:\LWR@printlength{\LWR@tempheight} ; % \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% \LWR@orignewline% - -ms-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - -webkit-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - transform: translate(0pt,\printlength{\LWR@tempraise}); % + transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% }% display:inline-block;"% -- cgit v1.2.3