texlive[54965] trunk: lwarp (1may20)

commits+karl at tug.org commits+karl at tug.org
Fri May 1 23:35:13 CEST 2020


Revision: 54965
          http://tug.org/svn/texlive?view=revision&revision=54965
Author:   karl
Date:     2020-05-01 23:35:13 +0200 (Fri, 01 May 2020)
Log Message:
-----------
lwarp (1may20)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
    trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
    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-acro.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
    trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
    trunk/Master/tlpkg/bin/tlpkginfo

Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua	2020-05-01 21:35:13 UTC (rev 54965)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.84"
+printversion = "v0.85"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()

Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2020-05-01 21:35:13 UTC (rev 54965)
@@ -2432,6 +2432,7 @@
   show_repos
   display_packages_info
   display_updated_globals
+  if {$::tcl_platform(platform) eq "windows"} {wm deiconify .}
 }
 
 ##### initialize ######################################################

Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt	2020-05-01 21:35:13 UTC (rev 54965)
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.84   README.txt
+LaTeX lwarp package v0.85   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	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua	2020-05-01 21:35:13 UTC (rev 54965)
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.84"
+printversion = "v0.85"
 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	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx	2020-05-01 21:35:13 UTC (rev 54965)
@@ -16,7 +16,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{lwarp}
-%<package>    [2020/04/24 v0.84  Allows LaTeX to directly produce HTML5 output.]
+%<package>    [2020/05/01 v0.85  Allows LaTeX to directly produce HTML5 output.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -1570,6 +1570,12 @@
     \end{itemize}
 }
 
