[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh441: Tell if top-level is executed first or last (e2f84ede)

PhelypeOleinik phelype.oleinik at latex-project.org
Sat Dec 12 19:03:01 CET 2020


Repository : https://github.com/latex3/latex2e
On branch  : hotfix/gh441
Link       : https://github.com/latex3/latex2e/commit/e2f84edec95be5d150cae5818ac555940cc03c59

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

commit e2f84edec95be5d150cae5818ac555940cc03c59
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Sat Dec 12 15:03:01 2020 -0300

    Tell if top-level is executed first or last


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

e2f84edec95be5d150cae5818ac555940cc03c59
 base/lthooks.dtx                          |  9 ++++++--
 base/testfiles-lthooks/filehook-003.tlg   |  6 +++---
 base/testfiles-lthooks/lthooks-009.tlg    |  8 ++++----
 base/testfiles-lthooks/lthooks-010.tlg    | 18 ++++++++--------
 base/testfiles-lthooks/lthooks-013.tlg    |  6 +++---
 base/testfiles-lthooks/lthooks-016.tlg    |  6 +++---
 base/testfiles-lthooks/lthooks-018.tlg    |  2 +-
 base/testfiles-lthooks/lthooks-019.tlg    | 26 +++++++++++------------
 base/testfiles-lthooks/lthooks-020.tlg    | 12 +++++------
 base/testfiles-lthooks/lthooks-021.tlg    |  4 ++--
 base/testfiles-lthooks/lthooks-022.tlg    | 10 ++++-----
 base/testfiles-lthooks/lthooks-023.tlg    |  2 +-
 base/testfiles-lthooks/lthooks-024.tlg    | 32 ++++++++++++++---------------
 base/testfiles-lthooks/lthooks-026.tlg    |  4 ++--
 base/testfiles-lthooks/lthooks-027.tlg    | 10 ++++-----
 base/testfiles-lthooks/lthooks-errors.tlg |  2 +-
 base/testfiles-lthooks2/lthooks2-002.tlg  | 34 +++++--------------------------
 base/testfiles-lthooks2/lthooks2-006.tlg  |  4 ++--
 18 files changed, 88 insertions(+), 107 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 5dc0d1cf..9554086c 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -3418,7 +3418,12 @@
 %
 %    If there is code in the |top-level| token list, print it:
 %    \begin{macrocode}
-        \@@_log_line:x { Document-level~(top-level)~code: }
+        \@@_log_line:x
+          {
+            Document-level~(top-level)~code
+            \hook_if_exist:nT {#1}
+              { ~(executed~\@@_if_reversed:nTF {#1} {first} {last} ) } :
+          }
         \@@_log_line_indent:x
           {
             \tl_if_empty:cTF { @@_toplevel~#1 }
@@ -3428,7 +3433,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-        \@@_log_line:x { Extra~code~for~next~invocation:}
+        \@@_log_line:x { Extra~code~for~next~invocation: }
         \@@_log_line_indent:x
           {
             \tl_if_empty:cTF { @@_next~#1 }
diff --git a/base/testfiles-lthooks/filehook-003.tlg b/base/testfiles-lthooks/filehook-003.tlg
index e941df97..b45ee6bc 100644
--- a/base/testfiles-lthooks/filehook-003.tlg
+++ b/base/testfiles-lthooks/filehook-003.tlg
@@ -47,7 +47,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     A -> \typeout {A}
 >     B -> \typeout {B}
 >     C -> \typeout {C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -60,7 +60,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     A -> \typeout {A}
 >     B -> \typeout {B}
 >     C -> \typeout {C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -73,7 +73,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     A -> \typeout {A}
 >     B -> \typeout {B}
 >     C -> \typeout {C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg
index 5bbda899..03549201 100644
--- a/base/testfiles-lthooks/lthooks-009.tlg
+++ b/base/testfiles-lthooks/lthooks-009.tlg
@@ -100,7 +100,7 @@ Update code for hook 'hook' on input line ...:
 -> The hook 'hook':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \hello \AddToHookNext {hook}{nested}world!
@@ -112,7 +112,7 @@ Use 'hook': \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world
 -> The hook 'hook':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \hello \AddToHookNext {hook}{nested}world!
@@ -124,7 +124,7 @@ and again: \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world!
 -> The hook 'hook':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \hello \AddToHookNext {hook}{nested}world!
@@ -136,7 +136,7 @@ once more: \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world!
 -> The hook 'hook':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \hello \AddToHookNext {hook}{nested}world!
diff --git a/base/testfiles-lthooks/lthooks-010.tlg b/base/testfiles-lthooks/lthooks-010.tlg
index 9ffb33d1..29fe40b9 100644
--- a/base/testfiles-lthooks/lthooks-010.tlg
+++ b/base/testfiles-lthooks/lthooks-010.tlg
@@ -12,7 +12,7 @@ l. ...\prop_show:c{g__hook_sffamily_code_prop}
 >     legacy -> Std sffamily code
 >     foo -> foo code
 >     bar -> bar code
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \typeout {first occasion only $\frac 12$} \AddToHookNext {sffamily}{\typeout {on second only}}
@@ -41,7 +41,7 @@ first occasion only $\frac 12$
 >     legacy -> Std sffamily code
 >     foo -> foo code
 >     bar -> bar code
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \typeout {on second only}
@@ -55,7 +55,7 @@ first occasion only $\frac 12$
 >     foo -> foo code
 >     bar -> bar code
 >     baz -> baz code
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     -> \typeout {on second only}
@@ -71,7 +71,7 @@ on second only
 >     foo -> foo code
 >     bar -> bar code
 >     baz -> baz code
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -94,7 +94,7 @@ l. ...\prop_show:c{g__hook_sffamily_code_prop}
 >     foo -> foo code
 >     bar -> bar code
 >     baz -> baz code
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -106,7 +106,7 @@ l. ...\prop_show:c{g__hook_sffamily_code_prop}
 -> The hook 'enddocument':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -117,7 +117,7 @@ l. ...\prop_show:c{g__hook_sffamily_code_prop}
 -> The hook 'xxx':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -127,7 +127,7 @@ l. ...\prop_show:c{g__hook_sffamily_code_prop}
 -> The hook 'xxx':
 > Code chunks:
 >     foo -> \typeout {some foo code ...}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {some code ...}
 > Extra code for next invocation:
 >     ---
@@ -140,7 +140,7 @@ some code ...
 -> The hook 'xxx':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg
index 5e48f7e5..8ebd74c9 100644
--- a/base/testfiles-lthooks/lthooks-013.tlg
+++ b/base/testfiles-lthooks/lthooks-013.tlg
@@ -14,7 +14,7 @@ Handled code for foo
 -> The hook 'env/itemize/begin':
 > Code chunks:
 >     foo -> \typeout {env itemize first}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {begin env itemize}
 > Extra code for next invocation:
 >     ---
@@ -26,7 +26,7 @@ Update code for hook 'file/bar' on input line ...:
 -> The hook 'file/bar':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {file bar}
 > Extra code for next invocation:
 >     ---
@@ -38,7 +38,7 @@ Update code for hook 'file/foo' on input line ...:
 -> The hook 'file/foo':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {file foo}
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-016.tlg b/base/testfiles-lthooks/lthooks-016.tlg
index 4716ed38..0b3cb8ff 100644
--- a/base/testfiles-lthooks/lthooks-016.tlg
+++ b/base/testfiles-lthooks/lthooks-016.tlg
@@ -14,7 +14,7 @@ Don't change this file in any respect.
 >     abc -> 1
 >     lmn -> 2
 >     xyz -> 3
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -27,7 +27,7 @@ Don't change this file in any respect.
 >     xyz -> 1
 >     abc -> 2
 >     lmn -> 3
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -40,7 +40,7 @@ Don't change this file in any respect.
 >     xyz -> 1
 >     abc -> 2
 >     lmn -> 3
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-018.tlg b/base/testfiles-lthooks/lthooks-018.tlg
index 459fb0d5..fc9f09a8 100644
--- a/base/testfiles-lthooks/lthooks-018.tlg
+++ b/base/testfiles-lthooks/lthooks-018.tlg
@@ -10,7 +10,7 @@ Handled code for my1
 -> The hook 'env/before/quote':
 > Code chunks:
 >     my1 -> \dotfill before 1\dotfill \par 
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-019.tlg b/base/testfiles-lthooks/lthooks-019.tlg
index f245e5fc..98c8bcc0 100644
--- a/base/testfiles-lthooks/lthooks-019.tlg
+++ b/base/testfiles-lthooks/lthooks-019.tlg
@@ -51,7 +51,7 @@ Handled code for my2
 >     my2 -> \typeout {B}\typeout {B2}
 >     my3 -> \typeout {C}
 >     my4 -> \typeout {D}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -114,7 +114,7 @@ Handled code for my2
 >     my3 -> \typeout {C}
 >     my4 -> \typeout {D}
 >     my5 -> \typeout {C alternate}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -163,7 +163,7 @@ Handled code for my2
 >     my1 -> \typeout {before B}
 >     my2 -> \typeout {before C}
 >     my3 -> \typeout {before D}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {before A}
 > Extra code for next invocation:
 >     ---
@@ -204,7 +204,7 @@ Handled code for my2
 >     my1 -> \typeout {after B}
 >     my2 -> \typeout {after C}
 >     my3 -> \typeout {after D}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     -> \typeout {after A}
 > Extra code for next invocation:
 >     ---
@@ -258,7 +258,7 @@ Handled code for zz2
 > Code chunks:
 >     zz1 -> \typeout {A}
 >     zz2 -> \typeout {B}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -284,7 +284,7 @@ Handled code for zz4
 >     zz2 -> \typeout {B}
 >     zz3 -> \typeout {C}
 >     zz4 -> \typeout {D}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -311,7 +311,7 @@ Handled code for zz3
 >     zz2 -> \typeout {B}
 >     zz3 -> \typeout {C}
 >     zz4 -> \typeout {D}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -323,7 +323,7 @@ Update code for hook 'Start' on input line ...:
 -> The hook 'Start':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -334,7 +334,7 @@ Update code for hook 'Stop' on input line ...:
 -> The hook 'Stop':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -374,7 +374,7 @@ Handled code for one
 -> The hook 'Start':
 > Code chunks:
 >     one -> \typeout {begin A}\typeout {begin B}\typeout {begin C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -391,7 +391,7 @@ Handled code for one
 -> The hook 'Stop':
 > Code chunks:
 >     one -> \typeout {end C}\typeout {end B}\typeout {end A}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -452,7 +452,7 @@ Handled code for zz3
 >     zz1 -> \typeout {A}
 >     zz2 -> \typeout {B}
 >     zz3 -> \typeout {C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -479,7 +479,7 @@ Handled code for zz3
 >     zz1 -> \typeout {A}
 >     zz2 -> \typeout {B}
 >     zz3 -> \typeout {C}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-020.tlg b/base/testfiles-lthooks/lthooks-020.tlg
index f5574f8d..95e93d57 100644
--- a/base/testfiles-lthooks/lthooks-020.tlg
+++ b/base/testfiles-lthooks/lthooks-020.tlg
@@ -23,7 +23,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -40,7 +40,7 @@ LaTeX Font Info:    ... okay on input line ....
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -71,7 +71,7 @@ A
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -88,7 +88,7 @@ A
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -119,7 +119,7 @@ A
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -136,7 +136,7 @@ A
 >     label-4 -> \typeout {D}
 >     label-5 -> \typeout {E}
 >     label-6 -> \typeout {F}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg
index d687df51..054d9d08 100644
--- a/base/testfiles-lthooks/lthooks-021.tlg
+++ b/base/testfiles-lthooks/lthooks-021.tlg
@@ -102,7 +102,7 @@ Update code for hook '??' on input line ...:
 > Code chunks:
 >     label1 -> code1
 >     label2 -> code2
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -125,7 +125,7 @@ Handled code for label2
 > Code chunks:
 >     label1 -> code1
 >     label2 -> code2
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-022.tlg b/base/testfiles-lthooks/lthooks-022.tlg
index a318bcf9..61ce84b6 100644
--- a/base/testfiles-lthooks/lthooks-022.tlg
+++ b/base/testfiles-lthooks/lthooks-022.tlg
@@ -5,7 +5,7 @@ Don't change this file in any respect.
 >     label-A -> \typeout {A-code}
 >     label-B -> \typeout {B-code}
 >     label-C -> \typeout {C-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -20,7 +20,7 @@ Package hooks Warning: Labels `label-B' and `label-A' are incompatible in hook
 >     label-A -> \typeout {A-code}
 >     label-B -> \typeout {B-code}
 >     label-C -> \typeout {C-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -33,7 +33,7 @@ Package hooks Warning: Labels `label-B' and `label-A' are incompatible in hook
 >     label-A -> \typeout {A-code}
 >     label-B -> \typeout {B-code}
 >     label-C -> \typeout {C-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -46,7 +46,7 @@ Package hooks Warning: Labels `label-B' and `label-A' are incompatible in hook
 >     label-A -> \typeout {A-code}
 >     label-B -> \typeout {B-code}
 >     label-C -> \typeout {C-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -59,7 +59,7 @@ Package hooks Warning: Labels `label-B' and `label-A' are incompatible in hook
 >     label-A -> \typeout {A-code}
 >     label-B -> \typeout {B-code}
 >     label-C -> \typeout {C-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-023.tlg b/base/testfiles-lthooks/lthooks-023.tlg
index e97abab0..6836bb56 100644
--- a/base/testfiles-lthooks/lthooks-023.tlg
+++ b/base/testfiles-lthooks/lthooks-023.tlg
@@ -19,7 +19,7 @@ incompatibility between packages.
 >     label-D -> \typeout {D-code}
 >     label-E -> \typeout {E-code}
 >     label-F -> \typeout {F-code}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-024.tlg b/base/testfiles-lthooks/lthooks-024.tlg
index 7fefedd6..ae480169 100644
--- a/base/testfiles-lthooks/lthooks-024.tlg
+++ b/base/testfiles-lthooks/lthooks-024.tlg
@@ -32,7 +32,7 @@ and I'll forget about whatever was undefined.
 >     top-level/foo -> top-level/foo
 >     top-level/foo/ -> top-level/foo/
 >     /./foo -> /./foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> top-leveltop-leveltop-level
 > Extra code for next invocation:
 >     ---
@@ -74,7 +74,7 @@ and I'll forget about whatever was undefined.
 >     pkg/foo -> pkg/foo
 >     pkg/foo/ -> pkg/foo/
 >     /./foo -> /./foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> top-leveltop-level
 > Extra code for next invocation:
 >     ---
@@ -85,7 +85,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     top-level/foo -> top-level/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -97,7 +97,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgA/foo -> pkgA/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -109,7 +109,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     lthooks-024-pkgB/foo -> lthooks-024-pkgB/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -121,7 +121,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgC/foo -> pkgC/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -133,7 +133,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     lthooks-024-pkgB/foo -> lthooks-024-pkgB/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -145,7 +145,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgA/foo -> pkgA/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -157,7 +157,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     top-level/foo -> top-level/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -168,7 +168,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     my-document/foo -> my-document/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -180,7 +180,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgA/foo -> pkgA/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -192,7 +192,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     lthooks-024-pkgB/foo -> lthooks-024-pkgB/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -204,7 +204,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgC/foo -> pkgC/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -216,7 +216,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     lthooks-024-pkgB/foo -> lthooks-024-pkgB/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -228,7 +228,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     pkgA/foo -> pkgA/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -240,7 +240,7 @@ and I'll forget about whatever was undefined.
 -> The hook 'foo':
 > Code chunks:
 >     my-document/foo -> my-document/foo
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-026.tlg b/base/testfiles-lthooks/lthooks-026.tlg
index 40cf3d67..06b5faea 100644
--- a/base/testfiles-lthooks/lthooks-026.tlg
+++ b/base/testfiles-lthooks/lthooks-026.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
 -> The hook 'env/quote/begin':
 > Code chunks:
 >     bar -> \typeout {quote begin 2}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {quote begin}
 > Extra code for next invocation:
 >     ---
@@ -45,7 +45,7 @@ quote after
 -> The hook 'env/quote/after':
 > Code chunks:
 >     foobar -> \typeout {quote after 2}
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed first):
 >     -> \typeout {quote after}
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-027.tlg b/base/testfiles-lthooks/lthooks-027.tlg
index f6d24915..5d010f5a 100644
--- a/base/testfiles-lthooks/lthooks-027.tlg
+++ b/base/testfiles-lthooks/lthooks-027.tlg
@@ -7,7 +7,7 @@ aaa bbb
 -> The hook 'A':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \message {aaa}
 > Extra code for next invocation:
 >     ---
@@ -23,7 +23,7 @@ aaa bbb
 -> The hook '-{hook}-':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \message {aaa}
 > Extra code for next invocation:
 >     ---
@@ -47,7 +47,7 @@ aaa bbb
 -> The hook 'gr^^c3^^bc^^c3^^9fe':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \message {aaa}
 > Extra code for next invocation:
 >     ---
@@ -63,7 +63,7 @@ aaa bbb
 -> The hook '^^e9^^89^^a4':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \message {aaa}
 > Extra code for next invocation:
 >     ---
@@ -79,7 +79,7 @@ aaa bbb
 -> The hook ' <-with spaces-> ':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \message {aaa}
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks/lthooks-errors.tlg b/base/testfiles-lthooks/lthooks-errors.tlg
index d905cf66..c7e7ff8e 100644
--- a/base/testfiles-lthooks/lthooks-errors.tlg
+++ b/base/testfiles-lthooks/lthooks-errors.tlg
@@ -24,7 +24,7 @@ incompatibility between packages.
 >     label3 ->  foo2
 >     label4 ->  foo3
 >     label5 ->  foo5
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg
index d63bc0c1..2b570162 100644
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@ -100,40 +100,16 @@ LaTeX Font Info:    ... okay on input line ....
 **** Add to hook enddocument/end (top-level) on input line ... <- \typeout {after preamble}
 Update code for hook 'enddocument/end' on input line ...:
 -> The hook 'enddocument':
-> Code chunks:
->     ---
-> Document-level (top-level) code:
->     ---
-> Extra code for next invocation:
->     ---
-> Rules:
->     ---
-> Hook code pool empty.
+> The hook is empty..
 -> The hook 'enddocument/afterlastpage':
-> Code chunks:
->     ---
-> Document-level (top-level) code:
->     ---
-> Extra code for next invocation:
->     ---
-> Rules:
->     ---
-> Hook code pool empty.
+> The hook is empty..
 -> The hook 'enddocument/afteraux':
-> Code chunks:
->     ---
-> Document-level (top-level) code:
->     ---
-> Extra code for next invocation:
->     ---
-> Rules:
->     ---
-> Hook code pool empty.
+> The hook is empty..
 -> The hook 'enddocument/info':
 > Code chunks:
 >     kernel/filelist -> \@dofilelist 
 >     kernel/warnings -> \@enddocument at kernel@warnings 
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -144,7 +120,7 @@ Update code for hook 'enddocument/end' on input line ...:
 -> The hook 'enddocument/end':
 > Code chunks:
 >     ---
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     -> \typeout {in preamble}\typeout {after preamble}
 > Extra code for next invocation:
 >     ---
diff --git a/base/testfiles-lthooks2/lthooks2-006.tlg b/base/testfiles-lthooks2/lthooks2-006.tlg
index 402baebc..61098e4c 100644
--- a/base/testfiles-lthooks2/lthooks2-006.tlg
+++ b/base/testfiles-lthooks2/lthooks2-006.tlg
@@ -5,7 +5,7 @@ my-package added CODE:
 -> The hook 'some-hook-a':
 > Code chunks:
 >     my-package -> CODE
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---
@@ -18,7 +18,7 @@ Adding a rule:
 -> The hook 'some-hook-a':
 > Code chunks:
 >     my-package -> CODE
-> Document-level (top-level) code:
+> Document-level (top-level) code (executed last):
 >     ---
 > Extra code for next invocation:
 >     ---





More information about the latex3-commits mailing list.