From a8029f11221860bf15a745fbc04869def0221f4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 May 2021 20:25:11 +0000 Subject: lwarp (29may21) git-svn-id: svn://tug.org/texlive/trunk@59390 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 2 +- Master/texmf-dist/doc/latex/lwarp/README.txt | 2 +- Master/texmf-dist/doc/latex/lwarp/lwarp.pdf | Bin 3202256 -> 3203770 bytes Master/texmf-dist/scripts/lwarp/lwarpmk.lua | 2 +- Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 118 +++++++++++++++++---- .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-listings.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty | 52 +++++---- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 9 +- 9 files changed, 143 insertions(+), 44 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index 0b09a9acafe..a34d61e216e 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2021 Brian Dunn -printversion = "v0.897" +printversion = "v0.898" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 62aa9f2f2f2..3c6e60f99ab 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.897 README.txt +LaTeX lwarp package v0.898 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf index 03031ceb9ce..2a35f3ec74c 100644 Binary files a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf and b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf differ diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 0b09a9acafe..a34d61e216e 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2021 Brian Dunn -printversion = "v0.897" +printversion = "v0.898" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index b326554a47f..0692faa1a39 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2021/05/24 v0.897 Allows LaTeX to directly produce HTML5 output.] +% [2021/05/24 v0.898 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -3098,7 +3098,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{54242} +% \CheckSum{54272} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -3237,6 +3237,7 @@ This boolean may be tested by the user for later use. % \changes{v0.895}{2021/02/18}{\ 2021/02/18} % \changes{v0.896}{2021/04/08}{\ 2021/04/08} % \changes{v0.897}{2021/05/24}{\ 2021/05/24} +% \changes{v0.898}{2021/05/29}{\ 2021/05/29} @@ -3460,6 +3461,11 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.898:] Minor updates. +% \begin{itemize} +% \item Fewer underfull \cs{hbox} warnings. +% \item \pkg{wrapfig}: Improved integration with \pkg{keyfloat}. +% \end{itemize} % \item[v0.897:] \pkg{siunitx} rollback. % \begin{itemize} % \item Added a table of file extensions to use with \cs{includegraphics}. @@ -20514,7 +20520,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.897" +printversion = "v0.898" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -28453,6 +28459,13 @@ end -- not --version \setlength{\topsep}{0pt}% \setlength{\partopsep}{0pt}% % \end{macrocode} +% +% Inside the verbatim, temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% % Create a new |pre| of the given class. % The tags may temporarily be turned off for internal use, such % as loading the \brand{MathJax} script. @@ -34579,6 +34592,15 @@ end -- not --version }{% \BlockClass{figurecaption}% }% +% \end{macrocode} +% +% Inside the caption, temporarily prevent underfull \cs{hbox} warnings, +% such as when the caption contains a math \SVG\ image. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% \begin{macrocode} }% {\endBlockClass} % \end{macrocode} @@ -37548,6 +37570,13 @@ end -- not --version \LWR@restoreorigformatting \booltrue{LWR@insidemathcomment} % \end{macrocode} +% +% Temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% % ^^A When a label is encountered, the \HTML\ comment is closed, % ^^A the label is generated in an \HTML-output context, % ^^A then the \HTML\ comment is opened again. @@ -37943,6 +37972,14 @@ end -- not --version \begingroup \LWR@restoreorigformatting +% \end{macrocode} +% +% Temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% \begin{macrocode} \booltrue{LWR@insidemathcomment} } % \end{macrocode} @@ -38550,6 +38587,13 @@ end -- not --version % \begin{macrocode} \LWR@ensuredoingapar% % \end{macrocode} +% +% Inside the \env{lateximage}, temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% % Next file: % \begin{macrocode} \addtocounter{LWR@externalfilecnt}{1}% @@ -58940,6 +58984,13 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space % \begin{macrocode} \large% % \end{macrocode} +% +% Temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% % Reset some defaults, possibly will be changed below if options were given: % \begin{macrocode} \setlength{\LWR@igwidth}{0pt}% @@ -63535,6 +63586,14 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \lstframe@\lst@frameround ffff\relax% lwarp \lst@multicols\@empty% lwarp \begingroup% +% \end{macrocode} +% +% Inside the listing, temporarily prevent underfull \cs{hbox} warnings. +% \changes{v0.898}{2021/05/24}{\pkg{listings}: Reduced underfull \cs{hbox} warnings.} +% \begin{macrocode} + \hbadness=10000\relax% +% \end{macrocode} +% \begin{macrocode} \ifx\lst@float\relax\else% \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}% \expandafter\@tempa% @@ -87328,31 +87387,48 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % add explicit \HTML\ style.} % \changes{v0.75}{2019/09/22}{\pkg{wrapfig}: Fix for width.} % \changes{v0.896}{2021/03/05}{\pkg{wrapfig}: Added \ARIA\ role.} +% \changes{v0.898}{2021/05/26}{\pkg{wrapfig}: Improved integration with \pkg{keyfloat}.} % \begin{macrocode} \newcommand*{\LWR@wrapposition}{} +\newcommand{\LWR@wrapfig@printHTMLwidth}{width:\LWR@printlength{\LWR@templengthone}} + +\AtBeginDocument{ + \@ifpackageloaded{keyfloat}{ + \renewcommand{\LWR@wrapfig@printHTMLwidth}{% + \ifboolexpr{ + test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}} or + bool {KFLT@inkeysubfloats} + }% + {\LWR@printpercentlength{\LWR@templengthone}{\linewidth}\%; }% + {\LWR@printlength{\LWR@templengthone}}% + }% + }{} +} + \newcommand*{\LWR@subwrapfigure}[2]{% -\renewcommand*{\LWR@wrapposition}{}% -\ifthenelse{% - \equal{#1}{r}\OR\equal{#1}{R}\OR% - \equal{#1}{o}\OR\equal{#1}{O}% -}% - {\renewcommand*{\LWR@wrapposition}{float:right}}% - {\renewcommand*{\LWR@wrapposition}{float:left}}% -\setlength{\LWR@templengthone}{#2}% -\LWR@BlockClassWP{% - width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % - margin:10pt% -}% -{% - width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % -}% -(note)% -{marginblock}% + \renewcommand*{\LWR@wrapposition}{}% + \ifthenelse{% + \equal{#1}{r}\OR\equal{#1}{R}\OR% + \equal{#1}{o}\OR\equal{#1}{O}% + }% + {\renewcommand*{\LWR@wrapposition}{float:right}}% + {\renewcommand*{\LWR@wrapposition}{float:left}}% + \setlength{\LWR@templengthone}{#2}% + \LWR@BlockClassWP{% + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % + margin:10pt% + }% + {% + width:\LWR@wrapfig@printHTMLwidth; % + \LWR@wrapposition; % + }% + (note)% + {marginblock}% % \end{macrocode} % \changes{v0.75}{2019/09/17}{\pkg{wrapfig}: Fix for \cs{linewidth}.} % \begin{macrocode} -\setlength{\linewidth}{\LWR@templengthone}% + \setlength{\linewidth}{\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 4f21fd6f8d9..8611329fb78 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -306,6 +306,7 @@ \LWR@origtilde \LWR@orignewline% \begin{LWR@setvirtualpage}% \large% + \hbadness=10000\relax% \setlength{\LWR@igwidth}{0pt}% \setlength{\LWR@igheight}{0pt}% \renewcommand*{\LWR@igwidthstyle}{}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 0c0d68f97d4..7a4a1d7f50b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -56,6 +56,7 @@ \lstframe@\lst@frameround ffff\relax% lwarp \lst@multicols\@empty% lwarp \begingroup% + \hbadness=10000\relax% \ifx\lst@float\relax\else% \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}% \expandafter\@tempa% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index b1f4c17acfd..e4213c168d6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -21,25 +21,41 @@ \LWR@ProvidesPackageDrop{wrapfig}[2003/01/31] \newcommand*{\LWR@wrapposition}{} +\newcommand{\LWR@wrapfig@printHTMLwidth}{width:\LWR@printlength{\LWR@templengthone}} + +\AtBeginDocument{ + \@ifpackageloaded{keyfloat}{ + \renewcommand{\LWR@wrapfig@printHTMLwidth}{% + \ifboolexpr{ + test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}} or + bool {KFLT@inkeysubfloats} + }% + {\LWR@printpercentlength{\LWR@templengthone}{\linewidth}\%; }% + {\LWR@printlength{\LWR@templengthone}}% + }% + }{} +} + \newcommand*{\LWR@subwrapfigure}[2]{% -\renewcommand*{\LWR@wrapposition}{}% -\ifthenelse{% - \equal{#1}{r}\OR\equal{#1}{R}\OR% - \equal{#1}{o}\OR\equal{#1}{O}% -}% - {\renewcommand*{\LWR@wrapposition}{float:right}}% - {\renewcommand*{\LWR@wrapposition}{float:left}}% -\setlength{\LWR@templengthone}{#2}% -\LWR@BlockClassWP{% - width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % - margin:10pt% -}% -{% - width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % -}% -(note)% -{marginblock}% -\setlength{\linewidth}{\LWR@templengthone}% + \renewcommand*{\LWR@wrapposition}{}% + \ifthenelse{% + \equal{#1}{r}\OR\equal{#1}{R}\OR% + \equal{#1}{o}\OR\equal{#1}{O}% + }% + {\renewcommand*{\LWR@wrapposition}{float:right}}% + {\renewcommand*{\LWR@wrapposition}{float:left}}% + \setlength{\LWR@templengthone}{#2}% + \LWR@BlockClassWP{% + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % + margin:10pt% + }% + {% + width:\LWR@wrapfig@printHTMLwidth; % + \LWR@wrapposition; % + }% + (note)% + {marginblock}% + \setlength{\linewidth}{\LWR@templengthone}% } \NewDocumentEnvironment{wrapfigure}{o m o m} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index ea5b75cec51..060b7db4a7e 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} - [2021/05/24 v0.897 Allows LaTeX to directly produce HTML5 output.] + [2021/05/24 v0.898 Allows LaTeX to directly produce HTML5 output.] @@ -4746,7 +4746,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.897" +printversion = "v0.898" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -8463,6 +8463,7 @@ end -- not --version \setlength{\parskip}{0ex}% \setlength{\topsep}{0pt}% \setlength{\partopsep}{0pt}% + \hbadness=10000\relax% \ifbool{LWR@verbtags}{% \LWR@htmltag{pre class=\textquotedbl#2\textquotedbl% \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}% @@ -11060,6 +11061,7 @@ end -- not --version }{% \BlockClass{figurecaption}% }% + \hbadness=10000\relax% }% {\endBlockClass} \newcommand*{\LWR@HTML@caption@begin}[1] @@ -12390,6 +12392,7 @@ end -- not --version \@nameuse{LWR@orig@#1} \LWR@restoreorigformatting \booltrue{LWR@insidemathcomment} + \hbadness=10000\relax% #2 \@nameuse{LWR@orig@end#1} \endgroup @@ -12564,6 +12567,7 @@ end -- not --version \begingroup \LWR@restoreorigformatting + \hbadness=10000\relax% \booltrue{LWR@insidemathcomment} } @@ -12763,6 +12767,7 @@ end -- not --version \LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}% \boolfalse{mathjax}% \LWR@ensuredoingapar% + \hbadness=10000\relax% \addtocounter{LWR@externalfilecnt}{1}% \LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}% \setcounterpageref{LWR@LIpage}{% -- cgit v1.2.3