From 980b7410cdd2e14152f006fdc1baa5041263b0b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Apr 2022 22:17:17 +0000 Subject: lwarp (22mar22) git-svn-id: svn://tug.org/texlive/trunk@62952 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 2 +- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 11 +- Master/texmf-dist/doc/latex/lwarp/README.txt | 2 +- Master/texmf-dist/doc/latex/lwarp/lwarp.pdf | Bin 3181454 -> 3185897 bytes Master/texmf-dist/scripts/lwarp/lwarpmk.lua | 2 +- Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 311 ++++++++++++++++----- .../texmf-dist/tex/latex/lwarp/lwarp-acronym.sty | 77 ++++- Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty | 23 -- .../texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty | 14 +- .../texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty | 16 +- .../tex/latex/lwarp/lwarp-patch-memoir.sty | 8 +- .../texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty | 2 +- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 50 ++-- 13 files changed, 384 insertions(+), 134 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index 6b4d48c89e3..901d7d3f427 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-2022 Brian Dunn -printversion = "v0.904a" +printversion = "v0.905" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 48d82305ba9..03e8b7e7269 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 62273 2022-02-28 08:52:17Z preining $ +# $Id: tlmgr.pl 62899 2022-04-04 17:45:51Z karl $ # # Copyright 2008-2022 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -7,8 +7,8 @@ use strict; use warnings; -my $svnrev = '$Revision: 62273 $'; -my $datrev = '$Date: 2022-02-28 09:52:17 +0100 (Mon, 28 Feb 2022) $'; +my $svnrev = '$Revision: 62899 $'; +my $datrev = '$Date: 2022-04-04 19:45:51 +0200 (Mon, 04 Apr 2022) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -7339,9 +7339,6 @@ TeX Live $TeXLive::TLConfig::ReleaseYear is frozen and will no longer be routinely updated. This happens when a new release is made, or will be made shortly. -If you're willing to help with pretesting a new release, and we hope -you are, please see https://tug.org/texlive/pretest.html. - For general status information about TeX Live, see its home page: https://tug.org/texlive @@ -10236,7 +10233,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 62273 2022-02-28 08:52:17Z preining $ +$Id: tlmgr.pl 62899 2022-04-04 17:45:51Z karl $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 780cab24092..b4d606ed34d 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.904a README.txt +LaTeX lwarp package v0.905 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 1522f8b7d93..e3c1f196a78 100644 Binary files a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf and b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf differ diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 6b4d48c89e3..901d7d3f427 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2022 Brian Dunn -printversion = "v0.904a" +printversion = "v0.905" 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 56963b90497..c812a89da09 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2022/03/16 v0.904a Allows LaTeX to directly produce HTML5 output.] +% [2022/03/22 v0.905 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -3246,7 +3246,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{55400} +% \CheckSum{55580} % % \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 @@ -3395,6 +3395,7 @@ This boolean may be tested by the user for later use. % \changes{v0.904}{2022/03/09}{\ 2022/03/09} % \changes{v0.904a}{2022/03/16}{\ 2022/03/16} % \changes{v0.904a}{2022/03/16}{Fixed missing \pkg{common-mathjax-siunitx}.} +% \changes{v0.905}{2022/03/22}{\ 2022/03/22} @@ -3628,6 +3629,12 @@ This boolean may be tested by the user for later use. % see the end of the Change History on page \pageref{sec:changesend}. % % \begin{description} +% \item[v0.905:] Bug fixes, internal improvements. +% \begin{itemize} +% \item Fixed conflict between \pkg{cleveref} and \pkg{splitidx}. +% \item Improved coexistence with \cs{AtEndDocument}. +% \item \pkg{acronym}: Updated to v1.47, added hyper links. +% \end{itemize} % \needspace{2\baselineskip} % \item[v0.904a:] Fixed missing \pkg{lwarp-common-mathjax-siunitx} package. % \needspace{2\baselineskip} @@ -14461,6 +14468,9 @@ This boolean may be tested by the user for later use. % % \subsection{Argument selection} % +% \changes{v0.905}{2022/03/21}{Added last of three, four.} +% \begin{macro}{\LWR@thirdofthree} \marg{first} \marg{second} \marg{third} +% \begin{macro}{\LWR@fourthoffour} \marg{first} \marg{second} \marg{third} \marg{fourth} % \begin{macro}{\LWR@firstoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth} % \changes{v0.63}{2019/01/25}{Added.} % \changes{v0.896}{2021/04/05}{Changed to firstoffive instead of four.} @@ -14473,6 +14483,9 @@ This boolean may be tested by the user for later use. % Used for extra cross referencing. % % \begin{macrocode} +\long\def\LWR@thirdofthree#1#2#3{#3}% +\long\def\LWR@fourthoffour#1#2#3#4{#4}% + \long\def\LWR@firstoffive#1#2#3#4#5{#1} \long\def\LWR@secondoffive#1#2#3#4#5{#2} \long\def\LWR@thirdoffive#1#2#3#4#5{#3} @@ -14484,6 +14497,8 @@ This boolean may be tested by the user for later use. % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % % \subsection{Inside boxes} @@ -21005,7 +21020,7 @@ MathJax = { -- Copyright 2016-2022 Brian Dunn -printversion = "v0.904a" +printversion = "v0.905" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -22509,20 +22524,21 @@ end -- not --version % \end{macrocode} -% \begin{macro}{\LWR@fontfortags} \marg{macro name} +% \begin{macro}{\LWR@fontfortags} \marg{macro name} \marg{argument} % % Forces roman TT font for \HTML\ tags. % \changes{v0.904}{2022/03/02}{Improved font control.} % \begin{macrocode} -\newrobustcmd*{\LWR@fontfortags}[1]{% +\newrobustcmd*{\LWR@fontfortags}[2]{% \ifmmode% \PackageError{lwarp}% {% An HTML tag was generated inside math.\MessageBreak This should never occur.\MessageBreak - Something is broken in Lwarp% + Something is broken in Lwarp.\MessageBreak + Enter `h' for details% }% - {(Using #1.)}% + {(Using #1{#2}.)}% \else% % \end{macrocode} % @@ -22558,7 +22574,7 @@ end -- not --version % \LWR@traceinfo{HTMLentity \detokenize{#1}}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{HTMLentity}% + \LWR@fontfortags{HTMLentity}{\detokenize{#1}}% \protect\LWR@origampersand\LWR@isolate{#1};% \endgroup% % \LWR@traceinfo{HTMLentity done}% @@ -23427,7 +23443,7 @@ end -- not --version \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmltagc}% + \LWR@fontfortags{LWR@htmltagc}{\detokenize{#1}}% \protect\LWR@origtextless% \LWR@isolate{#1}% \protect\LWR@origtextgreater% @@ -23611,7 +23627,7 @@ end -- not --version % \LWR@traceinfo{LWR@htmlopencomment}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmlopencomment}% + \LWR@fontfortags{LWR@htmlopencomment}{}% \LWR@print@mbox{\LWR@origtextless{}!-\/-}% \endgroup% } @@ -23620,7 +23636,7 @@ end -- not --version % \LWR@traceinfo{LWR@htmlclosecomment}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWr@htmlclosecomment}% + \LWR@fontfortags{LWr@htmlclosecomment}{}% \LWR@print@mbox{-\/-\LWR@origtextgreater}% \endgroup% } @@ -35889,9 +35905,11 @@ end -- not --version \makeatletter% % \end{macrocode} % -% Disable CJK \pkg{xpinyin} while generating the side\TOC. +% Disable \cs{ref} to avoid nested \HTML\ references. +% \changes{v0.905}{2022/03/21}{Disable \cs{ref} and CJK pinyin in \TOC, etc.} % \begin{macrocode} - \LWR@disablepinyin% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% % \end{macrocode} % % Read in the \TOC\ file: @@ -35979,7 +35997,7 @@ end -- not --version % \begin{macrocode} \AtBeginDocument{ -\let\LWR@origtableofcontents\tableofcontents +\LetLtxMacro\LWR@origtableofcontents\tableofcontents \renewcommand*{\tableofcontents}{% % \end{macrocode} @@ -36002,7 +36020,16 @@ end -- not --version \booltrue{LWR@copiedsidetoc}% }% \LWR@printpendingfootnotes - \LWR@origtableofcontents +% \end{macrocode} +% +% Disable \cs{ref} to avoid nested \HTML\ references. +% \changes{v0.905}{2022/03/21}{Disable \cs{ref} and CJK pinyin in \TOC, etc.} +% \begin{macrocode} + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origtableofcontents% + \endgroup% } }% \tableofcontents @@ -36023,7 +36050,16 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoffigures +% \end{macrocode} +% +% Disable \cs{ref} to avoid nested \HTML\ references. +% \changes{v0.905}{2022/03/21}{Disable \cs{ref} and CJK pinyin in \TOC, etc.} +% \begin{macrocode} + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoffigures% + \endgroup% } } % \end{macrocode} @@ -36042,7 +36078,16 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoftables +% \end{macrocode} +% +% Disable \cs{ref} to avoid nested \HTML\ references. +% \changes{v0.905}{2022/03/21}{Disable \cs{ref} and CJK pinyin in \TOC, etc.} +% \begin{macrocode} + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoftables% + \endgroup% } } % \end{macrocode} @@ -36513,6 +36558,7 @@ end -- not --version % \end{macro} + % \begin{macro}{\LWR@xindex@modifyentry} \marg{indexing term} % % If using \prog{xindex}, modifies the pipe character to become \cs{hyperindexformat}. @@ -36551,6 +36597,12 @@ end -- not --version % \end{macrocode} % \end{macro} +% \DescribeBoolean{LWR@xindex@tricked} Used to track \pkg{xindex} creation. See next. +% \begin{macrocode} +\newbool{LWR@xindex@tricked} +\boolfalse{LWR@xindex@tricked} +% \end{macrocode} + % \begin{macro}{\@wrindex} \marg{indexing term} \qquad % Redefined to write the |LWR@autoindex| counter instead of |page|. @@ -36562,9 +36614,6 @@ end -- not --version % \changes{v0.28}{2017/04/13}{Improved indexing.} % \changes{v0.88}{2020/07/12}{Added support for \prog{xindex}.} % \begin{macrocode} -\newbool{LWR@xindex@tricked} -\boolfalse{LWR@xindex@tricked} - \def\LWR@wrindex#1{% \ifbool{LWR@xindex}{% \ifbool{LWR@xindex@tricked}{}{% @@ -36580,9 +36629,13 @@ end -- not --version \def\LWR@tempone{#1}% }% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% - {\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% + {\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup% \@esphack% } @@ -43186,9 +43239,11 @@ color:\LWR@origpound\LWR@tempcolor% % \begin{macro}{\LWR@LwarpEnd} % Automatically sets up the \HTML-related actions for the start and end of the % document. +% \changes{v0.905}{2022/03/21}{Fixed \cs{LWR@LwarpEnd} hook order.} % \begin{macrocode} \AfterEndPreamble{\LWR@LwarpStart} \AtEndDocument{\LWR@LwarpEnd} +\DeclareHookRule{enddocument}{lwarp}{after}{legacy} % \end{macrocode} % \end{macro} % \end{macro} @@ -44502,7 +44557,73 @@ color:\LWR@origpound\LWR@tempcolor% % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{acronym}[2015/03/21] +\LWR@ProvidesPackagePass{acronym}[2020/04/17] +% \end{macrocode} + +% Simplifies for \HTML: +% \changes{v0.905}{2022/03/21}{\pkg{acronym}: Updated to v1.47.} +% \begin{macrocode} +\expandafter\def\csname AC@\AC@prefix{}@acro\endcsname#1[#2]#3{% + \ifAC@nolist% + \else% + \ifnum% + \ifAC@printonlyused 1% + \else\ifAC@printonlyreused 1% + \else 0\fi\fi% + =1\relax% + \ifnum% + \ifAC@printonlyused% + \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi% + \else\ifAC@printonlyreused% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi% + \else 0 \fi\fi% + =1\relax% + \item[\protect\AC@hypertarget{#1}{% + \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}% + }]\AC@hyperref[acro:#1]{#3}% + \ifAC@withpage% + \expandafter\ifx\csname r@acro:#1\endcsname\relax% + \PackageInfo{acronym}{% + Acronym #1 used in text but not spelled out in + full in text}% + \else% +% \nobreak\leaders\hbox{% +% $\m@th\mkern\@dotsep mu\hbox{.}\mkern\@dotsep mu$% +% }\hfill% +% \nobreak\hb@xt@\@pnumwidth{% +% \hfil\normalfont\normalcolor + \qquad --- % lwarp + \AC@pageref{acro:#1}% +% }% + \fi% + \fi\\% + \fi% + \else% + \item[\protect\AC@hypertarget{#1}{\AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]% + \AC@hyperref[acro:#1]{#3}% + \fi% + \fi% + \begingroup + \def\acroextra##1{}% + \@bsphack + \ifAC@printonlyreused% + \protected@write\@auxout{}{% + \string\newacro{#1}[% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used% + \string\AC@hyperlink{#1}{#2}% + \else% + {#2}% + \fi% + ]{#3}% + }% + \else% + \protected@write\@auxout{}{% + \string\newacro{#1}[\string\AC@hyperlink{#1}{#2}]{#3}% + }% + \fi% + \@esphack + \endgroup + \ignorespaces} % \end{macrocode} % Uses \cs{textit} instead of \cs{itshape}: @@ -44550,6 +44671,41 @@ color:\LWR@origpound\LWR@tempcolor% }% % \end{macrocode} +% Improve paragraph handling: +% \changes{v0.905}{2022/03/21}{\pkg{acronym}: Improved pars.} +% \begin{macrocode} +\BeforeBeginEnvironment{acronym}{\LWR@stoppars} +\AfterEndEnvironment{acronym}{\LWR@startpars} +% \end{macrocode} + +% Create hyperlinks, even though \pkg{hyperref} is only emulated: +% \changes{v0.905}{2022/03/21}{\pkg{acronym}: Add hyperlinks.} +% \begin{macrocode} +\AtBeginDocument{ + \LetLtxMacro\AC@hyperlink\hyperlink + \LetLtxMacro\AC@hyperref\hyperref + \newcommand*\AC@raisedhypertarget[2]{% +% \Hy@raisedlink{% + \hypertarget{#1}{}% +% }% + #2}% + \LetLtxMacro\AC@hypertarget\AC@raisedhypertarget + \def\AC@phantomsection{% +% \Hy@GlobalStepCount\Hy@linkcounter +% \edef\@currentHref{section*.\the \Hy@linkcounter}% +% \Hy@raisedlink{% +% \hyper@anchorstart{\@currentHref}\hyper@anchorend +% }% +% \phantomsection% + }% +} + +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\AC@hyperlink\@secondoftwo% + \LetLtxMacro\AC@hyperref\LWR@nullify@hyperref% +} +% \end{macrocode} + % \iffalse % % \fi @@ -49403,34 +49559,7 @@ s% } % \end{macrocode} -% Patch to fix bug for \pkg{cases} when used with \pkg{microtype}: -% \changes{v0.903}{2022/01/30}{\pkg{cases}: Updated to v3.2.} -% ^^A *88* Remove the following if microtype is fixed: -% \begin{macrocode} -\makeatletter -\begin{warpHTML} -\AtBeginDocument{ - \@ifpackageloaded{amsmath} - { - \xpatchcmd{\tagform@}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{tagform@ A}}% - \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{tagform@ B}}% - } - { - \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - }% -} -\end{warpHTML} -\makeatother -% \end{macrocode} +% \changes{v0.905}{2022/03/21}{\pkg{cases}: Removed \pkg{microtype} bug fix.} % % \iffalse @@ -62238,12 +62367,11 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % % Creates an \HTML\ link to |URL#category.name| with the given text. % -% To avoid nested links, \cs{ref} is temporarily redefined to the print version. % \begin{macrocode} \newcommand{\LWR@hyperreffinish}[1]{% \begingroup% \RenewDocumentCommand{\ref}{s m}{\LWR@print@ref{##2}}% - #1% + #1% \endgroup% \LWR@htmltag{/a}% } @@ -62272,7 +62400,6 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % % Creates text as an \HTML\ link to the \LaTeX\ label. % \begin{macrocode} - \NewDocumentCommand{\LWR@hyperrefcb}{O{label}}{% \LWR@startref{#1}% \endgroup% @@ -62354,6 +62481,32 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % \end{noindmacro} +% \begin{noindmacro}{\LWR@nullify@hyperref} +% \marg{1: URL} \marg{2: category} \marg{3: name} \marg{4: text} \quad ---\,or\,--- \\ +% \oarg{1: label} \marg{2: text} +% +% \begin{macrocode} +\newcommand{\LWR@nullify@hyperrefb}[2][]{} + +\newcommand*{\LWR@nullify@hyperref}{% + \@ifnextchar[\LWR@nullify@hyperrefb\@fourthoffour% +} +% \end{macrocode} +% \end{noindmacro} +% +% To nullify in a \env{lateximage} or \SVG\ math. +% \cs{hypertarget} must be left active for references to work, and does not harm. +% \changes{v0.905}{2022/03/21}{\pkg{hyperref}: Fix: No \HTML\ tags if math mode.} +% \begin{macrocode} +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\hyperdef\@thirdofthree + \LetLtxMacro\hyperlink\@secondoftwo% + \LetLtxMacro\hyperref\LWR@nullify@hyperref% +} +% \end{macrocode} + + + % \begin{noindmacro}{\autoref} * \marg{label} % % For \HTML, \cs{cleveref} is used instead. @@ -62967,17 +63120,25 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % writes the label's index instead of the page number: % \begin{macrocode} \renewcommand\imki@wrindexentrysplit[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \expandafter\protected@write\csname#1@idxfile\endcsname{}% - {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \expandafter\protected@write\csname#1@idxfile\endcsname{}% + {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% } \renewcommand\imki@wrindexentryunique[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \protected@write\@indexfile{}% - {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \protected@write\@indexfile{}% + {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% } \def\imki@wrindexsplit#1#2{% @@ -68489,7 +68650,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % \trouble[no effect]{maybemath=\pkg{maybemath}} % so all \pkg{maybemath} macros are ignored. % -% \changes{v0.0.895}{2021/01/08}{\pkg{maybemath}: Added.} +% \changes{v0.895}{2021/01/08}{\pkg{maybemath}: Added.} % % \codehtml % @@ -82457,13 +82618,17 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \csname index@#1@hook\endcsname % \expandafter\ifx\csname @@wrsindex\endcsname\relax \addtocounter{LWR@autoindex}{1}% lwarp - \label{LWRindex-\arabic{LWR@autoindex}}% lwarp % \@@@wrsindex{#1}{{\@tempa}{\thepage}}% - \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% + \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% % \else % \def\@tempb{\@@wrsindex{#1}}% % \expandafter\@tempb\@tempa||\\% % \fi +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \endgroup \@esphack \fi @@ -94408,12 +94573,16 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \AtBeginDocument{ \def\@@wrindexhyp#1||\\{% - \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% + \addtocounter{LWR@autoindex}{1}% lwarp % \ifshowindexmark\@showidx{#1}\fi \protected@write\@auxout{}% % {\string\@@wrindexm@m{\@idxfile}{#1}{\thepage}}% - {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% lwarp +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \endgroup \@esphack}% % \end{macrocode} @@ -94429,11 +94598,15 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \begin{macrocode} \def\@@wrspindexhyp#1||\\{% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% % \ifshowindexmark\@showidx{#1}\fi \protected@write\@auxout{}% % {\string\@@wrindexm@m{\@idxfile}{#1}{\@nameuse{the\@sptheidx}}}% {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% +% \end{macrocode} +% The label is assigned after the file write to avoid conflict with \pkg{cleveref}. +% \changes{v0.905}{2022/03/21}{Label after file write.} +% \begin{macrocode} + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup \@esphack}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty index 044b87dfe85..3c69b37319a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty @@ -16,7 +16,63 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{acronym}[2015/03/21] +\LWR@ProvidesPackagePass{acronym}[2020/04/17] + +\expandafter\def\csname AC@\AC@prefix{}@acro\endcsname#1[#2]#3{% + \ifAC@nolist% + \else% + \ifnum% + \ifAC@printonlyused 1% + \else\ifAC@printonlyreused 1% + \else 0\fi\fi% + =1\relax% + \ifnum% + \ifAC@printonlyused% + \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi% + \else\ifAC@printonlyreused% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi% + \else 0 \fi\fi% + =1\relax% + \item[\protect\AC@hypertarget{#1}{% + \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}% + }]\AC@hyperref[acro:#1]{#3}% + \ifAC@withpage% + \expandafter\ifx\csname r@acro:#1\endcsname\relax% + \PackageInfo{acronym}{% + Acronym #1 used in text but not spelled out in + full in text}% + \else% + \qquad --- % lwarp + \AC@pageref{acro:#1}% + \fi% + \fi\\% + \fi% + \else% + \item[\protect\AC@hypertarget{#1}{\AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]% + \AC@hyperref[acro:#1]{#3}% + \fi% + \fi% + \begingroup + \def\acroextra##1{}% + \@bsphack + \ifAC@printonlyreused% + \protected@write\@auxout{}{% + \string\newacro{#1}[% + \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used% + \string\AC@hyperlink{#1}{#2}% + \else% + {#2}% + \fi% + ]{#3}% + }% + \else% + \protected@write\@auxout{}{% + \string\newacro{#1}[\string\AC@hyperlink{#1}{#2}]{#3}% + }% + \fi% + \@esphack + \endgroup + \ignorespaces} \renewcommand{\acfia}[1]{% {\textit{\AC@acl{#1}}} (\ifAC@starred\acs*{#1}\else\acs{#1}\fi)} @@ -45,6 +101,25 @@ }% }% +\BeforeBeginEnvironment{acronym}{\LWR@stoppars} +\AfterEndEnvironment{acronym}{\LWR@startpars} + +\AtBeginDocument{ + \LetLtxMacro\AC@hyperlink\hyperlink + \LetLtxMacro\AC@hyperref\hyperref + \newcommand*\AC@raisedhypertarget[2]{% + \hypertarget{#1}{}% + #2}% + \LetLtxMacro\AC@hypertarget\AC@raisedhypertarget + \def\AC@phantomsection{% + }% +} + +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\AC@hyperlink\@secondoftwo% + \LetLtxMacro\AC@hyperref\LWR@nullify@hyperref% +} + \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty index 956f33eef28..e66156861d6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty @@ -38,29 +38,6 @@ \end{lateximage}\end{BlockClass} } -\makeatletter -\begin{warpHTML} -\AtBeginDocument{ - \@ifpackageloaded{amsmath} - { - \xpatchcmd{\tagform@}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{tagform@ A}}% - \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{tagform@ B}}% - } - { - \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)} - {} - {\LWR@patcherror{cases}{@eqnnum A}}% - }% -} -\end{warpHTML} -\makeatother \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index c0c8df88dbd..50865b64bb3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -317,7 +317,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand{\LWR@hyperreffinish}[1]{% \begingroup% \RenewDocumentCommand{\ref}{s m}{\LWR@print@ref{##2}}% - #1% + #1% \endgroup% \LWR@htmltag{/a}% } @@ -340,7 +340,6 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \LWR@hyperrefbb% } - \NewDocumentCommand{\LWR@hyperrefcb}{O{label}}{% \LWR@startref{#1}% \endgroup% @@ -384,6 +383,17 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \LWR@hyperlinkb% } +\newcommand{\LWR@nullify@hyperrefb}[2][]{} + +\newcommand*{\LWR@nullify@hyperref}{% + \@ifnextchar[\LWR@nullify@hyperrefb\@fourthoffour% +} +\appto\LWR@restoreorigformatting{% + \LetLtxMacro\hyperdef\@thirdofthree + \LetLtxMacro\hyperlink\@secondoftwo% + \LetLtxMacro\hyperref\LWR@nullify@hyperref% +} + \NewDocumentCommand{\autoref}{s m}{% \IfBooleanTF{#1}{\ref{#2}}{\cref{#2}}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty index 63be5b898de..bea655dedf9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty @@ -79,17 +79,17 @@ \LetLtxMacro\subsubitem\LWR@indexsubsubitem% } \renewcommand\imki@wrindexentrysplit[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \expandafter\protected@write\csname#1@idxfile\endcsname{}% - {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \expandafter\protected@write\csname#1@idxfile\endcsname{}% + {\string\indexentry{#2}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% } \renewcommand\imki@wrindexentryunique[3]{% -\addtocounter{LWR@autoindex}{1}% -\label{LWRindex-\arabic{LWR@autoindex}}% - \protected@write\@indexfile{}% - {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% + \addtocounter{LWR@autoindex}{1}% + \protected@write\@indexfile{}% + {\string\indexentry[#1]{#2}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% } \def\imki@wrindexsplit#1#2{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index 9044f663fa0..d46eb2a259f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -976,17 +976,17 @@ \AtBeginDocument{ \def\@@wrindexhyp#1||\\{% - \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% + \addtocounter{LWR@autoindex}{1}% lwarp \protected@write\@auxout{}% - {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% lwarp + \label{LWRindex-\arabic{LWR@autoindex}}% lwarp \endgroup \@esphack}% \def\@@wrspindexhyp#1||\\{% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@auxout{}% {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup \@esphack}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty index 9dc3ae00d47..0de4caeac02 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty @@ -37,8 +37,8 @@ \def\@tempa{#2}% \csname index@#1@hook\endcsname \addtocounter{LWR@autoindex}{1}% lwarp + \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% \label{LWRindex-\arabic{LWR@autoindex}}% lwarp - \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR@autoindex}}}% \endgroup \@esphack \fi diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 19cbcf8832c..ac519c67010 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} - [2022/03/16 v0.904a Allows LaTeX to directly produce HTML5 output.] + [2022/03/22 v0.905 Allows LaTeX to directly produce HTML5 output.] @@ -966,6 +966,9 @@ \LWR@origrule{0pt}{1\baselineskip}% \LWR@orignewline% } +\long\def\LWR@thirdofthree#1#2#3{#3}% +\long\def\LWR@fourthoffour#1#2#3#4{#4}% + \long\def\LWR@firstoffive#1#2#3#4#5{#1} \long\def\LWR@secondoffive#1#2#3#4#5{#2} \long\def\LWR@thirdoffive#1#2#3#4#5{#3} @@ -4854,7 +4857,7 @@ MathJax = { -- Copyright 2016-2022 Brian Dunn -printversion = "v0.904a" +printversion = "v0.905" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -6018,15 +6021,16 @@ end -- not --version \let\LWR@origampersand\& -\newrobustcmd*{\LWR@fontfortags}[1]{% +\newrobustcmd*{\LWR@fontfortags}[2]{% \ifmmode% \PackageError{lwarp}% {% An HTML tag was generated inside math.\MessageBreak This should never occur.\MessageBreak - Something is broken in Lwarp% + Something is broken in Lwarp.\MessageBreak + Enter `h' for details% }% - {(Using #1.)}% + {(Using #1{#2}.)}% \else% \ifdef{\romanencoding}% {% @@ -6045,7 +6049,7 @@ end -- not --version \newcommand*{\HTMLentity}[1]{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{HTMLentity}% + \LWR@fontfortags{HTMLentity}{\detokenize{#1}}% \protect\LWR@origampersand\LWR@isolate{#1};% \endgroup% } @@ -6419,7 +6423,7 @@ end -- not --version \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmltagc}% + \LWR@fontfortags{LWR@htmltagc}{\detokenize{#1}}% \protect\LWR@origtextless% \LWR@isolate{#1}% \protect\LWR@origtextgreater% @@ -6522,7 +6526,7 @@ end -- not --version \newcommand*{\LWR@htmlopencomment}{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWR@htmlopencomment}% + \LWR@fontfortags{LWR@htmlopencomment}{}% \LWR@print@mbox{\LWR@origtextless{}!-\/-}% \endgroup% } @@ -6530,7 +6534,7 @@ end -- not --version \newcommand*{\LWR@htmlclosecomment}{% \begingroup% \LWR@hook@processingtags% - \LWR@fontfortags{LWr@htmlclosecomment}% + \LWR@fontfortags{LWr@htmlclosecomment}{}% \LWR@print@mbox{-\/-\LWR@origtextgreater}% \endgroup% } @@ -11408,7 +11412,8 @@ end -- not --version \LWR@traceinfo{LWR@myshorttoc: loading}% \begingroup% \makeatletter% - \LWR@disablepinyin% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% \@input{\jobname.#1}% \endgroup% }% @@ -11438,7 +11443,7 @@ end -- not --version \boolfalse{LWR@copiedsidetoc} \AtBeginDocument{ -\let\LWR@origtableofcontents\tableofcontents +\LetLtxMacro\LWR@origtableofcontents\tableofcontents \renewcommand*{\tableofcontents}{% \ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{ @@ -11452,7 +11457,11 @@ end -- not --version \booltrue{LWR@copiedsidetoc}% }% \LWR@printpendingfootnotes - \LWR@origtableofcontents + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origtableofcontents% + \endgroup% } }% \tableofcontents @@ -11468,7 +11477,11 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoffigures + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoffigures% + \endgroup% } } @@ -11482,7 +11495,11 @@ end -- not --version } { \LWR@printpendingfootnotes - \LWR@origlistoftables + \begingroup% + \LetLtxMacro\ref\LWR@print@ref% + \LWR@disablepinyin% + \LWR@origlistoftables% + \endgroup% } } @@ -11712,9 +11729,9 @@ end -- not --version \def\LWR@tempone{#1}% }% \addtocounter{LWR@autoindex}{1}% - \label{LWRindex-\arabic{LWR@autoindex}}% \protected@write\@indexfile{}% - {\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% +{\string\indexentry{\LWR@tempone}{\arabic{LWR@autoindex}}}% + \label{LWRindex-\arabic{LWR@autoindex}}% \endgroup% \@esphack% } @@ -14582,6 +14599,7 @@ color:\LWR@origpound\LWR@tempcolor% \AfterEndPreamble{\LWR@LwarpStart} \AtEndDocument{\LWR@LwarpEnd} +\DeclareHookRule{enddocument}{lwarp}{after}{legacy} \end{warpHTML} -- cgit v1.2.3