[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: integrate lthooks into format.ins early on integrate ltexpl directly in format.ins not internally in ltdefns that makes "documentclasshook" become a non-hook (which is ok I would say) nfss font hooks rmfamily etc need looking at though (2cba59dc)

Frank Mittelbach frank.mittelbach at latex-project.org
Mon Aug 17 13:41:24 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : lthooks2
Link       : https://github.com/latex3/latex2e/commit/2cba59dc3a4f980df35e7e399d771687140f029c

>---------------------------------------------------------------

commit 2cba59dc3a4f980df35e7e399d771687140f029c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Mon Aug 17 13:41:24 2020 +0200

    integrate lthooks into format.ins early on
    integrate ltexpl directly in format.ins not internally in ltdefns
    that makes "documentclasshook" become a non-hook (which is ok I would say)
    nfss font hooks rmfamily etc need looking at though


>---------------------------------------------------------------

2cba59dc3a4f980df35e7e399d771687140f029c
 base/format.ins                        |  6 ++----
 base/ltclass.dtx                       | 16 ++++++++++++++++
 base/testfiles-lthooks/lthooks-000.tlg |  6 ------
 base/testfiles-lthooks/lthooks-001.tlg | 12 ------------
 base/testfiles-lthooks/lthooks-002.tlg | 12 ------------
 base/testfiles-lthooks/lthooks-003.tlg |  6 ------
 base/testfiles-lthooks/lthooks-004.tlg |  6 ------
 base/testfiles-lthooks/lthooks-005.tlg |  6 ------
 base/testfiles-lthooks/lthooks-006.tlg |  6 ------
 base/testfiles-lthooks/lthooks-007.tlg | 12 ------------
 base/testfiles-lthooks/lthooks-008.tlg |  8 +-------
 base/testfiles-lthooks/lthooks-009.tlg |  6 ------
 base/testfiles-lthooks/lthooks-011.tlg | 24 ------------------------
 base/testfiles-lthooks/lthooks-013.tlg |  6 ------
 base/testfiles-lthooks/lthooks-021.tlg |  6 ------
 15 files changed, 19 insertions(+), 119 deletions(-)

diff --git a/base/format.ins b/base/format.ins
index f40eb276..30feb949 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -162,8 +162,9 @@ the system are in the document `cfgguide.tex'.
           \from{ltplain.dtx}{2ekernel}
           \from{ltvers.dtx}{2ekernel}
           \from{ltluatex.dtx}{2ekernel}
-%          \from{lthooks.dtx}{2ekernel}        % L3 layer module
+          \from{ltexpl.dtx}{2ekernel}         % expl3-based extensions
           \from{ltdefns.dtx}{2ekernel}
+          \from{lthooks.dtx}{2ekernel}        % L3 layer module
           \from{ltalloc.dtx}{2ekernel}
           \from{ltcntrl.dtx}{2ekernel}
           \from{lterror.dtx}{2ekernel}
@@ -227,9 +228,6 @@ the system are in the document `cfgguide.tex'.
 }
 
 
-% expl3-based extensions
-\generate{\file{ltexpl.ltx}{\from{ltexpl.dtx}{2ekernel}}}
-
 % luatex support (TeX part)
 
 \generate{\file{ltluatex.tex}{\from{ltluatex.dtx}{tex,plain}}}
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index 16ac63d4..83dae638 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -583,6 +583,10 @@
 \@onlypreamble\@pushfilename
 %    \end{macrocode}
 %
+%
+%
+%
+%
 % \changes{v1.3l}{2020/06/05}{Added \cs{@expl at pop@filename@@}}
 %    \begin{macrocode}
 %<latexrelease>
@@ -604,6 +608,18 @@
 %<*2ekernel>
 %    \end{macrocode}
 %
