texlive[62952] trunk: lwarp (22mar22)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 6 00:17:17 CEST 2022
Revision: 62952
http://tug.org/svn/texlive?view=revision&revision=62952
Author: karl
Date: 2022-04-06 00:17:17 +0200 (Wed, 06 Apr 2022)
Log Message:
-----------
lwarp (22mar22)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
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-acronym.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2022-04-05 22:17:17 UTC (rev 62952)
@@ -2,7 +2,7 @@
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.904a"
+printversion = "v0.905"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2022-04-05 22:17:17 UTC (rev 62952)
@@ -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 @@
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 @@
distribution (L<https://tug.org/texlive>) 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
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2022-04-05 22:17:17 UTC (rev 62952)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.904a README.txt
+LaTeX lwarp package v0.905 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 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2022-04-05 22:17:17 UTC (rev 62952)
@@ -2,7 +2,7 @@
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.904a"
+printversion = "v0.905"
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 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2022-04-05 22:17:17 UTC (rev 62952)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2022/03/16 v0.904a Allows LaTeX to directly produce HTML5 output.]
+%<package> [2022/03/22 v0.905 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -3246,7 +3246,7 @@
%<*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 @@
% \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 @@
% 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 @@
%
% \subsection{Argument selection}
%
+% \changes{v0.905}{2022/03/21}{Added last of three, four.}
+% \begin{macro}{\LWR at thirdofthree} \marg{first} \marg{second} \marg{third}
+% \begin{macro}{\LWR at fourthoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
% \begin{macro}{\LWR at 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 @@
% Used for extra cross referencing.
%
% \begin{macrocode}
+\long\def\LWR at thirdofthree#1#2#3{#3}%
+\long\def\LWR at fourthoffour#1#2#3#4{#4}%
+
\long\def\LWR at firstoffive#1#2#3#4#5{#1}
\long\def\LWR at secondoffive#1#2#3#4#5{#2}
\long\def\LWR at thirdoffive#1#2#3#4#5{#3}
@@ -14484,6 +14497,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
%
% \subsection{Inside boxes}
@@ -21005,7 +21020,7 @@
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.904a"
+printversion = "v0.905"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -22509,20 +22524,21 @@
% \end{macrocode}
-% \begin{macro}{\LWR at fontfortags} \marg{macro name}
+% \begin{macro}{\LWR at 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 at fontfortags}[1]{%
+\newrobustcmd*{\LWR at 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 @@
% \LWR at traceinfo{HTMLentity \detokenize{#1}}%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{HTMLentity}%
+ \LWR at fontfortags{HTMLentity}{\detokenize{#1}}%
\protect\LWR at origampersand\LWR at isolate{#1};%
\endgroup%
% \LWR at traceinfo{HTMLentity done}%
@@ -23427,7 +23443,7 @@
\LWR at traceinfo{LWR at htmltagc !\detokenize{#1}!}%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWR at htmltagc}%
+ \LWR at fontfortags{LWR at htmltagc}{\detokenize{#1}}%
\protect\LWR at origtextless%
\LWR at isolate{#1}%
\protect\LWR at origtextgreater%
@@ -23611,7 +23627,7 @@
% \LWR at traceinfo{LWR at htmlopencomment}%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWR at htmlopencomment}%
+ \LWR at fontfortags{LWR at htmlopencomment}{}%
\LWR at print@mbox{\LWR at origtextless{}!-\/-}%
\endgroup%
}
@@ -23620,7 +23636,7 @@
% \LWR at traceinfo{LWR at htmlclosecomment}%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWr at htmlclosecomment}%
+ \LWR at fontfortags{LWr at htmlclosecomment}{}%
\LWR at print@mbox{-\/-\LWR at origtextgreater}%
\endgroup%
}
@@ -35889,9 +35905,11 @@
\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 at disablepinyin%
+ \LetLtxMacro\ref\LWR at print@ref%
+ \LWR at disablepinyin%
% \end{macrocode}
%
% Read in the \TOC\ file:
@@ -35979,7 +35997,7 @@
% \begin{macrocode}
\AtBeginDocument{
-\let\LWR at origtableofcontents\tableofcontents
+\LetLtxMacro\LWR at origtableofcontents\tableofcontents
\renewcommand*{\tableofcontents}{%
% \end{macrocode}
@@ -36002,7 +36020,16 @@
\booltrue{LWR at copiedsidetoc}%
}%
\LWR at printpendingfootnotes
- \LWR at 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 at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origtableofcontents%
+ \endgroup%
}
}% \tableofcontents
@@ -36023,7 +36050,16 @@
}
{
\LWR at printpendingfootnotes
- \LWR at 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 at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origlistoffigures%
+ \endgroup%
}
}
% \end{macrocode}
@@ -36042,7 +36078,16 @@
}
{
\LWR at printpendingfootnotes
- \LWR at 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 at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origlistoftables%
+ \endgroup%
}
}
% \end{macrocode}
@@ -36513,6 +36558,7 @@
% \end{macro}
+
% \begin{macro}{\LWR at xindex@modifyentry} \marg{indexing term}
%
% If using \prog{xindex}, modifies the pipe character to become \cs{hyperindexformat}.
@@ -36551,7 +36597,13 @@
% \end{macrocode}
% \end{macro}
+% \DescribeBoolean{LWR at xindex@tricked} Used to track \pkg{xindex} creation. See next.
+% \begin{macrocode}
+\newbool{LWR at xindex@tricked}
+\boolfalse{LWR at xindex@tricked}
+% \end{macrocode}
+
% \begin{macro}{\@wrindex} \marg{indexing term} \qquad
% Redefined to write the |LWR at autoindex| counter instead of |page|.
%
@@ -36562,9 +36614,6 @@
% \changes{v0.28}{2017/04/13}{Improved indexing.}
% \changes{v0.88}{2020/07/12}{Added support for \prog{xindex}.}
% \begin{macrocode}
-\newbool{LWR at xindex@tricked}
-\boolfalse{LWR at xindex@tricked}
-
\def\LWR at wrindex#1{%
\ifbool{LWR at xindex}{%
\ifbool{LWR at xindex@tricked}{}{%
@@ -36580,9 +36629,13 @@
\def\LWR at tempone{#1}%
}%
\addtocounter{LWR at autoindex}{1}%
+ \protected at write\@indexfile{}%
+ {\string\indexentry{\LWR at tempone}{\arabic{LWR at 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 at autoindex}}%
- \protected at write\@indexfile{}%
- {\string\indexentry{\LWR at tempone}{\arabic{LWR at autoindex}}}%
\endgroup%
\@esphack%
}
@@ -43186,9 +43239,11 @@
% \begin{macro}{\LWR at 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 at LwarpEnd} hook order.}
% \begin{macrocode}
\AfterEndPreamble{\LWR at LwarpStart}
\AtEndDocument{\LWR at LwarpEnd}
+\DeclareHookRule{enddocument}{lwarp}{after}{legacy}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -44502,9 +44557,75 @@
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{acronym}[2015/03/21]
+\LWR at 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 at prefix{}@acro\endcsname#1[#2]#3{%
+ \ifAC at nolist%
+ \else%
+ \ifnum%
+ \ifAC at printonlyused 1%
+ \else\ifAC at printonlyreused 1%
+ \else 0\fi\fi%
+ =1\relax%
+ \ifnum%
+ \ifAC at printonlyused%
+ \expandafter\ifx\csname acused@#1 at once\endcsname\AC at used 1 \else 0 \fi%
+ \else\ifAC at printonlyreused%
+ \expandafter\ifx\csname acused@#1 at twice\endcsname\AC at used 1 \else 0 \fi%
+ \else 0 \fi\fi%
+ =1\relax%
+ \item[\protect\AC at hypertarget{#1}{%
+ \AC at hyperref[acro:#1]{\aclabelfont{#2}\hfill}%
+ }]\AC at hyperref[acro:#1]{#3}%
+ \ifAC at withpage%
+ \expandafter\ifx\csname r at acro:#1\endcsname\relax%
+ \PackageInfo{acronym}{%
+ Acronym #1 used in text but not spelled out in
+ full in text}%
+ \else%
+% \nobreak\leaders\hbox{%
+% $\m at th\mkern\@dotsep mu\hbox{.}\mkern\@dotsep mu$%
+% }\hfill%
+% \nobreak\hb at xt@\@pnumwidth{%
+% \hfil\normalfont\normalcolor
+ \qquad --- % lwarp
+ \AC at pageref{acro:#1}%
+% }%
+ \fi%
+ \fi\\%
+ \fi%
+ \else%
+ \item[\protect\AC at hypertarget{#1}{\AC at hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]%
+ \AC at hyperref[acro:#1]{#3}%
+ \fi%
+ \fi%
+ \begingroup
+ \def\acroextra##1{}%
+ \@bsphack
+ \ifAC at printonlyreused%
+ \protected at write\@auxout{}{%
+ \string\newacro{#1}[%
+ \expandafter\ifx\csname acused@#1 at twice\endcsname\AC at used%
+ \string\AC at hyperlink{#1}{#2}%
+ \else%
+ {#2}%
+ \fi%
+ ]{#3}%
+ }%
+ \else%
+ \protected at write\@auxout{}{%
+ \string\newacro{#1}[\string\AC at hyperlink{#1}{#2}]{#3}%
+ }%
+ \fi%
+ \@esphack
+ \endgroup
+ \ignorespaces}
+% \end{macrocode}
+
% Uses \cs{textit} instead of \cs{itshape}:
% \begin{macrocode}
\renewcommand{\acfia}[1]{%
@@ -44550,6 +44671,41 @@
}%
% \end{macrocode}
+% Improve paragraph handling:
+% \changes{v0.905}{2022/03/21}{\pkg{acronym}: Improved pars.}
+% \begin{macrocode}
+\BeforeBeginEnvironment{acronym}{\LWR at stoppars}
+\AfterEndEnvironment{acronym}{\LWR at 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 at hyperlink\hyperlink
+ \LetLtxMacro\AC at hyperref\hyperref
+ \newcommand*\AC at raisedhypertarget[2]{%
+% \Hy at raisedlink{%
+ \hypertarget{#1}{}%
+% }%
+ #2}%
+ \LetLtxMacro\AC at hypertarget\AC at raisedhypertarget
+ \def\AC at phantomsection{%
+% \Hy at GlobalStepCount\Hy at linkcounter
+% \edef\@currentHref{section*.\the \Hy at linkcounter}%
+% \Hy at raisedlink{%
+% \hyper at anchorstart{\@currentHref}\hyper at anchorend
+% }%
+% \phantomsection%
+ }%
+}
+
+\appto\LWR at restoreorigformatting{%
+ \LetLtxMacro\AC at hyperlink\@secondoftwo%
+ \LetLtxMacro\AC at hyperref\LWR at nullify@hyperref%
+}
+% \end{macrocode}
+
% \iffalse
%</acronym>
% \fi
@@ -49403,34 +49559,7 @@
}
% \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 at patcherror{cases}{tagform@ A}}%
- \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)}
- {}
- {\LWR at patcherror{cases}{tagform@ B}}%
- }
- {
- \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(}
- {}
- {\LWR at patcherror{cases}{@eqnnum A}}%
- \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)}
- {}
- {\LWR at 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 @@
%
% 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 at hyperreffinish}[1]{%
\begingroup%
\RenewDocumentCommand{\ref}{s m}{\LWR at print@ref{##2}}%
- #1%
+ #1%
\endgroup%
\LWR at htmltag{/a}%
}
@@ -62272,7 +62400,6 @@
%
% Creates text as an \HTML\ link to the \LaTeX\ label.
% \begin{macrocode}
-
\NewDocumentCommand{\LWR at hyperrefcb}{O{label}}{%
\LWR at startref{#1}%
\endgroup%
@@ -62354,6 +62481,32 @@
% \end{noindmacro}
+% \begin{noindmacro}{\LWR at 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 at nullify@hyperrefb}[2][]{}
+
+\newcommand*{\LWR at nullify@hyperref}{%
+ \@ifnextchar[\LWR at 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 at restoreorigformatting{%
+ \LetLtxMacro\hyperdef\@thirdofthree
+ \LetLtxMacro\hyperlink\@secondoftwo%
+ \LetLtxMacro\hyperref\LWR at nullify@hyperref%
+}
+% \end{macrocode}
+
+
+
% \begin{noindmacro}{\autoref} * \marg{label}
%
% For \HTML, \cs{cleveref} is used instead.
@@ -62967,17 +63120,25 @@
% writes the label's index instead of the page number:
% \begin{macrocode}
\renewcommand\imki at wrindexentrysplit[3]{%
-\addtocounter{LWR at autoindex}{1}%
-\label{LWRindex-\arabic{LWR at autoindex}}%
- \expandafter\protected at write\csname#1 at idxfile\endcsname{}%
- {\string\indexentry{#2}{\arabic{LWR at autoindex}}}%
+ \addtocounter{LWR at autoindex}{1}%
+ \expandafter\protected at write\csname#1 at idxfile\endcsname{}%
+ {\string\indexentry{#2}{\arabic{LWR at 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 at autoindex}}%
}
\renewcommand\imki at wrindexentryunique[3]{%
-\addtocounter{LWR at autoindex}{1}%
-\label{LWRindex-\arabic{LWR at autoindex}}%
- \protected at write\@indexfile{}%
- {\string\indexentry[#1]{#2}{\arabic{LWR at autoindex}}}%
+ \addtocounter{LWR at autoindex}{1}%
+ \protected at write\@indexfile{}%
+ {\string\indexentry[#1]{#2}{\arabic{LWR at 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 at autoindex}}%
}
\def\imki at wrindexsplit#1#2{%
@@ -68489,7 +68650,7 @@
% \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 @@
\csname index@#1 at hook\endcsname
% \expandafter\ifx\csname @@wrsindex\endcsname\relax
\addtocounter{LWR at autoindex}{1}% lwarp
- \label{LWRindex-\arabic{LWR at autoindex}}% lwarp
% \@@@wrsindex{#1}{{\@tempa}{\thepage}}%
- \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR at autoindex}}}%
+ \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR at 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 at autoindex}}% lwarp
\endgroup
\@esphack
\fi
@@ -94408,12 +94573,16 @@
\AtBeginDocument{
\def\@@wrindexhyp#1||\\{%
- \addtocounter{LWR at autoindex}{1}%
- \label{LWRindex-\arabic{LWR at autoindex}}%
+ \addtocounter{LWR at autoindex}{1}% lwarp
% \ifshowindexmark\@showidx{#1}\fi
\protected at write\@auxout{}%
% {\string\@@wrindexm at m{\@idxfile}{#1}{\thepage}}%
- {\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at autoindex}}}%
+ {\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at 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 at autoindex}}% lwarp
\endgroup
\@esphack}%
% \end{macrocode}
@@ -94429,11 +94598,15 @@
% \begin{macrocode}
\def\@@wrspindexhyp#1||\\{%
\addtocounter{LWR at autoindex}{1}%
- \label{LWRindex-\arabic{LWR at autoindex}}%
% \ifshowindexmark\@showidx{#1}\fi
\protected at write\@auxout{}%
% {\string\@@wrindexm at m{\@idxfile}{#1}{\@nameuse{the\@sptheidx}}}%
{\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at 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 at autoindex}}%
\endgroup
\@esphack}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -16,8 +16,64 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR at ProvidesPackagePass{acronym}[2015/03/21]
+\LWR at ProvidesPackagePass{acronym}[2020/04/17]
+\expandafter\def\csname AC@\AC at prefix{}@acro\endcsname#1[#2]#3{%
+ \ifAC at nolist%
+ \else%
+ \ifnum%
+ \ifAC at printonlyused 1%
+ \else\ifAC at printonlyreused 1%
+ \else 0\fi\fi%
+ =1\relax%
+ \ifnum%
+ \ifAC at printonlyused%
+ \expandafter\ifx\csname acused@#1 at once\endcsname\AC at used 1 \else 0 \fi%
+ \else\ifAC at printonlyreused%
+ \expandafter\ifx\csname acused@#1 at twice\endcsname\AC at used 1 \else 0 \fi%
+ \else 0 \fi\fi%
+ =1\relax%
+ \item[\protect\AC at hypertarget{#1}{%
+ \AC at hyperref[acro:#1]{\aclabelfont{#2}\hfill}%
+ }]\AC at hyperref[acro:#1]{#3}%
+ \ifAC at withpage%
+ \expandafter\ifx\csname r at acro:#1\endcsname\relax%
+ \PackageInfo{acronym}{%
+ Acronym #1 used in text but not spelled out in
+ full in text}%
+ \else%
+ \qquad --- % lwarp
+ \AC at pageref{acro:#1}%
+ \fi%
+ \fi\\%
+ \fi%
+ \else%
+ \item[\protect\AC at hypertarget{#1}{\AC at hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]%
+ \AC at hyperref[acro:#1]{#3}%
+ \fi%
+ \fi%
+ \begingroup
+ \def\acroextra##1{}%
+ \@bsphack
+ \ifAC at printonlyreused%
+ \protected at write\@auxout{}{%
+ \string\newacro{#1}[%
+ \expandafter\ifx\csname acused@#1 at twice\endcsname\AC at used%
+ \string\AC at hyperlink{#1}{#2}%
+ \else%
+ {#2}%
+ \fi%
+ ]{#3}%
+ }%
+ \else%
+ \protected at write\@auxout{}{%
+ \string\newacro{#1}[\string\AC at hyperlink{#1}{#2}]{#3}%
+ }%
+ \fi%
+ \@esphack
+ \endgroup
+ \ignorespaces}
+
\renewcommand{\acfia}[1]{%
{\textit{\AC at acl{#1}}} (\ifAC at starred\acs*{#1}\else\acs{#1}\fi)}
@@ -45,7 +101,26 @@
}%
}%
+\BeforeBeginEnvironment{acronym}{\LWR at stoppars}
+\AfterEndEnvironment{acronym}{\LWR at startpars}
+\AtBeginDocument{
+ \LetLtxMacro\AC at hyperlink\hyperlink
+ \LetLtxMacro\AC at hyperref\hyperref
+ \newcommand*\AC at raisedhypertarget[2]{%
+ \hypertarget{#1}{}%
+ #2}%
+ \LetLtxMacro\AC at hypertarget\AC at raisedhypertarget
+ \def\AC at phantomsection{%
+ }%
+}
+
+\appto\LWR at restoreorigformatting{%
+ \LetLtxMacro\AC at hyperlink\@secondoftwo%
+ \LetLtxMacro\AC at hyperref\LWR at nullify@hyperref%
+}
+
+
\endinput
%%
%% End of file `lwarp-acronym.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -38,29 +38,6 @@
\end{lateximage}\end{BlockClass}
}
-\makeatletter
-\begin{warpHTML}
-\AtBeginDocument{
- \@ifpackageloaded{amsmath}
- {
- \xpatchcmd{\tagform@}{\leftprotrusion{(}}{(}
- {}
- {\LWR at patcherror{cases}{tagform@ A}}%
- \xpatchcmd{\tagform@}{\rightprotrusion{)}}{)}
- {}
- {\LWR at patcherror{cases}{tagform@ B}}%
- }
- {
- \xpatchcmd{\@eqnnum}{\leftprotrusion{(}}{(}
- {}
- {\LWR at patcherror{cases}{@eqnnum A}}%
- \xpatchcmd{\@eqnnum}{\rightprotrusion{)}}{)}
- {}
- {\LWR at patcherror{cases}{@eqnnum A}}%
- }%
-}
-\end{warpHTML}
-\makeatother
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -317,7 +317,7 @@
\newcommand{\LWR at hyperreffinish}[1]{%
\begingroup%
\RenewDocumentCommand{\ref}{s m}{\LWR at print@ref{##2}}%
- #1%
+ #1%
\endgroup%
\LWR at htmltag{/a}%
}
@@ -340,7 +340,6 @@
\LWR at hyperrefbb%
}
-
\NewDocumentCommand{\LWR at hyperrefcb}{O{label}}{%
\LWR at startref{#1}%
\endgroup%
@@ -384,6 +383,17 @@
\LWR at hyperlinkb%
}
+\newcommand{\LWR at nullify@hyperrefb}[2][]{}
+
+\newcommand*{\LWR at nullify@hyperref}{%
+ \@ifnextchar[\LWR at nullify@hyperrefb\@fourthoffour%
+}
+\appto\LWR at restoreorigformatting{%
+ \LetLtxMacro\hyperdef\@thirdofthree
+ \LetLtxMacro\hyperlink\@secondoftwo%
+ \LetLtxMacro\hyperref\LWR at nullify@hyperref%
+}
+
\NewDocumentCommand{\autoref}{s m}{%
\IfBooleanTF{#1}{\ref{#2}}{\cref{#2}}%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -79,17 +79,17 @@
\LetLtxMacro\subsubitem\LWR at indexsubsubitem%
}
\renewcommand\imki at wrindexentrysplit[3]{%
-\addtocounter{LWR at autoindex}{1}%
-\label{LWRindex-\arabic{LWR at autoindex}}%
- \expandafter\protected at write\csname#1 at idxfile\endcsname{}%
- {\string\indexentry{#2}{\arabic{LWR at autoindex}}}%
+ \addtocounter{LWR at autoindex}{1}%
+ \expandafter\protected at write\csname#1 at idxfile\endcsname{}%
+ {\string\indexentry{#2}{\arabic{LWR at autoindex}}}%
+ \label{LWRindex-\arabic{LWR at autoindex}}%
}
\renewcommand\imki at wrindexentryunique[3]{%
-\addtocounter{LWR at autoindex}{1}%
-\label{LWRindex-\arabic{LWR at autoindex}}%
- \protected at write\@indexfile{}%
- {\string\indexentry[#1]{#2}{\arabic{LWR at autoindex}}}%
+ \addtocounter{LWR at autoindex}{1}%
+ \protected at write\@indexfile{}%
+ {\string\indexentry[#1]{#2}{\arabic{LWR at autoindex}}}%
+ \label{LWRindex-\arabic{LWR at autoindex}}%
}
\def\imki at wrindexsplit#1#2{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -976,17 +976,17 @@
\AtBeginDocument{
\def\@@wrindexhyp#1||\\{%
- \addtocounter{LWR at autoindex}{1}%
- \label{LWRindex-\arabic{LWR at autoindex}}%
+ \addtocounter{LWR at autoindex}{1}% lwarp
\protected at write\@auxout{}%
- {\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at autoindex}}}%
+ {\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at autoindex}}}% lwarp
+ \label{LWRindex-\arabic{LWR at autoindex}}% lwarp
\endgroup
\@esphack}%
\def\@@wrspindexhyp#1||\\{%
\addtocounter{LWR at autoindex}{1}%
- \label{LWRindex-\arabic{LWR at autoindex}}%
\protected at write\@auxout{}%
{\string\@@wrindexm at m{\@idxfile}{#1}{\arabic{LWR at autoindex}}}%
+ \label{LWRindex-\arabic{LWR at autoindex}}%
\endgroup
\@esphack}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -37,8 +37,8 @@
\def\@tempa{#2}%
\csname index@#1 at hook\endcsname
\addtocounter{LWR at autoindex}{1}% lwarp
+ \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR at autoindex}}}%
\label{LWRindex-\arabic{LWR at autoindex}}% lwarp
- \@@@wrsindex{#1}{{\@tempa}{\arabic{LWR at autoindex}}}%
\endgroup
\@esphack
\fi
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2022-04-05 22:16:07 UTC (rev 62951)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2022-04-05 22:17:17 UTC (rev 62952)
@@ -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 at origrule{0pt}{1\baselineskip}%
\LWR at orignewline%
}
+\long\def\LWR at thirdofthree#1#2#3{#3}%
+\long\def\LWR at fourthoffour#1#2#3#4{#4}%
+
\long\def\LWR at firstoffive#1#2#3#4#5{#1}
\long\def\LWR at secondoffive#1#2#3#4#5{#2}
\long\def\LWR at thirdoffive#1#2#3#4#5{#3}
@@ -4854,7 +4857,7 @@
-- Copyright 2016-2022 Brian Dunn
-printversion = "v0.904a"
+printversion = "v0.905"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -6018,15 +6021,16 @@
\let\LWR at origampersand\&
-\newrobustcmd*{\LWR at fontfortags}[1]{%
+\newrobustcmd*{\LWR at 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 @@
\newcommand*{\HTMLentity}[1]{%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{HTMLentity}%
+ \LWR at fontfortags{HTMLentity}{\detokenize{#1}}%
\protect\LWR at origampersand\LWR at isolate{#1};%
\endgroup%
}
@@ -6419,7 +6423,7 @@
\LWR at traceinfo{LWR at htmltagc !\detokenize{#1}!}%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWR at htmltagc}%
+ \LWR at fontfortags{LWR at htmltagc}{\detokenize{#1}}%
\protect\LWR at origtextless%
\LWR at isolate{#1}%
\protect\LWR at origtextgreater%
@@ -6522,7 +6526,7 @@
\newcommand*{\LWR at htmlopencomment}{%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWR at htmlopencomment}%
+ \LWR at fontfortags{LWR at htmlopencomment}{}%
\LWR at print@mbox{\LWR at origtextless{}!-\/-}%
\endgroup%
}
@@ -6530,7 +6534,7 @@
\newcommand*{\LWR at htmlclosecomment}{%
\begingroup%
\LWR at hook@processingtags%
- \LWR at fontfortags{LWr at htmlclosecomment}%
+ \LWR at fontfortags{LWr at htmlclosecomment}{}%
\LWR at print@mbox{-\/-\LWR at origtextgreater}%
\endgroup%
}
@@ -11408,7 +11412,8 @@
\LWR at traceinfo{LWR at myshorttoc: loading}%
\begingroup%
\makeatletter%
- \LWR at disablepinyin%
+ \LetLtxMacro\ref\LWR at print@ref%
+ \LWR at disablepinyin%
\@input{\jobname.#1}%
\endgroup%
}%
@@ -11438,7 +11443,7 @@
\boolfalse{LWR at copiedsidetoc}
\AtBeginDocument{
-\let\LWR at origtableofcontents\tableofcontents
+\LetLtxMacro\LWR at origtableofcontents\tableofcontents
\renewcommand*{\tableofcontents}{%
\ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
@@ -11452,7 +11457,11 @@
\booltrue{LWR at copiedsidetoc}%
}%
\LWR at printpendingfootnotes
- \LWR at origtableofcontents
+ \begingroup%
+ \LetLtxMacro\ref\LWR at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origtableofcontents%
+ \endgroup%
}
}% \tableofcontents
@@ -11468,7 +11477,11 @@
}
{
\LWR at printpendingfootnotes
- \LWR at origlistoffigures
+ \begingroup%
+ \LetLtxMacro\ref\LWR at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origlistoffigures%
+ \endgroup%
}
}
@@ -11482,7 +11495,11 @@
}
{
\LWR at printpendingfootnotes
- \LWR at origlistoftables
+ \begingroup%
+ \LetLtxMacro\ref\LWR at print@ref%
+ \LWR at disablepinyin%
+ \LWR at origlistoftables%
+ \endgroup%
}
}
@@ -11712,9 +11729,9 @@
\def\LWR at tempone{#1}%
}%
\addtocounter{LWR at autoindex}{1}%
+ \protected at write\@indexfile{}%
+{\string\indexentry{\LWR at tempone}{\arabic{LWR at autoindex}}}%
\label{LWRindex-\arabic{LWR at autoindex}}%
- \protected at write\@indexfile{}%
- {\string\indexentry{\LWR at tempone}{\arabic{LWR at autoindex}}}%
\endgroup%
\@esphack%
}
@@ -14582,6 +14599,7 @@
\AfterEndPreamble{\LWR at LwarpStart}
\AtEndDocument{\LWR at LwarpEnd}
+\DeclareHookRule{enddocument}{lwarp}{after}{legacy}
\end{warpHTML}
More information about the tex-live-commits
mailing list.