texlive[59390] trunk: lwarp (29may21)

commits+karl at tug.org commits+karl at tug.org
Sat May 29 22:25:11 CEST 2021


Revision: 59390
          http://tug.org/svn/texlive?view=revision&revision=59390
Author:   karl
Date:     2021-05-29 22:25:11 +0200 (Sat, 29 May 2021)
Log Message:
-----------
lwarp (29may21)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
    trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
    trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
    trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
    trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty

Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2021-05-29 20:25:11 UTC (rev 59390)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2021 Brian Dunn
 
-printversion = "v0.897"
+printversion = "v0.898"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()

Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt	2021-05-29 20:25:11 UTC (rev 59390)
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.897   README.txt
+LaTeX lwarp package v0.898   README.txt
 
 Files included are:
 

Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua	2021-05-29 20:25:11 UTC (rev 59390)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2021 Brian Dunn
 
-printversion = "v0.897"
+printversion = "v0.898"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()

Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx	2021-05-29 20:25:11 UTC (rev 59390)
@@ -16,7 +16,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{lwarp}
-%<package>    [2021/05/24 v0.897  Allows LaTeX to directly produce HTML5 output.]
+%<package>    [2021/05/24 v0.898  Allows LaTeX to directly produce HTML5 output.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -3098,7 +3098,7 @@
 %<*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 @@
 % \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 @@
 %
 % \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 @@
 -- Copyright 2016-2021 Brian Dunn
 
 
-printversion = "v0.897"
+printversion = "v0.898"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -28453,6 +28459,13 @@
 \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 @@
         }{%
             \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 @@
     \LWR at restoreorigformatting
     \booltrue{LWR at 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 @@
 
     \begingroup
     \LWR at 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 at insidemathcomment}
 }
 %    \end{macrocode}
@@ -38550,6 +38587,13 @@
 %    \begin{macrocode}
     \LWR at 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 at externalfilecnt}{1}%
@@ -58940,6 +58984,13 @@
 %    \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 at igwidth}{0pt}%
@@ -63535,6 +63586,14 @@
     \lstframe@\lst at frameround ffff\relax%   lwarp
     \lst at 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 at float\relax\else%
         \edef\@tempa{\noexpand\lst at beginfloat{lstlisting}[\lst at float]}%
         \expandafter\@tempa%
@@ -87328,31 +87387,48 @@
 %           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 at wrapposition}{}
 
