diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-10 22:44:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-10 22:44:55 +0000 |
commit | 1a1d09aabbf7439ff6ff435fd61a07c4b06dff55 (patch) | |
tree | 4b67eaedd9a299b7175327fd2593644ed3ecaf23 /Master | |
parent | 915fb1cb5fef3e94262633a530dc3270aa9ff891 (diff) |
fancyvrb regression, tex4ht r1435
git-svn-id: svn://tug.org/texlive/trunk@69375 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
5 files changed, 18 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 24993d32133..ed0ea641883 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2024-01-10 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (fancyvrb.4ht): fixed regression in \FVC@Verb in + other contexts than \mintinline. + https://puszcza.gnu.org.ua/bugs/index.php?617 + 2024-01-05 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (unicode-math-hooks.4ht): require Amsmath from diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 523c7c93640..be94b6b5e34 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 1434 2024-01-05 22:29:16Z karl $ +% $Id: tex4ht-4ht.tex 1435 2024-01-10 09:23:41Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -25822,8 +25822,8 @@ wouldn't be produced. This hook is inserted by \Verb+\FV@FormattingPrep+. See \Link[://github.com/michal-h21/make4ht/issues/141]{}{}this issue\EndLink. \<fix fancyvrb\><<< -\pend:defI\FVC@Verb{\bgroup\let\a:fancyvrb\empty\a:verb} -\append:defI\FVC@Verb{\b:verb\egroup} +\def\:tempa#1{\let\sa:fancyvrb\a:fancyvrb\let\a:fancyvrb\empty\a:verb\o:FVC@Verb:{#1}\glet\a:fancyvrb\sa:fancyvrb\aftergroup\b:verb} +\HLet\FVC@Verb\:tempa >>> \<fix fancyvrb\><<< diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex index d4e883d60f4..0a11d693adc 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-options.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-options.tex 1430 2024-01-03 22:27:23Z karl $ +% $Id: tex4ht-options.tex 1436 2024-01-10 22:44:00Z karl $ % latex tex4ht-options or xhlatex tex4ht-options % % Copyright 2009-2024 TeX Users Group @@ -49,7 +49,7 @@ tail>>> \string:RestoreCatcodes\endcsname{\catcode`\%|=\the \catcode`\%}\catcode`\%|=14\fi % tex4ht.4ht (|version), generated from |jobname.tex -% Copyright 2009-2023 TeX Users Group +% Copyright 2009-2024 TeX Users Group % Copyright |CopyYear.1997. Eitan M. Gurari |<TeX4ht copywrite|> |<save catcodes|> diff --git a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht index 02e732aca22..423896c7c08 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht @@ -1,4 +1,4 @@ -% fancyvrb.4ht (2024-01-04-13:21), generated from tex4ht-4ht.tex +% fancyvrb.4ht (2024-01-10-14:05), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2024 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-01-04-13:21} +\immediate\write-1{version 2024-01-10-14:05} \pend:def\FV@FormattingPrep{\let\fv:color\empty @@ -94,8 +94,8 @@ \FV@SetLineNo% \def\FV@StepLineNo{\SkipRefstepAnchor\refstepcounter{FancyVerbLine}}% \FV@StepLineNo} -\pend:defI\FVC@Verb{\bgroup\let\a:fancyvrb\empty\a:verb} -\append:defI\FVC@Verb{\b:verb\egroup} +\def\:tempa#1{\let\sa:fancyvrb\a:fancyvrb\let\a:fancyvrb\empty\a:verb\o:FVC@Verb:{#1}\glet\a:fancyvrb\sa:fancyvrb\aftergroup\b:verb} +\HLet\FVC@Verb\:tempa \def\:tempa#1{\mbox{\FV@UseKeyValues% \let\a:fancyvrb\empty \FV@FormattingPrep% \a:verb #1\b:verb}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht index 87fe3d81c2d..dfa8e3eda6f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht @@ -1,8 +1,8 @@ \ifnum\the\catcode`\%=14\else \expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.4ht (2024-01-03-14:27), generated from tex4ht-options.tex -% Copyright 2009-2023 TeX Users Group +% tex4ht.4ht (2024-01-10-14:44), generated from tex4ht-options.tex +% Copyright 2009-2024 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -20,7 +20,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-01-03-14:27} +\immediate\write-1{version 2024-01-10-14:44} \expandafter\edef\csname :RestoreCatcodes\endcsname{% \expandafter\ifx \csname :RestoreCatcodes\endcsname\relax\else |