From 199bfaa843f7bbf42ecd1a2001cb96f321709689 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 May 2020 21:35:13 +0000 Subject: lwarp (1may20) git-svn-id: svn://tug.org/texlive/trunk@54965 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty | 4 ++ .../texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty | 12 ++-- .../texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty | 3 +- .../texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty | 17 ++++- Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty | 3 +- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 78 ++++++++++++++++------ 8 files changed, 89 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/tex/latex/lwarp') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty index 94601e73281..d35ad4e3323 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty @@ -32,6 +32,9 @@ } \ExplSyntaxOn +\@ifpackagelater{acro}{2020/04/29}% +{}% v3 or later +{% before v3 \@ifpackagelater{acro}{2019/09/23}% {% v2.10 or later \cs_gset_protected:Npn \__acro_typeset:nn #1#2 @@ -128,6 +131,7 @@ \group_end: } }% before v2.10 +}% before v3 \ExplSyntaxOff \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty index e70c3474836..36656de3c16 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.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{chemgreek}[2016/02/10] +\LWR@ProvidesPackagePass{chemgreek}[2020/01/16] \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty index d823017e23a..d2ba0005137 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty @@ -17,16 +17,16 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{idxlayout}[2012/03/30] \newcommand{\LWR@indexprenote}{} +\AtBeginDocument{ + \preto\printindex{ -\preto\printindex{ + \LWR@orignewpage + \LWR@startpars -\LWR@orignewpage -\LWR@startpars - -\LWR@indexprenote + \LWR@indexprenote + } } - \newcommand{\setindexprenote}[1]{\renewcommand{\LWR@indexprenote}{#1}} \newcommand*{\noindexprenote}{\renewcommand{\LWR@indexprenote}{}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty index 8bbe52a1058..75541a2b778 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty @@ -122,8 +122,7 @@ \CustomizeMathJax{ \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}% no starred } - -\CustomizeMathJax{\newcommand{\shortintertext}[1]{\\ \text{#1}\notag \\}} +\CustomizeMathJax{\newcommand{\shortintertext}[1]{\text{#1}\notag \\}} \CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}} \CustomizeMathJax{\newcommand{\shortvdotswithin}[1]{ & \hspace{.5em}\vdots \\}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty index 1600e59b58d..51211882db1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty @@ -48,7 +48,7 @@ \newcommand*{\LWR@nccmath@eqs}[2][]{\begin{eqnarray}#2\end{eqnarray}} \begin{warpMathJax} -\CustomizeMathJax{\renewcommand{\intertext}[2][]{\\ \text{#2}\notag \\}} +\CustomizeMathJax{\renewcommand{\intertext}[2][]{\text{#2}\notag \\}} \CustomizeMathJax{\newenvironment{fleqn}[1][]{}{}} \CustomizeMathJax{\newenvironment{ceqn}{}{}} \CustomizeMathJax{\newenvironment{darray}[2][c]{\begin{array}[#1]{#2}}{\end{array}}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index b003d11552d..05b1553f1c6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -18,8 +18,23 @@ +\PackageInfo{lwarp}{Using the lwarp version of package `titlesec'.}% +\ProvidesPackage{lwarp-titlesec}[2016/03/21] -\LWR@ProvidesPackageDrop{titlesec}[2016/03/21] +\newbool{LWR@loadtitleps} +\boolfalse{LWR@loadtitleps} + +\DeclareOption{pagestyles}{ + \booltrue{LWR@loadtitleps} +} + +\DeclareOption*{} + +\ProcessOptions\relax + +\ifbool{LWR@loadtitleps}{ + \RequirePackage{lwarp-titleps} +}{} \newcommand*{\titlelabel}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty index 67effdd15b2..eb5822a4644 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty @@ -20,9 +20,10 @@ \LWR@ProvidesPackagePass{url}[2013/09/16] -\renewcommand*{\Url@FormatString}{% +\newcommand*{\LWR@HTML@Url@FormatString}{% \expandafter\LWR@url@orig@url\expandafter{\Url@String}% } +\LWR@formatted{Url@FormatString} \endinput %% %% End of file `lwarp-url.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 1b36a974a5c..fc765c159b5 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} - [2020/04/24 v0.84 Allows LaTeX to directly produce HTML5 output.] + [2020/05/01 v0.85 Allows LaTeX to directly produce HTML5 output.] @@ -4289,7 +4289,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- -- Copyright 2016-2020 Brian Dunn -printversion = "v0.84" +printversion = "v0.85" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -5721,7 +5721,7 @@ end -- not --version \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \protect\LWR@origtextless% \LWR@isolate{#1}% \protect\LWR@origtextgreater% @@ -5821,7 +5821,7 @@ end -- not --version {% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \LWR@print@mbox{\LWR@origtextless{}!-\/-}% \endgroup% }% @@ -5831,7 +5831,7 @@ end -- not --version {% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \LWR@print@mbox{-\/-\LWR@origtextgreater}% \endgroup% }% @@ -5840,8 +5840,9 @@ end -- not --version \newcommand{\LWR@htmlcomment}[1]{% \LWR@htmlopencomment{}% {% -\LWR@origttfamily% break ligatures -#1% + \LWR@print@normalfont% + \LWR@origttfamily% break ligatures + #1% }% \LWR@htmlclosecomment{}} \newcommand{\LWR@htmlblockcomment}[1] @@ -7808,6 +7809,7 @@ end -- not --version \leavevmode\unskip\LWR@print@vspace*{-#2\baselineskip}% }{}% \begingroup% +\LWR@print@normalfont% \LWR@origttfamily% \LWR@print@small% \LWR@restoreoriglists% @@ -12810,52 +12812,88 @@ color:\LWR@origpound\LWR@tempcolor% }% }{\endBlockClass\LWR@startpars} -\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}} +\newrobustcmd*{\LWR@HTML@mdseries}{% + \LWR@print@mdseries% + \renewcommand*{\LWR@f@series}{md}% +} \LWR@formatted{mdseries} -\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}} +\newrobustcmd*{\LWR@HTML@bfseries}{% + \LWR@print@bfseries% + \renewcommand*{\LWR@f@series}{bf}% +} \LWR@formatted{bfseries} -\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}} +\newrobustcmd*{\LWR@HTML@ebweight}{% + \LWR@print@ebweight% + \renewcommand*{\LWR@f@series}{eb}% +} \LWR@formatted{ebweight} -\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}} +\newrobustcmd*{\LWR@HTML@lgweight}{% + \LWR@print@lgweight% + \renewcommand*{\LWR@f@series}{lg}% +} \LWR@formatted{lgweight} -\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}} +\newrobustcmd*{\LWR@HTML@rmfamily}{% + \LWR@print@rmfamily% + \renewcommand*{\LWR@f@family}{rm}% +} \LWR@formatted{rmfamily} -\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}} +\newrobustcmd*{\LWR@HTML@sffamily}{% + \LWR@print@sffamily% + \renewcommand*{\LWR@f@family}{sf}% +} \LWR@formatted{sffamily} -\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}} +\newrobustcmd*{\LWR@HTML@ttfamily}{% + \LWR@print@ttfamily% + \renewcommand*{\LWR@f@family}{tt}% +} \LWR@formatted{ttfamily} - -\newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}} +\newrobustcmd*{\LWR@HTML@upshape}{% + \LWR@print@upshape% + \renewcommand*{\LWR@f@shape}{up}% +} \AtBeginDocument{\LWR@formatted{upshape}} -\newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}} +\newrobustcmd*{\LWR@HTML@itshape}{% + \LWR@print@itshape% + \renewcommand*{\LWR@f@shape}{it}% +} \AtBeginDocument{\LWR@formatted{itshape}} -\newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}} +\newrobustcmd*{\LWR@HTML@scshape}{% + \LWR@print@scshape% + \renewcommand*{\LWR@f@shapecaps}{sc}% +} \AtBeginDocument{\LWR@formatted{scshape}} \@ifundefined{ulcshape}{ \LetLtxMacro\ulcshape\upshape }{} -\newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}} +\newrobustcmd*{\LWR@HTML@ulcshape}{% + \LWR@print@ulcshape% + \renewcommand*{\LWR@f@shapecaps}{ulc}% +} \AtBeginDocument{\LWR@formatted{ulcshape}} \@ifundefined{sishape}{ \LetLtxMacro\sishape\scshape }{} \newrobustcmd*{\LWR@HTML@sishape}{% + \LWR@print@sishape% \renewcommand*{\LWR@f@shape}{it} \renewcommand*{\LWR@f@shapecaps}{sc}% } \AtBeginDocument{\LWR@formatted{sishape}} -\newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}} +\newrobustcmd*{\LWR@HTML@slshape}{% + \LWR@print@slshape% + \renewcommand*{\LWR@f@shape}{sl}% +} \AtBeginDocument{\LWR@formatted{slshape}} \newrobustcmd{\LWR@HTML@sscshape}{\LWR@HTML@scshape} -- cgit v1.2.3