From d55bec8432e846d549d016899a3ee1d46363087e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 May 2022 20:54:40 +0000 Subject: allow more split files, tex4ht r1137; incomplete \ifx, tex4ht r1138 git-svn-id: svn://tug.org/texlive/trunk@63384 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 8 ++++++++ Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 6 ++++-- Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex | 4 ++-- Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty | 6 +++--- Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht | 8 +++++--- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index cf8ec3b96ae..e91efca8121 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,11 @@ +2022-05-23 Michal Hoftich + + * tex4ht-4ht.tex (xr-hyper.4ht): added closing \fi to prevent + warning about unclosed \ifx. + * tex4ht-sty.tex (tex4ht.sty): use higher value for cut files + counter, to allow generating of more than 9999 files. + https://tug.org/pipermail/tex4ht/2022q2/003234.html + 2022-05-22 Michal Hoftich * tex4ht-4ht.tex (listings.4ht), diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index af9b237e4c1..c516dffdb4e 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1136 2022-05-22 18:03:36Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1138 2022-05-23 12:21:20Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -3902,7 +3902,9 @@ Hyperref pasess five arguments to \`|\newlabel|, we must adapt \`|\XR:rEfLiNK| t \filename@parse{#1}% Get basename of the linked html file, % xr:dir\filename@base contains file's directory \a:xr[\csname xr:dir:\filename@base\endcsname#1]{#2}{}% - \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr} + % this extra \fi fixes warning about unclosed \ifx, I hope it doesn't break anything + % I cannot find where that \ifx starts + \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr\fi} \NewConfigure{xr}{2} \Configure{xr}{\Link}{\EndLink} \def\XR:rEfLiNK#1#2#3#4#5{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}{\xr:rEfLiNK#3}} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex index c7e58775aa0..1ff2a961510 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-sty.tex 1114 2022-04-19 20:40:47Z michal_h21 $ +% $Id: tex4ht-sty.tex 1137 2022-05-23 07:58:41Z michal_h21 $ % tex tex4ht-sty or ht tex tex4ht-sty % % Copyright 2009-2020 TeX Users Group @@ -4624,7 +4624,7 @@ make here an assumption that a compilation will not generate more than \<<< -\gHAdvance\fstf:id |by 10000 +\gHAdvance\fstf:id |by 100000 >>> It would be nice to have also fix-points for file ids within children, diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty index 07fa127f0f9..01e1480b4a1 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty @@ -1,7 +1,7 @@ \ifnum\the\catcode`\%=14\else\expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.sty (2022-04-19-13:53), generated from tex4ht-sty.tex +% tex4ht.sty (2022-05-23-13:42), generated from tex4ht-sty.tex % Copyright 2009-2022 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 2022-04-19-13:53} +\immediate\write-1{version 2022-05-23-13:42} \ifx \Preamble\UnDef \else @@ -3809,7 +3809,7 @@ \xp:var{#2}fstf:id,#1!*?: % \closeout\:refout \openout\:refout\jobname.xref \:clearpage -\gHAdvance\fstf:id 10000 +\gHAdvance\fstf:id 100000 % \gHAssign\maxfile:id \fstf:id \gHAssign\bs:fileid \maxfile:id diff --git a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht index 5563be7ba4d..bfa0d0e5ce9 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/xr-hyper.4ht @@ -1,4 +1,4 @@ -% xr-hyper.4ht (2022-04-25-13:36), generated from tex4ht-4ht.tex +% xr-hyper.4ht (2022-05-23-13:42), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-04-25-13:36} +\immediate\write-1{version 2022-05-23-13:42} \let\XR:loop=\XR@loop \def\XR@loop#1{% @@ -56,7 +56,9 @@ \filename@parse{#1}% Get basename of the linked html file, % xr:dir\filename@base contains file's directory \a:xr[\csname xr:dir:\filename@base\endcsname#1]{#2}{}% - \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr} + % this extra \fi fixes warning about unclosed \ifx, I hope it doesn't break anything + % I cannot find where that \ifx starts + \ifx\hyperrefLabel\:UnDef #3\else \hyperrefLabel\fi \b:xr\fi} \NewConfigure{xr}{2} \Configure{xr}{\Link}{\EndLink} \def\XR:rEfLiNK#1#2#3#4#5{{\xr:rEfLiNK#1}{\xr:rEfLiNK#2}{\xr:rEfLiNK#3}} -- cgit v1.2.3