+\newcommand{\limitsacro}{%
+Define acronymn formats using \cs{textbf} instead
+\watchout[formats]
+of \cs{bfseries} etc.
+}
+
 \newcommand{\limitschemfig}{%
 If using \cs{polymerdelim} to add delimiters to a \cs{chemfig},
 wrap both inside a single \env{lateximage}:
@@ -2999,7 +3005,7 @@
 %<*package>
 % \fi
 %
-% \CheckSum{44148}
+% \CheckSum{44178}
 %
 % \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
@@ -3126,6 +3132,7 @@
 % \changes{v0.82}{2020/03/25}{\ 2020/03/25}
 % \changes{v0.83}{2020/03/27}{\ 2020/03/27}
 % \changes{v0.84}{2020/04/24}{\ 2020/04/24}
+% \changes{v0.85}{2020/05/01}{\ 2020/05/01}
 
 
 
@@ -3348,6 +3355,16 @@
 %
 % \begin{description}
 % \needspace{2\baselineskip}
+% \item[v0.85:] \pkg{fontspec}
+%   \begin{itemize}
+%   \item \pkg{fontspec}: Fixed core font change macros for world languages.
+%       \margintag{packages}
+%   \item \pkg{acro}: Due to v3 changes, when defining acronym formats,
+%       \watchout[\pkg{acro} formats]
+%       use \cs{textbf} instead of \cs{bfseries}, etc.
+%   \item Fixed \pkg{idxlayout}, \pkg{mathtools}, \pkg{titlesec}, \pkg{url}.
+%   \end{itemize}
+% \needspace{2\baselineskip}
 % \item[v0.84:] Previous/next page links, numerous fixes.
 %   \begin{itemize}
 %   \item Added documentation of \env{BlockClass} and \cs{InlineClass}
@@ -10093,6 +10110,10 @@
 % \limitsfixme
 %
 %
+% \subsubsection{\pkg{acro} package}
+% \limitsacro
+% \trouble{acro=\pkg{acro}}
+%
 % \subsubsection{\pkg{chemfig} package}
 %
 % \limitschemfig
@@ -13919,6 +13940,7 @@
 % ^^A 
 % ^^A 
 %
+% \DescribePackage{fontspec}
 % Load \pkg{fontspec} if necessary:
 % \changes{v0.50}{2018/02/24}{Fix: Load \pkg{fontspec} if necessary.}
 %    \begin{macrocode}
@@ -19014,7 +19036,7 @@
 -- Copyright 2016-2020 Brian Dunn
 
 
-printversion = "v0.84"
+printversion = "v0.85"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -21217,12 +21239,13 @@
 % Break ligatures and use upright apostrophes in \HTML\ tags.
 %
 % \cs{protect} is in case the tag appears in \TOC, \LOF, \LOT.
+% \changes{v0.85}{2020/04/30}{Fix: Added print macros for \pkg{fontspec}.}
 %    \begin{macrocode}
 \newcommand*{\LWR at htmltagc}[1]{%
 \LWR at traceinfo{LWR at htmltagc !\detokenize{#1}!}%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \protect\LWR at origtextless%
 \LWR at isolate{#1}%
 \protect\LWR at origtextgreater%
@@ -21395,6 +21418,7 @@
 % \begin{macro}{\LWR at htmlclosecomment}
 % \changes{v0.47}{2018/01/25}{Add \cs{mbox} to prevent line breaks.}
 % \changes{v0.63}{2018/11/30}{Fix: Break ligature for \pkg{luatexko}.}
+% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.}
 %    \begin{macrocode}
 \newcommand*{\LWR at htmlopencomment}{%
 {%
@@ -21401,7 +21425,7 @@
 % \LWR at traceinfo{LWR at htmlopencomment}%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \LWR at print@mbox{\LWR at origtextless{}!-\/-}%
 \endgroup%
 }%
@@ -21412,7 +21436,7 @@
 % \LWR at traceinfo{LWR at htmlclosecomment}%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \LWR at print@mbox{-\/-\LWR at origtextgreater}%
 \endgroup%
 }%
@@ -21424,13 +21448,14 @@
 % \begin{macro}{\LWR at htmlcomment} \marg{comment}
 %
 % \changes{v0.28}{2017/04/13}{Breaks ligatures in \HTML\ comments.}
-%
+% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.}
 %    \begin{macrocode}
 \newcommand{\LWR at htmlcomment}[1]{%
 \LWR at htmlopencomment{}%
 {%
-\LWR at origttfamily% break ligatures
-#1%
+    \LWR at print@normalfont%
+    \LWR at origttfamily% break ligatures
+    #1%
 }%
 \LWR at htmlclosecomment{}}
 %    \end{macrocode}
@@ -26516,8 +26541,10 @@
 %    \end{macrocode}
 % \changes{v0.50}{2018/03/02}{Improved column alignment.}
 % \changes{v0.54}{2018/04/06}{Improved column alignment.}
+% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.}
 %    \begin{macrocode}
 % \LWR at print@normalsize%
+\LWR at print@normalfont%
 \LWR at origttfamily%
 \LWR at print@small%
 %    \end{macrocode}
@@ -38151,10 +38178,14 @@
 % \changes{v0.48}{2018/02/02}{Improved font control.}
 % \changes{v0.50}{2018/02/20}{Robustify macros.}
 % \changes{v0.72}{2019/05/24}{Use \cs{LWR at formatted} for \cs{bfseries}, etc.}
+% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.}
 %
 % \begin{macro}{\mdseries}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@mdseries}{\renewcommand*{\LWR at f@series}{md}}
+\newrobustcmd*{\LWR at HTML@mdseries}{%
+    \LWR at print@mdseries%
+    \renewcommand*{\LWR at f@series}{md}%
+}
 \LWR at formatted{mdseries}
 %    \end{macrocode}
 % \end{macro}
@@ -38161,7 +38192,10 @@
 
 % \begin{macro}{\bfseries}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@bfseries}{\renewcommand*{\LWR at f@series}{bf}}
+\newrobustcmd*{\LWR at HTML@bfseries}{%
+    \LWR at print@bfseries%
+    \renewcommand*{\LWR at f@series}{bf}%
+}
 \LWR at formatted{bfseries}
 %    \end{macrocode}
 % \end{macro}
@@ -38169,7 +38203,10 @@
 % \begin{macro}{\ebweight} From \pkg{nfssext-cfr}.
 % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@ebweight}{\renewcommand*{\LWR at f@series}{eb}}