+%   The push and pop macros are injected in \cs{@pushfilename} and
+%   \cs{@popfilename} so that they correctly keep track of the hook
+%   labels.
+% \fmi{Properly integrate in the kernel}
+%    \begin{macrocode}
+\ExplSyntaxOn
+\tl_gput_left:Nn \@pushfilename { \__hook_curr_name_push:n { } }
+\tl_gput_left:Nn \@popfilename { \__hook_curr_name_pop: }
+\ExplSyntaxOff
+%    \end{macrocode}
+%
+%
 %    \begin{macrocode}
 \def\@p at pfilename#1#2#3#4\@nil{%
   \gdef\@currname{#1}%
diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg
index 1f6298c9..6dae641e 100644
--- a/base/testfiles-lthooks/lthooks-000.tlg
+++ b/base/testfiles-lthooks/lthooks-000.tlg
@@ -7,11 +7,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -37,7 +32,6 @@ Data structure for label rules:
 Handled code for l3backend-dvips
 Update code for hook 'shipout/lastpage' on input line ...:
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
 No file lthooks-000.aux.
diff --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg
index 4814a8d5..f7d31885 100644
--- a/base/testfiles-lthooks/lthooks-001.tlg
+++ b/base/testfiles-lthooks/lthooks-001.tlg
@@ -13,11 +13,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -51,7 +46,6 @@ Data structure for label rules:
 Handled code for label1
 Handled code for label2
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobar\g__hook_xxx_next_code_tl  
@@ -85,11 +79,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -121,7 +110,6 @@ Data structure for label rules:
  label1 = 0 -> 
 Handled code for label1
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foo\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-002.tlg b/base/testfiles-lthooks/lthooks-002.tlg
index f9790cbc..d1f65579 100644
--- a/base/testfiles-lthooks/lthooks-002.tlg
+++ b/base/testfiles-lthooks/lthooks-002.tlg
@@ -13,11 +13,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -51,7 +46,6 @@ Data structure for label rules:
 Handled code for label1
 Handled code for label2
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobar\g__hook_xxx_next_code_tl  
@@ -87,11 +81,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -125,7 +114,6 @@ Data structure for label rules:
 Handled code for label1
 Handled code for top-level
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobaz\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-003.tlg b/base/testfiles-lthooks/lthooks-003.tlg
index 476f9ef0..d0cba6c1 100644
--- a/base/testfiles-lthooks/lthooks-003.tlg
+++ b/base/testfiles-lthooks/lthooks-003.tlg
@@ -58,11 +58,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -120,7 +115,6 @@ Handled code for label5
 Handled code for label8
 Handled code for label6
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo1 foo9 foo3 foo2 foo7 foo4 foo5 foo8 foo6\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-004.tlg b/base/testfiles-lthooks/lthooks-004.tlg
index 46e0c149..76a1bace 100644
--- a/base/testfiles-lthooks/lthooks-004.tlg
+++ b/base/testfiles-lthooks/lthooks-004.tlg
@@ -42,11 +42,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -95,7 +90,6 @@ Data structure for label rules:
  label4 = 0 -> label1
 ====================
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo4\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg
index ea9308ee..ea8d7c1a 100644
--- a/base/testfiles-lthooks/lthooks-005.tlg
+++ b/base/testfiles-lthooks/lthooks-005.tlg
@@ -65,11 +65,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -127,7 +122,6 @@ Handled code for label5
 Handled code for label8
 Handled code for label6
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo1 foo9 foo3 foo2 foo7 foo4 foo5 foo8 foo6\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg
index 680255b2..c9aa044d 100644
--- a/base/testfiles-lthooks/lthooks-006.tlg
+++ b/base/testfiles-lthooks/lthooks-006.tlg
@@ -38,11 +38,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -82,7 +77,6 @@ Handled code for label1
 Handled code for label3
 Handled code for label2
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo1 foo3 foo2\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-007.tlg b/base/testfiles-lthooks/lthooks-007.tlg
index 77d71c85..0dce76e5 100644
--- a/base/testfiles-lthooks/lthooks-007.tlg
+++ b/base/testfiles-lthooks/lthooks-007.tlg
@@ -39,11 +39,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -83,7 +78,6 @@ Handled code for label1
 Handled code for label3
 Handled code for label2
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo1 foo3\g__hook_xxx_next_code_tl  
@@ -94,11 +88,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -136,7 +125,6 @@ Handled code for label1
 Handled code for label2
 Handled code for label3
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx ->  foo1 foo3\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-008.tlg b/base/testfiles-lthooks/lthooks-008.tlg
index 1860f008..ae7d88cb 100644
--- a/base/testfiles-lthooks/lthooks-008.tlg
+++ b/base/testfiles-lthooks/lthooks-008.tlg
@@ -54,11 +54,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -85,7 +80,6 @@ Handled code for l3backend-dvips
 Update code for hook 'shipout/lastpage' on input line ...:
 All initialized (non-empty) hooks:
  enddocument -> \typeout {bar}\typeout {from my package}\typeout {legacy before hook code loaded}\typeout {legacy after hook code loaded code}\typeout {baz}\typeout {on top-level}\typeout {foo}\g__hook_enddocument_next_code_tl  
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
 No file lthooks-008.aux.
@@ -103,7 +97,7 @@ LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line ....
 LaTeX Font Info:    ... okay on input line ....
 LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line ....
 LaTeX Font Info:    ... okay on input line ....
-> \@enddocumenthook=\g__hook_enddocument_code_tl .
+> \@enddocumenthook=.
 bar
 from my package
 legacy before hook code loaded
diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg
index 33185b26..0ffb9ca1 100644
--- a/base/testfiles-lthooks/lthooks-009.tlg
+++ b/base/testfiles-lthooks/lthooks-009.tlg
@@ -13,11 +13,6 @@ Handled code for legacy
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -44,7 +39,6 @@ Handled code for l3backend-dvips
 Update code for hook 'shipout/lastpage' on input line ...:
 All initialized (non-empty) hooks:
  sffamily -> \typeout {Std sffamily code}\g__hook_sffamily_next_code_tl  
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
 No file lthooks-009.aux.
diff --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg
index ae00f030..9313016c 100644
--- a/base/testfiles-lthooks/lthooks-011.tlg
+++ b/base/testfiles-lthooks/lthooks-011.tlg
@@ -8,11 +8,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -44,7 +39,6 @@ Data structure for label rules:
  front = 0 -> 
 Handled code for front
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foo\g__hook_xxx_next_code_tl  
@@ -56,11 +50,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -94,7 +83,6 @@ Data structure for label rules:
 Handled code for front
 Handled code for rear
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobar\g__hook_xxx_next_code_tl  
@@ -106,11 +94,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -146,7 +129,6 @@ Handled code for front
 Handled code for rear
 Handled code for labels
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobarbaz\g__hook_xxx_next_code_tl  
@@ -158,11 +140,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -200,7 +177,6 @@ Handled code for rear
 Handled code for labels
 Handled code for return
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  xxx -> foobarbazboom\g__hook_xxx_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg
index b07257a7..176cdb8a 100644
--- a/base/testfiles-lthooks/lthooks-013.tlg
+++ b/base/testfiles-lthooks/lthooks-013.tlg
@@ -70,11 +70,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -127,7 +122,6 @@ Data structure for label rules:
  top-level = 0 -> 
 Handled code for top-level
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
  env/itemize/begin -> \typeout {env itemize first}\typeout {begin env itemize}\g__hook_env/itemize/begin_next_code_tl  
diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg
index a07a883e..4c270fbd 100644
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@ -7,11 +7,6 @@ Update code for hook 'sffamily' on input line ...:
 Update code for hook 'ttfamily' on input line ...:
 Update code for hook 'defaultfamily' on input line ...:
 Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 -> 
-Handled code for legacy
 Update code for hook 'begindocument/before' on input line ...:
 Update code for hook 'begindocument/end' on input line ...:
 Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -37,7 +32,6 @@ Data structure for label rules:
 Handled code for l3backend-dvips
 Update code for hook 'shipout/lastpage' on input line ...:
 All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl  
  enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl  
  shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl  
 No file lthooks-021.aux.





More information about the latex3-commits mailing list.