texlive[74332] Master/texmf-dist: no page breaks in
commits+karl at tug.org
commits+karl at tug.org
Thu Feb 27 22:16:54 CET 2025
Revision: 74332
https://tug.org/svn/texlive?view=revision&revision=74332
Author: karl
Date: 2025-02-27 22:16:53 +0100 (Thu, 27 Feb 2025)
Log Message:
-----------
no page breaks in \Configure{MathClass}, tex4ht r1652; correct destinations for list of listings, tex4ht r1653
Revision Links:
--------------
https://tug.org/svn/texlive?view=revision&revision=1652
https://tug.org/svn/texlive?view=revision&revision=1653
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2025-02-27 20:16:34 UTC (rev 74331)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2025-02-27 21:16:53 UTC (rev 74332)
@@ -1,3 +1,14 @@
+2025-02-27 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (listings.4ht): use correct destinations for links
+ in list of listings.
+ https://tug.org/pipermail/tex4ht/2025q1/003697.html
+
+ * tex4ht-sty.tex (tex4ht.sty): don't add page breaks in
+ \Configure{MathClass}. It prevents writing to the aux file for the
+ Acronym package.
+ https://tex.stackexchange.com/a/737993/2891
+
2025-02-26 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-mathml.tex (mathml.4ht): declare formatting for \sin etc.
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2025-02-27 20:16:34 UTC (rev 74331)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2025-02-27 21:16:53 UTC (rev 74332)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1649 2025-02-25 12:30:36Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1653 2025-02-27 14:02:06Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2025 TeX Users Group
@@ -34175,14 +34175,23 @@
of \Verb|\addcontentsline| which can then be used to write the correct TOC
information to the .4tc file.
+The contents line will point to the listings environment. We expect that the environment
+will have id in the form of listing-<number>, where <number> is the number of the listing.
+The \Verb|\listingN| counter is updated after the contents line is written, so we need
+to increase it locally.
+
+\<next listings id\><<<
+listing-\the\numexpr\listingN+1\relax>>>
+
\<listings list of\><<<
\def\lst:newaddcontentsline#1#2#3{\gHAdvance\TitleCount by 1
{\protect:wrtoc%
+ \Tag{)Q|<next listings id|>}{\FileNumber}% write listings id to the xref file, so it can be used in links
\protected at edef\:temp{#3}%
\protected at edef\:temp{\the\:tokwrite{\string\doTocEntry%
\string\toclol% identify this entry as list of listings
{\thetable}{\string\csname\space a:TocLink\string\endcsname%
- {\FileNumber}{\cur:th \:currentlabel}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}%
+ {\FileNumber}{|<next listings id|>}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}%
{}\relax}}\:temp%
}}%
>>>
@@ -34195,8 +34204,6 @@
\let\addcontentsline\lst:newaddcontentsline%
}
\append:defI\lst at MakeCaption{%
- % insert destination ID for the list of listings
- \Link{}{\cur:th\:currentlabel}\EndLink
\let\addcontentsline\lst:addcontentsline
}
>>>
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex 2025-02-27 20:16:34 UTC (rev 74331)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex 2025-02-27 21:16:53 UTC (rev 74332)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-sty.tex 1635 2025-02-03 09:13:19Z michal_h21 $
+% $Id: tex4ht-sty.tex 1652 2025-02-27 12:28:37Z michal_h21 $
% tex tex4ht-sty or ht tex tex4ht-sty
%
% Copyright 2009-2022 TeX Users Group
@@ -9252,7 +9252,7 @@
\vbox{$${\ht:special
{t4ht\string^#1}{#5}^{{#5}^{#5}}\ht:special{t4ht\string^}}$$}\egroup
\fi
- {\everypar{}\noindent\vfill\break}%
+ |<math dummy paragraph|>%
\ht:special{t4ht@]}\EndNoFonts
}
\NewConfigure{MathDelimiters}[2]{\NoFonts \ht:special{t4ht@[}%
@@ -9269,14 +9269,26 @@
\ht:special{t4ht\string^4}{}^{{}^{#1}}\ht:special
{t4ht\string^5}{}^{{}^{#2}}%
\ht:special{t4ht\string^}}$$}%
- {\everypar{}\noindent\vfill\break}%
+ |<math dummy paragraph|>%
\ht:special{t4ht@]}\egroup
\EndNoFonts}
\catcode`\^=12
>>>
+I am not sure why the following code was used in the original code for math classes.
+It forces new pages during the .4ht file processing, which leads to problems if some
+packages want to write some information to the aux file. I've found this isssue
+\Link[https://tex.stackexchange.com/a/737993/2891]{}{}this bug report\EndLink.
+\<math dummy paragraph do not use\><<<
+{\everypar{}\noindent\vfill\break}
+>>>
+So instead, we just use a paragraph. It seems to work fine with math class definitions.
+
+\<math dummy paragraph\><<<
+{\everypar{}\noindent}>>>
+
\<math classes\><<<
\HAssign\New:MathClass|=7
\catcode`\/=0
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht 2025-02-27 20:16:34 UTC (rev 74331)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht 2025-02-27 21:16:53 UTC (rev 74332)
@@ -1,4 +1,4 @@
-% listings.4ht (2025-02-20-13:18), generated from tex4ht-4ht.tex
+% listings.4ht (2025-02-27-12:30), generated from tex4ht-4ht.tex
% Copyright 2001-2009 Eitan M. Gurari
% Copyright 2009-2025 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2025-02-20-13:18}
+\immediate\write-1{version 2025-02-27-12:30}
\@ifpackageloaded{xcolor}{}{%
\RequirePackage{xcolor}
@@ -101,11 +101,12 @@
\def\lst:newaddcontentsline#1#2#3{\gHAdvance\TitleCount by 1
{\protect:wrtoc%
+ \Tag{)Qlisting-\the\numexpr\listingN+1\relax}{\FileNumber}% write listings id to the xref file, so it can be used in links
\protected at edef\:temp{#3}%
\protected at edef\:temp{\the\:tokwrite{\string\doTocEntry%
\string\toclol% identify this entry as list of listings
{\thetable}{\string\csname\space a:TocLink\string\endcsname%
- {\FileNumber}{\cur:th \:currentlabel}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}%
+ {\FileNumber}{listing-\the\numexpr\listingN+1\relax}{}{\ifx\:temp\empty\else \ignorespaces #3\fi}}%
{}\relax}}\:temp%
}}%
\pend:defI\lst at MakeCaption{%
@@ -113,8 +114,6 @@
\let\addcontentsline\lst:newaddcontentsline%
}
\append:defI\lst at MakeCaption{%
- % insert destination ID for the list of listings
- \Link{}{\cur:th\:currentlabel}\EndLink
\let\addcontentsline\lst:addcontentsline
}
\ConfigureToc{lol} {}{\empty}{}{\newline}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty 2025-02-27 20:16:34 UTC (rev 74331)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty 2025-02-27 21:16:53 UTC (rev 74332)
@@ -1,7 +1,7 @@
\ifnum\the\catcode`\%=14\else\expandafter\edef\csname
\string:RestoreCatcodes\endcsname{\catcode`\%\the
\catcode`\%}\catcode`\%14\fi
-% tex4ht.sty (2025-02-03-13:10), generated from tex4ht-sty.tex
+% tex4ht.sty (2025-02-27-12:30), generated from tex4ht-sty.tex
% Copyright 2009-2025 TeX Users Group
% Copyright 1996-2009 Eitan M. Gurari
%
@@ -20,7 +20,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2025-02-03-13:10}
+\immediate\write-1{version 2025-02-27-12:30}
\ifx \Preamble\UnDef \else
@@ -2684,7 +2684,7 @@
\vbox{$${\ht:special
{t4ht\string^#1}{#5}^{{#5}^{#5}}\ht:special{t4ht\string^}}$$}\egroup
\fi
- {\everypar{}\noindent\vfill\break}%
+ {\everypar{}\noindent}%
\ht:special{t4ht@]}\EndNoFonts
}
\NewConfigure{MathDelimiters}[2]{\NoFonts \ht:special{t4ht@[}%
@@ -2701,7 +2701,7 @@
\ht:special{t4ht\string^4}{}^{{}^{#1}}\ht:special
{t4ht\string^5}{}^{{}^{#2}}%
\ht:special{t4ht\string^}}$$}%
- {\everypar{}\noindent\vfill\break}%
+ {\everypar{}\noindent}%
\ht:special{t4ht@]}\egroup
\EndNoFonts}
\catcode`\^=12
More information about the tex-live-commits
mailing list.