+\newrobustcmd*{\LWR at HTML@ebweight}{%
+    \LWR at print@ebweight%
+    \renewcommand*{\LWR at f@series}{eb}%
+}
 \LWR at formatted{ebweight}
 %    \end{macrocode}
 % \end{macro}
@@ -38177,7 +38214,10 @@
 % \begin{macro}{\lgweight} From \pkg{nfssext-cfr}.
 % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@lgweight}{\renewcommand*{\LWR at f@series}{lg}}
+\newrobustcmd*{\LWR at HTML@lgweight}{%
+    \LWR at print@lgweight%
+    \renewcommand*{\LWR at f@series}{lg}%
+}
 \LWR at formatted{lgweight}
 %    \end{macrocode}
 % \end{macro}
@@ -38184,7 +38224,10 @@
 
 % \begin{macro}{\rmfamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@rmfamily}{\renewcommand*{\LWR at f@family}{rm}}
+\newrobustcmd*{\LWR at HTML@rmfamily}{%
+    \LWR at print@rmfamily%
+    \renewcommand*{\LWR at f@family}{rm}%
+}
 \LWR at formatted{rmfamily}
 %    \end{macrocode}
 % \end{macro}
@@ -38191,7 +38234,10 @@
 
 % \begin{macro}{\sffamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@sffamily}{\renewcommand*{\LWR at f@family}{sf}}
+\newrobustcmd*{\LWR at HTML@sffamily}{%
+    \LWR at print@sffamily%
+    \renewcommand*{\LWR at f@family}{sf}%
+}
 \LWR at formatted{sffamily}
 %    \end{macrocode}
 % \end{macro}
@@ -38198,14 +38244,25 @@
 
 % \begin{macro}{\ttfamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@ttfamily}{\renewcommand*{\LWR at f@family}{tt}}
+\newrobustcmd*{\LWR at HTML@ttfamily}{%
+    \LWR at print@ttfamily%
+    \renewcommand*{\LWR at f@family}{tt}%
+}
 \LWR at formatted{ttfamily}
 %    \end{macrocode}
 % \end{macro}
-
+%
+%
+% The following use \cs{AtBeginDocument} due to the
+% \LaTeX\ core \cs{reinstall at nfss@defs}, which redefines these
+% \cs{AtBeginDocument}.   See \cmds{texdoc source2e}.
+%
 % \begin{macro}{\upshape}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@upshape}{\renewcommand*{\LWR at f@shape}{up}}
+\newrobustcmd*{\LWR at HTML@upshape}{%
+    \LWR at print@upshape%
+    \renewcommand*{\LWR at f@shape}{up}%
+}
 \AtBeginDocument{\LWR at formatted{upshape}}
 %    \end{macrocode}
 % \end{macro}
@@ -38212,7 +38269,10 @@
 
 % \begin{macro}{\itshape}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@itshape}{\renewcommand*{\LWR at f@shape}{it}}
+\newrobustcmd*{\LWR at HTML@itshape}{%
+    \LWR at print@itshape%
+    \renewcommand*{\LWR at f@shape}{it}%
+}
 \AtBeginDocument{\LWR at formatted{itshape}}
 %    \end{macrocode}
 % \end{macro}
@@ -38219,7 +38279,10 @@
 
 % \begin{macro}{\scshape}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@scshape}{\renewcommand*{\LWR at f@shapecaps}{sc}}
+\newrobustcmd*{\LWR at HTML@scshape}{%
+    \LWR at print@scshape%
+    \renewcommand*{\LWR at f@shapecaps}{sc}%
+}
 \AtBeginDocument{\LWR at formatted{scshape}}
 %    \end{macrocode}
 % \end{macro}
@@ -38230,7 +38293,10 @@
 \@ifundefined{ulcshape}{
     \LetLtxMacro\ulcshape\upshape
 }{}
-\newrobustcmd*{\LWR at HTML@ulcshape}{\renewcommand*{\LWR at f@shapecaps}{ulc}}
+\newrobustcmd*{\LWR at HTML@ulcshape}{%
+    \LWR at print@ulcshape%
+    \renewcommand*{\LWR at f@shapecaps}{ulc}%
+}
 \AtBeginDocument{\LWR at formatted{ulcshape}}
 %    \end{macrocode}
 % \end{macro}
