diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
70 files changed, 889 insertions, 116 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index 44bd61dc7b9..4c470c63641 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -184,6 +184,10 @@ + + + + \endinput %% %% End of file `lwarp-abstract.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty index 4bad8ba0136..f56a93787ff 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-afterpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty index d6d1a9648ec..bb8af86c89e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -142,6 +142,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% + + + + \endinput %% %% End of file `lwarp-algorithmicx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty index 09af6105b3c..f568d17e1f5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -129,6 +129,10 @@ + + + + \endinput %% %% End of file `lwarp-alltt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty index 4f662335979..67b812d00e9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty @@ -132,6 +132,10 @@ + + + + \endinput %% %% End of file `lwarp-bookmark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index 9eb9d54c561..f4cb4a77035 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -128,6 +128,10 @@ + + + + \endinput %% %% End of file `lwarp-booktabs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty index e6e6c823e79..829844a250d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty @@ -131,6 +131,10 @@ + + + + \endinput %% %% End of file `lwarp-changepage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty index d011cc44068..573e6069beb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty @@ -125,6 +125,10 @@ + + + + \endinput %% %% End of file `lwarp-dcolumn.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty index 4c3908bbcb5..4bbab9ac043 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty @@ -135,6 +135,10 @@ + + + + \endinput %% %% End of file `lwarp-draftwatermark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty index 9d9e67463b8..7290d1fef8c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty @@ -132,6 +132,10 @@ + + + + \endinput %% %% End of file `lwarp-enumerate.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index 4d88e4a2efa..b3b14a2f7d7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -161,6 +161,10 @@ + + + + \endinput %% %% End of file `lwarp-epigraph.sty'. 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 7349cd20e62..12b9f0d5f56 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -144,6 +144,10 @@ + + + + \endinput %% %% End of file `lwarp-eso-pic.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty index 113b431ba12..90d4796865e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty @@ -128,6 +128,10 @@ + + + + \endinput %% %% End of file `lwarp-everypage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty index 4322ced1728..412e7b86796 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty @@ -136,6 +136,10 @@ + + + + \endinput %% %% End of file `lwarp-extramarks.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty index a5260f1af78..b9a811558c0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty @@ -143,6 +143,10 @@ + + + + \endinput %% %% End of file `lwarp-fancyhdr.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index 22d9565d3ab..5e8a906f38a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -149,6 +149,10 @@ + + + + \endinput %% %% End of file `lwarp-float.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index fac91b4d693..fa8388f28d1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -50,22 +50,49 @@ -\NewDocumentCommand{\floatbox}{o m o o o +m +m}{% -\ifbool{LWR@insubfloatrow} -{ -\IfValueTF{#3} -{\@nameuse{sub#2}{#3}} -{\@nameuse{sub#2}{\linewidth}} +\newbool{LWR@subcaptionloaded} + +\AtBeginDocument{ +\@ifpackageloaded{subcaption} +{\booltrue{LWR@subcaptionloaded}} +{\boolfalse{LWR@subcaptionloaded}} } -{ + +\NewDocumentCommand{\floatbox}{o m o o o +m +m}{% +\ifbool{LWR@subcaptionloaded}% +{% subcaption +\ifbool{LWR@insubfloatrow}% +{% subcaption in a subfloatrow +\IfValueTF{#3}% +{\@nameuse{sub#2}{#3}}% +{\@nameuse{sub#2}{\linewidth}}% +}% subcaption in a subfloatrow +{% subcaption not in subfloatrow +\@nameuse{#2}% +}% subcaption not in subfloatrow +#6 + +#7 +\ifbool{LWR@insubfloatrow}% +{\@nameuse{endsub#2}}% +{\@nameuse{end#2}}% +}% subcaption +{% assume subfig +\ifbool{LWR@insubfloatrow}% +{% subfig in a subfloatrow +\begingroup +\let\caption\@firstofone +\subfloat[#6]{#7} +\endgroup +}% subfig in a subfloatrow +{% subfig package, but not a subfig \@nameuse{#2} -} #6 #7 -\ifbool{LWR@insubfloatrow} -{\@nameuse{endsub#2}} -{\@nameuse{end#2}} +\@nameuse{end#2} +}% subfig package, but not a subfig +}% assume subfig } \newcommand*{\nocapbeside}{} @@ -139,7 +166,7 @@ \LWR@frowkeyfileext\ \LWR@frowkeywithin}% \newfloat{#1}{\LWR@frowkeyplacement}% {\LWR@frowkeyfileext}[\LWR@frowkeywithin]% -\LWR@traceinfo{*** finished newfloat #1} +\LWR@traceinfo{finished newfloat #1} }% \ifthenelse{\equal{\LWR@frowkeyname}{}} {} @@ -256,6 +283,10 @@ + + + + \endinput %% %% End of file `lwarp-floatrow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty index 53973c744f4..a602feb9451 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-fontenc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty index 6bb27d0bb5d..5ef016a8a4e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty @@ -125,6 +125,10 @@ + + + + \endinput %% %% End of file `lwarp-fontspec.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty index 042f7104e59..b65fd706640 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty @@ -124,6 +124,10 @@ + + + + \endinput %% %% End of file `lwarp-ftnright.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty index cbde6320727..f438541ab9e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty @@ -131,6 +131,10 @@ + + + + \endinput %% %% End of file `lwarp-geometry.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 59e205f4921..ab923d0d05c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -130,6 +130,10 @@ and it is emulated by lwarp.} + + + + \endinput %% %% End of file `lwarp-graphics.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty index 418f7ce2994..ed3fb17ebb4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty @@ -125,6 +125,10 @@ + + + + \endinput %% %% End of file `lwarp-graphicx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index b6a87c31c8e..a08f4ca0fba 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -230,6 +230,10 @@ + + + + \endinput %% %% End of file `lwarp-hyperref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty index 5c7964bb82b..2d10317e991 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty @@ -125,6 +125,10 @@ + + + + \endinput %% %% End of file `lwarp-indentfirst.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty index 4d5a30c354d..cf6b095209f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-inputenc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index cfde5023a03..27e3cbfeda6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -153,6 +153,10 @@ + + + + \endinput %% %% End of file `lwarp-keyfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty index e5edfaf189a..4d23afef1fe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-layout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty index 8abf932d1bf..018d3b54c64 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty @@ -130,6 +130,10 @@ + + + + \endinput %% %% End of file `lwarp-letterspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 330240b37c9..ea2fca8b889 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -70,7 +70,7 @@ \let\LWR@origlsthkEveryPar\lsthk@EveryPar -\renewcommand{\l@lstlisting}[2]{\hypertocfloat{1}{toclstlisting}{#1}{#2}} +\renewcommand{\l@lstlisting}[2]{\hypertocfloat{1}{lstlisting}{lol}{#1}{#2}} \renewcommand{\lst@Init}[1]{% \LWR@traceinfo{lst@Init}% \renewcommand*{\@captype}{lstlisting}% @@ -167,7 +167,6 @@ \kern\VerbatimHTMLWidth \kern\lst@numbersep \lst@numberstyle{\thelstnumber}}}% }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}} - \end{warpHTML} @@ -230,6 +229,10 @@ + + + + \endinput %% %% End of file `lwarp-listings.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 0a30d576d76..d569b6cd3f2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -166,6 +166,10 @@ + + + + \endinput %% %% End of file `lwarp-longtable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty index a0b9dea1660..e8e7c0cbdb2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-lscape.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty index 083e3368334..49de52cee3b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty @@ -131,6 +131,10 @@ + + + + \endinput %% %% End of file `lwarp-ltcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty index 6533f6df0b7..3dbdf2bbebd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty @@ -128,6 +128,10 @@ + + + + \endinput %% %% End of file `lwarp-mcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 1d5cd5006f4..0555655a0d2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -283,6 +283,10 @@ solid + + + + \endinput %% %% End of file `lwarp-mdframed.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty index 3ae91861aab..47fb8539ab5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty @@ -157,6 +157,10 @@ + + + + \endinput %% %% End of file `lwarp-microtype.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty index d81715ac47d..d7e9b07229e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty @@ -153,6 +153,10 @@ + + + + \endinput %% %% End of file `lwarp-multicol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index 94b29e1d539..ceb0967d563 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -125,6 +125,10 @@ + + + + \endinput %% %% End of file `lwarp-multirow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty index ee19cfcb474..f72ad7c1f73 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty @@ -128,6 +128,10 @@ + + + + \endinput %% %% End of file `lwarp-nameref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty index 5c34b5b448d..4e472e399e7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty @@ -127,6 +127,10 @@ + + + + \endinput %% %% End of file `lwarp-needspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty index 05186cf4515..a721939d307 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-newclude.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty index adfe6de3e14..f50d99d2b01 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty @@ -652,6 +652,8 @@ figure.subfigure, figure.subtable { display: inline-block ; margin: 3ex 1em 3ex 1em ; } +figcaption .minipage { margin:0 ; padding: 0 } + div.floatrow { text-align: center; } div.floatrow figure { display: inline-block ; margin: 1ex 2% ; } @@ -1180,7 +1182,7 @@ font-size: 1.5em ; border-radius: 1ex ; } -figure.figure .minipage { border: none; } +figure.figure .minipage, figcaption .minipage { border: none; } div.marginblock div.minipage { border: none; } @@ -1404,7 +1406,6 @@ figcaption , .lstlisting { .minipage { background-color: #fffcf5 ; border: none ; - margin: 1em ; } div.floatrow figure { border: none ; } @@ -1576,7 +1577,7 @@ MathJax.Hub.Config({ -- Print the usage of the lwarpmk command: -printversion = "v0.23" +printversion = "v0.24" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -2103,6 +2104,10 @@ end -- not --version + + + + \endinput %% %% End of file `lwarp-newproject.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty index cfae65494d1..96e675014f2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-newunicodechar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty index a4e7ba9d038..0fe5c1c8fdd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty @@ -129,6 +129,10 @@ + + + + \endinput %% %% End of file `lwarp-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty index e7e98356c52..accbe65a987 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty @@ -131,6 +131,10 @@ + + + + \endinput %% %% End of file `lwarp-nowidow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty index 55b40afa6fd..1bd09c3db67 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty @@ -130,6 +130,10 @@ + + + + \endinput %% %% End of file `lwarp-pagenote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty index 7d729a1cf6e..18899008492 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty @@ -124,6 +124,10 @@ + + + + \endinput %% %% End of file `lwarp-parskip.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty index b3333065eea..5da3393a9d7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-placeins.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty index acb9166bfe5..214bd879986 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty @@ -147,6 +147,10 @@ + + + + \endinput %% %% End of file `lwarp-ragged2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty index 7b5ae26a4f8..125e8edf648 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty @@ -137,6 +137,10 @@ + + + + \endinput %% %% End of file `lwarp-rotating.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty index 78b98dab321..c59497c59a0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty @@ -154,6 +154,10 @@ + + + + \endinput %% %% End of file `lwarp-setspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty index 169a6d81cfd..166d843913e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty @@ -126,6 +126,10 @@ + + + + \endinput %% %% End of file `lwarp-showkeys.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty index 599129630bf..a67c1fcf64f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty @@ -144,6 +144,10 @@ + + + + \endinput %% %% End of file `lwarp-sidecap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty new file mode 100644 index 00000000000..14b698c8bad --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -0,0 +1,330 @@ +%% +%% This is file `lwarp-subfig.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `subfig') +%% This is a generated file. +%% Copyright 2016-2017 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{subfig} + +\long\def\sf@@@subfloat#1[#2][#3]#4{% +\begin{minipage}{\linewidth}% new +\LWR@stoppars% new + \@ifundefined{FBsc@max}{}% + {\FB@readaux{\let\FBsuboheight\relax}}% + \@tempcnta=\@ne + \if@minipage + \@tempcnta=\z@ + \else\ifdim \lastskip=\z@ \else + \@tempcnta=\tw@ + \fi\fi + \ifmaincaptiontop + \sf@top=\sf@nearskip + \sf@bottom=\sf@farskip + \else + \sf@top=\sf@farskip + \sf@bottom=\sf@nearskip + \fi + \leavevmode +\setbox\@tempboxa \hbox{#4}% + \@tempdima=\wd\@tempboxa + \@ifundefined{FBsc@max}{}% + {\global\advance\Xhsize-\wd\@tempboxa + \dimen@=\ht\@tempboxa + \advance\dimen@\dp\@tempboxa + \ifdim\dimen@>\FBso@max + \global\FBso@max\dimen@ + \fi}% + \vtop\bgroup + \vbox\bgroup + \ifcase\@tempcnta + \@minipagefalse + \or + \vskip\sf@top + \or + \ifdim \lastskip=\z@ \else + \@tempskipb\sf@top\relax\@xaddvskip + \fi + \fi + \sf@ifpositiontop{% + \ifx \@empty#3\relax \else + \sf@subcaption{#1}{#2}{#3}% + \vskip\sf@capskip + \vskip\sf@captopadj + \fi\egroup + \hrule width0pt height0pt depth0pt +\LWR@startpars% new +#4 +\LWR@stoppars% new + }{% +\LWR@startpars% new + \@ifundefined{FBsc@max}% + { +#4 +}% + {\ifx\FBsuboheight\relax +#4 + \else +#4 + \fi}% +\LWR@stoppars% new + \egroup + \ifx \@empty#3\relax \else + \vskip\sf@capskip + \hrule width0pt height0pt depth0pt + \sf@subcaption{#1}{#2}{#3}% + \fi + }% + \vskip\sf@bottom + \egroup + \@ifundefined{FBsc@max}{}% + {\addtocounter{FRobj}{-1}% + \ifnum\c@FRobj=0\else + \subfloatrowsep + \fi}% + \ifmaincaptiontop\else + \global\advance\@nameuse{c@\@captype}\m@ne + \fi +\end{minipage}% new +\LWR@startpars% new + \endgroup\ignorespaces% +}% + +\long\def\sf@subcaption#1#2#3{% +\LWR@stoppars% new + \ifx \relax#2\relax \else + \bgroup + \let\label=\@gobble + \let\protect=\string + \def\@subcaplabel{% + \caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}% + \sf@updatecaptionlist{#1}{#2}{\the\value{\@captype}}{\the\value{#1}}% + \egroup + \fi + \bgroup + \ifx \relax#3\relax + \let\captionlabelsep=\relax + \fi + \@ifundefined{FBsc@max}% +{ +\LWR@traceinfo{sfsubcap B1}% new +\LWR@htmlblocktag{figcaption}% new +\caption@make +{\@nameuse{sub\@captype name}}% +{\@nameuse{thesub\@captype}}% +{#3} +\LWR@htmlblocktag{/figcaption}% new +\LWR@traceinfo{sfsubcap B2}% new +}% + {\dimen@\ht0% + \advance\dimen@\dp0% + \ifdim\dimen@>\FBsc@max + \global\FBsc@max\dimen@ + \fi + \FB@readaux{\let\FBsubcheight\relax}% + \ifx\FBsubcheight\relax + \def\next{ +}% + \else + \def\next{ +}% + \fi + \vbox{% + +\LWR@traceinfo{sfsubcap C1}% new + \caption@make + {\@nameuse{sub\@captype name}}% + {\@nameuse{thesub\@captype}}% + {#3} +\LWR@traceinfo{sfsubcap C1}% new + + } +}% + \egroup +\LWR@startpars% new +} + +\renewcommand\caption@@@make[2]{% +\LWR@startpars% new + \sbox\@tempboxa{#1}% + \ifdim\wd\@tempboxa=\z@ + \let\caption@lsep\relax + \fi + \caption@ifempty{#2}{% + \let\caption@lsep\@empty + \let\caption@tfmt\@firstofone + }% +\renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new + \caption@applyfont + \caption@fmt + {\ifcaption@star\else + \begingroup + \captionlabelfont + #1% + \endgroup + \fi}% + {\ifcaption@star\else + \begingroup + \caption@iflf\captionlabelfont + \relax\caption@lsep + \endgroup + \fi}% + {{\captiontextfont + \caption@ifstrut + {\vrule\@height\ht\strutbox\@width\z@}% + {}% + \nobreak\hskip\z@skip % enable hyphenation + \caption@tfmt{#2} +\LWR@ensuredoingapar% new + \caption@ifstrut + {\ifhmode\@finalstrut\strutbox\fi}% + {}% + \par}} +\LWR@stoppars% new +} + +\def\subfloat@label{% +\LWR@ensuredoingapar% new + \@ifnextchar(% %) match left parenthesis + {\sf@sub@label} + {\sf@sub@label(Sub\@captype\space + \@ifundefined{thechapter}{}{\@nameuse{thechapter}\space}% + \@nameuse{p@sub\@captype}% + \@nameuse{thesub\@captype}.)}} + +\renewcommand{\sf@subref}[1]{% +\LWR@subnewref{#1}{sub@#1}% +} +\renewcommand{\sf@@subref}[1]{\LWR@origpageref{sub@#1}} +\let\LWR@orig@newsubfloat\@newsubfloat + +\def\@newsubfloat[#1]#2{% +\LWR@orig@newsubfloat[#1]{#2}% +\renewcommand{\l@sub#2}[2]{\hypertocfloat{2}{sub#2}{\ext@sub#2}{##1}{##2}} +} +\renewcommand{\l@subfigure}[2]{\hypertocfloat{2}{subfigure}{lof}{#1}{#2}} +\renewcommand{\l@subtable}[2]{\hypertocfloat{2}{subtable}{lot}{#1}{#2}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\endinput +%% +%% End of file `lwarp-subfig.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index c0c91822a53..8007f93855c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -96,6 +96,8 @@ + + \LWR@ProvidesPackageDrop{tabularx} \newenvironment{tabularx}[2] @@ -132,6 +134,8 @@ + + \endinput %% %% End of file `lwarp-tabularx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty index e6cf1588279..edc32546c69 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty @@ -99,6 +99,8 @@ + + \LWR@ProvidesPackageDrop{textpos} \NewDocumentEnvironment{textblock}{m r()}{}{} @@ -142,6 +144,8 @@ + + \endinput %% %% End of file `lwarp-textpos.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty index ba7c5b8f0bb..96f03811e22 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty @@ -101,6 +101,8 @@ + + \LWR@ProvidesPackageDrop{threeparttable} \newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}} @@ -141,6 +143,8 @@ + + \endinput %% %% End of file `lwarp-threeparttable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty new file mode 100644 index 00000000000..354ce7d6617 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -0,0 +1,160 @@ +%% +%% This is file `lwarp-tikz.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tikz') +%% This is a generated file. +%% Copyright 2016-2017 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{tikz} + + +\begin{warpHTML} + +\newboolean{LWR@tikzbabel} + +\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 +{ +\usetikzlibrary{babel} +\booltrue{LWR@tikzbabel} +} +{\boolfalse{LWR@tikzbabel}} + +\BeforeBeginEnvironment{tikzpicture}{% +\lateximage% +\ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 +{}% +{\catcode`\$=3} % dollar sign is math shift +} + +\AfterEndEnvironment{tikzpicture}{% +\endlateximage% +\ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 +{}% +{\catcode`\$=\active}% +} + +\end{warpHTML} + + + + + + + + + + + + + + + + + + + + + + + +\endinput +%% +%% End of file `lwarp-tikz.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty index 191f8127126..eba76342e8b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty @@ -104,6 +104,10 @@ + + + + \LWR@ProvidesPackageDrop{titleps} \RenewDocumentCommand{\newpagestyle}{m o m}{} \RenewDocumentCommand{\renewpagestyle}{m o m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index fbf6271bff4..570991c9b4f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -106,6 +106,10 @@ + + + + \LWR@ProvidesPackageDrop{titlesec} \newcommand*{\titlelabel}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty index 8fc8416d69a..bb09e79b3ec 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty @@ -108,6 +108,10 @@ + + + + \LWR@ProvidesPackageDrop{titletoc} \NewDocumentCommand{\dottedcontents}{m o m m m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 70125571f78..8c2f5216c99 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -109,6 +109,10 @@ + + + + \LWR@ProvidesPackagePass{titling} \let\LWR@orig@bsmtitlempty\@bsmtitlempty \renewcommand*{\@bsmtitlempty}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 0665c5dd407..2d97467ad29 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -112,6 +112,10 @@ + + + + \LWR@ProvidesPackageDrop{tocloft} \newcommand{\tocloftpagestyle}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty index 16118e9b265..c1f2e5b74e5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty @@ -114,6 +114,10 @@ + + + + \LWR@ProvidesPackageDrop{trivfloat} \LWR@origRequirePackage{trivfloat} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index cc21a6bf7cb..0b9f468b82d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -114,6 +114,10 @@ + + + + \LWR@ProvidesPackagePass{verse} \AfterEndPreamble{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty index 510bdd26248..dc63e4c3761 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty @@ -116,6 +116,10 @@ + + + + \LWR@ProvidesPackageDrop{wallpaper} \newcommand*{\CenterWallPaper}[2]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index 3235f5aaa74..1f6c2796026 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -117,6 +117,10 @@ + + + + \LWR@ProvidesPackageDrop{wrapfig} \newlength{\LWR@wrapwidth} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index d32a76062b6..32043419464 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -119,6 +119,10 @@ + + + + \LWR@ProvidesPackagePass{xcolor} \newcommand*{\LWR@tempcolor}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index 7c85e95f131..6da4283cab2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -120,6 +120,10 @@ + + + + \LWR@ProvidesPackagePass{xfrac} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 9ab86bf0d27..438e5652786 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.23 Allows LaTeX to directly produce HTML5 output.] + [2017/03/15 v0.24 Allows LaTeX to directly produce HTML5 output.] @@ -171,9 +171,11 @@ after lwarp.} \LWR@loadafter{setspace} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} +\LWR@loadafter{subfig} \LWR@loadafter{tabularx} \LWR@loadafter{textpos} \LWR@loadafter{threeparttable} +\LWR@loadafter{tikz} \LWR@loadafter{titleps} \LWR@loadafter{titlesec} \LWR@loadafter{titletoc} @@ -271,7 +273,6 @@ top=1in,bottom=1in,% \RequirePackage{caption} -\RequirePackage{subcaption} \RequirePackage{enumitem} \setlist[itemize]{leftmargin=0em} @@ -654,11 +655,13 @@ top=1in,bottom=1in,% \HomeHTMLFileName.html% }% {% -\LWR@traceinfo{LWR@htmlsectionfilename C}% +\LWR@traceinfo{LWR@htmlsectionfilename C \LWR@tempone}% \ifthenelse{% \equal{\HTMLFileName}{} \AND \equal{\LWR@tempone}{Index} \OR \equal{\LWR@tempone}{index}% }% -{\_#1.html}% +{% +\LWR@traceinfo{prefixing the index name with an underscore.}% +\_#1.html}% {\HTMLFileName#1.html}% }% \LWR@traceinfo{LWR@htmlsectionfilename Z}% @@ -1597,6 +1600,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\tabular\LWR@tabular \let\endtabular\endLWR@tabular \let\LWR@origcaption\caption +\let\LWR@origltx@label\ltx@label \let\ltx@label\LWR@htmlmathlabel \let\TeX\LWR@TeX \let\LaTeX\LWR@LaTeX @@ -2517,10 +2521,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% not at the left edge: \LWR@traceinfo{not at the left edge}% \LWR@setexparray{LWR@colatspec}{\theLWR@tabletotalcols}{\LWR@strresult}% -\LWR@traceinfo{at \theLWR@tabletotalcols: \LWR@colatspec(\theLWR@tabletotalcols)!}% -}% +\LWR@traceinfo{at \theLWR@tabletotalcols: % + \LWR@getexparray{LWR@colatspec}{\theLWR@tabletotalcols})!}% \let\LWR@strresult\relax% \booltrue{LWR@validtablecol}% +}% } \newcommand*{\LWR@parsebangcolumn}{% \LWR@traceinfo{bang column}% @@ -3040,9 +3045,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@spref{#1}{zLWR@name}% } \newcommand*{\LWR@htmlfileref}[1]{% -\LWR@traceinfo{LWR@htmlfileref A: !#1!}% \LWR@spref{#1}{zLWR@htmlfilenumber}% -\LWR@traceinfo{LWR@htmlfileref B}% } \newcommand*{\LWR@lateximagedepthref}[1]{% \LWR@spref{#1}{zLWR@lateximagedepth}% @@ -3076,67 +3079,63 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% pars not allowed }% not lateximage } - -\newcommand*{\LWR@sublabel}[1]{% -\LWR@traceinfo{LWR@sublabel: !#1!}% +\newcommand*{\LWR@newlabel}[1]{% +\LWR@traceinfo{LWR@newlabel: !#1!}% \LWR@origlabel{#1}% -\LWR@traceinfo{about to splabel}% -\LWR@traceinfo{filesectionnames is \ifbool{FileSectionNames}{true}{false}}% -\LWR@traceinfo{LWR@thisfilename is !\LWR@thisfilename!}% -\LWR@traceinfo{LWR@htmlfilenumber is \theLWR@htmlfilenumber}% +\LWR@traceinfo{LWR@newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}% +\LWR@traceinfo{LWR@newlabel: LWR@thisfilename is !\LWR@thisfilename!}% +\LWR@traceinfo{LWR@newlabel: LWR@htmlfilenumber is \theLWR@htmlfilenumber}% \LWR@splabel{#1}% \LWR@subsublabel{#1}% -\LWR@traceinfo{finished with LWR@sublabel}% -} -\newcommand*{\LWR@newlabel}[1]{% -\LWR@traceinfo{lwr@newlabel: !#1!}% -\LWR@sublabel{#1}% -\LWR@traceinfo{lwr@newlabel: done}% +\LWR@traceinfo{LWR@newlabel: done}% } \newcommand*{\LWR@startref}[1] {% \edef\LWR@lidref{\LWR@lateximagedepthref{#1}} -\LWR@traceinfo{***LWR@startref A: !#1!}% +\LWR@traceinfo{LWR@startref A: !#1!}% \LWR@htmltag{a href="% -\LWR@traceinfo{***LWR@startref B}% +\LWR@traceinfo{LWR@startref B}% \LWR@htmlrefsectionfilename{#1}% -\LWR@traceinfo{***LWR@startref C}% +\LWR@traceinfo{LWR@startref C}% \#% -\LWR@traceinfo{***LWR@startref D: !#1!}% +\LWR@traceinfo{LWR@startref D: !#1!}% \ifthenelse{\equal{\LWR@lidref}{??}}% -{??}% {% -\LWR@traceinfo{***LWR@startref D1}% -\LWR@traceinfo{***depthref is \LWR@lidref}% +\LWR@traceinfo{LWR@startref D0: ??} +??}% +{% +\LWR@traceinfo{LWR@startref D1: \LWR@lidref}% \ifthenelse{\cnttest{\LWR@lidref}{>}{0}}% {% -\LWR@traceinfo{***LWR@startref D2}% +\LWR@traceinfo{LWR@startref D2: \LWR@lidref}% lateximage\LWR@lateximagenumberref{#1}% }% {% -\LWR@traceinfo{***LWR@startref D3}% +\LWR@traceinfo{LWR@startref D3}% #1% }% }% -\LWR@traceinfo{***LWR@startref E}% +\LWR@traceinfo{LWR@startref E}% "{}}% -\LWR@traceinfo{***LWR@startref F}% +\LWR@traceinfo{LWR@startref F}% +} + +\NewDocumentCommand{\LWR@subnewref}{m m}{% +\LWR@traceinfo{LWR@subnewref #1 #2}% +\LWR@startref{#1}% +\LWR@origref{#2}% +\LWR@htmltag{/a}% } \NewDocumentCommand{\LWR@newref}{s m}{% \LWR@traceinfo{LWR@newref #2}% \IfBooleanTF{#1}% {\LWR@origref{#2}}% -{% -\LWR@startref{#2}% -\LWR@origref{#2}% -\LWR@htmltag{/a}% -}% +{\LWR@subnewref{#2}{#2}}% } - \newcommand*{\pagerefPageFor}{see } \NewDocumentCommand{\LWR@newpageref}{s m}{% \IfBooleanTF{#1}% @@ -3279,6 +3278,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \begingroup% \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}% +\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}% \LWR@htmlblocktag{figcaption}% \LWR@origcaption@begin% } @@ -3292,8 +3292,10 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@traceinfo{LWR@caption@end: done}% } +\AtBeginDocument{ \let\caption@begin\LWR@caption@begin \let\caption@end\LWR@caption@end +} \let\LWR@origcaptionlistentry\captionlistentry @@ -3434,33 +3436,46 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{% \LWR@startpars% \LWR@subhyperrefclass{% -\LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{#2}% +\LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}% \LWR@stoppars% } {} } +\newcounter{lofdepth} +\setcounter{lofdepth}{1} + +\newcounter{lotdepth} +\setcounter{lotdepth}{1} -\newcommand{\hypertocfloat}[4]{% +\newcommand{\hypertocfloat}[5]{% \LWR@startpars +\@ifundefined{c@#3depth}{% +\newcounter{#3depth}% +\setcounter{#3depth}{1}% +}{}% +\LWR@traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}% +\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}{% +\LWR@startpars% \LWR@subhyperrefclass{% \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}% \#autofloat-\arabic{LWR@nextautofloat}}% -{#3}{#2}% +{#4}{toc#2}% \LWR@stoppars% +}{}% } -\renewcommand{\l@part}[2]{\hypertoc{-1}{tocpart}{#1}{#2}} +\renewcommand{\l@part}[2]{\hypertoc{-1}{part}{#1}{#2}} \DeclareDocumentCommand{\l@chapter}{m m} -{\hypertoc{0}{tocchapter}{#1}{#2}} -\renewcommand{\l@section}[2]{\hypertoc{1}{tocsection}{#1}{#2}} -\renewcommand{\l@subsection}[2]{\hypertoc{2}{tocsubsection}{#1}{#2}} +{\hypertoc{0}{chapter}{#1}{#2}} +\renewcommand{\l@section}[2]{\hypertoc{1}{section}{#1}{#2}} +\renewcommand{\l@subsection}[2]{\hypertoc{2}{subsection}{#1}{#2}} \renewcommand{\l@subsubsection}[2] -{\hypertoc{3}{tocsubsubsection}{#1}{#2}} -\renewcommand{\l@paragraph}[2]{\hypertoc{4}{tocparagraph}{#1}{#2}} -\renewcommand{\l@subparagraph}[2]{\hypertoc{5}{tocsubparagraph}{#1}{#2}} -\renewcommand{\l@figure}[2]{\hypertocfloat{1}{tocfigure}{#1}{#2}} -\renewcommand{\l@table}[2]{\hypertocfloat{1}{toctable}{#1}{#2}} +{\hypertoc{3}{subsubsection}{#1}{#2}} +\renewcommand{\l@paragraph}[2]{\hypertoc{4}{paragraph}{#1}{#2}} +\renewcommand{\l@subparagraph}[2]{\hypertoc{5}{subparagraph}{#1}{#2}} +\renewcommand{\l@figure}[2]{\hypertocfloat{1}{figure}{lof}{#1}{#2}} +\renewcommand{\l@table}[2]{\hypertocfloat{1}{table}{lot}{#1}{#2}} \end{warpHTML} @@ -3670,15 +3685,19 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \newbool{LWR@amsmultline} \boolfalse{LWR@amsmultline} - \newcommand*{\LWR@htmlmathlabel}[1]{% \LWR@traceinfo{LWR@htmlmathlabel #1}% \ifbool{mathjax}{% \text{ \ifbool{LWR@amsmultline}{}{\hspace*{\totwidth@}} -\LWR@htmlclosecomment\LWR@sublabel{\@firstofone#1}\LWR@htmlopencomment}% +\LWR@htmlclosecomment% +\LWR@origltx@label{#1}% +\LWR@htmlopencomment% +}% text +}% mathjax +{% +\LWR@origltx@label{#1}% }% -{\LWR@sublabel{\@firstofone#1}}% } \newcommand*{\LWR@beginhideamsmath}{ @@ -4367,6 +4386,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \renewcommand{\@@setcpagerefrange}[3]{% #1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}} +}% AfterEndPreamble \let\LWR@origlabel\label \let\label\LWR@newlabel @@ -4375,54 +4395,14 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \let\LWR@origpageref\pageref \let\pageref\LWR@newpageref -}% AfterEndPreamble - \end{warpHTML} - \begin{warpHTML} -\BeforeBeginEnvironment{picture}{ - -\lateximage} +\BeforeBeginEnvironment{picture}{\lateximage} -\AfterEndEnvironment{picture}{\endlateximage - -} - -\end{warpHTML} - - - -\begin{warpHTML} - -\newbool{LWR@tikzbabel} -\boolfalse{LWR@tikzbabel} - -\AtBeginDocument{ -\@ifpackageloaded{tikz}{ -\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 -{\booltrue{LWR@tikzbabel}} -{\boolfalse{LWR@tikzbabel}} -}{} -} - -\BeforeBeginEnvironment{tikzpicture}{% - -\lateximage -\ifbool{LWR@tikzbabel} -{} -{\catcode`\$=3} % dollar sign is math shift -} - -\AfterEndEnvironment{tikzpicture}{% -\endlateximage - -\ifbool{LWR@tikzbabel} -{} -{\catcode`\$=\active} -} +\AfterEndEnvironment{picture}{\endlateximage} \end{warpHTML} @@ -4490,7 +4470,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% -\LWR@traceinfo{starting minipage}% +\LWR@traceinfo{starting minipage of width #4}% \uselengthunit{in}% \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -4499,6 +4479,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% +\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}} \addtocounter{LWR@minipagedepth}{1}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified \IfValueTF{#2}{\setlength{\LWR@minipageheight}{#2}}{}% @@ -4512,7 +4493,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \ifthenelse{\equal{#3}{c}}{justify-content: center ; }{}% \ifthenelse{\equal{#3}{b}}{justify-content: flex-end ; }{}% \ifthenelse{\equal{#3}{s}}{justify-content: space-between ; }{}% -\LWR@traceinfo{minipage: about to print the width}% +\LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}% \uselengthunit{PT}% \ifbool{LWR@minipagefullwidth}% {\boolfalse{LWR@minipagefullwidth}}% @@ -4546,8 +4527,9 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \LWR@startpars% \global\booltrue{LWR@minipagethispar}% } -\RenewDocumentCommand{\parbox}{O{t} o O{t} m m} +\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m} { +\LWR@traceinfo{parbox of width #4}% \begin{minipage}[#1][#2][#3]{#4} #5 \end{minipage} @@ -4714,9 +4696,11 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \newlength{\LWR@tempheight} \newlength{\LWR@tempraise} - \NewDocumentCommand{\LWR@hspace}{s m}{% \setlength{\LWR@tempwidth}{#2}% +\ifnum\gluestretchorder\LWR@tempwidth>0% +\setlength{\LWR@tempwidth}{2em}% +\fi% \ifthenelse{\dimtest{\LWR@tempwidth}{=}{0pt}}{}{% \LWR@minipagestoppars% \ifthenelse{\dimtest{\LWR@tempwidth}{=}{.16667em}} @@ -4990,6 +4974,10 @@ homehtmlfilename = "\HomeHTMLFileName"% + + + + \endinput %% %% End of file `lwarp.sty'. |