diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
5 files changed, 39 insertions, 28 deletions
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% |