lwarp (23sep19)

git-svn-id: svn://tug.org/texlive/trunk@52161 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 124 insertions, 61 deletions

diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index f688b4b6556..a38ce84fc42 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.74   README.txt
+LaTeX lwarp package v0.75   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 74a1de68615..5b3f9d64b1b 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
index 659a0174469..329fa4f3f13 100755
--- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
+++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2019 Brian Dunn
 
-printversion = "v0.74"
+printversion = "v0.75"
 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 cb3c21b5ac7..7bedf7e6dd2 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -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 @@ This boolean may be tested by the user for later use.
 %<*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 @@ This boolean may be tested by the user for later use.
 % \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 @@ This boolean may be tested by the user for later use.
 %
 % \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 @@ This boolean may be tested by the user for later use.
 
 \newlength{\LWR@userspaperheight}
 \setlength{\LWR@userspaperheight}{\paperheight}
+
+\newlength{\LWR@usersmarginparwidth}
+\setlength{\LWR@usersmarginparwidth}{\marginparwidth}
 %    \end{macrocode}
 %
 % For \pkg{lwarp}, use a very large page and margins
@@ -15292,6 +15304,7 @@ This boolean may be tested by the user for later use.
 % \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.marginparblock {
 
 div.marginblock div.minipage,
 div.marginparblock div.minipage {
-    display: block ;
+    display: inline-block ;
     margin: 0pt auto 0pt auto ;
 }
 
@@ -17859,7 +17872,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
 -- Copyright 2016-2019 Brian Dunn
 
 
-printversion = "v0.74"
+printversion = "v0.75"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -34820,7 +34833,7 @@ autopage-\theLWR@currentautosec%
 % 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 @@ autopage-\theLWR@currentautosec%
 % 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@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@minipagewidth}% the padded width
+\addtolength{\linewidth}{-3em}% the original width
 \setlength{\textwidth}{6in}%
 \setlength{\textheight}{9in}%
 %    \end{macrocode}
@@ -35644,6 +35662,8 @@ color:\LWR@origpound\LWR@tempcolor%
 % \end{macro}
 
 
+
+
 %    \begin{macrocode}
 \newcommand{\LWR@null@rmfamily}{}
 \newcommand{\LWR@null@sffamily}{}
@@ -41254,7 +41274,7 @@ s%
 % \codehtml
 %
 %    \begin{macrocode}
-\LWR@ProvidesPackagePass{caption}[2018/10/05]
+\LWR@ProvidesPackagePass{caption}[2019/09/01]
 %    \end{macrocode}
 
 %    \begin{macrocode}
@@ -51638,13 +51658,13 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %
 % \codehtml
 %    \begin{macrocode}