@@ -38242,6 +38308,7 @@
     \LetLtxMacro\sishape\scshape
 }{}
 \newrobustcmd*{\LWR at HTML@sishape}{%
+    \LWR at print@sishape%
     \renewcommand*{\LWR at f@shape}{it}
     \renewcommand*{\LWR at f@shapecaps}{sc}%
 }
@@ -38252,7 +38319,10 @@
 % \begin{macro}{\slshape}
 % \changes{v0.62}{2018/11/11}{Added.}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@slshape}{\renewcommand*{\LWR at f@shape}{sl}}
+\newrobustcmd*{\LWR at HTML@slshape}{%
+    \LWR at print@slshape%
+    \renewcommand*{\LWR at f@shape}{sl}%
+}
 \AtBeginDocument{\LWR at formatted{slshape}}
 %    \end{macrocode}
 % \end{macro}
@@ -40249,6 +40319,8 @@
 % \DescribePackage{acro}
 % \pkg{acro} is patched for use by \pkg{lwarp}.
 %
+% \limitsacro
+%
 % \changes{v0.48}{2018/02/02}{\pkg{acro}: Added.}
 %
 % \codehtml
@@ -40281,6 +40353,9 @@
 % \changes{v0.76}{2019/10/07}{\pkg{acro}: Updated for v2.10.}
 %    \begin{macrocode}
 \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
@@ -40377,6 +40452,7 @@
     \group_end:
   }
 }% before v2.10
+}% before v3
 \ExplSyntaxOff
 %    \end{macrocode}
 
@@ -45448,7 +45524,7 @@
 % \codehtml
 %
 %    \begin{macrocode}
-\LWR at ProvidesPackagePass{chemgreek}[2016/02/10]
+\LWR at ProvidesPackagePass{chemgreek}[2020/01/16]
 %    \end{macrocode}
 
 %    \begin{macrocode}
@@ -52215,7 +52291,8 @@
 \providecommand*{\multfootsep}{,}
 %    \end{macrocode}
 %
-% Using \pkg{cleveref}:
+% Using \pkg{cleveref}.
+% \cs{labelcref} only prints the number of the object, not its type.
 %    \begin{macrocode}
 \providecommand*{\footref}[1]{\labelcref{#1}}
 %    \end{macrocode}
@@ -55190,16 +55267,24 @@
 %
 %    \begin{macrocode}
 \newcommand{\LWR at indexprenote}{}
+%    \end{macrocode}
+%
+% \cs{AtBeginDocument} to help with package load order.
+% \changes{v0.85}{2020/04/29}{\pkg{idxlayout}: Fixed: \cs{AtBeginDocument} for load order.}
+%    \begin{macrocode}
+\AtBeginDocument{
+    \preto\printindex{
 
-\preto\printindex{
+    \LWR at orignewpage
+    \LWR at startpars
 
-\LWR at orignewpage
-\LWR at startpars
+    \LWR at indexprenote
 
-\LWR at indexprenote
-
+    }
 }
-
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \newcommand{\setindexprenote}[1]{\renewcommand{\LWR at indexprenote}{#1}}
 \newcommand*{\noindexprenote}{\renewcommand{\LWR at indexprenote}{}}
 
@@ -58845,9 +58930,12 @@
 \CustomizeMathJax{
     \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}%   no starred
 }
+%    \end{macrocode}
+%
+% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.}
+%    \begin{macrocode}
+\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 \\}}
 \CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}}
