lwarp (1may20)

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

15 files changed, 244 insertions, 72 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index a6239409bcf..b2e06788aa1 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.84"
+printversion = "v0.85"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index 3b2b53b1c9e..363f0ff6e60 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -2432,6 +2432,7 @@ proc rebuild_interface {} {
   show_repos
   display_packages_info
   display_updated_globals
+  if {$::tcl_platform(platform) eq "windows"} {wm deiconify .}
 }
 
 ##### initialize ######################################################
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index d4c0b0a6500..992bd5efd05 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.84   README.txt
+LaTeX lwarp package v0.85   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 eea09fbc8ed..44912c4d03d 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 a6239409bcf..b2e06788aa1 100755
--- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
+++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2020 Brian Dunn
 
-printversion = "v0.84"
+printversion = "v0.85"
 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 f073d2bc36a..8d1bb36cd3c 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>    [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 @@ Or, use a short name for the \TOC\ entry without the math, or use \cs{texorpdfst
     \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 @@ This boolean may be tested by the user for later use.
 %<*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 @@ This boolean may be tested by the user for later use.
 % \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 @@ This boolean may be tested by the user for later use.
 %
 % \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 @@ This boolean may be tested by the user for later use.
 % \limitsfixme
 %
 %
+% \subsubsection{\pkg{acro} package}
+% \limitsacro
+% \trouble{acro=\pkg{acro}}
+%
 % \subsubsection{\pkg{chemfig} package}
 %
 % \limitschemfig
@@ -13919,6 +13940,7 @@ This boolean may be tested by the user for later use.
 % ^^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 @@ 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 ()
@@ -21217,12 +21239,13 @@ end -- not --version
 % 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@htmltagc}[1]{%
 \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%
@@ -21395,13 +21418,14 @@ end -- not --version
 % \begin{macro}{\LWR@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@htmlopencomment}{%
 {%
 % \LWR@traceinfo{LWR@htmlopencomment}%
 \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%
 }%
@@ -21412,7 +21436,7 @@ end -- not --version
 % \LWR@traceinfo{LWR@htmlclosecomment}%
 \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%
 }%
@@ -21424,13 +21448,14 @@ end -- not --version
 % \begin{macro}{\LWR@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@htmlcomment}[1]{%
 \LWR@htmlopencomment{}%
 {%
-\LWR@origttfamily% break ligatures
-#1%
+    \LWR@print@normalfont%
+    \LWR@origttfamily% break ligatures
+    #1%
 }%
 \LWR@htmlclosecomment{}}
 %    \end{macrocode}
@@ -26516,8 +26541,10 @@ end -- not --version
 %    \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@print@normalsize%
+\LWR@print@normalfont%
 \LWR@origttfamily%
 \LWR@print@small%
 %    \end{macrocode}
@@ -38151,17 +38178,24 @@ color:\LWR@origpound\LWR@tempcolor%
 % \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@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@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}}
+\newrobustcmd*{\LWR@HTML@mdseries}{%
+    \LWR@print@mdseries%
+    \renewcommand*{\LWR@f@series}{md}%
+}
 \LWR@formatted{mdseries}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\bfseries}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}}
+\newrobustcmd*{\LWR@HTML@bfseries}{%
+    \LWR@print@bfseries%
+    \renewcommand*{\LWR@f@series}{bf}%
+}
 \LWR@formatted{bfseries}
 %    \end{macrocode}
 % \end{macro}
@@ -38169,7 +38203,10 @@ color:\LWR@origpound\LWR@tempcolor%
 % \begin{macro}{\ebweight} From \pkg{nfssext-cfr}.
 % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}}
+\newrobustcmd*{\LWR@HTML@ebweight}{%
+    \LWR@print@ebweight%
+    \renewcommand*{\LWR@f@series}{eb}%
+}
 \LWR@formatted{ebweight}
 %    \end{macrocode}
 % \end{macro}
@@ -38177,49 +38214,75 @@ color:\LWR@origpound\LWR@tempcolor%
 % \begin{macro}{\lgweight} From \pkg{nfssext-cfr}.
 % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}}
+\newrobustcmd*{\LWR@HTML@lgweight}{%
+    \LWR@print@lgweight%
+    \renewcommand*{\LWR@f@series}{lg}%
+}
 \LWR@formatted{lgweight}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\rmfamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}}
+\newrobustcmd*{\LWR@HTML@rmfamily}{%
+    \LWR@print@rmfamily%
+    \renewcommand*{\LWR@f@family}{rm}%
+}
 \LWR@formatted{rmfamily}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\sffamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}}
+\newrobustcmd*{\LWR@HTML@sffamily}{%
+    \LWR@print@sffamily%
+    \renewcommand*{\LWR@f@family}{sf}%
+}
 \LWR@formatted{sffamily}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\ttfamily}
 %    \begin{macrocode}
-\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}}
+\newrobustcmd*{\LWR@HTML@ttfamily}{%
+    \LWR@print@ttfamily%
+    \renewcommand*{\LWR@f@family}{tt}%
+}
 \LWR@formatted{ttfamily}
 %    \end{macrocode}
 % \end{macro}
