texlive[52161] trunk: lwarp (23sep19)
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 23 22:58:04 CEST 2019
Revision: 52161
http://tug.org/svn/texlive?view=revision&revision=52161
Author: karl
Date: 2019-09-23 22:58:04 +0200 (Mon, 23 Sep 2019)
Log Message:
-----------
lwarp (23sep19)
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-caption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.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 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2019-09-23 20:58:04 UTC (rev 52161)
@@ -2,7 +2,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.74"
+printversion = "v0.75"
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 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2019-09-23 20:58:04 UTC (rev 52161)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.74 README.txt
+LaTeX lwarp package v0.75 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 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2019-09-23 20:58:04 UTC (rev 52161)
@@ -2,7 +2,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.74"
+printversion = "v0.75"
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 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2019-09-23 20:58:04 UTC (rev 52161)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2019/09/02 v0.74 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/09/23 v0.75 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -2679,7 +2679,7 @@
%<*package>
% \fi
%
-% \CheckSum{33339}
+% \CheckSum{33352}
%
% \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
@@ -2796,6 +2796,7 @@
% \changes{v0.72}{2019/06/08}{\ 2019/06/08}
% \changes{v0.73}{2019/07/11}{\ 2019/07/11}
% \changes{v0.74}{2019/09/02}{\ 2019/09/02}
+% \changes{v0.75}{2019/09/23}{\ 2019/09/23}
@@ -3016,6 +3017,14 @@
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.75:] \pkg{keyfloat}, \pkg{wrapfig}
+% \begin{itemize}
+% \item \cs{minipage}: Fix for \cs{linewidth}.
+% \item \pkg{keyfloat}: Improved color control.
+% \margintag{packages}
+% \item \pkg{wrapfig}: Fix for \cs{linewidth}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.74:] Docs, \SVG\ math, \prog{lwarpmk}, \HTML\ \attribute{alt} and \attribute{title} text, \pkg{lyluatex}
% \begin{itemize}
% \item Added to the tutorial the section \nameref{sec:whatnext}.
@@ -13162,6 +13171,9 @@
\newlength{\LWR at userspaperheight}
\setlength{\LWR at userspaperheight}{\paperheight}
+
+\newlength{\LWR at usersmarginparwidth}
+\setlength{\LWR at usersmarginparwidth}{\marginparwidth}
% \end{macrocode}
%
% For \pkg{lwarp}, use a very large page and margins
@@ -15292,6 +15304,7 @@
% \changes{v0.73}{2019/06/21}{\filenm{lwarp.css}: Added \cs{book} for \pkg{memoir}.}
% \changes{v0.73}{2019/06/30}{\filenm{lwarp.css}: Improved pkg{tocdata} formatting.}
% \changes{v0.74}{2019/08/04}{\filenm{lwarp.css}: Added \pkg{lyluatex}.}
+% \changes{v0.75}{2019/09/22}{\filenm{lwarp.css}: Improved marginblock.}
%
% ^^A *lwarp.css
%
@@ -15729,7 +15742,7 @@
div.marginblock div.minipage,
div.marginparblock div.minipage {
- display: block ;
+ display: inline-block ;
margin: 0pt auto 0pt auto ;
}
@@ -17859,7 +17872,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.74"
+printversion = "v0.75"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -34820,7 +34833,7 @@
% The following used to be an actual \LaTeX\ minipage.
% \changes{v0.45}{2017/12/01}{Fix: Improper \cs{prevdepth}.}
% \begin{macrocode}
-\begingroup
+\begingroup%
% \end{macrocode}
% Compute width, adjusted for frames:
% \begin{macrocode}
@@ -34912,8 +34925,13 @@
% These do not affect the actual size of the \PDF\ output,
% but are used by any reference to \cs{linewidth}, etc.
% inside the virtual minipage being created here.
+% \cs{LWR at minipagewidth} was the original then padded by 3em,
+% which is restored here. This is done instead of settings back to \#4,
+% in case \#4 was \cs{linewidth}, which was changed to 6in above.
+% \changes{v0.75}{2019/09/17}{Fix: \cs{linewidth}.}
% \begin{macrocode}
-\setlength{\linewidth}{#4}% the original width
+\setlength{\linewidth}{\LWR at minipagewidth}% the padded width
+\addtolength{\linewidth}{-3em}% the original width
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
% \end{macrocode}
@@ -35644,6 +35662,8 @@
% \end{macro}
+
+
% \begin{macrocode}
\newcommand{\LWR at null@rmfamily}{}
\newcommand{\LWR at null@sffamily}{}
@@ -41254,7 +41274,7 @@
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{caption}[2018/10/05]
+\LWR at ProvidesPackagePass{caption}[2019/09/01]
% \end{macrocode}
% \begin{macrocode}
@@ -51638,13 +51658,13 @@
%
% \codehtml
% \begin{macrocode}
-\LWR at ProvidesPackagePass{keyfloat}[2019/03/21]
+\LWR at ProvidesPackagePass{keyfloat}[2019/09/23]
-\@ifpackagelater{keyfloat}{2019/03/21}{}{
+\@ifpackagelater{keyfloat}{2019/09/23}{}{
\PackageError{lwarp-keyfloat}
{%
The keyfloat package is out of date.\MessageBreak
- Update to keyfloat v2.00 2019/03/21 or later%
+ Update to keyfloat v2.01 2019/09/23 or later%
}
{%
Please update the keyfloat package. It's worth it!%
@@ -51657,10 +51677,12 @@
\AtBeginDocument{
% \end{macrocode}
%
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
\providecommand*{\KFLT at LWR@hook at boxouter}{}
\renewcommand*{\KFLT at LWR@hook at boxouter}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -51667,15 +51689,16 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
-
-\let\KFLT at LWR@hook at boxouter@minipage\relax
-\let\endKFLT at LWR@hook at boxouter@minipage\relax
-\newenvironment*{KFLT at LWR@hook at boxouter@minipage}[2][]{}{}
-
+% \end{macrocode}
+%
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
+% \begin{macrocode}
\providecommand*{\KFLT at LWR@hook at keysubfloats}{}
\renewcommand*{\KFLT at LWR@hook at keysubfloats}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -51682,15 +51705,20 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
\let\KFLT at LWR@hook at keyfloatsminipage\relax
\let\endKFLT at LWR@hook at keyfloatsminipage\relax
\newenvironment*{KFLT at LWR@hook at keyfloatsminipage}[1]{}{}
-
+% \end{macrocode}
+%
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
+% \begin{macrocode}
\providecommand*{\KFLT at LWR@hook at keyfloats}{}
\renewcommand*{\KFLT at LWR@hook at keyfloats}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -51697,6 +51725,7 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
\renewcommand*{\KFLT at maybeendfloatrow}{%
@@ -51788,7 +51817,7 @@
\LWR at traceinfo{KFLT at boxinner}%
\LWR at stoppars%
\minipagefullwidth%
- \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{
+ \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{%
\fminipage{\KFLT at imagewidth}%
}{%
\minipage{\KFLT at imagewidth}%
@@ -51795,7 +51824,7 @@
}%
}
{%
- \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{
+ \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{%
\endfminipage%
}{%
\endminipage%
@@ -51830,7 +51859,7 @@
{% text to add
{% local
% \end{macrocode}
-% Add some space, then create a full-width minipage to contain the text:
+% Add some space, then create a \element{div} to contain the text:
% \begin{macrocode}
\addvspace{\smallskipamount}%
\LWR at KFLT@settextalign{#1}%
@@ -51874,7 +51903,7 @@
\renewcommand*{\KFLT@@addartisttext}[3]{%
% \end{macrocode}
- % Add space and create the name inside a full-width minipage:
+ % Add space and create the name inside a \element{div}:
% \begin{macrocode}
% \addvspace{\medskipamount}%
% \begin{minipage}{\linewidth}%
@@ -51903,13 +51932,19 @@
% \end{macrocode}
+% \begin{noindenvironment}{KFLT at marginfloat} \oarg{offset} \marg{type}
% \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \progcode{FormatWP} add explicit \HTML\ style.}
% \begin{macrocode}
\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
{%
- \LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+ \uselengthunit{PT}%
+ \LWR at BlockClassWP%
+ {float:right; width:2in; margin:10pt}%
+ {}%
+ {marginblock}%
\captionsetup{type=#2}%
- \minipage{2in}%
+ \minipage{\LWR at usersmarginparwidth}%
+ \setlength{\marginparwidth}{.95\LWR at usersmarginparwidth}%
}
{%
\endminipage%
@@ -51916,6 +51951,7 @@
\endLWR at BlockClassWP%
}
% \end{macrocode}
+% \end{noindenvironment}
% \begin{macrocode}
@@ -51929,12 +51965,13 @@
% \end{macrocode}
+% \begin{noindenvironment}{keywrap} \marg{width} \marg{keyfloat}
% ^^A % Modified to vertically align minipage for \HTML\ output:
% \begin{macrocode}
\DeclareDocumentEnvironment{keywrap}{m +m}
{%
\LWR at ensuredoingapar%
- \setlength{\linewidth}{6in}%
+ \setlength{\linewidth}{6in}% in case #1 has \linewidth
\setlength{\LWR at templengthone}{#1}%
\begin{LWR at BlockClassWP}%
{%
@@ -51941,9 +51978,7 @@
float:right; width:\LWR at printlength{\LWR at templengthone}; % extra space
margin:10pt%
}%
- {%
- width:\LWR at printlength{\LWR at templengthone}%
- }%
+ {}%
{marginblock}%
\setlength{\linewidth}{.95\LWR at templengthone}%
\booltrue{KFLT at keywrap}%
@@ -51952,6 +51987,7 @@
}
{}
% \end{macrocode}
+% \end{noindenvironment}
%
% \begin{macrocode}
}% AtBeginDocument
@@ -67981,7 +68017,7 @@
%
% \changes{v0.42}{2017/10/26}{\pkg{wrapfig}: If \progcode{FormatWP}
% add explicit \HTML\ style.}
-%
+% \changes{v0.75}{2019/09/22}{\pkg{wrapfig}: Fix for width.}
% \begin{macrocode}
\newcommand*{\LWR at wrapposition}{}
@@ -67999,9 +68035,13 @@
margin:10pt%
}%
{%
- width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition%
+ \LWR at wrapposition%
}%
{marginblock}%
+% \end{macrocode}
+% \changes{v0.75}{2019/09/17}{\pkg{wrapfig}: Fix for \cs{linewidth}.}
+% \begin{macrocode}
+\setlength{\linewidth}{\LWR at templengthone}%
}
@@ -68253,6 +68293,18 @@
% \end{macrocode}
%
%
+% \subsection{\cs{normalcolor}}
+%
+% \begin{macro}{\normalcolor}
+% \changes{v0.75}{2019/09/12}{Added for \HTML.}
+% \begin{macrocode}
+\DeclareRobustCommand{\LWR at HTML@normalcolor}{\color{black}}%
+
+\LWR at formatted{normalcolor}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \subsection{\HTML\ color style}
%
% \begin{noindmacro}{\LWR at findcurrenttextcolor}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2019-09-23 20:58:04 UTC (rev 52161)
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR at ProvidesPackagePass{caption}[2018/10/05]
+\LWR at ProvidesPackagePass{caption}[2019/09/01]
\renewcommand\caption at ibox[3]{%
\@testopt{\caption at iibox{#1}{#2}{#3}}{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2019-09-23 20:58:04 UTC (rev 52161)
@@ -17,13 +17,13 @@
%% version 2005/12/01 or later.
-\LWR at ProvidesPackagePass{keyfloat}[2019/03/21]
+\LWR at ProvidesPackagePass{keyfloat}[2019/09/23]
-\@ifpackagelater{keyfloat}{2019/03/21}{}{
+\@ifpackagelater{keyfloat}{2019/09/23}{}{
\PackageError{lwarp-keyfloat}
{%
The keyfloat package is out of date.\MessageBreak
- Update to keyfloat v2.00 2019/03/21 or later%
+ Update to keyfloat v2.01 2019/09/23 or later%
}
{%
Please update the keyfloat package. It's worth it!%
@@ -33,7 +33,8 @@
\AtBeginDocument{
\providecommand*{\KFLT at LWR@hook at boxouter}{}
\renewcommand*{\KFLT at LWR@hook at boxouter}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -40,15 +41,12 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
-
-\let\KFLT at LWR@hook at boxouter@minipage\relax
-\let\endKFLT at LWR@hook at boxouter@minipage\relax
-\newenvironment*{KFLT at LWR@hook at boxouter@minipage}[2][]{}{}
-
\providecommand*{\KFLT at LWR@hook at keysubfloats}{}
\renewcommand*{\KFLT at LWR@hook at keysubfloats}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -55,15 +53,16 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
\let\KFLT at LWR@hook at keyfloatsminipage\relax
\let\endKFLT at LWR@hook at keyfloatsminipage\relax
\newenvironment*{KFLT at LWR@hook at keyfloatsminipage}[1]{}{}
-
\providecommand*{\KFLT at LWR@hook at keyfloats}{}
\renewcommand*{\KFLT at LWR@hook at keyfloats}{%
- \ifbool{KFLT at keywrap}{}{%
+ \ifbool{KFLT at keywrap}{%
+ }{%
\ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
\setlength{\linewidth}{6in}%
\setlength{\textwidth}{6in}%
@@ -70,6 +69,7 @@
\setlength{\textheight}{9in}%
}{}%
}%
+ \normalcolor%
}
\renewcommand*{\KFLT at maybeendfloatrow}{%
@@ -136,7 +136,7 @@
\LWR at traceinfo{KFLT at boxinner}%
\LWR at stoppars%
\minipagefullwidth%
- \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{
+ \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{%
\fminipage{\KFLT at imagewidth}%
}{%
\minipage{\KFLT at imagewidth}%
@@ -143,7 +143,7 @@
}%
}
{%
- \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{
+ \ifboolexpr{bool{KFLT at ft} or bool{KFLT at f}}{%
\endfminipage%
}{%
\endminipage%
@@ -201,7 +201,7 @@
\renewcommand*{\KFLT@@addartisttext}[3]{%
% \end{macrocode}
- % Add space and create the name inside a full-width minipage:
+ % Add space and create the name inside a \element{div}:
% \begin{macrocode}
% \begin{minipage}{\linewidth}%
\LWR at KFLT@setnamealign{#3}%
@@ -228,9 +228,14 @@
\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
{%
- \LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+ \uselengthunit{PT}%
+ \LWR at BlockClassWP%
+ {float:right; width:2in; margin:10pt}%
+ {}%
+ {marginblock}%
\captionsetup{type=#2}%
- \minipage{2in}%
+ \minipage{\LWR at usersmarginparwidth}%
+ \setlength{\marginparwidth}{.95\LWR at usersmarginparwidth}%
}
{%
\endminipage%
@@ -248,7 +253,7 @@
\DeclareDocumentEnvironment{keywrap}{m +m}
{%
\LWR at ensuredoingapar%
- \setlength{\linewidth}{6in}%
+ \setlength{\linewidth}{6in}% in case #1 has \linewidth
\setlength{\LWR at templengthone}{#1}%
\begin{LWR at BlockClassWP}%
{%
@@ -255,9 +260,7 @@
float:right; width:\LWR at printlength{\LWR at templengthone}; % extra space
margin:10pt%
}%
- {%
- width:\LWR at printlength{\LWR at templengthone}%
- }%
+ {}%
{marginblock}%
\setlength{\linewidth}{.95\LWR at templengthone}%
\booltrue{KFLT at keywrap}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2019-09-23 20:58:04 UTC (rev 52161)
@@ -35,9 +35,10 @@
margin:10pt%
}%
{%
- width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition%
+ \LWR at wrapposition%
}%
{marginblock}%
+\setlength{\linewidth}{\LWR at templengthone}%
}
\NewDocumentEnvironment{wrapfigure}{o m o m}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2019-09-23 20:58:04 UTC (rev 52161)
@@ -26,6 +26,9 @@
\LetLtxMacro\pagecolor\LWR at print@pagecolor%
\LetLtxMacro\nopagecolor\LWR at print@nopagecolor%
}
+\DeclareRobustCommand{\LWR at HTML@normalcolor}{\color{black}}%
+
+\LWR at formatted{normalcolor}
\renewcommand*{\LWR at findcurrenttextcolor}{%
\protect\colorlet{LWR at current@color}{.}%
\protect\convertcolorspec{named}{LWR at current@color}{HTML}\LWR at tempcolor%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-09-23 20:57:22 UTC (rev 52160)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-09-23 20:58:04 UTC (rev 52161)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2019/09/02 v0.74 Allows LaTeX to directly produce HTML5 output.]
+ [2019/09/23 v0.75 Allows LaTeX to directly produce HTML5 output.]
@@ -1029,6 +1029,9 @@
\newlength{\LWR at userspaperheight}
\setlength{\LWR at userspaperheight}{\paperheight}
+
+\newlength{\LWR at usersmarginparwidth}
+\setlength{\LWR at usersmarginparwidth}{\marginparwidth}
\LWR at origgeometry{
reset,
paperheight=190in,
@@ -2342,7 +2345,7 @@
div.marginblock div.minipage,
div.marginparblock div.minipage {
- display: block ;
+ display: inline-block ;
margin: 0pt auto 0pt auto ;
}
@@ -4085,7 +4088,7 @@
-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.74"
+printversion = "v0.75"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -11487,7 +11490,7 @@
\NewDocumentEnvironment{LWR at HTML@sub at minipage}{m m m m}
{%
\LWR at traceinfo{minipage}%
-\begingroup
+\begingroup%
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
\LWR at orignewpage%
@@ -11536,7 +11539,8 @@
\ifblank{#2}{}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
-\setlength{\linewidth}{#4}% the original width
+\setlength{\linewidth}{\LWR at minipagewidth}% the padded width
+\addtolength{\linewidth}{-3em}% the original width
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
\LWR at print@raggedright%
More information about the tex-live-commits
mailing list