summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-29 20:25:11 +0000
committerKarl Berry <karl@freefriends.org>2021-05-29 20:25:11 +0000
commita8029f11221860bf15a745fbc04869def0221f4d (patch)
tree612b469ef1211e1f4351fbb4639aa3ea7a512b10 /Master/texmf-dist/tex/latex/lwarp
parent70af71c72e5d0a76f8adf71fb52c6e16261e77c6 (diff)
lwarp (29may21)
git-svn-id: svn://tug.org/texlive/trunk@59390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty1
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty52
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty9
4 files changed, 43 insertions, 20 deletions
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}{%