@@ -61742,7 +61830,13 @@
 \newcommand*{\LWR at nccmath@eqs}[2][]{\begin{eqnarray}#2\end{eqnarray}}
 
 \begin{warpMathJax}
-\CustomizeMathJax{\renewcommand{\intertext}[2][]{\\ \text{#2}\notag \\}}
+%    \end{macrocode}
+%
+% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.}
+%    \begin{macrocode}
+\CustomizeMathJax{\renewcommand{\intertext}[2][]{\text{#2}\notag \\}}
+%    \end{macrocode}
+%    \begin{macrocode}
 \CustomizeMathJax{\newenvironment{fleqn}[1][]{}{}}
 \CustomizeMathJax{\newenvironment{ceqn}{}{}}
 \CustomizeMathJax{\newenvironment{darray}[2][c]{\begin{array}[#1]{#2}}{\end{array}}}
@@ -72956,10 +73050,28 @@
 %
 %
 % Discard all options for \pkg{lwarp-titlesec}:
-
+%
 % \codehtml
+%
+% \changes{v0.85}{2020/04/30}{\pkg{titlesec}: \optn{pagestyles} option.}
 %    \begin{macrocode}
-\LWR at ProvidesPackageDrop{titlesec}[2016/03/21]
+\PackageInfo{lwarp}{Using the lwarp version of package `titlesec'.}%
+\ProvidesPackage{lwarp-titlesec}[2016/03/21]
+
+\newbool{LWR at loadtitleps}
+\boolfalse{LWR at loadtitleps}
+
+\DeclareOption{pagestyles}{
+    \booltrue{LWR at loadtitleps}
+}
+
+\DeclareOption*{}
+
+\ProcessOptions\relax
+
+\ifbool{LWR at loadtitleps}{
+    \RequirePackage{lwarp-titleps}
+}{}
 %    \end{macrocode}
 
 % \begin{noindmacro}{\titlelabel} \marg{label-format}
@@ -75388,6 +75500,7 @@
 %
 % \changes{v0.52}{2018/03/29}{\pkg{url}: Added.}
 % \changes{v0.80}{2020/02/06}{\pkg{url}: Creates hyperlinks.}
+% \changes{v0.85}{2020/05/01}{\pkg{url}: Fixed print mode.}
 %
 % \codehtml
 %
@@ -75406,9 +75519,10 @@
 % ^^A        \LWR at url@origUrl at FormatString%
 %
 %    \begin{macrocode}
-\renewcommand*{\Url at FormatString}{%
+\newcommand*{\LWR at HTML@Url at FormatString}{%
     \expandafter\LWR at url@orig at url\expandafter{\Url at String}%
 }
+\LWR at formatted{Url at FormatString}
 %    \end{macrocode}
 %
 % \iffalse

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -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{chemgreek}[2016/02/10]
+\LWR at ProvidesPackagePass{chemgreek}[2020/01/16]
 
 \ExplSyntaxOn
 

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -17,16 +17,16 @@
 %% version 2005/12/01 or later.
 \LWR at ProvidesPackageDrop{idxlayout}[2012/03/30]
 \newcommand{\LWR at indexprenote}{}
+\AtBeginDocument{
+    \preto\printindex{
 
-\preto\printindex{
+    \LWR at orignewpage
+    \LWR at startpars
 
-\LWR at orignewpage
-\LWR at startpars
+    \LWR at indexprenote
 
-\LWR at indexprenote
-
+    }
 }
-
 \newcommand{\setindexprenote}[1]{\renewcommand{\LWR at indexprenote}{#1}}
 \newcommand*{\noindexprenote}{\renewcommand{\LWR at indexprenote}{}}
 

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -122,9 +122,8 @@
 \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 \\}}
 \CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}}

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccmath.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -48,7 +48,7 @@
 \newcommand*{\LWR at 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}}}

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -18,9 +18,24 @@
 
 
 
+\PackageInfo{lwarp}{Using the lwarp version of package `titlesec'.}%
+\ProvidesPackage{lwarp-titlesec}[2016/03/21]
 
-\LWR at ProvidesPackageDrop{titlesec}[2016/03/21]
+\newbool{LWR at loadtitleps}
+\boolfalse{LWR at loadtitleps}
 
+\DeclareOption{pagestyles}{
+    \booltrue{LWR at loadtitleps}
+}
+
+\DeclareOption*{}
+
+\ProcessOptions\relax
+
+\ifbool{LWR at loadtitleps}{
+    \RequirePackage{lwarp-titleps}
+}{}
+
 \newcommand*{\titlelabel}[1]{}
 
 \newcommand\titleformat{%

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -20,9 +20,10 @@
 
 \LWR at ProvidesPackagePass{url}[2013/09/16]
 
-\renewcommand*{\Url at FormatString}{%
+\newcommand*{\LWR at HTML@Url at FormatString}{%
     \expandafter\LWR at url@orig at url\expandafter{\Url at String}%
 }
+\LWR at formatted{Url at FormatString}
 \endinput
 %%
 %% End of file `lwarp-url.sty'.

Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty	2020-05-01 21:35:13 UTC (rev 54965)
@@ -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 @@
 
 -- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.84"
+printversion = "v0.85"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -5721,7 +5721,7 @@
 \LWR at traceinfo{LWR at htmltagc !\detokenize{#1}!}%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \protect\LWR at origtextless%
 \LWR at isolate{#1}%
 \protect\LWR at origtextgreater%
@@ -5821,7 +5821,7 @@
 {%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \LWR at print@mbox{\LWR at origtextless{}!-\/-}%
 \endgroup%
 }%
@@ -5831,7 +5831,7 @@
 {%
 \begingroup%
 \LWR at FBcancel%
-\ifmmode\else\protect\LWR at origttfamily\fi%
+\ifmmode\else\protect\LWR at print@normalfont\protect\LWR at origttfamily\fi%
 \LWR at print@mbox{-\/-\LWR at origtextgreater}%
 \endgroup%
 }%
@@ -5840,8 +5840,9 @@
 \newcommand{\LWR at htmlcomment}[1]{%
 \LWR at htmlopencomment{}%
 {%
-\LWR at origttfamily% break ligatures
-#1%
+    \LWR at print@normalfont%
+    \LWR at origttfamily% break ligatures
+    #1%
 }%
 \LWR at htmlclosecomment{}}
 \newcommand{\LWR at htmlblockcomment}[1]
@@ -7808,6 +7809,7 @@
     \leavevmode\unskip\LWR at print@vspace*{-#2\baselineskip}%
 }{}%
 \begingroup%
+\LWR at print@normalfont%
 \LWR at origttfamily%
 \LWR at print@small%
 \LWR at restoreoriglists%
@@ -12810,40 +12812,72 @@
     }%
 }{\endBlockClass\LWR at startpars}
 
-\newrobustcmd*{\LWR at HTML@mdseries}{\renewcommand*{\LWR at f@series}{md}}
+\newrobustcmd*{\LWR at HTML@mdseries}{%
+    \LWR at print@mdseries%
+    \renewcommand*{\LWR at f@series}{md}%
+}
 \LWR at formatted{mdseries}
 
-\newrobustcmd*{\LWR at HTML@bfseries}{\renewcommand*{\LWR at f@series}{bf}}
+\newrobustcmd*{\LWR at HTML@bfseries}{%
+    \LWR at print@bfseries%
+    \renewcommand*{\LWR at f@series}{bf}%
+}
 \LWR at formatted{bfseries}
 
-\newrobustcmd*{\LWR at HTML@ebweight}{\renewcommand*{\LWR at f@series}{eb}}
+\newrobustcmd*{\LWR at HTML@ebweight}{%
+    \LWR at print@ebweight%
+    \renewcommand*{\LWR at f@series}{eb}%
+}
 \LWR at formatted{ebweight}
 
-\newrobustcmd*{\LWR at HTML@lgweight}{\renewcommand*{\LWR at f@series}{lg}}
+\newrobustcmd*{\LWR at HTML@lgweight}{%
+    \LWR at print@lgweight%
+    \renewcommand*{\LWR at f@series}{lg}%
+}
 \LWR at formatted{lgweight}
 
-\newrobustcmd*{\LWR at HTML@rmfamily}{\renewcommand*{\LWR at f@family}{rm}}
+\newrobustcmd*{\LWR at HTML@rmfamily}{%
+    \LWR at print@rmfamily%
+    \renewcommand*{\LWR at f@family}{rm}%
+}
 \LWR at formatted{rmfamily}
 
-\newrobustcmd*{\LWR at HTML@sffamily}{\renewcommand*{\LWR at f@family}{sf}}
+\newrobustcmd*{\LWR at HTML@sffamily}{%
+    \LWR at print@sffamily%
+    \renewcommand*{\LWR at f@family}{sf}%
+}
 \LWR at formatted{sffamily}
 
-\newrobustcmd*{\LWR at HTML@ttfamily}{\renewcommand*{\LWR at f@family}{tt}}
+\newrobustcmd*{\LWR at HTML@ttfamily}{%
+    \LWR at print@ttfamily%
+    \renewcommand*{\LWR at f@family}{tt}%
+}
 \LWR at formatted{ttfamily}
-
-\newrobustcmd*{\LWR at HTML@upshape}{\renewcommand*{\LWR at f@shape}{up}}
+\newrobustcmd*{\LWR at HTML@upshape}{%
+    \LWR at print@upshape%
+    \renewcommand*{\LWR at f@shape}{up}%
+}
 \AtBeginDocument{\LWR at formatted{upshape}}
 
-\newrobustcmd*{\LWR at HTML@itshape}{\renewcommand*{\LWR at f@shape}{it}}
+\newrobustcmd*{\LWR at HTML@itshape}{%
+    \LWR at print@itshape%
+    \renewcommand*{\LWR at f@shape}{it}%
+}
 \AtBeginDocument{\LWR at formatted{itshape}}
 
-\newrobustcmd*{\LWR at HTML@scshape}{\renewcommand*{\LWR at f@shapecaps}{sc}}
+\newrobustcmd*{\LWR at HTML@scshape}{%
+    \LWR at print@scshape%
+    \renewcommand*{\LWR at f@shapecaps}{sc}%
+}
 \AtBeginDocument{\LWR at formatted{scshape}}
 
 \@ifundefined{ulcshape}{
     \LetLtxMacro\ulcshape\upshape
 }{}
-\newrobustcmd*{\LWR at HTML@ulcshape}{\renewcommand*{\LWR at f@shapecaps}{ulc}}
+\newrobustcmd*{\LWR at HTML@ulcshape}{%
+    \LWR at print@ulcshape%
+    \renewcommand*{\LWR at f@shapecaps}{ulc}%
+}
 \AtBeginDocument{\LWR at formatted{ulcshape}}
 
 \@ifundefined{sishape}{
@@ -12850,12 +12884,16 @@
     \LetLtxMacro\sishape\scshape
 }{}
 \newrobustcmd*{\LWR at HTML@sishape}{%
+    \LWR at print@sishape%
     \renewcommand*{\LWR at f@shape}{it}
     \renewcommand*{\LWR at f@shapecaps}{sc}%
 }
 \AtBeginDocument{\LWR at formatted{sishape}}
 
-\newrobustcmd*{\LWR at HTML@slshape}{\renewcommand*{\LWR at f@shape}{sl}}
+\newrobustcmd*{\LWR at HTML@slshape}{%
+    \LWR at print@slshape%
+    \renewcommand*{\LWR at f@shape}{sl}%
+}
 \AtBeginDocument{\LWR at formatted{slshape}}
 
 \newrobustcmd{\LWR at HTML@sscshape}{\LWR at HTML@scshape}

Modified: trunk/Master/tlpkg/bin/tlpkginfo
===================================================================
--- trunk/Master/tlpkg/bin/tlpkginfo	2020-05-01 21:33:56 UTC (rev 54964)
+++ trunk/Master/tlpkg/bin/tlpkginfo	2020-05-01 21:35:13 UTC (rev 54965)
@@ -391,7 +391,7 @@
     # redirect to stderr because we want the only stdout to be the
     # directory name for ctan2tl to use. Intentionally do not use -q
     # so that we have a chance of noticing errors.
-    system ("timeout 10s svn update $catfile </dev/null >&2")
+    system ("timeout 4s svn update $catfile </dev/null >&2")
       unless $ENV{"TLPKGINFO_CATALOGUE_NO_UPDATE"};
     
     open (CATFILE, "<$catfile") || die "open($catfile) failed, fixme: $!";



More information about the tex-live-commits mailing list.