diff --git a/required/latex-lab/latex-lab-new-or-1.dtx b/required/latex-lab/latex-lab-new-or-1.dtx index bb5bf3602..a4b93adc3 100644 --- a/required/latex-lab/latex-lab-new-or-1.dtx +++ b/required/latex-lab/latex-lab-new-or-1.dtx @@ -99,7 +99,7 @@ % We patch \cs{@makecol}, if new-or-2 is loaded too it will overwrite that again. % \begin{macrocode} \providecommand\@kernel@before@footins{} - \providecommand\@kernel@before@cclv@new{} + \providecommand\@kernel@tagsupport@@makecol{} \patchcmd\@makecol {\vskip\skip\footins} @@ -108,7 +108,7 @@ \patchcmd\@makecol {\let\@elt\relax} - {\@kernel@before@cclv@new\let\@elt\relax} + {\@kernel@tagsupport@@makecol\let\@elt\relax} {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror } \AddToHook{package/footmisc/after} @@ -116,7 +116,7 @@ \def \@makecol {% \setbox\@outputbox \box\@cclv \@outputbox@removebskip - \@kernel@before@cclv@new + \@kernel@tagsupport@@makecol \let\@elt\relax \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty diff --git a/required/latex-lab/latex-lab-new-or-2.dtx b/required/latex-lab/latex-lab-new-or-2.dtx index 63ecd9055..e03c5cdbb 100644 --- a/required/latex-lab/latex-lab-new-or-2.dtx +++ b/required/latex-lab/latex-lab-new-or-2.dtx @@ -245,7 +245,7 @@ % \fmi{The name is likely to change and it probably will eventually % be replaced with a socket.} % \begin{macrocode} - \@kernel@before@cclv@new + \@kernel@tagsupport@@makecol % \end{macrocode} % When this code is run any ``here'' floats in the \cs{@outputbox} are already handled, so we % recycle their registers and put them back to the \cs{@freelist}. diff --git a/required/latex-lab/testfiles/new-or-001.tlg b/required/latex-lab/testfiles/new-or-001.tlg index 21c8df871..d36b8e94f 100644 --- a/required/latex-lab/testfiles/new-or-001.tlg +++ b/required/latex-lab/testfiles/new-or-001.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. > \@makecol=macro: -->\setbox \@outputbox \box \@cclv \@outputbox@removebskip \@kernel@before@cclv@new \let \@elt \relax \xdef \@freelist {\@freelist \@midlist }\global \let \@midlist \@empty \UseSocket {@makecol/outputbox}\ifvbox \@kludgeins \@make@specialcolbox \else \@make@normalcolbox \fi \global \maxdepth \@maxdepth . +->\setbox \@outputbox \box \@cclv \@outputbox@removebskip \@kernel@tagsupport@@makecol \let \@elt \relax \xdef \@freelist {\@freelist \@midlist }\global \let \@midlist \@empty \UseSocket {@makecol/outputbox}\ifvbox \@kludgeins \@make@specialcolbox \else \@make@normalcolbox \fi \global \maxdepth \@maxdepth . \@makecol l. ...\ShowCommand\@makecol ------------------- diff --git a/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty index f8b871ffd..d6f17b62a 100644 --- a/texmf/tex/latex/tagpdf/tagpdf.sty +++ b/texmf/tex/latex/tagpdf/tagpdf.sty @@ -3235,7 +3235,7 @@ \AddToHook{begindocument/before} { - \providecommand\@kernel@before@cclv@new{} + \providecommand\@kernel@tagsupport__tagmakecol{} \providecommand\@kernel@before@cclv{} \bool_if:NF \g__tag_mode_lua_bool { @@ -3248,7 +3248,7 @@ \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c@page} \__tag_add_missing_mcs_to_stream:Nn \@cclv {main} } - \tl_put_right:Nn \@kernel@before@cclv@new + \tl_put_right:Nn \@kernel@tagsupport__tagmakecol { \__tag_check_typeout_v:n {====>~In~\token_to_str:N \@makecol\c_space_tl\the\c@page} \__tag_add_missing_mcs_to_stream:Nn \@outputbox {main}