+\newcommand{\LWR at wrapfig@printHTMLwidth}{width:\LWR at printlength{\LWR at templengthone}}
+
+\AtBeginDocument{
+    \@ifpackageloaded{keyfloat}{
+        \renewcommand{\LWR at wrapfig@printHTMLwidth}{%
+            \ifboolexpr{
+                test {\ifnumgreater{\value{KFLT at keyfloatdepth}}{0}} or
+                bool {KFLT at inkeysubfloats}
+            }%
+                {\LWR at printpercentlength{\LWR at templengthone}{\linewidth}\%; }%
+                {\LWR at printlength{\LWR at templengthone}}%
+        }%
+    }{}
+}
+
 \newcommand*{\LWR at subwrapfigure}[2]{%
-\renewcommand*{\LWR at wrapposition}{}%
-\ifthenelse{%
-    \equal{#1}{r}\OR\equal{#1}{R}\OR%
-    \equal{#1}{o}\OR\equal{#1}{O}%
-}%
-    {\renewcommand*{\LWR at wrapposition}{float:right}}%
-    {\renewcommand*{\LWR at wrapposition}{float:left}}%
-\setlength{\LWR at templengthone}{#2}%
-\LWR at BlockClassWP{%
-    width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
-    margin:10pt%
-}%
-{%
-    width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
-}%
-(note)%
-{marginblock}%
+    \renewcommand*{\LWR at wrapposition}{}%
+    \ifthenelse{%
+        \equal{#1}{r}\OR\equal{#1}{R}\OR%
+        \equal{#1}{o}\OR\equal{#1}{O}%
+    }%
+        {\renewcommand*{\LWR at wrapposition}{float:right}}%
+        {\renewcommand*{\LWR at wrapposition}{float:left}}%
+    \setlength{\LWR at templengthone}{#2}%
+    \LWR at BlockClassWP{%
+        width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
+        margin:10pt%
+    }%
+    {%
+        width:\LWR at wrapfig@printHTMLwidth; %
+        \LWR at wrapposition; %
+    }%
+    (note)%
+    {marginblock}%
 %    \end{macrocode}
 % \changes{v0.75}{2019/09/17}{\pkg{wrapfig}: Fix for \cs{linewidth}.}
 %    \begin{macrocode}
-\setlength{\linewidth}{\LWR at templengthone}%
+    \setlength{\linewidth}{\LWR at templengthone}%
 }
 
 

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty	2021-05-29 20:25:11 UTC (rev 59390)
@@ -306,6 +306,7 @@
     \LWR at origtilde \LWR at orignewline%
     \begin{LWR at setvirtualpage}%
     \large%
+            \hbadness=10000\relax%
     \setlength{\LWR at igwidth}{0pt}%
     \setlength{\LWR at igheight}{0pt}%
     \renewcommand*{\LWR at igwidthstyle}{}%

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty	2021-05-29 20:25:11 UTC (rev 59390)
@@ -56,6 +56,7 @@
     \lstframe@\lst at frameround ffff\relax%   lwarp
     \lst at multicols\@empty%  lwarp
     \begingroup%
+            \hbadness=10000\relax%
     \ifx\lst at float\relax\else%
         \edef\@tempa{\noexpand\lst at beginfloat{lstlisting}[\lst at float]}%
         \expandafter\@tempa%

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty	2021-05-29 20:25:11 UTC (rev 59390)
@@ -21,25 +21,41 @@
 \LWR at ProvidesPackageDrop{wrapfig}[2003/01/31]
 \newcommand*{\LWR at wrapposition}{}
 
+\newcommand{\LWR at wrapfig@printHTMLwidth}{width:\LWR at printlength{\LWR at templengthone}}
+
+\AtBeginDocument{
+    \@ifpackageloaded{keyfloat}{
+        \renewcommand{\LWR at wrapfig@printHTMLwidth}{%
+            \ifboolexpr{
+                test {\ifnumgreater{\value{KFLT at keyfloatdepth}}{0}} or
+                bool {KFLT at inkeysubfloats}
+            }%
+                {\LWR at printpercentlength{\LWR at templengthone}{\linewidth}\%; }%
+                {\LWR at printlength{\LWR at templengthone}}%
+        }%
+    }{}
+}
+
 \newcommand*{\LWR at subwrapfigure}[2]{%
-\renewcommand*{\LWR at wrapposition}{}%
-\ifthenelse{%
-    \equal{#1}{r}\OR\equal{#1}{R}\OR%
-    \equal{#1}{o}\OR\equal{#1}{O}%
-}%
-    {\renewcommand*{\LWR at wrapposition}{float:right}}%
-    {\renewcommand*{\LWR at wrapposition}{float:left}}%
-\setlength{\LWR at templengthone}{#2}%
-\LWR at BlockClassWP{%
-    width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
-    margin:10pt%
-}%
-{%
-    width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
-}%
-(note)%
-{marginblock}%
-\setlength{\linewidth}{\LWR at templengthone}%
+    \renewcommand*{\LWR at wrapposition}{}%
+    \ifthenelse{%
+        \equal{#1}{r}\OR\equal{#1}{R}\OR%
+        \equal{#1}{o}\OR\equal{#1}{O}%
+    }%
+        {\renewcommand*{\LWR at wrapposition}{float:right}}%
+        {\renewcommand*{\LWR at wrapposition}{float:left}}%
+    \setlength{\LWR at templengthone}{#2}%
+    \LWR at BlockClassWP{%
+        width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
+        margin:10pt%
+    }%
+    {%
+        width:\LWR at wrapfig@printHTMLwidth; %
+        \LWR at wrapposition; %
+    }%
+    (note)%
+    {marginblock}%
+    \setlength{\linewidth}{\LWR at templengthone}%
 }
 
 \NewDocumentEnvironment{wrapfigure}{o m o m}

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty	2021-05-29 20:24:04 UTC (rev 59389)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty	2021-05-29 20:25:11 UTC (rev 59390)
@@ -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 @@
 
 -- Copyright 2016-2021 Brian Dunn
 
-printversion = "v0.897"
+printversion = "v0.898"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -8463,6 +8463,7 @@
 \setlength{\parskip}{0ex}%
 \setlength{\topsep}{0pt}%
 \setlength{\partopsep}{0pt}%
+            \hbadness=10000\relax%
 \ifbool{LWR at verbtags}{%
     \LWR at htmltag{pre class=\textquotedbl#2\textquotedbl%
         \ifthenelse{\equal{#1}{}}{}{ style=\textquotedbl#1\textquotedbl}%
@@ -11060,6 +11061,7 @@
         }{%
             \BlockClass{figurecaption}%
         }%
+            \hbadness=10000\relax%
     }%
     {\endBlockClass}
 \newcommand*{\LWR at HTML@caption at begin}[1]
@@ -12390,6 +12392,7 @@
     \@nameuse{LWR at orig@#1}
     \LWR at restoreorigformatting
     \booltrue{LWR at insidemathcomment}
+    \hbadness=10000\relax%
     #2
     \@nameuse{LWR at orig@end#1}
     \endgroup
@@ -12564,6 +12567,7 @@
 
     \begingroup
     \LWR at restoreorigformatting
+    \hbadness=10000\relax%
     \booltrue{LWR at insidemathcomment}
 }
 
@@ -12763,6 +12767,7 @@
     \LWR at traceinfo{lateximage: LWR at lateximagenumber is \arabic{LWR at lateximagenumber}}%
     \boolfalse{mathjax}%
     \LWR at ensuredoingapar%
+            \hbadness=10000\relax%
     \addtocounter{LWR at externalfilecnt}{1}%
     \LWR at traceinfo{lateximage: LWR at externalfilecnt is \arabic{LWR at externalfilecnt}}%
     \setcounterpageref{LWR at LIpage}{%



More information about the tex-live-commits mailing list.