-
+%
+%
+% The following use \cs{AtBeginDocument} due to the
+% \LaTeX\ core \cs{reinstall@nfss@defs}, which redefines these
+% \cs{AtBeginDocument}.   See \cmds{texdoc source2e}.
+%
 % \begin{macro}{\upshape}
 %    \begin{macrocode}
-\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}}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\itshape}
 %    \begin{macrocode}
-\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}}
 %    \end{macrocode}
 % \end{macro}
 
 % \begin{macro}{\scshape}
 %    \begin{macrocode}
-\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}}
 %    \end{macrocode}
 % \end{macro}
@@ -38230,7 +38293,10 @@ color:\LWR@origpound\LWR@tempcolor%
 \@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}}
 %    \end{macrocode}
 % \end{macro}
@@ -38242,6 +38308,7 @@ color:\LWR@origpound\LWR@tempcolor%
     \LetLtxMacro\sishape\scshape
 }{}
 \newrobustcmd*{\LWR@HTML@sishape}{%
+    \LWR@print@sishape%
     \renewcommand*{\LWR@f@shape}{it}
     \renewcommand*{\LWR@f@shapecaps}{sc}%
 }
@@ -38252,7 +38319,10 @@ color:\LWR@origpound\LWR@tempcolor%
 % \begin{macro}{\slshape}
 % \changes{v0.62}{2018/11/11}{Added.}
 %    \begin{macrocode}
-\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}}
 %    \end{macrocode}
 % \end{macro}
@@ -40249,6 +40319,8 @@ color:\LWR@origpound\LWR@tempcolor%
 % \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 @@ color:\LWR@origpound\LWR@tempcolor%
 % \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 @@ color:\LWR@origpound\LWR@tempcolor%
     \group_end:
   }
 }% before v2.10
+}% before v3
 \ExplSyntaxOff
 %    \end{macrocode}
 
@@ -45448,7 +45524,7 @@ s%
 % \codehtml
 %
 %    \begin{macrocode}
-\LWR@ProvidesPackagePass{chemgreek}[2016/02/10]
+\LWR@ProvidesPackagePass{chemgreek}[2020/01/16]
 %    \end{macrocode}
 
 %    \begin{macrocode}
@@ -52215,7 +52291,8 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
 \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 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %
 %    \begin{macrocode}
 \newcommand{\LWR@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@orignewpage
-\LWR@startpars
+    \LWR@orignewpage
+    \LWR@startpars
 
-\LWR@indexprenote
+    \LWR@indexprenote
 
+    }
 }
-
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \newcommand{\setindexprenote}[1]{\renewcommand{\LWR@indexprenote}{#1}}
 \newcommand*{\noindexprenote}{\renewcommand{\LWR@indexprenote}{}}
 
@@ -58845,8 +58930,11 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 \CustomizeMathJax{
     \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}%   no starred
 }
-
-\CustomizeMathJax{\newcommand{\shortintertext}[1]{\\ \text{#1}\notag \\}}
+%    \end{macrocode}
+%
+% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.}
+%    \begin{macrocode}
+\CustomizeMathJax{\newcommand{\shortintertext}[1]{\text{#1}\notag \\}}
 
 \CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}}
 \CustomizeMathJax{\newcommand{\shortvdotswithin}[1]{ & \hspace{.5em}\vdots \\}}
@@ -61742,7 +61830,13 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 \newcommand*{\LWR@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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %
 %
 % Discard all options for \pkg{lwarp-titlesec}:
-
+%
 % \codehtml
+%
+% \changes{v0.85}{2020/04/30}{\pkg{titlesec}: \optn{pagestyles} option.}
 %    \begin{macrocode}
-\LWR@ProvidesPackageDrop{titlesec}[2016/03/21]
+\PackageInfo{lwarp}{Using the lwarp version of package `titlesec'.}%
+\ProvidesPackage{lwarp-titlesec}[2016/03/21]
+
+\newbool{LWR@loadtitleps}
+\boolfalse{LWR@loadtitleps}
+
+\DeclareOption{pagestyles}{
+    \booltrue{LWR@loadtitleps}
+}
+
+\DeclareOption*{}
+
+\ProcessOptions\relax
+
+\ifbool{LWR@loadtitleps}{
+    \RequirePackage{lwarp-titleps}
+}{}
 %    \end{macrocode}
 
 % \begin{noindmacro}{\titlelabel} \marg{label-format}
@@ -75388,6 +75500,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %
 % \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 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 % ^^A        \LWR@url@origUrl@FormatString%
 %
 %    \begin{macrocode}
-\renewcommand*{\Url@FormatString}{%
+\newcommand*{\LWR@HTML@Url@FormatString}{%
     \expandafter\LWR@url@orig@url\expandafter{\Url@String}%
 }
+\LWR@formatted{Url@FormatString}
 %    \end{macrocode}
 %
 % \iffalse
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}
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 8ed6a4c7a0c..1e11e3d8739 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -391,7 +391,7 @@ sub prepare {
     # 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: $!";