From b482212984105cf874198fd412f9dbb70f1565b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Mar 2018 21:54:38 +0000 Subject: lwarp (3mar18) git-svn-id: svn://tug.org/texlive/trunk@46804 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty | 27 + .../texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty | 27 + Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty | 1 + .../tex/latex/lwarp/lwarp-dblfloatfix.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty | 78 +++ .../texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty | 24 + .../texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 25 +- Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty | 12 +- .../texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-listings.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty | 1 + .../tex/latex/lwarp/lwarp-morefloats.sty | 21 + .../texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty | 25 + .../texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty | 3 + Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty | 33 + Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty | 35 ++ .../texmf-dist/tex/latex/lwarp/lwarp-schemata.sty | 40 ++ .../texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty | 44 +- Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty | 50 ++ Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 696 +++++++++++++++------ 24 files changed, 962 insertions(+), 211 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty (limited to 'Master/texmf-dist/tex/latex/lwarp') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty new file mode 100644 index 00000000000..25c0dafd1a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-axodraw2.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `axodraw2') +%% 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{axodraw2} + +\BeforeBeginEnvironment{axopicture}{\begin{lateximage}[axopicture]} + +\AfterEndEnvironment{axopicture}{\end{lateximage}} + +\endinput +%% +%% End of file `lwarp-axodraw2.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty new file mode 100644 index 00000000000..fdd88117053 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-bytefield.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bytefield') +%% 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{bytefield} + +\BeforeBeginEnvironment{bytefield}{\begin{lateximage}[bytefield]} + +\AfterEndEnvironment{bytefield}{\end{lateximage}} + +\endinput +%% +%% End of file `lwarp-bytefield.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty index 1c9e5258781..dbc8dd6aeaa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty @@ -15,6 +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@origRequirePackage{lwarp-xcolor}% for \convertcolorspec \LWR@ProvidesPackagePass{cancel} \LetLtxMacro\LWR@origcancel\cancel \LetLtxMacro\LWR@origbcancel\bcancel diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty new file mode 100644 index 00000000000..806d480e0f7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-dblfloatfix.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `dblfloatfix') +%% 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{dblfloatfix} +\endinput +%% +%% End of file `lwarp-dblfloatfix.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty new file mode 100644 index 00000000000..82b71417bd3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty @@ -0,0 +1,78 @@ +%% +%% This is file `lwarp-diagbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `diagbox') +%% 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{diagbox} +\LetLtxMacro\LWR@origdiagbox@double\diagbox@double +\LetLtxMacro\LWR@origdiagbox@triple\diagbox@triple + +\appto\LWR@restoreorigformatting{ +\LetLtxMacro\diagbox@double\LWR@origdiagbox@double +\LetLtxMacro\diagbox@triple\LWR@origdiagbox@triple +} + +\newcommand{\LWR@diagbox@AB}[4]{ +\begingroup% +\LetLtxMacro\\\newline% +\BlockClassSingle{diagbox#1}{#2}% +\BlockClassSingle{diagbox#3}{#4}% +\endgroup% +\LWR@stoppars% +} + +\newcommand{\LWR@diagboxNW}[2]{% +\LWR@diagbox@AB{E}{#2}{W}{#1}% +} + +\newcommand{\LWR@diagboxNE}[2]{% +\LWR@diagbox@AB{W}{#1}{E}{#2}% +} + +\let\LWR@diagboxSW\LWR@diagboxNE +\let\LWR@diagboxSE\LWR@diagboxNW + +\def\diagbox@double#1#2#3{% +\setkeys{diagbox}{dir=NW,#1}% +\csuse{LWR@diagbox\diagbox@dir}{#2}{#3}% +} + +\newcommand{\LWR@diagboxTNW}[3]{% +\BlockClassSingle{diagboxtitleN}{#1} +\LWR@diagboxNW{#2}{#3} +} + +\newcommand{\LWR@diagboxTNE}[3]{% +\BlockClassSingle{diagboxtitleN}{#1} +\LWR@diagboxNE{#2}{#3} +} + +\newcommand{\LWR@diagboxTSW}[3]{% +\LWR@diagboxSW{#2}{#3} +\BlockClassSingle{diagboxtitleS}{#1} +} + +\newcommand{\LWR@diagboxTSE}[3]{% +\LWR@diagboxSE{#2}{#3} +\BlockClassSingle{diagboxtitleS}{#1} +} +\def\diagbox@triple#1#2#3#4{% +\setkeys{diagbox}{dir=NW,#1}% +\csuse{LWR@diagboxT\diagbox@dir}{#3}{#2}{#4}% +} +\endinput +%% +%% End of file `lwarp-diagbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty new file mode 100644 index 00000000000..bbb6875adf5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-epstopdf.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `epstopdf') +%% 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{epstopdf} +\newcommand*{\epstopdfsetup}[1]{} +\newcommand*{\epstopdfcall}[1]{} +\newcommand*{\epstopdfDeclareGraphicsRule}[4]{} +\endinput +%% +%% End of file `lwarp-epstopdf.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index 9f3585173cf..c30cb0951f5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -16,6 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \RequirePackage{xcolor}% for \convertcolorspec + \LWR@ProvidesPackagePass{fancyvrb} \begin{warpHTML} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index 83898a6830c..47226d7af23 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -21,7 +21,7 @@ \setlength{\LWR@templengthone}{#3}% \LWR@BlockClassWP{% float:right; % - width:\LWR@printlength{\LWR@templengthone}; % + width:\LWR@printlength{\LWR@templengthone}; % extra space margin:10pt% }{% width:\LWR@printlength{\LWR@templengthone}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 48d102c1d0e..3307c12a546 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -64,7 +64,7 @@ \ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% {% \renewcommand*{\LWR@igheightstyle}{% - height:\LWR@printlength{\LWR@igheight} % + height:\LWR@printlength{\LWR@igheight} % extra space }% \IfEndWith{#1}{ex}% {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex @@ -234,15 +234,15 @@ img src="% {\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% \ifthenelse{\NOT\equal{\LWR@igangle}{}}% {% -\LWR@rotstyle{-ms-}{\LWR@igangle} % -\LWR@rotstyle{-webkit-}{\LWR@igangle} % +\LWR@rotstyle{-ms-}{\LWR@igangle} % extra space +\LWR@rotstyle{-webkit-}{\LWR@igangle} % extra space \LWR@rotstyle{}{\LWR@igangle % }}{}% \ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% \NOT\equal{\LWR@igyscale}{1}}% -{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % -\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % -\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{} % +{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % extra space +\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % extra space +\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{} % extra space \ifthenelse{\NOT\equal{\LWR@opacity}{1}}% {opacity:\LWR@opacity; }% {}% @@ -257,7 +257,6 @@ img src="% - \AtBeginDocument{ \LWR@traceinfo{Patching includegraphics.} @@ -302,9 +301,9 @@ img src="% \LWR@htmltagc{span style="display: inline-block; % \ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% {transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% -\LWR@rotstyle{-ms-}{#2} % -\LWR@rotstyle{-webkit-}{#2} % -\LWR@rotstyle{}{#2} % +\LWR@rotstyle{-ms-}{#2} % extra space +\LWR@rotstyle{-webkit-}{#2} % extra space +\LWR@rotstyle{}{#2} % extra space "}\LWR@orignewline% \begin{LWR@nestspan}% #3% @@ -318,9 +317,9 @@ img src="% \AtBeginDocument{ \RenewDocumentCommand{\scalebox}{m o m}{% \LWR@htmltagc{span style="display: inline-block; % -\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space +\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space +\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space "}% \begin{LWR@nestspan}% #3% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty index 0e3efd3dece..c8c0aa40793 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty @@ -42,9 +42,15 @@ \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% \renewcommand*{\LWR@printopenlist}{% \LWR@findhangingleftmargin% - ul style="\LWR@origmbox{list-style-type:none;} % - \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}"% + ul style="% + \LWR@origmbox{list-style-type:none;} % extra space + \LWR@origmbox{% + margin-left:\LWR@printlength{\LWR@templengthone}% + } ; % extra space + \LWR@origmbox{% + text-indent:-\LWR@printlength{\hangingindent}% + }% + "% }% \let\item\LWR@itemizeitem% \list{}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 0e1ff43a768..b40292f99d0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -82,7 +82,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \LWR@ensuredoingapar% \setlength{\LWR@templengthone}{#1}% \begin{LWR@BlockClassWP}{% - float:right; width:\LWR@printlength{\LWR@templengthone}; % + float:right; width:\LWR@printlength{\LWR@templengthone}; % extra space margin:10pt% }% {% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty index 4797dcd0663..547decf2339 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{lettrine} \DeclareDocumentCommand{\lettrine}{o m m}{% -\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} % +\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} % extra space } \newcounter{DefaultLines} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 805e5de83a9..a9c4368c0be 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -20,6 +20,7 @@ \begin{warpHTML} \LWR@ProvidesPackagePass{listings} +\lst@column@flexible \let\LWR@origlst@Init\lst@Init \let\LWR@origlst@DeInit\lst@DeInit diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 202b4033e09..6da3ac8e0b8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -18,6 +18,7 @@ \RequirePackage{xcolor}% for \convertcolorspec + \LWR@ProvidesPackageDrop{mdframed} \LWR@origRequirePackage{amsthm} \LWR@origRequirePackage[framemethod=none]{mdframed} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty new file mode 100644 index 00000000000..d7d0f7a0acf --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-morefloats.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `morefloats') +%% 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{morefloats} +\endinput +%% +%% End of file `lwarp-morefloats.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty new file mode 100644 index 00000000000..cd14cedced6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-nonfloat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `nonfloat') +%% 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{nonfloat} +\LetLtxMacro\topcaption\caption +\newcommand{\figcaption}{\def\@captype{figure}\caption} +\newcommand{\tabcaption}{\def\@captype{table}\topcaption} +\newenvironment{narrow}[2]{}{} +\endinput +%% +%% End of file `lwarp-nonfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index ca86d223018..b584124920e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -281,6 +281,8 @@ \InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]} }% not amsthm \ifbool{LWR@ntheoremamsthm}{}{% +\ifx\thm@usestd\@undefined +\else \theoremnumbering{arabic} \theoremstyle{plain} \RequirePackage{latexsym} @@ -326,6 +328,7 @@ \qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof \theoremsymbol{} +\fi }% not amsthm \ifbool{LWR@ntheoremamsthm}{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty new file mode 100644 index 00000000000..a5029cc2283 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-pbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pbox') +%% 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{pbox} +\NewDocumentCommand{\pbox}{O{t} o O{t} m +m}{% +\booltrue{LWR@minipagefullwidth}% +\parbox[#1][#2][#3]{#4}{#5}% +} + +\newcommand{\settominwidth}[3][\columnwidth]{% +\settowidth{#2}{#3}% +} + +\newcommand{\widthofpbox}[1]{% +\widthof{#1}% +} +\endinput +%% +%% End of file `lwarp-pbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty new file mode 100644 index 00000000000..749b4614d61 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty @@ -0,0 +1,35 @@ +%% +%% This is file `lwarp-phfqit.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `phfqit') +%% 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{phfqit} + +\LetLtxMacro\LWR@origbitstring\bitstring + +\renewcommand\bitstring[1]{% +\InlineClass[% + text-decoration: overline underline ; +]{bitstring}{#1}% +} + +\appto{\LWR@restoreorigformatting}{ +\LetLtxMacro\bitstring\LWR@origbitstring +} + +\endinput +%% +%% End of file `lwarp-phfqit.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty new file mode 100644 index 00000000000..c2946d4947c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-schemata.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `schemata') +%% 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{schemata} + +\LetLtxMacro\LWR@schemata@origschema\schema +\LetLtxMacro\LWR@schemata@origSchema\Schema + +\renewcommand{\schema}[3][open]{% +\begin{lateximage}% +\LWR@orignormalsize +\LWR@schemata@origschema[#1]{#2}{#3}% +\end{lateximage}% +} + +\renewcommand{\Schema}[5][open]{% +\begin{lateximage}% +\LWR@orignormalsize +\LWR@schemata@origSchema[#1]{#2}{#3}{#4}{#5}% +\end{lateximage}% +} + +\endinput +%% +%% End of file `lwarp-schemata.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty index 8c1985f6dd1..cecc0eda7c9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty @@ -16,6 +16,8 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. +\RequirePackage{xcolor}% for \convertcolorspec + \LWR@ProvidesPackagePass{siunitx} \AtBeginDocument{% in case textcomp was not loaded @@ -24,6 +26,7 @@ \DeclareSIUnit\elementarycharge{\textit{e}} \DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}} \DeclareSIUnit\hartree{\textit{E}\textsubscript{h}} +\DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar} }% AtBeginDocument \ExplSyntaxOn @@ -92,7 +95,9 @@ } { \__siunitx_unit_output_pre_print: - \LWR@subsingledollar{\__siunitx_print:nn { number } { #1 }}% lwarp + \LWR@subsingledollar{% lwarp + \textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp + }{\__siunitx_print:nn { number } { #1 }}% lwarp \__siunitx_unit_output_print: } \group_end:% lwarp @@ -123,7 +128,42 @@ \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_per_symbol_tl \tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_unit_denominator_tl } - +\cs_undefine:N \__siunitx_angle_print_astronomy_aux: +\cs_new_protected:Npn \__siunitx_angle_print_astronomy_aux: { + \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer } + \l__siunitx_tmpa_tl + { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } + \ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% lwarp + {% lateximage + \hbox_set:Nn \l__siunitx_angle_marker_box + { + \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } + } + \hbox_set:Nn \l__siunitx_angle_unit_box + { + \__siunitx_print:nV { unit } \l__siunitx_unit_tl + \skip_horizontal:n { -\scriptspace } + } + \__siunitx_angle_print_astronomy_aux:n { marker } + \__siunitx_angle_print_astronomy_aux:n { unit } + \hbox_set:Nn \l__siunitx_angle_marker_box + { + \box_use:N \l__siunitx_angle_marker_box + \box_use:N \l__siunitx_angle_unit_box + } + \dim_compare:nNnTF + { \l__siunitx_angle_marker_dim } > { \l__siunitx_angle_unit_dim } + { \__siunitx_angle_print_astronomy_marker: } + { \__siunitx_angle_print_astronomy_unit: } + }% lateximage + {% not a lateximage + \__siunitx_print:nV { unit } \l__siunitx_unit_tl + \__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } } + }% not a lateximage + \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-decimal } + \l__siunitx_tmpa_tl + { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl } +} \RenewDocumentCommand \num { o m } { \leavevmode \group_begin:% lwarp diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 67e9e0c8377..728d49952ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -29,7 +29,7 @@ \begin{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% -{\catcode`\$=3} % dollar sign is math shift +{\catcode`\$=3}% dollar sign is math shift } \AfterEndEnvironment{tikzpicture}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty new file mode 100644 index 00000000000..22f5657eba6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty @@ -0,0 +1,50 @@ +%% +%% This is file `lwarp-xy.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xy') +%% 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{xy} + +\AtBeginDocument{ + +\preto{\xy}{\begin{lateximage}[xy image]} +\appto{\endxy}{\end{lateximage}} + +\@ifundefined{xymatrix}{}{ +\LetLtxMacro\LWR@origxymatrix\xymatrix + +\renewcommand{\xymatrix}[1]{% +\begin{lateximage}[xymatrix] +\LWR@origxymatrix{#1} +\end{lateximage} +} +} + +\@ifundefined{xygraph}{}{ +\LetLtxMacro\LWR@origxygraph\xygraph + +\renewcommand{\xygraph}[1]{% +\begin{lateximage}[xygraph] +\LWR@origxygraph{#1} +\end{lateximage} +} +} + +} + +\endinput +%% +%% End of file `lwarp-xy.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 930690dcd95..753a687aab8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,17 +17,48 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2018/02/19 v0.49 Allows LaTeX to directly produce HTML5 output.] + [2018/03/03 v0.50 Allows LaTeX to directly produce HTML5 output.] \RequirePackage{iftex} +\newif\ifxetexorluatex +\ifXeTeX + \xetexorluatextrue +\else + \ifLuaTeX + \xetexorluatextrue + \else + \xetexorluatexfalse + \fi +\fi \ifLuaTeX \RequirePackage{luatex85}% until the geometry package is updated \fi +\newcommand{\LWR@mdfive}[1]{% +\PackageError{lwarp} +{No MD5 macro was found.} +{Lwarp must find the macros pdfmdfivesum or mdfivesum.} +} + +\ifPDFTeX +\let\LWR@mdfive\pdfmdfivesum +\fi + +\ifLuaTeX +\RequirePackage{pdftexcmds} +\let\LWR@mdfive\pdf@mdfivesum +\fi + +\ifXeTeX +\@ifundefined{pdffivesum}{} + {\let\LWR@mdfive\pdfmdfivesum} +\@ifundefined{mdfivesum}{} + {\let\LWR@mdfive\mdfivesum} +\fi \ifPDFTeX \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} @@ -225,6 +256,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{arabicfront} \LWR@notmemoirloadafter{array} \LWR@loadafter{authblk} +\LWR@loadafter{axodraw2} \LWR@loadafter{backref} \LWR@loadafter{balance} \LWR@loadafter{bigdelim} @@ -235,6 +267,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} +\LWR@loadafter{bytefield} \LWR@loadafter{cancel} \LWR@loadafter{caption} \LWR@notmemoirloadafter{ccaption} @@ -250,8 +283,10 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{crop} \LWR@loadafter{cuted} \LWR@loadafter{cutwin} +\LWR@loadafter{dblfloatfix} \LWR@loadafter{dblfnote} \LWR@notmemoirloadafter{dcolumn} +\LWR@loadafter{diagbox} \LWR@loadafter{draftwatermark} \LWR@loadafter{easy-todo} \LWR@loadafter{ebook} @@ -263,6 +298,7 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{enumerate} \LWR@loadafter{enumitem} \LWR@notmemoirloadafter{epigraph} +\LWR@loadafter{epstopdf} \LWR@loadafter{eso-pic} \LWR@loadafter{everypage} \LWR@loadafter{everyshi} @@ -332,6 +368,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{microtype} \LWR@loadafter{midfloat} \LWR@loadafter{midpage} +\LWR@loadafter{morefloats} \LWR@notmemoirloadafter{moreverb} \LWR@notmemoirloadafter{mparhack} \LWR@loadafter{multirow} @@ -341,6 +378,7 @@ For a possible alternative, see package(s) #2.} \LWR@notmemoirloadafter{needspace} \LWR@loadafter{newtxmath} \LWR@notmemoirloadafter{nextpage} +\LWR@loadafter{nonfloat} \LWR@loadafter{nonumonpart} \LWR@loadafter{nopageno} \LWR@loadafter{nowidow} @@ -351,10 +389,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{pagesel} \LWR@loadafter{paralist} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pbox} \LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} +\LWR@loadafter{phfqit} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} \LWR@loadafter{prettyref} @@ -369,6 +409,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{rotating} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} +\LWR@loadafter{schemata} \LWR@loadafter{scrextend} \LWR@loadafter{scrhack} \LWR@loadafter{scrlayer} @@ -429,29 +470,15 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{xmpincl} \LWR@loadafter{xtab} \LWR@loadafter{xurl} +\LWR@loadafter{xy} \LWR@loadafter{zwpagelayout} - -\begin{warpall} - - -\RequirePackage{iftex} -\newif\ifxetexorluatex -\ifXeTeX - \xetexorluatextrue -\else - \ifLuaTeX - \xetexorluatextrue - \else - \xetexorluatexfalse - \fi -\fi - -\end{warpall} - \begin{warpHTML} \ifxetexorluatex +\@ifpackageloaded{fontspec}{}{ +\usepackage[no-math]{fontspec} +} \defaultfontfeatures[\rmfamily]{Ligatures={NoCommon,TeX}} \defaultfontfeatures[\sffamily]{Ligatures={NoCommon,TeX}} \defaultfontfeatures[\ttfamily]{Ligatures=NoCommon} @@ -546,9 +573,8 @@ top=1in,bottom=1in,% \RequirePackage{zref} -\PassOptionsToPackage{leqno}{amsmath} \RequirePackage{amsmath} -\def\maketag@@@#1{#1} +\def\maketag@@@#1{\text{#1}} \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}} @@ -946,7 +972,9 @@ top=1in,bottom=1in,% } \LetLtxMacro\LWR@origunderline\underline - +\let\LWR@origraggedright\raggedright +\let\LWR@origraggedleft\raggedleft +\let\LWR@origcentering\centering \let\LWR@orignewpage\newpage \let\LWR@origpagestyle\pagestyle @@ -1203,6 +1231,25 @@ span.underline { text-decoration-skip ; } +span.overline { + text-decoration: overline ; + text-decoration-skip ; +} + +/* for diagbox */ +div.diagboxtitleN { border-bottom: 1px solid gray } +div.diagboxtitleS { border-top: 1px solid gray } + +div.diagboxE { + padding-left: 2em ; + text-align: right ; +} + +div.diagboxW { + padding-right: 2em ; + text-align: left ; +} + /* For realscripts */ .supsubscript { display: inline-block; @@ -1551,6 +1598,36 @@ border-top: 1px solid silver ; border-bottom: 1px solid silver ; } +div.displaymath { + text-align: center ; +} + +div.displaymathnumbered { + text-align: right ; + margin-left: 5% ; + margin-right: 5% ; + min-width: 2.5in ; +} + +@media all and (min-width: 400px) { + div.displaymathnumbered { + margin-left: 10% ; + margin-right: 10% ; + } +} + +@media all and (min-width: 800px) { + div.displaymathnumbered { + margin-right: 20% ; + } +} + +@media all and (min-width: 1200px) { + div.displaymathnumbered { + margin-right: 30% ; + } +} + .inlineprogramlisting { font-family: "DejaVu Mono", "Bitstream Vera Mono", "Lucida Console", "Nimbus Mono L", "Liberation Mono", "FreeMono", "Andale Mono", @@ -2518,6 +2595,8 @@ div.minipage { border-radius: 1ex ; } +table div.minipage { background: none ; border: none ; } + div.framebox div.minipage {border:none ; background:none} section.textbody > div.minipage { @@ -2852,6 +2931,18 @@ nav.botnavigation { \end{filecontents*} \end{warpprint} +\begin{warpprint} +\begin{filecontents*}{lwarp_one_limage.txt} +@echo off +pdfseparate -f %1 -l %1 %4_html.pdf lateximages\lateximagetemp-%%d.pdf" +pdfcrop lateximages\lateximagetemp-%1.pdf lateximages\%3.pdf +pdftocairo -svg lateximages\%3.pdf lateximages\%3.svg +del lateximages\%3.pdf +del lateximages\lateximagetemp-%1.pdf" +exit +\end{filecontents*} +\end{warpprint} + \begin{warpprint} \begin{filecontents*}{lwarp_mathjax.txt} @@ -2966,7 +3057,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.49" +printversion = "v0.50" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -2989,7 +3080,7 @@ lwarpmk pdftohtml [project]: For use with latexmk or a Makefile: Convert project_html.pdf to project_html.html and individual HTML files. -lwarpmk clean [project]: Remove project.aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl* +lwarpmk clean [project]: Remove .aux, .toc, .lof/t, .idx, .ind, .log, *_html_inc.*, .gl* lwarpmk cleanall [project]: Remove auxiliary files and also project.pdf, *.html lwarpmk -h: Print this help message. lwarpmk --help: Print this help message. @@ -3029,10 +3120,12 @@ local sfile = io.open(sourcefile) io.output(destfile) for line in sfile:lines() do i,j,copen,cstart,newfilename = string.find (line,"(.*)|(.*)|(.*)|") ; -if ( (i~= nil) and (copen == "