diff --git a/base/changes.txt b/base/changes.txt index a4edef9e6..004248109 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -14,6 +14,11 @@ All changes above are only part of the development branch for the next release. # 2024-11-01 PL1 Release ######################### +2024-11-22 Frank Mittelbach + + * lttagging.dtx (section{Implementation}): + Declare \tag_if_active:TF and friends in the kernel (gh/1558) + 2024-11-19 Frank Mittelbach * lttextcomp.dtx: diff --git a/base/lttagging.dtx b/base/lttagging.dtx index 6b68cd0e0..e8befabf7 100644 --- a/base/lttagging.dtx +++ b/base/lttagging.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{lttagging.dtx} - [2024/10/21 v1.0k LaTeX Kernel (tagging support)] + [2024/11/22 v1.0l LaTeX Kernel (tagging support)] % \iffalse \documentclass{l3doc} \GetFileInfo{lttagging.dtx} @@ -183,16 +183,11 @@ % Again this is not the final definition for the kernel; it is just % a version to get going while some parts of the kernel support are % still missing. +% \changes{v1.0l}{2024/11/21}{Define \cs{tag_if_active:TF} conditionals here (github/1558)} % \begin{macrocode} -\AddToHook{begindocument}[kernel]{ - \cs_if_exist:NF \tag_if_active:T - { - \prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } - { \prg_return_false: } - } -} +\prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } + { \prg_return_false: } % \end{macrocode} -% % Dummy definitions in the kernel. % These definitions will get updated in \pkg{tagpdf}. % The default in the kernel is just to get rid of the first argument, the second is preserved if present: diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg index e7741b43f..0a175a3c7 100644 --- a/base/testfiles-lthooks/ltcmdhooks-001.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg @@ -65,11 +65,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -242,7 +237,6 @@ Data structure for label rules: Handled code for x Handled code for y All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg index fcc64bf6e..8a93c911d 100644 --- a/base/testfiles-lthooks/lthooks-000.tlg +++ b/base/testfiles-lthooks/lthooks-000.tlg @@ -5,11 +5,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -166,7 +161,6 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg index b6b9ed65f..9ac5c370f 100644 --- a/base/testfiles-lthooks/lthooks-001.tlg +++ b/base/testfiles-lthooks/lthooks-001.tlg @@ -10,11 +10,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -173,7 +168,6 @@ Data structure for label rules: Handled code for label1 Handled code for label2 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -262,11 +256,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -423,7 +412,6 @@ Data structure for label rules: label1 = 0 -> Handled code for label1 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-002.tlg b/base/testfiles-lthooks/lthooks-002.tlg index a7b87d723..9c43281db 100644 --- a/base/testfiles-lthooks/lthooks-002.tlg +++ b/base/testfiles-lthooks/lthooks-002.tlg @@ -10,11 +10,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -173,7 +168,6 @@ Data structure for label rules: Handled code for label1 Handled code for label2 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -264,11 +258,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -425,7 +414,6 @@ Data structure for label rules: label1 = 0 -> Handled code for label1 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-003.tlg b/base/testfiles-lthooks/lthooks-003.tlg index 4d973492d..f5e466b76 100644 --- a/base/testfiles-lthooks/lthooks-003.tlg +++ b/base/testfiles-lthooks/lthooks-003.tlg @@ -96,11 +96,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -283,7 +278,6 @@ Handled code for label5 Handled code for label8 Handled code for label6 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-004.tlg b/base/testfiles-lthooks/lthooks-004.tlg index 3f361be05..6e7b34fab 100644 --- a/base/testfiles-lthooks/lthooks-004.tlg +++ b/base/testfiles-lthooks/lthooks-004.tlg @@ -80,11 +80,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -258,7 +253,6 @@ Data structure for label rules: label4 = 0 -> label1 ==================== All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg index b9f98b801..47b460998 100644 --- a/base/testfiles-lthooks/lthooks-005.tlg +++ b/base/testfiles-lthooks/lthooks-005.tlg @@ -103,11 +103,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -290,7 +285,6 @@ Handled code for label5 Handled code for label8 Handled code for label6 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg index ff2011d20..200b6c39b 100644 --- a/base/testfiles-lthooks/lthooks-006.tlg +++ b/base/testfiles-lthooks/lthooks-006.tlg @@ -76,11 +76,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -244,7 +239,6 @@ Handled code for label1 Handled code for label3 Handled code for label2 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-007.tlg b/base/testfiles-lthooks/lthooks-007.tlg index cc1281d18..d8325c8ff 100644 --- a/base/testfiles-lthooks/lthooks-007.tlg +++ b/base/testfiles-lthooks/lthooks-007.tlg @@ -77,11 +77,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -246,7 +241,6 @@ Handled code for label1 Handled code for label3 Handled code for label2 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -270,11 +264,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -437,7 +426,6 @@ Handled code for label1 Handled code for label2 Handled code for label3 All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-008.tlg b/base/testfiles-lthooks/lthooks-008.tlg index dd09a291a..fbf173f7f 100644 --- a/base/testfiles-lthooks/lthooks-008.tlg +++ b/base/testfiles-lthooks/lthooks-008.tlg @@ -76,11 +76,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -246,7 +241,6 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument -> \typeout {foo}\typeout {bar}\typeout {from my package}\__hook_toplevel enddocument \__hook_next enddocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg index 9e6ac770a..9de10df33 100644 --- a/base/testfiles-lthooks/lthooks-009.tlg +++ b/base/testfiles-lthooks/lthooks-009.tlg @@ -6,11 +6,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -172,7 +167,6 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument sffamily -> \typeout {Std sffamily code}\__hook_toplevel sffamily \__hook_next sffamily enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after diff --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg index 509771428..babe8e214 100644 --- a/base/testfiles-lthooks/lthooks-011.tlg +++ b/base/testfiles-lthooks/lthooks-011.tlg @@ -6,11 +6,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -172,7 +167,6 @@ Update code for hook 'yyy' on input line ...: Update code for hook 'zzz' on input line ...: Update code for hook 'next_zzz' on input line ...: All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -197,11 +191,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -365,7 +354,6 @@ Update code for hook 'yyy' on input line ...: Update code for hook 'zzz' on input line ...: Update code for hook 'next_zzz' on input line ...: All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -390,11 +378,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -560,7 +543,6 @@ Update code for hook 'yyy' on input line ...: Update code for hook 'zzz' on input line ...: Update code for hook 'next_zzz' on input line ...: All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -585,11 +567,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -757,7 +734,6 @@ Update code for hook 'yyy' on input line ...: Update code for hook 'zzz' on input line ...: Update code for hook 'next_zzz' on input line ...: All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg index cfd5b3b9d..3d1966999 100644 --- a/base/testfiles-lthooks/lthooks-013.tlg +++ b/base/testfiles-lthooks/lthooks-013.tlg @@ -58,11 +58,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -227,7 +222,6 @@ Handled code for foo Update code for hook 'env/itemize/end' on input line ...: Update code for hook 'file/bar' on input line ...: All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg index 282cbc898..c201c3deb 100644 --- a/base/testfiles-lthooks/lthooks-021.tlg +++ b/base/testfiles-lthooks/lthooks-021.tlg @@ -5,11 +5,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -166,7 +161,6 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks/lthooks-031.tlg b/base/testfiles-lthooks/lthooks-031.tlg index 8d7e9e78d..206b98263 100644 --- a/base/testfiles-lthooks/lthooks-031.tlg +++ b/base/testfiles-lthooks/lthooks-031.tlg @@ -16,7 +16,6 @@ Don't change this file in any respect. l. ...\ShowHook{include/foo/after} -> The hook 'begindocument': > Code chunks: -> kernel -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }} > A -> \typeout {A2} > B -> \typeout {B2} > Document-level (top-level) code (executed last): @@ -26,7 +25,7 @@ l. ...\ShowHook{include/foo/after} > Rules: > --- > Execution order: -> kernel, A, B. +> A, B. } l. ...\ShowHook{begindocument} (../l3backend-pdftex.def diff --git a/base/testfiles-lthooks/lthooks-legacy.tlg b/base/testfiles-lthooks/lthooks-legacy.tlg index db2099805..9b14c2d3a 100644 --- a/base/testfiles-lthooks/lthooks-legacy.tlg +++ b/base/testfiles-lthooks/lthooks-legacy.tlg @@ -8,11 +8,9 @@ Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: **** Add to hook begindocument (legacy) on input line ... <- \typeout {legacy begindocument\on@line } Code labels for sorting: - kernel and legacy + legacy Data structure for label rules: - kernel = 0 -> legacy = 0 -> -Handled code for kernel Handled code for legacy Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: @@ -188,7 +186,7 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\typeout {legacy begindocument\on@line }\__hook_toplevel begindocument \__hook_next begindocument + begindocument -> \typeout {legacy begindocument\on@line }\__hook_toplevel begindocument \__hook_next begindocument rmfamily -> \typeout {legacy rmfamily\on@line }\__hook_toplevel rmfamily \__hook_next rmfamily sffamily -> \typeout {legacy sffamily\on@line }\__hook_toplevel sffamily \__hook_next sffamily ttfamily -> \typeout {legacy ttfamily\on@line }\__hook_toplevel ttfamily \__hook_next ttfamily diff --git a/base/testfiles-lthooks/lthooks-rollback-args.tlg b/base/testfiles-lthooks/lthooks-rollback-args.tlg index cc67014ba..2d6a28e00 100644 --- a/base/testfiles-lthooks/lthooks-rollback-args.tlg +++ b/base/testfiles-lthooks/lthooks-rollback-args.tlg @@ -1359,7 +1359,6 @@ Already applied: [....-..-..] UTF-8 default on input line .... ) -> The hook 'begindocument': > Code chunks: -> kernel -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }} > label -> \def \ay ##1{\typeout {ay(##1)}}\def \by ##1{\typeout {by(##1)}} > Document-level (top-level) code (executed last): > -> \def \ax ##1{\typeout {ax(##1)}}\def \bx ##1{\typeout {bx(##1)}} @@ -1368,7 +1367,7 @@ Already applied: [....-..-..] UTF-8 default on input line .... > Rules: > --- > Execution order: -> kernel, label. +> label. } l. ...\ShowHook{begindocument} ax(1) diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg index bc6183761..c54a0740a 100644 --- a/base/testfiles-lthooks2/lthooks2-002.tlg +++ b/base/testfiles-lthooks2/lthooks2-002.tlg @@ -10,32 +10,13 @@ Update code for hook 'file/after' on input line ...: Update code for hook 'package/after' on input line ...: **** Add to hook enddocument/end (top-level) on input line ... <- \typeout {in preamble} Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel -> The hook 'begindocument': -> Code chunks: -> kernel -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }} -> Document-level (top-level) code (executed last): -> --- -> Extra code for next invocation: -> --- -> Rules: -> --- -> Execution order: -> kernel. +> The hook is empty. Update code for hook 'para/before' on input line ...: Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -192,7 +173,6 @@ Data structure for label rules: backend = 0 -> Handled code for backend All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg index 181a618e4..4513dd0bd 100644 --- a/base/testfiles-lthooks2/lthooks2-005.tlg +++ b/base/testfiles-lthooks2/lthooks2-005.tlg @@ -6,11 +6,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -161,7 +156,6 @@ Data structure for label rules: firstaid = 0 -> Handled code for firstaid All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after @@ -185,11 +179,6 @@ Update code for hook 'para/after' on input line ...: Update code for hook 'para/begin' on input line ...: Update code for hook 'para/end' on input line ...: Update code for hook 'begindocument' on input line ...: -Code labels for sorting: - kernel -Data structure for label rules: - kernel = 0 -> -Handled code for kernel Update code for hook 'begindocument/before' on input line ...: Update code for hook 'begindocument/end' on input line ...: Update code for hook 'include/before' on input line ...: @@ -348,7 +337,6 @@ Data structure for label rules: Handled code for my-package Handled code for other-package All initialized (non-empty) hooks: - begindocument -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }}\__hook_toplevel begindocument \__hook_next begindocument enddocument/info -> \@dofilelist \@enddocument@kernel@warnings \__hook_toplevel enddocument/info \__hook_next enddocument/info file/dinbrief.cls/after -> \__hook_toplevel file/dinbrief.cls/after \FirstAidNeededT {dinbrief}{cls}{....-..-.. LaTeX2e class}{\AddToHook {env/document/begin}{\begingroup }}\__hook_next file/dinbrief.cls/after file/pgfpages.sty/after -> \__hook_toplevel file/pgfpages.sty/after \cs_gset_eq:NN \shipout \pgfpages@originalshipout \cs_set_eq:NN \pgfpages@originalshipout \tex_shipout:D \cs_set_eq:NN \tex_shipout:D \pgfpages@interceptshipout \__hook_next file/pgfpages.sty/after diff --git a/base/testfiles/github-0962b.luatex.tlg b/base/testfiles/github-0962b.luatex.tlg index c061d8274..3d50d3f45 100644 --- a/base/testfiles/github-0962b.luatex.tlg +++ b/base/testfiles/github-0962b.luatex.tlg @@ -2,7 +2,6 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -> The hook 'begindocument': > Code chunks: -> kernel -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }} > doc -> \catcode `\^^A=14\relax \catcode `\^^X=14\relax \let \macro@font \MacroFont > ltxdoc -> \MakeShortVerb {\|}\providecommand \LuaTeX {Lua\TeX } \providecommand \cls {\textsf } \providecommand \pkg {\textsf } \providecommand \enquote [1]{``##1''} \providecommand \url {\texttt } > Document-level (top-level) code (executed last): @@ -12,7 +11,7 @@ Don't change this file in any respect. > Rules: > --- > Execution order: -> kernel, doc, ltxdoc. +> doc, ltxdoc. } l. ...\ShowHook{begindocument} > \PrintMacroName=macro: diff --git a/base/testfiles/github-0962b.tlg b/base/testfiles/github-0962b.tlg index 71197423b..261b9fa82 100644 --- a/base/testfiles/github-0962b.tlg +++ b/base/testfiles/github-0962b.tlg @@ -2,7 +2,6 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -> The hook 'begindocument': > Code chunks: -> kernel -> \cs_if_exist:NF \tag_if_active:T {\prg_new_conditional:Npnn \tag_if_active: {p,T,TF,F}{\prg_return_false: }} > doc -> \catcode `\^^A=14\relax \catcode `\^^X=14\relax \let \macro@font \MacroFont > ltxdoc -> \MakeShortVerb {\|}\providecommand \LuaTeX {Lua\TeX } \providecommand \cls {\textsf } \providecommand \pkg {\textsf } \providecommand \enquote [1]{``##1''} \providecommand \url {\texttt } > Document-level (top-level) code (executed last): @@ -12,7 +11,7 @@ Don't change this file in any respect. > Rules: > --- > Execution order: -> kernel, doc, ltxdoc. +> doc, ltxdoc. } l. ...\ShowHook{begindocument} > \PrintMacroName=macro: diff --git a/base/update-lthooks-tests.sh b/base/update-lthooks-tests.sh index 6371bc956..d9f84e016 100755 --- a/base/update-lthooks-tests.sh +++ b/base/update-lthooks-tests.sh @@ -1,4 +1,7 @@ +l3build save -epdftex,luatex \ + github-0962b + l3build save -cconfig-lthooks2 \ lthooks2-002 \ lthooks2-004 \ diff --git a/required/latex-lab/update-all.sh b/required/latex-lab/update-all.sh index 387eb1c80..19753e989 100644 --- a/required/latex-lab/update-all.sh +++ b/required/latex-lab/update-all.sh @@ -1,11 +1,12 @@ l3build save \ documentmetadata-phase-II \ - new-or-001 + new-or-001 \ + gh-tagging628-settodim l3build save -epdftex,luatex \ documentmetadata-support-000 \ documentmetadata-support-001 \ - documentmetadata-support-002 - - + documentmetadata-support-002 \ + standard-a4f \ + tagging-gh34 diff --git a/required/tools/testfiles/github-1558.lvt b/required/tools/testfiles/github-1558.lvt new file mode 100644 index 000000000..6d85cb7f2 --- /dev/null +++ b/required/tools/testfiles/github-1558.lvt @@ -0,0 +1,26 @@ +\show\documentclass + +\documentclass{article} + +\input{test2e} + +\usepackage{array} +\newsavebox\hvOBox + +\START + +\savebox\hvOBox{% +\begin{tabular}{@{} *9c @{\hspace{6em}} *3c @{}} +2007& 2074& 1626& 113& 25& 8& 11& 8& 12& 71& 200& 3\\ +\end{tabular}} + +\OMIT +\begin{document} +\TIMO + +\usebox\hvOBox + +\newpage + +\OMIT +\end{document} diff --git a/required/tools/testfiles/github-1558.tlg b/required/tools/testfiles/github-1558.tlg new file mode 100644 index 000000000..a3cb22efb --- /dev/null +++ b/required/tools/testfiles/github-1558.tlg @@ -0,0 +1,8 @@ +This is a generated file for the LaTeX2e validation system. +Don't change this file in any respect. +LaTeX Font Info: External font `cmex10' loaded for size +(Font) <7> on input line .... +LaTeX Font Info: External font `cmex10' loaded for size +(Font) <5> on input line .... +[1 +] diff --git a/texmf/tex/latex/tagpdf/tagpdf-base.sty b/texmf/tex/latex/tagpdf/tagpdf-base.sty index bdcfa47bf..f8286a907 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-base.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-base.sty @@ -25,7 +25,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-base} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-base} {2024-11-22} {0.99j} {part of tagpdf - provide base, no-op versions of the user commands } \cs_new_protected:Npn \__tag_whatsits: {} \AddToHook{begindocument} @@ -52,7 +52,6 @@ \cs_new_protected:Nn \tag_mc_end:{ \__tag_whatsits: } %% File: tagpdf-mc-shared.dtx - \newcounter { g__tag_MCID_abs_int } \cs_new:Npn \__tag_get_data_mc_counter: { @@ -89,8 +88,11 @@ %% File: tagpdf-checks.dtx \cs_new:Npn \tag_get:n #1 { \use:c {__tag_get_data_#1: } } -\prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } - { \prg_return_false: } +\cs_if_exist:NF\tag_if_active:T + { + \prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } + { \prg_return_false: } + } \prg_new_conditional:Npnn \tag_if_box_tagged:N #1 {p,T,F,TF} { \tl_if_exist:cTF {l_tag_box_\int_use:N #1_tl} diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty index faed53b3c..354d3e91e 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-debug-generic} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-11-22} {0.99j} {part of tagpdf - debugging code related to marking chunks - generic mode} \cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval { diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty index 7b0f3b96d..ea873c5d9 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-debug-lua} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-11-22} {0.99j} {part of tagpdf - debugging code related to marking chunks - lua mode} \cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum { diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug.sty b/texmf/tex/latex/tagpdf/tagpdf-debug.sty index 2ad6c2103..7bc9d48bb 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug.sty @@ -26,7 +26,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-debug} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-debug} {2024-11-22} {0.99j} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} @@ -248,7 +248,6 @@ ,debug/structures .default:n = 1 } %% File: tagpdf-mc-shared.dtx - %% File: tagpdf-tree.dtx %% File: tagpdf-roles.dtx %% File: tagpdf-struct.dtx diff --git a/texmf/tex/latex/tagpdf/tagpdf-luatex.def b/texmf/tex/latex/tagpdf/tagpdf-luatex.def index e25286e33..63ee9f480 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-luatex.def +++ b/texmf/tex/latex/tagpdf/tagpdf-luatex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-backend.dtx -\ProvidesExplFile {tagpdf-luatex.def} {2024-10-27} {0.99g} +\ProvidesExplFile {tagpdf-luatex.def} {2024-11-22} {0.99j} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index 716de1a1d..1bae99bc9 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-11-22} {0.99j} {part of tagpdf - code related to marking chunks - generic mode} \tl_new:N \l__tag_mc_ref_abspage_tl @@ -29,7 +29,10 @@ \seq_new:N \g__tag_mc_main_marks_seq \seq_new:N \g__tag_mc_footnote_marks_seq \seq_new:N \g__tag_mc_multicol_marks_seq - +\cs_new_protected:Npn \tag_mc_new_stream:n #1 + { + \seq_new:c { g__tag_mc_multicol_#1_seq } + } \seq_new:N \l__tag_mc_firstmarks_seq \seq_new:N \l__tag_mc_botmarks_seq \cs_new_protected:Npn \__tag_mc_begin_marks:nn #1 #2 %#1 tag, #2 label @@ -233,6 +236,7 @@ %% } } +\cs_set_eq:NN \tag_mc_add_missing_to_stream:Nn \__tag_add_missing_mcs_to_stream:Nn \prg_new_conditional:Nnn \__tag_mc_if_in: {p,T,F,TF} { \bool_if:NTF \g__tag_in_mc_bool diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty index 7f0331f89..7e39b1a3c 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-11-22} {0.99j} {tagpdf - mc code only for the luamode } \hook_gput_code:nnn{begindocument}{tagpdf/mc} { @@ -76,6 +76,8 @@ } } \cs_new_protected:Npn \__tag_add_missing_mcs_to_stream:Nn #1#2 {} +\cs_set_eq:NN \tag_mc_add_missing_to_stream:Nn \__tag_add_missing_mcs_to_stream:Nn +\cs_new_protected:Npn \tag_mc_new_stream:n #1 {} \prg_new_conditional:Nnn \__tag_mc_if_in: {p,T,F,TF} { \int_compare:nNnTF diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def index 113d92036..201e23953 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-11-22} {0.99j} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def index 516094991..7b156ff0b 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-11-22} {0.99j} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def index af23601b3..e73971e0d 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-11-22} {0.99j} abs,abs,mathml, and,and,mathml, annotation,annotation,mathml, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def index 88d859999..6f002b303 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-11-22} {0.99j} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def index ccb4e7282..4d7f3d572 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-11-22} {0.99j} %% {pdf2} {http://iso.org/pdf2/ssn}{} StructTreeRoot,StructTreeRoot,pdf2,D, Document,Document,pdf2,D, diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv index 4c89e41f8..3b8590903 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv +++ b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-11-22} {0.99j} ,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅ DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅ diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv index 27dd3a33b..3ac411976 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv +++ b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-10-27} {0.99g} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-11-22} {0.99j} ,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅ Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅ diff --git a/texmf/tex/latex/tagpdf/tagpdf.lua b/texmf/tex/latex/tagpdf/tagpdf.lua index 4ad1ba5b3..62e08da88 100644 --- a/texmf/tex/latex/tagpdf/tagpdf.lua +++ b/texmf/tex/latex/tagpdf/tagpdf.lua @@ -24,8 +24,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.99g", --TAGVERSION - date = "2024-10-27", --TAGDATE + version = "0.99j", --TAGVERSION + date = "2024-11-22", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } diff --git a/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty index f4451113d..7bada0d56 100644 --- a/texmf/tex/latex/tagpdf/tagpdf.sty +++ b/texmf/tex/latex/tagpdf/tagpdf.sty @@ -28,7 +28,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf} {2024-10-27} {0.99g} +\ProvidesExplPackage {tagpdf} {2024-11-22} {0.99j} { LaTeX kernel code for PDF tagging } \bool_if:nF @@ -624,7 +624,6 @@ } } %% File: tagpdf-mc-shared.dtx - \cs_new:Npn \__tag_get_mc_abs_cnt: { \int_use:N \c@g__tag_MCID_abs_int } \bool_new:N \g__tag_in_mc_bool \__tag_prop_new_linked:N \g__tag_mc_parenttree_prop @@ -3283,8 +3282,9 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, } \cs_set_protected:Npn \tag_socket_use:nnn #1#2#3 { - \bool_if:NT \l__tag_active_socket_bool - { \socket_use:nnn {tagsupport/#1} {#2} {#3} } + \bool_if:NTF \l__tag_active_socket_bool + { \socket_use:nnn {tagsupport/#1} {#2} {#3} } + { #3 } } \cs_set:Npn \tag_socket_use_expandable:n #1 { @@ -3763,26 +3763,29 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, \cs_if_exist:NT \@kernel@before@footins { \tl_put_right:Nn \@kernel@before@footins - { \__tag_add_missing_mcs_to_stream:Nn \footins {footnote} } + { \tag_mc_add_missing_to_stream:Nn \footins {footnote} } \tl_put_right:Nn \@kernel@before@cclv { \__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} + \tag_mc_add_missing_to_stream:Nn \@cclv {main} } \tl_put_right:Nn \@kernel@tagsupport@@makecol { \__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} + \tag_mc_add_missing_to_stream:Nn \@outputbox {main} } - \tl_put_right:Nn \@mult@ptagging@hook - { - \__tag_check_typeout_v:n {====>~In~\string\page@sofar} - \process@cols\mult@firstbox + \tl_if_exist:NT \@mult@ptagging@hook + { + \tl_put_right:Nn \@mult@ptagging@hook { - \__tag_add_missing_mcs_to_stream:Nn \count@ {multicol} + \__tag_check_typeout_v:n {====>~In~\string\page@sofar} + \process@cols\mult@firstbox + { + \tag_mc_add_missing_to_stream:Nn \count@ {multicol} + } + \tag_mc_add_missing_to_stream:Nn \mult@rightbox {multicol} } - \__tag_add_missing_mcs_to_stream:Nn \mult@rightbox {multicol} - } + } } } }