-\LWR@ProvidesPackagePass{keyfloat}[2019/03/21]
+\LWR@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,46 +51677,55 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 \AtBeginDocument{
 %    \end{macrocode}
 %
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
 %    \begin{macrocode}
 \providecommand*{\KFLT@LWR@hook@boxouter}{}
 \renewcommand*{\KFLT@LWR@hook@boxouter}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
-
-\let\KFLT@LWR@hook@boxouter@minipage\relax
-\let\endKFLT@LWR@hook@boxouter@minipage\relax
-\newenvironment*{KFLT@LWR@hook@boxouter@minipage}[2][]{}{}
-
+%    \end{macrocode}
+%
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
+%    \begin{macrocode}
 \providecommand*{\KFLT@LWR@hook@keysubfloats}{}
 \renewcommand*{\KFLT@LWR@hook@keysubfloats}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
 
 \let\KFLT@LWR@hook@keyfloatsminipage\relax
 \let\endKFLT@LWR@hook@keyfloatsminipage\relax
 \newenvironment*{KFLT@LWR@hook@keyfloatsminipage}[1]{}{}
-
+%    \end{macrocode}
+%
+% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
+%    \begin{macrocode}
 \providecommand*{\KFLT@LWR@hook@keyfloats}{}
 \renewcommand*{\KFLT@LWR@hook@keyfloats}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
 
 \renewcommand*{\KFLT@maybeendfloatrow}{%
@@ -51788,14 +51817,14 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
     \LWR@traceinfo{KFLT@boxinner}%
     \LWR@stoppars%
     \minipagefullwidth%
-    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{
+    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{%
         \fminipage{\KFLT@imagewidth}%
     }{%
         \minipage{\KFLT@imagewidth}%
     }%
 }
 {%
-    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{
+    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{%
         \endfminipage%
     }{%
         \endminipage%
@@ -51830,7 +51859,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
     {% 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@KFLT@settextalign{#1}%
@@ -51874,7 +51903,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 
     \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,19 +51932,26 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %    \end{macrocode}
 
 
+% \begin{noindenvironment}{KFLT@marginfloat} \oarg{offset} \marg{type}
 % \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \progcode{FormatWP} add explicit \HTML\ style.}
 %    \begin{macrocode}
 \DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
 {%
-    \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+    \uselengthunit{PT}%
+    \LWR@BlockClassWP%
+        {float:right; width:2in; margin:10pt}%
+        {}%
+        {marginblock}%
     \captionsetup{type=#2}%
-    \minipage{2in}%
+    \minipage{\LWR@usersmarginparwidth}%
+    \setlength{\marginparwidth}{.95\LWR@usersmarginparwidth}%
 }
 {%
     \endminipage%
     \endLWR@BlockClassWP%
 }
 %    \end{macrocode}
+% \end{noindenvironment}
 
 
 %    \begin{macrocode}
@@ -51929,21 +51965,20 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %    \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@ensuredoingapar%
-    \setlength{\linewidth}{6in}%
+    \setlength{\linewidth}{6in}% in case #1 has \linewidth
     \setlength{\LWR@templengthone}{#1}%
     \begin{LWR@BlockClassWP}%
         {%
             float:right; width:\LWR@printlength{\LWR@templengthone};  % extra space
             margin:10pt%
         }%
-        {%
-            width:\LWR@printlength{\LWR@templengthone}%
-        }%
+        {}%
         {marginblock}%
     \setlength{\linewidth}{.95\LWR@templengthone}%
     \booltrue{KFLT@keywrap}%
@@ -51952,6 +51987,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 }
 {}
 %    \end{macrocode}
+% \end{noindenvironment}
 %
 %    \begin{macrocode}
 }% AtBeginDocument
@@ -67981,7 +68017,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %
 % \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@wrapposition}{}
 
@@ -67999,9 +68035,13 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
     margin:10pt%
 }%
 {%
-    width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition%
+    \LWR@wrapposition%
 }%
 {marginblock}%
+%    \end{macrocode}
+% \changes{v0.75}{2019/09/17}{\pkg{wrapfig}: Fix for \cs{linewidth}.}
+%    \begin{macrocode}
+\setlength{\linewidth}{\LWR@templengthone}%
 }
 
 
@@ -68253,6 +68293,18 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %    \end{macrocode}
 %
 %
+% \subsection{\cs{normalcolor}}
+%
+% \begin{macro}{\normalcolor}
+% \changes{v0.75}{2019/09/12}{Added for \HTML.}
+%    \begin{macrocode}
+\DeclareRobustCommand{\LWR@HTML@normalcolor}{\color{black}}%
+
+\LWR@formatted{normalcolor}
+%    \end{macrocode}
+% \end{macro}
+%
+%
 % \subsection{\HTML\ color style}
 %
 % \begin{noindmacro}{\LWR@findcurrenttextcolor}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
index 9e0808fb78f..212a0993fb4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
@@ -16,7 +16,7 @@
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
 
-\LWR@ProvidesPackagePass{caption}[2018/10/05]
+\LWR@ProvidesPackagePass{caption}[2019/09/01]
 
 \renewcommand\caption@ibox[3]{%
   \@testopt{\caption@iibox{#1}{#2}{#3}}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
index 1b74ee3ad87..44fa0d952f6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
@@ -17,13 +17,13 @@
 %% version 2005/12/01 or later.
 
 
-\LWR@ProvidesPackagePass{keyfloat}[2019/03/21]
+\LWR@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,43 +33,43 @@
 \AtBeginDocument{
 \providecommand*{\KFLT@LWR@hook@boxouter}{}
 \renewcommand*{\KFLT@LWR@hook@boxouter}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
-
-\let\KFLT@LWR@hook@boxouter@minipage\relax
-\let\endKFLT@LWR@hook@boxouter@minipage\relax
-\newenvironment*{KFLT@LWR@hook@boxouter@minipage}[2][]{}{}
-
 \providecommand*{\KFLT@LWR@hook@keysubfloats}{}
 \renewcommand*{\KFLT@LWR@hook@keysubfloats}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
 
 \let\KFLT@LWR@hook@keyfloatsminipage\relax
 \let\endKFLT@LWR@hook@keyfloatsminipage\relax
 \newenvironment*{KFLT@LWR@hook@keyfloatsminipage}[1]{}{}
-
 \providecommand*{\KFLT@LWR@hook@keyfloats}{}
 \renewcommand*{\KFLT@LWR@hook@keyfloats}{%
-    \ifbool{KFLT@keywrap}{}{%
+    \ifbool{KFLT@keywrap}{%
+    }{%
         \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{%
             \setlength{\linewidth}{6in}%
             \setlength{\textwidth}{6in}%
             \setlength{\textheight}{9in}%
         }{}%
     }%
+    \normalcolor%
 }
 
 \renewcommand*{\KFLT@maybeendfloatrow}{%
@@ -136,14 +136,14 @@
     \LWR@traceinfo{KFLT@boxinner}%
     \LWR@stoppars%
     \minipagefullwidth%
-    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{
+    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{%
         \fminipage{\KFLT@imagewidth}%
     }{%
         \minipage{\KFLT@imagewidth}%
     }%
 }
 {%
-    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{
+    \ifboolexpr{bool{KFLT@ft} or bool{KFLT@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@KFLT@setnamealign{#3}%
@@ -228,9 +228,14 @@
 
 \DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
 {%
-    \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+    \uselengthunit{PT}%
+    \LWR@BlockClassWP%
+        {float:right; width:2in; margin:10pt}%
+        {}%
+        {marginblock}%
     \captionsetup{type=#2}%
-    \minipage{2in}%
+    \minipage{\LWR@usersmarginparwidth}%
+    \setlength{\marginparwidth}{.95\LWR@usersmarginparwidth}%
 }
 {%
     \endminipage%
@@ -248,16 +253,14 @@
 \DeclareDocumentEnvironment{keywrap}{m +m}
 {%
     \LWR@ensuredoingapar%
-    \setlength{\linewidth}{6in}%
+    \setlength{\linewidth}{6in}% in case #1 has \linewidth
     \setlength{\LWR@templengthone}{#1}%
     \begin{LWR@BlockClassWP}%
         {%
             float:right; width:\LWR@printlength{\LWR@templengthone};  % extra space
             margin:10pt%
         }%
-        {%
-            width:\LWR@printlength{\LWR@templengthone}%
-        }%
+        {}%
         {marginblock}%
     \setlength{\linewidth}{.95\LWR@templengthone}%
     \booltrue{KFLT@keywrap}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
index 7a0679e1f05..5ba2f61fcd0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
@@ -35,9 +35,10 @@
     margin:10pt%
 }%
 {%
-    width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition%
+    \LWR@wrapposition%
 }%
 {marginblock}%
+\setlength{\linewidth}{\LWR@templengthone}%
 }
 
 \NewDocumentEnvironment{wrapfigure}{o m o m}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index e4e85161186..f2e5bbb7a07 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -26,6 +26,9 @@
 \LetLtxMacro\pagecolor\LWR@print@pagecolor%
 \LetLtxMacro\nopagecolor\LWR@print@nopagecolor%
 }
+\DeclareRobustCommand{\LWR@HTML@normalcolor}{\color{black}}%
+
+\LWR@formatted{normalcolor}
 \renewcommand*{\LWR@findcurrenttextcolor}{%
 \protect\colorlet{LWR@current@color}{.}%
 \protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 2fca6085b4a..89678d63968 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}
-    [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@userspaperheight}
 \setlength{\LWR@userspaperheight}{\paperheight}
+
+\newlength{\LWR@usersmarginparwidth}
+\setlength{\LWR@usersmarginparwidth}{\marginparwidth}
 \LWR@origgeometry{
     reset,
     paperheight=190in,
@@ -2342,7 +2345,7 @@ div.marginblock, div.marginparblock {
 
 div.marginblock div.minipage,
 div.marginparblock div.minipage {
-    display: block ;
+    display: inline-block ;
     margin: 0pt auto 0pt auto ;
 }
 
@@ -4085,7 +4088,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-
 
 -- Copyright 2016-2019 Brian Dunn
 
-printversion = "v0.74"
+printversion = "v0.75"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -11487,7 +11490,7 @@ autopage-\theLWR@currentautosec%
 \NewDocumentEnvironment{LWR@HTML@sub@minipage}{m m m m}
 {%
 \LWR@traceinfo{minipage}%
-\begingroup
+\begingroup%
 \setlength{\LWR@minipagewidth}{#4}%
 \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{%
     \LWR@orignewpage%
@@ -11536,7 +11539,8 @@ autopage-\theLWR@currentautosec%
 \ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }%
 "}%
 
-\setlength{\linewidth}{#4}% the original width
+\setlength{\linewidth}{\LWR@minipagewidth}% the padded width
+\addtolength{\linewidth}{-3em}% the original width
 \setlength{\textwidth}{6in}%
 \setlength{\textheight}{9in}%
 \LWR@print@raggedright%