From 7a4486be53d6aed5b32cb2d33896da1037f55fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAURENS=20J=C3=A9r=C3=B4me?= Date: Tue, 23 Jan 2024 21:59:44 +0100 Subject: [PATCH] lthooks: `\DebugPrintHook` - new function for testing - new dedicated `lthooks-debug.tlv` - many `*.tlv` and `*.tlg` updated - some `update_*_tests.sh` updated --- base/lthooks.dtx | 193 +++++- base/testfiles-lthooks/filehook-003.lvt | 6 +- base/testfiles-lthooks/filehook-003.tlg | 107 +++- base/testfiles-lthooks/filehook-bug-140.lvt | 2 +- base/testfiles-lthooks/filehook-bug-140.tlg | 29 +- base/testfiles-lthooks/github-0401.lvt | 2 +- base/testfiles-lthooks/github-0401.tlg | 23 + base/testfiles-lthooks/github-0565.lvt | 2 +- base/testfiles-lthooks/github-0565.tlg | 27 +- base/testfiles-lthooks/github-0606.lvt | 2 +- base/testfiles-lthooks/github-0606.tlg | 31 +- base/testfiles-lthooks/github-0648.lvt | 4 +- base/testfiles-lthooks/github-0648.tlg | 31 +- base/testfiles-lthooks/github-0648b.lvt | 10 +- base/testfiles-lthooks/github-1052.lvt | 12 +- base/testfiles-lthooks/github-1052.tlg | 185 ++++-- base/testfiles-lthooks/ltcmdhooks-001.lvt | 8 +- base/testfiles-lthooks/ltcmdhooks-001.tlg | 140 +++-- base/testfiles-lthooks/ltcmdhooks-002.lvt | 2 +- base/testfiles-lthooks/ltcmdhooks-002.tlg | 32 +- base/testfiles-lthooks/ltcmdhooks-003.lvt | 4 +- base/testfiles-lthooks/ltcmdhooks-008.lvt | 28 +- base/testfiles-lthooks/ltcmdhooks-008.tlg | 416 ++++++++++--- base/testfiles-lthooks/ltcmdhooks-013.lvt | 24 +- base/testfiles-lthooks/ltcmdhooks-013.tlg | 390 ++++++++---- base/testfiles-lthooks/ltcmdhooks-014.lvt | 24 +- base/testfiles-lthooks/ltcmdhooks-014.tlg | 378 ++++++++---- base/testfiles-lthooks/ltcmdhooks-015.lvt | 24 +- base/testfiles-lthooks/ltcmdhooks-015.tlg | 378 ++++++++---- base/testfiles-lthooks/lthooks-009.lvt | 8 +- base/testfiles-lthooks/lthooks-009.tlg | 112 +++- base/testfiles-lthooks/lthooks-010.lvt | 18 +- base/testfiles-lthooks/lthooks-010.tlg | 312 +++++++--- base/testfiles-lthooks/lthooks-013.lvt | 10 +- base/testfiles-lthooks/lthooks-013.tlg | 138 ++++- base/testfiles-lthooks/lthooks-016.lvt | 6 +- base/testfiles-lthooks/lthooks-016.tlg | 107 +++- base/testfiles-lthooks/lthooks-018.lvt | 4 +- base/testfiles-lthooks/lthooks-018.tlg | 30 +- base/testfiles-lthooks/lthooks-019.lvt | 26 +- base/testfiles-lthooks/lthooks-019.tlg | 466 ++++++++++---- base/testfiles-lthooks/lthooks-020.lvt | 12 +- base/testfiles-lthooks/lthooks-020.tlg | 287 +++++---- base/testfiles-lthooks/lthooks-021.lvt | 4 +- base/testfiles-lthooks/lthooks-021.tlg | 68 ++- base/testfiles-lthooks/lthooks-022.lvt | 10 +- base/testfiles-lthooks/lthooks-022.tlg | 183 ++++-- base/testfiles-lthooks/lthooks-023.lvt | 2 +- base/testfiles-lthooks/lthooks-023.tlg | 54 +- base/testfiles-lthooks/lthooks-024.lvt | 4 +- base/testfiles-lthooks/lthooks-024.tlg | 535 +++++++++++++---- base/testfiles-lthooks/lthooks-026.lvt | 4 +- base/testfiles-lthooks/lthooks-026.tlg | 64 +- base/testfiles-lthooks/lthooks-027.lvt | 8 +- base/testfiles-lthooks/lthooks-027.tlg | 112 +++- base/testfiles-lthooks/lthooks-028.lvt | 22 +- base/testfiles-lthooks/lthooks-028.tlg | 358 ++++++++--- .../lthooks-029-deprecated-after.lvt | 28 +- .../lthooks-029-deprecated-after.tlg | 404 ++++++++++--- .../lthooks-029-deprecated-before.lvt | 28 +- .../lthooks-029-deprecated-before.tlg | 404 ++++++++++--- .../lthooks-029-deprecated.lvt | 28 +- .../lthooks-029-deprecated.tlg | 404 ++++++++++--- base/testfiles-lthooks/lthooks-029.lvt | 22 +- base/testfiles-lthooks/lthooks-029.tlg | 315 ++++++++-- base/testfiles-lthooks/lthooks-029b.lvt | 4 +- base/testfiles-lthooks/lthooks-029b.tlg | 65 +- base/testfiles-lthooks/lthooks-030.lvt | 4 +- base/testfiles-lthooks/lthooks-030.tlg | 58 +- base/testfiles-lthooks/lthooks-031.lvt | 10 +- base/testfiles-lthooks/lthooks-031.tlg | 160 +++-- base/testfiles-lthooks/lthooks-033.lvt | 34 +- base/testfiles-lthooks/lthooks-033.tlg | 567 +++++++++++++----- base/testfiles-lthooks/lthooks-034.lvt | 4 +- base/testfiles-lthooks/lthooks-034.tlg | 71 ++- base/testfiles-lthooks/lthooks-debug.lvt | 128 ++++ base/testfiles-lthooks/lthooks-debug.tlg | 558 +++++++++++++++++ .../lthooks-doc-examples.lvt | 8 +- .../lthooks-doc-examples.tlg | 156 +++-- .../lthooks-errors-deprecated.lvt | 2 +- .../lthooks-errors-deprecated.tlg | 47 +- base/testfiles-lthooks/lthooks-errors.lvt | 2 +- base/testfiles-lthooks/lthooks-errors.tlg | 41 +- .../lthooks-rollback-args.tlg | 1 + base/testfiles-lthooks2/github-0431.lvt | 4 +- base/testfiles-lthooks2/github-0431.tlg | 54 +- base/testfiles-lthooks2/lthooks2-002.lvt | 12 +- base/testfiles-lthooks2/lthooks2-002.tlg | 172 +++++- base/testfiles-lthooks2/lthooks2-006.lvt | 2 +- base/testfiles-lthooks2/lthooks2-006.tlg | 324 ++++++++-- base/testfiles-search/tlb-CJK-001.lvt | 4 +- base/testfiles-search/tlb-CJK-001.tlg | 68 ++- base/testfiles/github-0424.lvt | 2 +- base/testfiles/github-0424.tlg | 31 +- base/testfiles/github-0479-often.luatex.tlg | 1 + base/testfiles/github-0479-often.tlg | 1 + base/testfiles/github-0479-often.xetex.tlg | 1 + base/testfiles/github-0944.lvt | 2 +- base/testfiles/github-0944.tlg | 44 +- base/testfiles/github-0962b.luatex.tlg | 34 +- base/testfiles/github-0962b.lvt | 2 +- base/testfiles/github-0962b.tlg | 34 +- ...latexrelease-rollback-003-often.luatex.tlg | 2 + .../tlb-latexrelease-rollback-003-often.tlg | 2 + ...-latexrelease-rollback-003-often.xetex.tlg | 2 + ...atexrelease-rollback-2020-10-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2020-10-01.tlg | 1 + ...latexrelease-rollback-2020-10-01.xetex.tlg | 1 + ...atexrelease-rollback-2021-06-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2021-06-01.tlg | 1 + ...latexrelease-rollback-2021-06-01.xetex.tlg | 1 + ...atexrelease-rollback-2021-11-15.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2021-11-15.tlg | 1 + ...latexrelease-rollback-2021-11-15.xetex.tlg | 1 + ...atexrelease-rollback-2022-06-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2022-06-01.tlg | 1 + ...latexrelease-rollback-2022-06-01.xetex.tlg | 1 + ...atexrelease-rollback-2022-11-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2022-11-01.tlg | 1 + ...latexrelease-rollback-2022-11-01.xetex.tlg | 1 + ...atexrelease-rollback-2023-06-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2023-06-01.tlg | 1 + ...latexrelease-rollback-2023-06-01.xetex.tlg | 1 + ...atexrelease-rollback-2023-11-01.luatex.tlg | 1 + .../tlb-latexrelease-rollback-2023-11-01.tlg | 1 + ...latexrelease-rollback-2023-11-01.xetex.tlg | 1 + .../tlb-rollback-004-often.luatex.tlg | 1 + base/testfiles/tlb-rollback-004-often.tlg | 1 + .../tlb-rollback-004-often.xetex.tlg | 1 + base/testfiles/tlb-rollback-005.luatex.tlg | 1 + base/testfiles/tlb-rollback-005.tlg | 1 + base/testfiles/tlb-rollback-005.xetex.tlg | 1 + base/update-lthooks-tests.sh | 16 +- base/update-rollback-tests.sh | 1 + .../testfiles-TU/firstaid-bidi.luatex.tlg | 27 +- .../firstaid/testfiles-TU/firstaid-bidi.lvt | 2 +- .../firstaid/testfiles-TU/firstaid-bidi.tlg | 27 +- .../firstaid-unicode-math.luatex.tlg | 31 +- .../testfiles-TU/firstaid-unicode-math.lvt | 2 +- .../testfiles-TU/firstaid-unicode-math.tlg | 31 +- .../toc-ex-article-hyperref-1.luatex.tpf | 370 ++++++------ .../toc-ex-article-hyperref-1.tpf | 380 ++++++------ .../toc-ex-article-hyperref-2.luatex.tpf | 370 ++++++------ .../toc-ex-article-hyperref-2.tpf | 380 ++++++------ .../toc-ex-article-hyperref-3.luatex.tpf | 396 ++++++------ .../toc-ex-article-hyperref-3.tpf | 406 ++++++------- .../toc-ex-book-hyperref-1.luatex.tpf | 460 +++++++------- .../testfiles-toc/toc-ex-book-hyperref-1.tpf | 468 +++++++-------- 148 files changed, 9279 insertions(+), 3944 deletions(-) create mode 100644 base/testfiles-lthooks/lthooks-debug.lvt create mode 100644 base/testfiles-lthooks/lthooks-debug.tlg diff --git a/base/lthooks.dtx b/base/lthooks.dtx index 2d1426df22..a0739df4ab 100644 --- a/base/lthooks.dtx +++ b/base/lthooks.dtx @@ -32,7 +32,7 @@ % % \begin{macrocode} \def\lthooksversion{v1.1h} -\def\lthooksdate{2024/01/24} +\def\lthooksdate{2024/01/27} % \end{macrocode} % %<*driver> @@ -1000,7 +1000,7 @@ % that is, in the order they will be executed when the hook is used. % % -% \subsubsection{Debugging hook code} +% \subsubsection{Debugging or testing hook code} % % \begin{function}{\DebugHooksOn,\DebugHooksOff} % \begin{syntax} @@ -1011,6 +1011,15 @@ % not really intended for normal use. % \end{function} % +% \begin{function}{\DebugPrintHook} +% \begin{syntax} +% \cs{DebugPrintHook} \Arg{hook} +% \end{syntax} +% Prints information about the hook. The output is rather coarse and +% primarily intended for debugging or testing purposes. +% Use \cs{ShowHook} for normal use. +% \end{function} +% % % \subsection{L3 programming layer (\texttt{expl3}) interfaces} % \label{sec:l3hook-interface} @@ -6664,7 +6673,154 @@ % \end{macrocode} % \end{macro} % -% +% \begin{macro}{\DebugPrintHook} +% Print detailed hook information. +% \changes{v1.1h}{2024/01/27} +% {Add \cs{DebugPrintHook}.} +% \begin{macrocode} +\cs_new_protected:Npn \DebugPrintHook #1 + { +% \end{macrocode} +% We store the argument before normalization +% \begin{macrocode} + \tl_set:Ne \l_@@_print_tl { #1 } + \@@_normalize_hook_args:Nn \@@_debug_print:n { #1 } + } +% \end{macrocode} +% Next function is for \cs{DebugPrintHook} usage only. +% \begin{macrocode} +%\IncludeInRelease{2024/01/27}{\DebugPrintHook} +% {Test~or~debug} +\cs_new_protected:Npn \@@_debug_print:n #1 + { + \@@_preamble_hook:n { #1 } + \exp_args:NV \str_if_eq:nnF \l_@@_print_tl { #1 } + { +% \end{macrocode} +% The normalization has changed the argument, display the original argument. +% \begin{macrocode} + \iow_term:x { <<<~Hook:~'#1'(<- ~ '\l_@@_print_tl') } + \use_none:nn + } + \iow_term:n { <<<~Hook:~'#1' } + \iow_term:n { ...~Attributes: } + \cs_set:Npn \@@_tmp:w ##1 + { + \iow_term:x + { + ...~\space\space##1:~ + \cs_if_exist_use:cF { @@_if_##1:nT } + { \use:c { hook_if_##1:nT } } + { #1 } { Y \use_none:n } N + } + } + \@@_tmp:w { deprecated_generic } + \@@_tmp:w { generic } + \@@_tmp:w { declared } + \@@_tmp:w { structure_exist } + \@@_tmp:w { usable } + \@@_tmp:w { disabled } + \@@_tmp:w { empty } + \@@_tmp:w { reversed } + \@@_tmp:w { generic_reversed } + \@@_tmp:w { consumed } +% \end{macrocode} +% Done with \cs[no-index]{@@_tmp:w}. +% \begin{macrocode} + \iow_term:x + { + ...~\space\space\c_hash_str\space of~arguments:~ + \int_eval:n { \str_count:e { \@@_parameter:n {#1} } / 3 } + } + \iow_term:n { ...~Code~chunks: } + \prop_map_inline:cn { g_@@_#1_code_prop } + { + \exp_after:wN \cs_set:Npn \exp_after:wN \@@_debug_print:n:w + \c_@@_nine_parameters_tl { ##2 } + \iow_term:x + { + ...~\space\space + '##1' ~->~\cs_replacement_spec:N \@@_debug_print:n:w + } + } + \iow_term:x + { + ...~\space\space'top~level' + \@@_cs_if_empty:cTF { @@_toplevel~#1 } + { ~ empty } + { ~ -> ~ \cs_replacement_spec:c { @@_toplevel~#1 } } + } + \iow_term:x + { + ...~\space\space next-only + \@@_cs_if_empty:cTF { @@_next~#1 } + { ~ empty } + { + ~ -> ~ \exp_last_unbraced:Nf \@@_log_next_code:w + { \cs_replacement_spec:c { @@_next~#1 } } + } + } + \iow_term:n { ...~Default~rules: } + \tl_set:Nn \l_@@_print_tl { \iow_term:x { ...~\space\space None } } + \@@_list_rules:nn {#1} + { + \str_if_eq:nnT {##3} {??} + { + \tl_set:Nn \l_@@_print_tl { ##2 } + \tl_if_in:NnTF \l_@@_print_tl { ^^J } + { + \tl_replace_once:Nnn \l_@@_print_tl { ^^J } { '~##1~' } + } + { + \tl_replace_once:Nnn \l_@@_print_tl { | } { '~##1~' } + } + \iow_term:x { ...~\space\space'\l_@@_print_tl' } + \tl_clear:N \l_@@_print_tl + } + } + \l_@@_print_tl + \iow_term:n { ...~Rules: } + \tl_set:Nn \l_@@_print_tl { \iow_term:x { ...~\space\space None } } + \@@_list_rules:nn {#1} + { + \str_if_eq:nnF {##3} {??} + { + \tl_set:Nn \l_@@_print_tl { ##2 } + \tl_if_in:NnTF \l_@@_print_tl { ^^J } + { + \tl_replace_once:Nnn \l_@@_print_tl { ^^J } { '~##1~' } + } + { + \tl_replace_once:Nnn \l_@@_print_tl { | } { '~##1~' } + } + \iow_term:x { ...~\space\space'\l_@@_print_tl' } + \tl_clear:N \l_@@_print_tl + } + } + \l_@@_print_tl + \iow_term:n { ...~Execution~order: } + \hook_if_empty:nF { #1 } + { + \clist_if_exist:cT { g_@@_#1_labels_clist } + { + \clist_if_empty:cF + { g_@@_#1_labels_clist } + { + \iow_term:x + { + ...~\space\space' + \clist_use:cn { g_@@_#1_labels_clist } { ',~' }' + } + \use_none:n + } + } + } + { \iow_term:x { ...~\space\space None } } + \iow_term:n { >>> } + } +%\EndIncludeInRelease +% \end{macrocode} +% \end{macro} % % % \subsection{Specifying code for next invocation} @@ -7174,6 +7330,37 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}[pTF]{ +% \hook_if_consumed:n, +% } +% Partially redundant with \cs[no-index]{@@_execute_immediately:nTF}. +% \begin{macrocode} +\prg_new_conditional:Npnn \hook_if_consumed:n #1 { p, T, F, TF } + { + \exp_after:wN \@@_use_none_delimit_by_s_mark:w + \if:w I + \if_cs_exist:w g_@@_#1_reversed_tl \cs_end: + \cs:w g_@@_#1_reversed_tl \exp_after:wN \cs_end: + \fi: + X + \s_@@_mark \prg_return_true: + \else: + \s_@@_mark \prg_return_false: + \fi: + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{ +% \IfHookConsumedTF, +% } +% \LaTeXe\ API. Not yet documented. +% \begin{macrocode} +\cs_set_eq:NN \IfHookConsumedTF \hook_if_consumed:nTF +% \end{macrocode} +% \end{macro} +% +% % \subsection{Querying a hook} % % Simpler data types, like token lists, have three possible states; they diff --git a/base/testfiles-lthooks/filehook-003.lvt b/base/testfiles-lthooks/filehook-003.lvt index aea9c107ef..0506bb0f6c 100644 --- a/base/testfiles-lthooks/filehook-003.lvt +++ b/base/testfiles-lthooks/filehook-003.lvt @@ -26,9 +26,9 @@ \begin{document} -\LogHook{include/before} -\LogHook{include/after} -\LogHook{include/end} +\DebugPrintHook{include/before} +\DebugPrintHook{include/after} +\DebugPrintHook{include/end} \END diff --git a/base/testfiles-lthooks/filehook-003.tlg b/base/testfiles-lthooks/filehook-003.tlg index fb6bdab92e..3a251317b6 100644 --- a/base/testfiles-lthooks/filehook-003.tlg +++ b/base/testfiles-lthooks/filehook-003.tlg @@ -36,32 +36,81 @@ 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 .... -==> Hook: 'include/before' -> Code chunks: -> 'A' -> \typeout {A} -> 'B' -> \typeout {B} -> 'C' -> \typeout {C} -> Execution order: -> 1: 'A' -> 2: 'B' -> 3: 'C'. -==> Hook: 'include/after' -> reversed -> Code chunks: -> 'A' -> \typeout {A} -> 'B' -> \typeout {B} -> 'C' -> \typeout {C} -> Execution order: -> 1: 'C' -> 2: 'B' -> 3: 'A'. -==> Hook: 'include/end' -> reversed -> Code chunks: -> 'A' -> \typeout {A} -> 'B' -> \typeout {B} -> 'C' -> \typeout {C} -> Execution order: -> 1: 'C' -> 2: 'B' -> 3: 'A'. +<<< Hook: 'include/before' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A} +... 'B' -> \typeout {B} +... 'C' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'A', 'B', 'C' +>>> +<<< Hook: 'include/after' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A} +... 'B' -> \typeout {B} +... 'C' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'C', 'B', 'A' +>>> +<<< Hook: 'include/end' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A} +... 'B' -> \typeout {B} +... 'C' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'C', 'B', 'A' +>>> diff --git a/base/testfiles-lthooks/filehook-bug-140.lvt b/base/testfiles-lthooks/filehook-bug-140.lvt index 0b07492454..31f80bd27b 100644 --- a/base/testfiles-lthooks/filehook-bug-140.lvt +++ b/base/testfiles-lthooks/filehook-bug-140.lvt @@ -24,7 +24,7 @@ \START -\LogHook{file/\jobname-foo-bar.tex/before} +\DebugPrintHook{file/\jobname-foo-bar.tex/before} \typeout{----------------------} diff --git a/base/testfiles-lthooks/filehook-bug-140.tlg b/base/testfiles-lthooks/filehook-bug-140.tlg index 286c64a893..8109091431 100644 --- a/base/testfiles-lthooks/filehook-bug-140.tlg +++ b/base/testfiles-lthooks/filehook-bug-140.tlg @@ -1,11 +1,28 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'file/filehook-bug-140-foo-bar.tex/before' -> builtin generic -> Code chunks: -> 'top-level' -> \typeout {1}\typeout {2}\typeout {3} -> Execution order: -> 1: 'top-level'. +<<< Hook: 'file/filehook-bug-140-foo-bar.tex/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {1}\typeout {2}\typeout {3} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ---------------------- 1 2 diff --git a/base/testfiles-lthooks/github-0401.lvt b/base/testfiles-lthooks/github-0401.lvt index 9121ab837b..7b698170d3 100644 --- a/base/testfiles-lthooks/github-0401.lvt +++ b/base/testfiles-lthooks/github-0401.lvt @@ -12,6 +12,6 @@ \AddToHook{begindocument}[mypackage]{\relax} -\ShowHook{begindocument} +\DebugPrintHook{begindocument} \END diff --git a/base/testfiles-lthooks/github-0401.tlg b/base/testfiles-lthooks/github-0401.tlg index bfbef442cf..454bd96c4e 100644 --- a/base/testfiles-lthooks/github-0401.tlg +++ b/base/testfiles-lthooks/github-0401.tlg @@ -1,2 +1,25 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/github-0565.lvt b/base/testfiles-lthooks/github-0565.lvt index c14e5e0445..35f4a1b382 100644 --- a/base/testfiles-lthooks/github-0565.lvt +++ b/base/testfiles-lthooks/github-0565.lvt @@ -8,7 +8,7 @@ \AddToHookNext{foo}{\typeout{--> next}} \ClearHookNext{foo} -\ShowHook{foo} +\DebugPrintHook{foo} diff --git a/base/testfiles-lthooks/github-0565.tlg b/base/testfiles-lthooks/github-0565.tlg index 9db0e611ea..13cde80e06 100644 --- a/base/testfiles-lthooks/github-0565.tlg +++ b/base/testfiles-lthooks/github-0565.tlg @@ -1,6 +1,25 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -==> Hook: 'foo' -> empty. - } -l. ...\ShowHook{foo} +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/github-0606.lvt b/base/testfiles-lthooks/github-0606.lvt index 066637e9fb..42f1e9edf0 100644 --- a/base/testfiles-lthooks/github-0606.lvt +++ b/base/testfiles-lthooks/github-0606.lvt @@ -25,6 +25,6 @@ \AddToHookNext{A}{\typeout{C}} % nothing \RemoveFromHook{A}[top-level] \DeclareHookRule{A}{b}{after}{c} -\ShowHook{A} % The hook is empty. +\DebugPrintHook{A} % The hook is empty. \END diff --git a/base/testfiles-lthooks/github-0606.tlg b/base/testfiles-lthooks/github-0606.tlg index cf7ca00b7b..908362d1df 100644 --- a/base/testfiles-lthooks/github-0606.tlg +++ b/base/testfiles-lthooks/github-0606.tlg @@ -19,11 +19,26 @@ You tried to set the ordering of hook 'A' using \DeclareHookRule{A}{b}{after}{c} but hook 'A' was already used as a one-time hook, thus sorting is no longer possible. Declare the rule before the hook is used. -==> Hook: 'A' -> Code chunks: -> next-only -> \typeout {C} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{A} - % The hook is empty. +<<< Hook: 'A' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {C} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/github-0648.lvt b/base/testfiles-lthooks/github-0648.lvt index 243eff0615..f21662b007 100644 --- a/base/testfiles-lthooks/github-0648.lvt +++ b/base/testfiles-lthooks/github-0648.lvt @@ -42,8 +42,8 @@ \RemoveFromHook{file/before/foo.tex}[top-level] \resethook{file/before/foo.tex} -\typeout{\string\ShowHook:} -\ShowHook{file/before/foo.tex} +\typeout{\string\DebugPrintHook:} +\DebugPrintHook{file/before/foo.tex} \resethook{file/before/foo.tex} \typeout{\string\AddToHookNext:} diff --git a/base/testfiles-lthooks/github-0648.tlg b/base/testfiles-lthooks/github-0648.tlg index 44b5a7f57b..cfcb4618ee 100644 --- a/base/testfiles-lthooks/github-0648.tlg +++ b/base/testfiles-lthooks/github-0648.tlg @@ -21,13 +21,30 @@ LaTeX hooks Warning: Generic hook 'include/after/bbb' is deprecated. \RemoveFromHook: LaTeX hooks Warning: Generic hook 'file/before/foo.tex' is deprecated. (hooks) Use hook 'file/foo.tex/before' instead. -\ShowHook: -LaTeX hooks Warning: Generic hook 'file/before/foo.tex' is deprecated. -(hooks) Use hook 'file/foo.tex/before' instead. -==> Hook: 'file/foo.tex/before' -> builtin generic. - } -l. ...\ShowHook{file/before/foo.tex} +\DebugPrintHook: +<<< Hook: 'file/before/foo.tex' +... Attributes: +... deprecated_generic: Y +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> \AddToHookNext: LaTeX hooks Warning: Generic hook 'file/before/foo.tex' is deprecated. (hooks) Use hook 'file/foo.tex/before' instead. diff --git a/base/testfiles-lthooks/github-0648b.lvt b/base/testfiles-lthooks/github-0648b.lvt index ea56d0d039..54954333bf 100644 --- a/base/testfiles-lthooks/github-0648b.lvt +++ b/base/testfiles-lthooks/github-0648b.lvt @@ -22,15 +22,15 @@ \AddToHookNext{package/before/after}{\typeout{next after before.sty}} \AddToHookNext{package/before/before}{\typeout{next before before.sty}} -% \ShowHook and \DeclareHookRule fail miserably due to the deprecation +% \DebugPrintHook and \DeclareHookRule fail miserably due to the deprecation % code when used with a 'package', 'class', or 'include' hook with % files named 'before' or 'after' (the name becomes indistinguishable % from the position), but hopefully nobody actually uses that ;-) -% \ShowHook{package/after/after}[x] -% \ShowHook{package/after/before}[x] -% \ShowHook{package/before/after}[x] -% \ShowHook{package/before/before}[x] +% \DebugPrintHook{package/after/after}[x] +% \DebugPrintHook{package/after/before}[x] +% \DebugPrintHook{package/before/after}[x] +% \DebugPrintHook{package/before/before}[x] \typeout{-------------------------------} \RequirePackage{before} diff --git a/base/testfiles-lthooks/github-1052.lvt b/base/testfiles-lthooks/github-1052.lvt index 5c6d5ea1d9..5dc4fa8631 100644 --- a/base/testfiles-lthooks/github-1052.lvt +++ b/base/testfiles-lthooks/github-1052.lvt @@ -8,29 +8,29 @@ \ExplSyntaxOn \hook_gput_code:nnn { env/foo/before } { label } { \typeout{env/foo/before} } -\hook_show:n { env/foo/before } +\DebugPrintHook { env/foo/before } \hook_use:n { env/foo/before } \hook_gput_code:nnn { envfoobefore } { label } { \typeout{envfoobefore} } -\hook_show:n { envfoobefore } +\DebugPrintHook { envfoobefore } \hook_new:n { envfoobefore } \hook_use:n { envfoobefore } \hook_gput_next_code:nn { env/foo/after } { \typeout{env/foo/after} } -\hook_show:n { env/foo/after } +\DebugPrintHook { env/foo/after } \hook_use:n { env/foo/after } \hook_gput_next_code:nn { envfooafter } { \typeout{envfooafter} } -\hook_show:n { envfooafter } +\DebugPrintHook { envfooafter } \hook_new:n { envfooafter } \hook_use:n { envfooafter } \hook_gput_code:nnn { env/foo/begin } { top-level } { \typeout{env/foo/begin} } -\hook_show:n { env/foo/begin } +\DebugPrintHook { env/foo/begin } \hook_use:n { env/foo/begin } \hook_gput_code:nnn { envfoobegin } { top-level } { \typeout{envfoobegin} } -\hook_show:n { envfoobegin } +\DebugPrintHook { envfoobegin } \hook_new:n { envfoobegin } \hook_use:n { envfoobegin } diff --git a/base/testfiles-lthooks/github-1052.tlg b/base/testfiles-lthooks/github-1052.tlg index e045fc74fa..728a66b19d 100644 --- a/base/testfiles-lthooks/github-1052.tlg +++ b/base/testfiles-lthooks/github-1052.tlg @@ -1,53 +1,148 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'env/foo/before' -> builtin generic -> Code chunks: -> 'label' -> \typeout {env/foo/before} -> Execution order: -> 1: 'label'. - } -l. ...\hook_show:n { env/foo/before } +<<< Hook: 'env/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {env/foo/before} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> env/foo/before -==> Hook: 'envfoobefore' -> not declared -> Code chunks: -> 'label' -> \typeout {envfoobefore} -> No execution. - } -l. ...\hook_show:n { envfoobefore } +<<< Hook: 'envfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {envfoobefore} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> envfoobefore -==> Hook: 'env/foo/after' -> builtin generic, reversed -> Code chunks: -> next-only -> \typeout {env/foo/after} -> Execution order: -> 1: next-only. - } -l. ...\hook_show:n { env/foo/after } +<<< Hook: 'env/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {env/foo/after} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> env/foo/after -==> Hook: 'envfooafter' -> not declared -> Code chunks: -> next-only -> \typeout {envfooafter} -> No execution. - } -l. ...\hook_show:n { envfooafter } +<<< Hook: 'envfooafter' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {envfooafter} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> envfooafter -==> Hook: 'env/foo/begin' -> builtin generic -> Code chunks: -> 'top-level' -> \typeout {env/foo/begin} -> Execution order: -> 1: 'top-level'. - } -l. ...\hook_show:n { env/foo/begin } +<<< Hook: 'env/foo/begin' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {env/foo/begin} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> env/foo/begin -==> Hook: 'envfoobegin' -> not declared -> Code chunks: -> 'top-level' -> \typeout {envfoobegin} -> No execution. - } -l. ...\hook_show:n { envfoobegin } +<<< Hook: 'envfoobegin' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {envfoobegin} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> envfoobegin diff --git a/base/testfiles-lthooks/ltcmdhooks-001.lvt b/base/testfiles-lthooks/ltcmdhooks-001.lvt index 74edb53a85..3e29f6fde9 100644 --- a/base/testfiles-lthooks/ltcmdhooks-001.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-001.lvt @@ -23,8 +23,8 @@ \AddToHook{cmd/foo/before}[y]{before 2 } \AddToHook{cmd/foo/after} [y]{after 2 } -\ShowHook{cmd/foo/before} -\ShowHook{cmd/foo/after} +\DebugPrintHook{cmd/foo/before} +\DebugPrintHook{cmd/foo/after} \show\foo @@ -34,8 +34,8 @@ \begin{document} -\ShowHook{cmd/foo/before} -\ShowHook{cmd/foo/after} +\DebugPrintHook{cmd/foo/before} +\DebugPrintHook{cmd/foo/after} \show\foo diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg index d0f458b96a..269bf7d143 100644 --- a/base/testfiles-lthooks/ltcmdhooks-001.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg @@ -18,16 +18,31 @@ Data structure for label rules: y = 0 -> Handled code for x Handled code for y -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'x' -> before 1 -> 'y' -> before 2 -> Execution order: -> 1: 'x' -> 2: 'y'. - } -l. ...\ShowHook{cmd/foo/before} +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'x' -> before 1 +... 'y' -> before 2 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'x', 'y' +>>> Update code for hook 'cmd/foo/after' on input line ...: Code labels for sorting: x and y @@ -36,16 +51,31 @@ Data structure for label rules: y = 0 -> Handled code for x Handled code for y -==> Hook: 'cmd/foo/after' -> builtin generic, reversed, unknown arguments -> Code chunks: -> 'x' -> after 1 -> 'y' -> after 2 -> Execution order: -> 1: 'y' -> 2: 'x'. - } -l. ...\ShowHook{cmd/foo/after} +<<< Hook: 'cmd/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'x' -> after 1 +... 'y' -> after 2 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'y', 'x' +>>> > \foo=\long macro: #1#2->FOO #1 #2. l. ...\show\foo @@ -265,26 +295,56 @@ Data structure for label rules: y = 0 -> Handled code for x Handled code for y -==> Hook: 'cmd/foo/before' -> builtin generic, 2 arguments -> Code chunks: -> 'x' -> before 1 -> 'y' -> before 2 -> Execution order: -> 1: 'x' -> 2: 'y'. - } -l. ...\ShowHook{cmd/foo/before} -==> Hook: 'cmd/foo/after' -> builtin generic, reversed, 2 arguments -> Code chunks: -> 'x' -> after 1 -> 'y' -> after 2 -> Execution order: -> 1: 'y' -> 2: 'x'. - } -l. ...\ShowHook{cmd/foo/after} +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'x' -> before 1 +... 'y' -> before 2 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'x', 'y' +>>> +<<< Hook: 'cmd/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'x' -> after 1 +... 'y' -> after 2 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'y', 'x' +>>> > \foo=\long macro: #1#2->\UseHookWithArguments {cmd/foo/before}{2}{#1}{#2}FOO #1 #2\UseHookWithArguments {cmd/foo/after}{2}{#1}{#2}. l. ...\show\foo diff --git a/base/testfiles-lthooks/ltcmdhooks-002.lvt b/base/testfiles-lthooks/ltcmdhooks-002.lvt index 55a0e04a68..eb0ececbd3 100644 --- a/base/testfiles-lthooks/ltcmdhooks-002.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-002.lvt @@ -15,7 +15,7 @@ \AddToHook{cmd/foo/before}[x]{ before } \AddToHook{cmd/foo/after}[x] { after } -\ShowHook{cmd/foo/before} +\DebugPrintHook{cmd/foo/before} \show\foo \showoutput diff --git a/base/testfiles-lthooks/ltcmdhooks-002.tlg b/base/testfiles-lthooks/ltcmdhooks-002.tlg index 6b593fdca2..c48daef14a 100644 --- a/base/testfiles-lthooks/ltcmdhooks-002.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-002.tlg @@ -14,14 +14,30 @@ Code labels for sorting: Data structure for label rules: x = 0 -> Handled code for x -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'x' -> before -> Execution order: -> 1: 'x'. - } -l. ...\ShowHook{cmd/foo/before} +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'x' -> before +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'x' +>>> > \foo=\long macro: #1#2->FOO #1 #2. l. ...\show\foo diff --git a/base/testfiles-lthooks/ltcmdhooks-003.lvt b/base/testfiles-lthooks/ltcmdhooks-003.lvt index 30eeb61806..c6533ce06f 100644 --- a/base/testfiles-lthooks/ltcmdhooks-003.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-003.lvt @@ -30,8 +30,8 @@ \AddToHook{cmd/\cstostr#3/before}[lbl]{before} \AddToHook{cmd/\cstostr#3/after}[lbl]{after} % - % \ShowHook{cmd/\cstostr#3/before} - % \ShowHook{cmd/\cstostr#3/after} + % \DebugPrintHook{cmd/\cstostr#3/before} + % \DebugPrintHook{cmd/\cstostr#3/after} % \ShowCommand#3% % diff --git a/base/testfiles-lthooks/ltcmdhooks-008.lvt b/base/testfiles-lthooks/ltcmdhooks-008.lvt index 085dd35b72..128f0af340 100644 --- a/base/testfiles-lthooks/ltcmdhooks-008.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-008.lvt @@ -9,34 +9,34 @@ \typeout{=================================} \def\foo{foo} -\AddToHook{\foo}{before} \ShowHook{\foo} -\DisableGenericHook{\foo} \ShowHook{\foo} -\AddToHook{\foo}{after} \ShowHook{\foo} +\AddToHook{\foo}{before} \DebugPrintHook{\foo} +\DisableGenericHook{\foo} \DebugPrintHook{\foo} +\AddToHook{\foo}{after} \DebugPrintHook{\foo} \typeout{=================================} \def\foo{bar} -\AddToHook{\foo}{before} \ShowHook{\foo} -\NewHook{\foo} \ShowHook{\foo} -\DisableGenericHook{\foo} \ShowHook{\foo} +\AddToHook{\foo}{before} \DebugPrintHook{\foo} +\NewHook{\foo} \DebugPrintHook{\foo} +\DisableGenericHook{\foo} \DebugPrintHook{\foo} \typeout{=================================} \def\foo{baz} -\DisableGenericHook{\foo} \ShowHook{\foo} -\AddToHookNext{\foo}{after} \ShowHook{\foo} +\DisableGenericHook{\foo} \DebugPrintHook{\foo} +\AddToHookNext{\foo}{after} \DebugPrintHook{\foo} \typeout{=================================} \def\foo{env/foo/before} -\DisableGenericHook{\foo} \ShowHook{\foo} -\AddToHookNext{\foo}{after} \ShowHook{\foo} +\DisableGenericHook{\foo} \DebugPrintHook{\foo} +\AddToHookNext{\foo}{after} \DebugPrintHook{\foo} \typeout{=================================} \def\foo{cmd/test/before} -\DisableGenericHook{\foo} \ShowHook{\foo} -\AddToHook{\foo}{after} \ShowHook{\foo} +\DisableGenericHook{\foo} \DebugPrintHook{\foo} +\AddToHook{\foo}{after} \DebugPrintHook{\foo} \typeout{=================================} \def\foo{cmd/mycmd/after} @@ -49,14 +49,14 @@ \AddToHook{\foo}[XXX]{\ERROR 1} \AddToHookNext{\foo}{\ERROR 2} -\ShowHook{\foo} +\DebugPrintHook{\foo} % This won't work, so we disable... \DisableGenericHook{\foo} % ... and try adding even more code nonetheless :) \AddToHook{\foo}{\ERROR 3} -\ShowHook{\foo} +\DebugPrintHook{\foo} \ShowCommand\mycmd diff --git a/base/testfiles-lthooks/ltcmdhooks-008.tlg b/base/testfiles-lthooks/ltcmdhooks-008.tlg index d159e08bf0..6d9ce3144f 100644 --- a/base/testfiles-lthooks/ltcmdhooks-008.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-008.tlg @@ -1,119 +1,343 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ================================= -==> Hook: 'foo' -> not declared -> Code chunks: -> 'top-level' -> before -> No execution. - } -l. ...\AddToHook{\foo}{before} \ShowHook{\foo} -==> Hook: 'foo' -> not declared, disabled -> Code chunks: -> 'top-level' -> before -> No execution. - } -l. ...\DisableGenericHook{\foo} \ShowHook{\foo} +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Cannot add code to disabled hook 'foo'. For immediate help type H . ... l. ...\AddToHook{\foo}{after} - \ShowHook{\foo} + \DebugPrintHook{\foo} The hook 'foo' you tried to add code to was previously disabled with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code added to it. -==> Hook: 'foo' -> not declared, disabled -> Code chunks: -> 'top-level' -> before -> No execution. - } -l. ...\AddToHook{\foo}{after} \ShowHook{\foo} +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ================================= -==> Hook: 'bar' -> not declared -> Code chunks: -> 'top-level' -> before -> No execution. - } -l. ...\AddToHook{\foo}{before} \ShowHook{\foo} -==> Hook: 'bar' -> Code chunks: -> 'top-level' -> before -> Execution order: -> 1: 'top-level'. - } -l. ...\NewHook{\foo} \ShowHook{\foo} -==> Hook: 'bar' -> not declared, disabled -> Code chunks: -> 'top-level' -> before -> No execution. - } -l. ...\DisableGenericHook{\foo} \ShowHook{\foo} +<<< Hook: 'bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> before +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ================================= -==> Hook: 'baz' -> not declared, disabled. - } -l. ...\DisableGenericHook{\foo} \ShowHook{\foo} +<<< Hook: 'baz' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Cannot add code to disabled hook 'baz'. For immediate help type H . ... l. ...\AddToHookNext{\foo}{after} - \ShowHook{\foo} + \DebugPrintHook{\foo} The hook 'baz' you tried to add code to was previously disabled with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code added to it. -==> Hook: 'baz' -> not declared, disabled. - } -l. ...\AddToHookNext{\foo}{after} \ShowHook{\foo} +<<< Hook: 'baz' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ================================= -==> Hook: 'env/foo/before' -> builtin generic, disabled. - } -l. ...\DisableGenericHook{\foo} \ShowHook{\foo} +<<< Hook: 'env/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Cannot add code to disabled hook 'env/foo/before'. For immediate help type H . ... l. ...\AddToHookNext{\foo}{after} - \ShowHook{\foo} + \DebugPrintHook{\foo} The hook 'env/foo/before' you tried to add code to was previously disabled with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code added to it. -==> Hook: 'env/foo/before' -> builtin generic, disabled. - } -l. ...\AddToHookNext{\foo}{after} \ShowHook{\foo} +<<< Hook: 'env/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ================================= -==> Hook: 'cmd/test/before' -> builtin generic, disabled. - } -l. ...\DisableGenericHook{\foo} \ShowHook{\foo} +<<< Hook: 'cmd/test/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Cannot add code to disabled hook 'cmd/test/before'. For immediate help type H . ... l. ...\AddToHook{\foo}{after} - \ShowHook{\foo} + \DebugPrintHook{\foo} The hook 'cmd/test/before' you tried to add code to was previously disabled with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code added to it. -==> Hook: 'cmd/test/before' -> builtin generic, disabled. - } -l. ...\AddToHook{\foo}{after} \ShowHook{\foo} +<<< Hook: 'cmd/test/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ================================= -==> Hook: 'cmd/mycmd/after' -> builtin generic, reversed, unknown arguments -> Code chunks: -> 'XXX' -> \ERROR 1 -> next-only -> \ERROR 2 -> Execution order: -> 1: 'XXX' -> 2: next-only. - } -l. ...\ShowHook{\foo} +<<< Hook: 'cmd/mycmd/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'XXX' -> \ERROR 1 +... 'top level' empty +... next-only-> \ERROR 2 +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'XXX' +>>> ! LaTeX hooks Error: Cannot add code to disabled hook 'cmd/mycmd/after'. For immediate help type H . ... @@ -121,14 +345,30 @@ l. ...\AddToHook{\foo}{\ERROR 3} The hook 'cmd/mycmd/after' you tried to add code to was previously disabled with \hook_disable_generic:n or \DisableGenericHook, so it cannot have code added to it. -==> Hook: 'cmd/mycmd/after' -> builtin generic, reversed, disabled -> Code chunks: -> 'XXX' -> \ERROR 1 -> next-only -> \ERROR 2 -> No execution. - } -l. ...\ShowHook{\foo} +<<< Hook: 'cmd/mycmd/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'XXX' -> \ERROR 1 +... 'top level' empty +... next-only-> \ERROR 2 +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'XXX' +>>> > \mycmd=macro: ->\@ifnextchar [{\mycmdaux }{\mycmdaux []}. \mycmd diff --git a/base/testfiles-lthooks/ltcmdhooks-013.lvt b/base/testfiles-lthooks/ltcmdhooks-013.lvt index 09e18b76b2..eaf465b515 100755 --- a/base/testfiles-lthooks/ltcmdhooks-013.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-013.lvt @@ -19,21 +19,21 @@ \AddToHookWithArguments{cmd/bar/before}[X]{\typeout{[bar/before/2] (#1)}} \AddToHookWithArguments{cmd/bar/after}[X]{\typeout{[bar/after/2] (#2)}} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (unknown arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (unknown arguments) \show\bar -\ShowHook{cmd/bar/before} % (unknown arguments) -\ShowHook{cmd/bar/after} % (unknown arguments) +\DebugPrintHook{cmd/bar/before} % (unknown arguments) +\DebugPrintHook{cmd/bar/after} % (unknown arguments) \csname __hook_cmd_begindocument_code:\endcsname % \begin{document} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (9 arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (9 arguments) \show\bar -\ShowHook{cmd/bar/before} % (1 argument) -\ShowHook{cmd/bar/after} % (1 argument) +\DebugPrintHook{cmd/bar/before} % (1 argument) +\DebugPrintHook{cmd/bar/after} % (1 argument) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -44,11 +44,11 @@ \AddToHookWithArguments{cmd/Abar/before}[X]{\typeout{[Abar/before] (#1)}} \AddToHookWithArguments{cmd/Abar/after}[X]{\typeout{[Abar/after] (#2)}} % error -\ShowHook{cmdAfoobefore} -\ShowHook{cmd/Afoo/before} % (unknown arguments) +\DebugPrintHook{cmdAfoobefore} +\DebugPrintHook{cmd/Afoo/before} % (unknown arguments) \show\Abar -\ShowHook{cmd/Abar/before} % (1 argument) -\ShowHook{cmd/Abar/after} % (1 argument) +\DebugPrintHook{cmd/Abar/before} % (1 argument) +\DebugPrintHook{cmd/Abar/after} % (1 argument) \END diff --git a/base/testfiles-lthooks/ltcmdhooks-013.tlg b/base/testfiles-lthooks/ltcmdhooks-013.tlg index 5579111c8b..a7d2e7aa65 100755 --- a/base/testfiles-lthooks/ltcmdhooks-013.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-013.tlg @@ -1,42 +1,104 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> 'X' -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'X' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/foo/before} - % (unknown arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {[foo/before] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'X' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> > \bar=macro: #1->\typeout {[bar/body] (#1)}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, unknown arguments -> Code chunks: -> 'X' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/bar/before} - % (unknown arguments) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, unknown arguments -> Code chunks: -> 'X' -> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/bar/after} - % (unknown arguments) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'X' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'X' -> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ! Illegal parameter number in definition of hook 'cmd/bar/after'. (hooks) Offending label: 'X'. @@ -55,43 +117,105 @@ l. ......e __hook_cmd_begindocument_code:\endcsname You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> 'X' -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'X' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/foo/before} - % (9 arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {[foo/before] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'X' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> > \bar=macro: #1->\UseHookWithArguments {cmd/bar/before}{1}{#1}\typeout {[bar/body] (#1)}\UseHookWithArguments {cmd/bar/after}{1}{#1}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, 1 argument -> Code chunks: -> 'X' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/bar/before} - % (1 argument) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> 'X' -> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/bar/after} - % (1 argument) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'X' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'X' -> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ! LaTeX hooks Error: Generic hooks cannot be added to '\Afoo'. For immediate help type H . ... @@ -108,40 +232,102 @@ l. ......bar/after}[X]{\typeout{[Abar/after] (#2)}} You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdAfoobefore' -> not declared -> Code chunks: -> 'X' -> \typeout {[Afoo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdAfoobefore} -==> Hook: 'cmd/Afoo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'X' -> \typeout {[Afoo/before] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/Afoo/before} - % (unknown arguments) +<<< Hook: 'cmdAfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {[Afoo/before] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/Afoo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'X' -> \typeout {[Afoo/before] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> > \Abar=macro: #1->\UseHookWithArguments {cmd/Abar/before}{1}{#1}\typeout {[Abar/body] (#1)}\UseHookWithArguments {cmd/Abar/after}{1}{#1}. l. ...\show\Abar -==> Hook: 'cmd/Abar/before' -> builtin generic, 1 argument -> Code chunks: -> 'X' -> \typeout {[Abar/before] (#1)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/Abar/before} - % (1 argument) -==> Hook: 'cmd/Abar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> 'X' -> \typeout {[Abar/after] (##2)} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{cmd/Abar/after} - % (1 argument) +<<< Hook: 'cmd/Abar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'X' -> \typeout {[Abar/before] (#1)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> +<<< Hook: 'cmd/Abar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'X' -> \typeout {[Abar/after] (##2)} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> diff --git a/base/testfiles-lthooks/ltcmdhooks-014.lvt b/base/testfiles-lthooks/ltcmdhooks-014.lvt index 55ee460f50..a7670ad69f 100755 --- a/base/testfiles-lthooks/ltcmdhooks-014.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-014.lvt @@ -19,21 +19,21 @@ \AddToHookWithArguments{cmd/bar/before}[top-level]{\typeout{[bar/before/2] (#1)}} \AddToHookWithArguments{cmd/bar/after}[top-level]{\typeout{[bar/after/2] (#2)}} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (unknown arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (unknown arguments) \show\bar -\ShowHook{cmd/bar/before} % (unknown arguments) -\ShowHook{cmd/bar/after} % (unknown arguments) +\DebugPrintHook{cmd/bar/before} % (unknown arguments) +\DebugPrintHook{cmd/bar/after} % (unknown arguments) \csname __hook_cmd_begindocument_code:\endcsname % \begin{document} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (9 arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (9 arguments) \show\bar -\ShowHook{cmd/bar/before} % (1 argument) -\ShowHook{cmd/bar/after} % (1 argument) +\DebugPrintHook{cmd/bar/before} % (1 argument) +\DebugPrintHook{cmd/bar/after} % (1 argument) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -44,11 +44,11 @@ \AddToHookWithArguments{cmd/Abar/before}[top-level]{\typeout{[Abar/before] (#1)}} \AddToHookWithArguments{cmd/Abar/after}[top-level]{\typeout{[Abar/after] (#2)}} -\ShowHook{cmdAfoobefore} -\ShowHook{cmd/Afoo/before} % (unknown arguments) +\DebugPrintHook{cmdAfoobefore} +\DebugPrintHook{cmd/Afoo/before} % (unknown arguments) \show\Abar -\ShowHook{cmd/Abar/before} % (1 argument) -\ShowHook{cmd/Abar/after} % (1 argument) +\DebugPrintHook{cmd/Abar/before} % (1 argument) +\DebugPrintHook{cmd/Abar/after} % (1 argument) \END diff --git a/base/testfiles-lthooks/ltcmdhooks-014.tlg b/base/testfiles-lthooks/ltcmdhooks-014.tlg index 52735b4e20..3d0fee7d5c 100755 --- a/base/testfiles-lthooks/ltcmdhooks-014.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-014.tlg @@ -1,42 +1,100 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> 'top-level' -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'top-level' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/foo/before} - % (unknown arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {[foo/before] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \bar=macro: #1->\typeout {[bar/body] (#1)}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, unknown arguments -> Code chunks: -> 'top-level' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/bar/before} - % (unknown arguments) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, unknown arguments -> Code chunks: -> 'top-level' -> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/bar/after} - % (unknown arguments) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! Illegal parameter number in definition of \__hook_toplevel cmd/bar/after. 2 @@ -53,43 +111,101 @@ l. ......e __hook_cmd_begindocument_code:\endcsname You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> 'top-level' -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'top-level' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/foo/before} - % (9 arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {[foo/before] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \bar=macro: #1->\UseHookWithArguments {cmd/bar/before}{1}{#1}\typeout {[bar/body] (#1)}\UseHookWithArguments {cmd/bar/after}{1}{#1}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, 1 argument -> Code chunks: -> 'top-level' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/bar/before} - % (1 argument) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> 'top-level' -> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/bar/after} - % (1 argument) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' -> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Generic hooks cannot be added to '\Afoo'. For immediate help type H . ... @@ -103,40 +219,98 @@ l. ......r}[top-level]{\typeout{[Abar/after] (#2)}} You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdAfoobefore' -> not declared -> Code chunks: -> 'top-level' -> \typeout {[Afoo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdAfoobefore} -==> Hook: 'cmd/Afoo/before' -> builtin generic, unknown arguments -> Code chunks: -> 'top-level' -> \typeout {[Afoo/before] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/Afoo/before} - % (unknown arguments) +<<< Hook: 'cmdAfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {[Afoo/before] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/Afoo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \typeout {[Afoo/before] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \Abar=macro: #1->\UseHookWithArguments {cmd/Abar/before}{1}{#1}\typeout {[Abar/body] (#1)}\UseHookWithArguments {cmd/Abar/after}{1}{#1}. l. ...\show\Abar -==> Hook: 'cmd/Abar/before' -> builtin generic, 1 argument -> Code chunks: -> 'top-level' -> \typeout {[Abar/before] (#1)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/Abar/before} - % (1 argument) -==> Hook: 'cmd/Abar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> 'top-level' -> \typeout {[Abar/after] (##2)} -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{cmd/Abar/after} - % (1 argument) +<<< Hook: 'cmd/Abar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' -> \typeout {[Abar/before] (#1)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/Abar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' -> \typeout {[Abar/after] (##2)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/ltcmdhooks-015.lvt b/base/testfiles-lthooks/ltcmdhooks-015.lvt index 8d8f526d9d..c5842679e5 100755 --- a/base/testfiles-lthooks/ltcmdhooks-015.lvt +++ b/base/testfiles-lthooks/ltcmdhooks-015.lvt @@ -19,21 +19,21 @@ \AddToHookNextWithArguments{cmd/bar/before}{\typeout{[bar/before/2] (#1)}} \AddToHookNextWithArguments{cmd/bar/after}{\typeout{[bar/after/2] (#2)}} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (unknown arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (unknown arguments) \show\bar -\ShowHook{cmd/bar/before} % (unknown arguments) -\ShowHook{cmd/bar/after} % (unknown arguments) +\DebugPrintHook{cmd/bar/before} % (unknown arguments) +\DebugPrintHook{cmd/bar/after} % (unknown arguments) \csname __hook_cmd_begindocument_code:\endcsname % \begin{document} -\ShowHook{cmdfoobefore} -\ShowHook{cmd/foo/before} % (9 arguments) +\DebugPrintHook{cmdfoobefore} +\DebugPrintHook{cmd/foo/before} % (9 arguments) \show\bar -\ShowHook{cmd/bar/before} % (1 argument) -\ShowHook{cmd/bar/after} % (1 argument) +\DebugPrintHook{cmd/bar/before} % (1 argument) +\DebugPrintHook{cmd/bar/after} % (1 argument) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -44,11 +44,11 @@ \AddToHookNextWithArguments{cmd/Abar/before}{\typeout{[Abar/before] (#1)}} \AddToHookNextWithArguments{cmd/Abar/after}{\typeout{[Abar/after] (#2)}} -\ShowHook{cmdAfoobefore} -\ShowHook{cmd/Afoo/before} % (unknown arguments) +\DebugPrintHook{cmdAfoobefore} +\DebugPrintHook{cmd/Afoo/before} % (unknown arguments) \show\Abar -\ShowHook{cmd/Abar/before} % (1 argument) -\ShowHook{cmd/Abar/after} % (1 argument) +\DebugPrintHook{cmd/Abar/before} % (1 argument) +\DebugPrintHook{cmd/Abar/after} % (1 argument) \END diff --git a/base/testfiles-lthooks/ltcmdhooks-015.tlg b/base/testfiles-lthooks/ltcmdhooks-015.tlg index 78c6ae48f6..12d3193cc3 100755 --- a/base/testfiles-lthooks/ltcmdhooks-015.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-015.tlg @@ -1,42 +1,100 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> next-only -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> next-only -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/foo/before} - % (unknown arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[foo/before] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \bar=macro: #1->\typeout {[bar/body] (#1)}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, unknown arguments -> Code chunks: -> next-only -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/bar/before} - % (unknown arguments) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, unknown arguments -> Code chunks: -> next-only -> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/bar/after} - % (unknown arguments) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[bar/after] (#2)}\typeout {[bar/after/2] (#2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! Illegal parameter number in definition of \__hook_next cmd/bar/after. 2 @@ -53,43 +111,101 @@ l. ......e __hook_cmd_begindocument_code:\endcsname You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdfoobefore' -> not declared -> Code chunks: -> next-only -> \typeout {[foo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdfoobefore} -==> Hook: 'cmd/foo/before' -> builtin generic, unknown arguments -> Code chunks: -> next-only -> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/foo/before} - % (9 arguments) +<<< Hook: 'cmdfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[foo/before] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/foo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[foo/before] (#1)}\typeout {[foo/before/2] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \bar=macro: #1->\UseHookWithArguments {cmd/bar/before}{1}{#1}\typeout {[bar/body] (#1)}\UseHookWithArguments {cmd/bar/after}{1}{#1}. l. ...\show\bar -==> Hook: 'cmd/bar/before' -> builtin generic, 1 argument -> Code chunks: -> next-only -> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/bar/before} - % (1 argument) -==> Hook: 'cmd/bar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> next-only -> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/bar/after} - % (1 argument) +<<< Hook: 'cmd/bar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[bar/before] (#1)}\typeout {[bar/before/2] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/bar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[bar/after] (##2)}\typeout {[bar/after/2] (##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! LaTeX hooks Error: Generic hooks cannot be added to '\Afoo'. For immediate help type H . ... @@ -103,40 +219,98 @@ l. ......d/Abar/after}{\typeout{[Abar/after] (#2)}} You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'cmdAfoobefore' -> not declared -> Code chunks: -> next-only -> \typeout {[Afoo/before] (#1)} -> No execution. - } -l. ...\ShowHook{cmdAfoobefore} -==> Hook: 'cmd/Afoo/before' -> builtin generic, unknown arguments -> Code chunks: -> next-only -> \typeout {[Afoo/before] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/Afoo/before} - % (unknown arguments) +<<< Hook: 'cmdAfoobefore' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[Afoo/before] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/Afoo/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[Afoo/before] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \Abar=macro: #1->\UseHookWithArguments {cmd/Abar/before}{1}{#1}\typeout {[Abar/body] (#1)}\UseHookWithArguments {cmd/Abar/after}{1}{#1}. l. ...\show\Abar -==> Hook: 'cmd/Abar/before' -> builtin generic, 1 argument -> Code chunks: -> next-only -> \typeout {[Abar/before] (#1)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/Abar/before} - % (1 argument) -==> Hook: 'cmd/Abar/after' -> builtin generic, reversed, 1 argument -> Code chunks: -> next-only -> \typeout {[Abar/after] (##2)} -> Execution order: -> 1: next-only. - } -l. ...\ShowHook{cmd/Abar/after} - % (1 argument) +<<< Hook: 'cmd/Abar/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[Abar/before] (#1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'cmd/Abar/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'top level' empty +... next-only-> \typeout {[Abar/after] (##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/lthooks-009.lvt b/base/testfiles-lthooks/lthooks-009.lvt index 0f2b11ec0f..fa2577f36b 100644 --- a/base/testfiles-lthooks/lthooks-009.lvt +++ b/base/testfiles-lthooks/lthooks-009.lvt @@ -44,15 +44,15 @@ \AddToHookNext{hook}{\hello} \AddToHookNext{hook}{\AddToHookNext{hook}{nested}} \AddToHookNext{hook}{world!} -\LogHook{hook} +\DebugPrintHook{hook} \typeout{Use 'hook': \UseHook{hook}} -\LogHook{hook} +\DebugPrintHook{hook} \typeout{and again: \UseHook{hook}} -\LogHook{hook} +\DebugPrintHook{hook} \typeout{once more: \UseHook{hook}} -\LogHook{hook} +\DebugPrintHook{hook} \end{document} diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg index 693353b943..5248c4fe96 100644 --- a/base/testfiles-lthooks/lthooks-009.tlg +++ b/base/testfiles-lthooks/lthooks-009.tlg @@ -175,29 +175,101 @@ Update code for hook 'sffamily' on input line ...: only this code Nothing? Update code for hook 'hook' on input line ...: -==> Hook: 'hook' -> Code chunks: -> next-only -> \hello \AddToHookNext {hook}{nested}world! -> Execution order: -> 1: next-only. +<<< Hook: 'hook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \hello \AddToHookNext {hook}{nested}world! +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Use 'hook': \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world! -==> Hook: 'hook' -> Code chunks: -> next-only -> \hello \AddToHookNext {hook}{nested}world! -> Execution order: -> 1: next-only. +<<< Hook: 'hook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \hello \AddToHookNext {hook}{nested}world! +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> and again: \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world! -==> Hook: 'hook' -> Code chunks: -> next-only -> \hello \AddToHookNext {hook}{nested}world! -> Execution order: -> 1: next-only. +<<< Hook: 'hook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \hello \AddToHookNext {hook}{nested}world! +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> once more: \__hook_clear_next:n {hook}Hello, \AddToHookNext {hook}{nested}world! -==> Hook: 'hook' -> Code chunks: -> next-only -> \hello \AddToHookNext {hook}{nested}world! -> Execution order: -> 1: next-only. +<<< Hook: 'hook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only-> \hello \AddToHookNext {hook}{nested}world! +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Absolute page = 1 (target: 1) [1 ] (lthooks-009.aux) diff --git a/base/testfiles-lthooks/lthooks-010.lvt b/base/testfiles-lthooks/lthooks-010.lvt index 63e8f346d3..0c5be1218b 100644 --- a/base/testfiles-lthooks/lthooks-010.lvt +++ b/base/testfiles-lthooks/lthooks-010.lvt @@ -28,46 +28,46 @@ \prop_show:c{g__hook_sffamily_code_prop} \ExplSyntaxOff -\LogHook{sffamily} +\DebugPrintHook{sffamily} \begin{document} \sffamily % first next code -\LogHook{sffamily} +\DebugPrintHook{sffamily} \AddToHook {sffamily}[baz] {baz code} -\LogHook{sffamily} +\DebugPrintHook{sffamily} \sffamily -\LogHook{sffamily} % second next code +\DebugPrintHook{sffamily} % second next code \ExplSyntaxOn \prop_show:c{g__hook_sffamily_code_prop} \ExplSyntaxOff \sffamily -\LogHook{sffamily} +\DebugPrintHook{sffamily} -\LogHook{enddocument} +\DebugPrintHook{enddocument} \typeout{--- New hook after begin document ---} \NewHook{xxx} -\LogHook{xxx} +\DebugPrintHook{xxx} \UseHook{xxx} \AddToHook{xxx} {\typeout{some code ...}} \AddToHook{xxx}[foo]{\typeout{some foo code ...}} -\LogHook{xxx} +\DebugPrintHook{xxx} \UseHook{xxx} \RemoveFromHook{xxx}[*] -\LogHook{xxx} +\DebugPrintHook{xxx} diff --git a/base/testfiles-lthooks/lthooks-010.tlg b/base/testfiles-lthooks/lthooks-010.tlg index 9646a6a5eb..047df097b8 100644 --- a/base/testfiles-lthooks/lthooks-010.tlg +++ b/base/testfiles-lthooks/lthooks-010.tlg @@ -7,19 +7,32 @@ outer braces): > {bar} => {bar code}. } l. ...\prop_show:c{g__hook_sffamily_code_prop} -==> Hook: 'sffamily' -> Code chunks: -> 'legacy' -> Std sffamily code -> 'foo' -> foo code -> 'bar' -> bar code -> next-only -> \typeout {first occasion only $\frac 12$} \AddToHookNext {sffamily}{\typeout {on second only}} -> Rules: -> 'foo' after 'bar' -> Execution order: -> 1: 'legacy' -> 2: 'bar' -> 3: 'foo' -> 4: next-only. +<<< Hook: 'sffamily' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> Std sffamily code +... 'foo' -> foo code +... 'bar' -> bar code +... 'top level' empty +... next-only-> \typeout {first occasion only $\frac 12$} \AddToHookNext {sffamily}{\typeout {on second only}} +... Default rules: +... None +... Rules: +... 'foo' > 'bar' +... Execution order: +... 'legacy', 'bar', 'foo' +>>> (../l3backend-pdftex.def File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX) \l__color_backend_stack_int=\count... @@ -41,50 +54,89 @@ 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 .... first occasion only $\frac 12$ -==> Hook: 'sffamily' -> Code chunks: -> 'legacy' -> Std sffamily code -> 'foo' -> foo code -> 'bar' -> bar code -> next-only -> \typeout {on second only} -> Rules: -> 'foo' after 'bar' -> Execution order: -> 1: 'legacy' -> 2: 'bar' -> 3: 'foo' -> 4: next-only. -==> Hook: 'sffamily' -> Code chunks: -> 'legacy' -> Std sffamily code -> 'foo' -> foo code -> 'bar' -> bar code -> 'baz' -> baz code -> next-only -> \typeout {on second only} -> Rules: -> 'foo' after 'bar' -> 'foo' voids 'baz' -> Execution order: -> 1: 'legacy' -> 2: 'bar' -> 3: 'baz' -> 4: 'foo' -> 5: next-only. +<<< Hook: 'sffamily' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> Std sffamily code +... 'foo' -> foo code +... 'bar' -> bar code +... 'top level' empty +... next-only-> \typeout {on second only} +... Default rules: +... None +... Rules: +... 'foo' > 'bar' +... Execution order: +... 'legacy', 'bar', 'foo' +>>> +<<< Hook: 'sffamily' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> Std sffamily code +... 'foo' -> foo code +... 'bar' -> bar code +... 'baz' -> baz code +... 'top level' empty +... next-only-> \typeout {on second only} +... Default rules: +... None +... Rules: +... 'foo' > 'bar' +... 'foo' <- 'baz' +... Execution order: +... 'legacy', 'bar', 'baz', 'foo' +>>> on second only -==> Hook: 'sffamily' -> Code chunks: -> 'legacy' -> Std sffamily code -> 'foo' -> foo code -> 'bar' -> bar code -> 'baz' -> baz code -> Rules: -> 'foo' after 'bar' -> 'foo' voids 'baz' -> Execution order: -> 1: 'legacy' -> 2: 'bar' -> 3: 'baz' -> 4: 'foo'. +<<< Hook: 'sffamily' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> Std sffamily code +... 'foo' -> foo code +... 'bar' -> bar code +... 'baz' -> baz code +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'foo' > 'bar' +... 'foo' <- 'baz' +... Execution order: +... 'legacy', 'bar', 'baz', 'foo' +>>> The property list \g__hook_sffamily_code_prop contains the pairs (without outer braces): > {legacy} => {Std sffamily code} @@ -93,33 +145,127 @@ outer braces): > {baz} => {baz code}. } l. ...\prop_show:c{g__hook_sffamily_code_prop} -==> Hook: 'sffamily' -> Code chunks: -> 'legacy' -> Std sffamily code -> 'foo' -> foo code -> 'bar' -> bar code -> 'baz' -> baz code -> Rules: -> 'foo' after 'bar' -> 'foo' voids 'baz' -> Execution order: -> 1: 'legacy' -> 2: 'bar' -> 3: 'baz' -> 4: 'foo'. -==> Hook: 'enddocument' -> empty. +<<< Hook: 'sffamily' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> Std sffamily code +... 'foo' -> foo code +... 'bar' -> bar code +... 'baz' -> baz code +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'foo' > 'bar' +... 'foo' <- 'baz' +... Execution order: +... 'legacy', 'bar', 'baz', 'foo' +>>> +<<< Hook: 'enddocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> --- New hook after begin document --- -==> Hook: 'xxx' -> empty. -==> Hook: 'xxx' -> Code chunks: -> 'foo' -> \typeout {some foo code ...} -> 'top-level' -> \typeout {some code ...} -> Execution order: -> 1: 'foo' -> 2: 'top-level'. +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'foo' -> \typeout {some foo code ...} +... 'top level' -> \typeout {some code ...} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'foo' +>>> some foo code ... some code ... -==> Hook: 'xxx' -> empty. +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/lthooks-013.lvt b/base/testfiles-lthooks/lthooks-013.lvt index 91823ea19b..a0ba077c7d 100644 --- a/base/testfiles-lthooks/lthooks-013.lvt +++ b/base/testfiles-lthooks/lthooks-013.lvt @@ -26,16 +26,16 @@ \AddToHook{file/bar}{\typeout{file bar}} -\LogHook{env/itemize/begin} -\LogHook{file/bar} -\LogHook{file/foo} +\DebugPrintHook{env/itemize/begin} +\DebugPrintHook{file/bar} +\DebugPrintHook{file/foo} -\LogHook{env/itemize/began} % this one has a typo +\DebugPrintHook{env/itemize/began} % this one has a typo \AddToHook{baz}{missing decl} -\LogHook{bar} +\DebugPrintHook{bar} \begin{document} diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg index b7adb13412..4db85951b3 100644 --- a/base/testfiles-lthooks/lthooks-013.tlg +++ b/base/testfiles-lthooks/lthooks-013.tlg @@ -11,30 +11,124 @@ Code labels for sorting: Data structure for label rules: foo = 0 -> Handled code for foo -==> Hook: 'env/itemize/begin' -> builtin generic -> Code chunks: -> 'foo' -> \typeout {env itemize first} -> 'top-level' -> \typeout {begin env itemize} -> Execution order: -> 1: 'foo' -> 2: 'top-level'. +<<< Hook: 'env/itemize/begin' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'foo' -> \typeout {env itemize first} +... 'top level' -> \typeout {begin env itemize} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'foo' +>>> Update code for hook 'file/bar' on input line ...: -==> Hook: 'file/bar' -> Code chunks: -> 'top-level' -> \typeout {file bar} -> Execution order: -> 1: 'top-level'. -==> Hook: 'file/foo' -> not declared -> Code chunks: -> 'top-level' -> \typeout {file foo} -> No execution. -==> Hook: 'env/itemize/began' -> not declared. +<<< Hook: 'file/bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {file bar} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'file/foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {file foo} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'env/itemize/began' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> **** Add to undeclared hook baz (top-level) on input line ... <- missing decl -==> Hook: 'bar' -> not declared. +<<< Hook: 'bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> 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 ...: diff --git a/base/testfiles-lthooks/lthooks-016.lvt b/base/testfiles-lthooks/lthooks-016.lvt index 80145d9bc5..d481188179 100644 --- a/base/testfiles-lthooks/lthooks-016.lvt +++ b/base/testfiles-lthooks/lthooks-016.lvt @@ -36,8 +36,8 @@ \TIMO -\LogHook{xxx} -\LogHook{yyy} -\LogHook{zzz} +\DebugPrintHook{xxx} +\DebugPrintHook{yyy} +\DebugPrintHook{zzz} \END diff --git a/base/testfiles-lthooks/lthooks-016.tlg b/base/testfiles-lthooks/lthooks-016.tlg index d32607e6d3..a87d6fdc1c 100644 --- a/base/testfiles-lthooks/lthooks-016.tlg +++ b/base/testfiles-lthooks/lthooks-016.tlg @@ -9,32 +9,81 @@ Don't change this file in any respect. **** Add to hook zzz (xyz) on input line ... <- 1 **** Add to hook zzz (abc) on input line ... <- 2 **** Add to hook zzz (lmn) on input line ... <- 3 -==> Hook: 'xxx' -> Code chunks: -> 'abc' -> 1 -> 'lmn' -> 2 -> 'xyz' -> 3 -> Execution order: -> 1: 'abc' -> 2: 'lmn' -> 3: 'xyz'. -==> Hook: 'yyy' -> Code chunks: -> 'xyz' -> 1 -> 'abc' -> 2 -> 'lmn' -> 3 -> Execution order: -> 1: 'xyz' -> 2: 'abc' -> 3: 'lmn'. -==> Hook: 'zzz' -> Code chunks: -> 'xyz' -> 1 -> 'abc' -> 2 -> 'lmn' -> 3 -> Rules: -> 'xyz' after 'lmn' -> Execution order: -> 1: 'abc' -> 2: 'lmn' -> 3: 'xyz'. +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'abc' -> 1 +... 'lmn' -> 2 +... 'xyz' -> 3 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'abc', 'lmn', 'xyz' +>>> +<<< Hook: 'yyy' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'xyz' -> 1 +... 'abc' -> 2 +... 'lmn' -> 3 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'xyz', 'abc', 'lmn' +>>> +<<< Hook: 'zzz' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'xyz' -> 1 +... 'abc' -> 2 +... 'lmn' -> 3 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'xyz' > 'lmn' +... Execution order: +... 'abc', 'lmn', 'xyz' +>>> diff --git a/base/testfiles-lthooks/lthooks-018.lvt b/base/testfiles-lthooks/lthooks-018.lvt index 734f8d4770..c8bc519867 100644 --- a/base/testfiles-lthooks/lthooks-018.lvt +++ b/base/testfiles-lthooks/lthooks-018.lvt @@ -1,4 +1,4 @@ -% Check that \par works in \ShowHook (issue #84 in AccessiblePDF) +% Check that \par works in \DebugPrintHook (issue #84 in AccessiblePDF) \ExplSyntaxOn \debug_on:n { check-declarations , deprecation } @@ -16,6 +16,6 @@ \AddToHook{env/quote/before}[my1]{\dotfill before 1\dotfill\par} -\LogHook{env/quote/before} +\DebugPrintHook{env/quote/before} \END diff --git a/base/testfiles-lthooks/lthooks-018.tlg b/base/testfiles-lthooks/lthooks-018.tlg index c3be15f151..049adf3846 100644 --- a/base/testfiles-lthooks/lthooks-018.tlg +++ b/base/testfiles-lthooks/lthooks-018.tlg @@ -7,9 +7,27 @@ Code labels for sorting: Data structure for label rules: my1 = 0 -> Handled code for my1 -==> Hook: 'env/quote/before' -> builtin generic -> Code chunks: -> 'my1' -> \dotfill before 1\dotfill \par -> Execution order: -> 1: 'my1'. +<<< Hook: 'env/quote/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my1' -> \dotfill before 1\dotfill \par +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my1' +>>> diff --git a/base/testfiles-lthooks/lthooks-019.lvt b/base/testfiles-lthooks/lthooks-019.lvt index 96fd108706..79c712c393 100644 --- a/base/testfiles-lthooks/lthooks-019.lvt +++ b/base/testfiles-lthooks/lthooks-019.lvt @@ -26,7 +26,7 @@ \UseHook{xx} -\LogHook{xx} +\DebugPrintHook{xx} \typeout{Expected output: my1 my3 my4 my2} @@ -48,7 +48,7 @@ \UseHook{yy} -\LogHook{yy} +\DebugPrintHook{yy} \typeout{Expected output: my2, my5, my4, my3, my1} @@ -70,12 +70,12 @@ \UseHook{env/quote/before} -\LogHook{env/quote/before} +\DebugPrintHook{env/quote/before} \typeout{Expected output: my1, my3, my2} \UseHook{env/quote/after} -\LogHook{env/quote/after} +\DebugPrintHook{env/quote/after} \typeout{Expected output: my2, my3, my1} @@ -94,12 +94,12 @@ \UseHook{Start} \UseHook{Stop} -\LogHook{Start} -\LogHook{Stop} +\DebugPrintHook{Start} +\DebugPrintHook{Stop} \DeclareHookRule{Stop}{zz3}{before}{zz4} -\LogHook{Stop} +\DebugPrintHook{Stop} \RemoveFromHook{Start}[*] \RemoveFromHook{Stop}[zz1] @@ -108,8 +108,8 @@ \RemoveFromHook{Stop}[zz4] -\LogHook{Start} -\LogHook{Stop} +\DebugPrintHook{Start} +\DebugPrintHook{Stop} \DeclareHookRule{Stop}{zz3}{unrelated}{zz4} @@ -125,8 +125,8 @@ \UseHook{Start} \UseHook{Stop} -\LogHook{Start} -\LogHook{Stop} +\DebugPrintHook{Start} +\DebugPrintHook{Stop} \RemoveFromHook{Start}[*] \RemoveFromHook{Stop}[*] @@ -145,8 +145,8 @@ \UseHook{Start} \UseHook{Stop} -\LogHook{Start} -\LogHook{Stop} +\DebugPrintHook{Start} +\DebugPrintHook{Stop} \END diff --git a/base/testfiles-lthooks/lthooks-019.tlg b/base/testfiles-lthooks/lthooks-019.tlg index 7abf464ebc..4229de7ca6 100644 --- a/base/testfiles-lthooks/lthooks-019.tlg +++ b/base/testfiles-lthooks/lthooks-019.tlg @@ -45,19 +45,33 @@ Handled code for my1 Handled code for my3 Handled code for my4 Handled code for my2 -==> Hook: 'xx' -> Code chunks: -> 'my1' -> \typeout {A}\typeout {A2} -> 'my2' -> \typeout {B}\typeout {B2} -> 'my3' -> \typeout {C} -> 'my4' -> \typeout {D} -> Rules: -> 'my4' before 'my2' -> Execution order: -> 1: 'my1' -> 2: 'my3' -> 3: 'my4' -> 4: 'my2'. +<<< Hook: 'xx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my1' -> \typeout {A}\typeout {A2} +... 'my2' -> \typeout {B}\typeout {B2} +... 'my3' -> \typeout {C} +... 'my4' -> \typeout {D} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'my4' < 'my2' +... Execution order: +... 'my1', 'my3', 'my4', 'my2' +>>> Expected output: my1 my3 my4 my2 **** Add to hook yy (my1) on input line ... <- \typeout {A} **** Add to hook yy (my1) on input line ... <- \typeout {A2} @@ -106,23 +120,35 @@ Handled code for my3 Handled code for my4 Handled code for my5 Handled code for my2 -==> Hook: 'yy' -> reversed -> Code chunks: -> 'my1' -> \typeout {A}\typeout {A2} -> 'my2' -> \typeout {B}\typeout {B2} -> 'my3' -> \typeout {C} -> 'my4' -> \typeout {D} -> 'my5' -> \typeout {C alternate} -> Rules: -> 'my4' after 'my2' -> 'my3' voids 'my5' -> Execution order: -> 1: 'my2' -> 2: 'my5' -> 3: 'my4' -> 4: 'my3' -> 5: 'my1'. +<<< Hook: 'yy' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my1' -> \typeout {A}\typeout {A2} +... 'my2' -> \typeout {B}\typeout {B2} +... 'my3' -> \typeout {C} +... 'my4' -> \typeout {D} +... 'my5' -> \typeout {C alternate} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'my4' > 'my2' +... 'my5' -> 'my3' +... Execution order: +... 'my2', 'my5', 'my4', 'my3', 'my1' +>>> Expected output: my2, my5, my4, my3, my1 **** Add to hook env/quote/before (top-level) on input line ... <- \typeout {before A} **** Add to hook env/quote/after (top-level) on input line ... <- \typeout {after A} @@ -158,20 +184,32 @@ Data structure for label rules: Handled code for my1 Handled code for my3 Handled code for my2 -==> Hook: 'env/quote/before' -> builtin generic -> Code chunks: -> 'my1' -> \typeout {before B} -> 'my2' -> \typeout {before C} -> 'my3' -> \typeout {before D} -> 'top-level' -> \typeout {before A} -> Default rules: -> 'my3' before 'my2' -> Execution order: -> 1: 'my1' -> 2: 'my3' -> 3: 'my2' -> 4: 'top-level'. +<<< Hook: 'env/quote/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my1' -> \typeout {before B} +... 'my2' -> \typeout {before C} +... 'my3' -> \typeout {before D} +... 'top level' -> \typeout {before A} +... next-only empty +... Default rules: +... 'my3' < 'my2' +... Rules: +... None +... Execution order: +... 'my1', 'my3', 'my2' +>>> Expected output: my1, my3, my2 Update code for hook 'env/quote/after' on input line ...: default rule my3|my2: < found @@ -199,20 +237,32 @@ Data structure for label rules: Handled code for my1 Handled code for my3 Handled code for my2 -==> Hook: 'env/quote/after' -> builtin generic, reversed -> Code chunks: -> 'my1' -> \typeout {after B} -> 'my2' -> \typeout {after C} -> 'my3' -> \typeout {after D} -> 'top-level' -> \typeout {after A} -> Default rules, to be mirrored: -> 'my3' before 'my2' -> Execution order: -> 1: 'top-level' -> 2: 'my2' -> 3: 'my3' -> 4: 'my1'. +<<< Hook: 'env/quote/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my1' -> \typeout {after B} +... 'my2' -> \typeout {after C} +... 'my3' -> \typeout {after D} +... 'top level' -> \typeout {after A} +... next-only empty +... Default rules: +... 'my3' < 'my2' +... Rules: +... None +... Execution order: +... 'my2', 'my3', 'my1' +>>> Expected output: my2, my3, my1 **** Add to hook Start (zz1) on input line ... <- \typeout {A} **** Add to hook Start (zz2) on input line ... <- \typeout {B} @@ -254,13 +304,31 @@ Data structure for label rules: zz2 = 0 -> Handled code for zz1 Handled code for zz2 -==> Hook: 'Start' -> Code chunks: -> 'zz1' -> \typeout {A} -> 'zz2' -> \typeout {B} -> Execution order: -> 1: 'zz1' -> 2: 'zz2'. +<<< Hook: 'Start' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'zz1' -> \typeout {A} +... 'zz2' -> \typeout {B} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'zz1', 'zz2' +>>> Update code for hook 'Stop' on input line ...: Code labels for sorting: zz1, zz2, zz3 and zz4 @@ -273,18 +341,33 @@ Handled code for zz1 Handled code for zz2 Handled code for zz3 Handled code for zz4 -==> Hook: 'Stop' -> reversed -> Code chunks: -> 'zz1' -> \typeout {A} -> 'zz2' -> \typeout {B} -> 'zz3' -> \typeout {C} -> 'zz4' -> \typeout {D} -> Execution order: -> 1: 'zz4' -> 2: 'zz3' -> 3: 'zz2' -> 4: 'zz1'. +<<< Hook: 'Stop' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'zz1' -> \typeout {A} +... 'zz2' -> \typeout {B} +... 'zz3' -> \typeout {C} +... 'zz4' -> \typeout {D} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'zz4', 'zz3', 'zz2', 'zz1' +>>> Update code for hook 'Stop' on input line ...: normal rule zz4|zz3: > found Code labels for sorting: @@ -298,26 +381,81 @@ Handled code for zz1 Handled code for zz2 Handled code for zz4 Handled code for zz3 -==> Hook: 'Stop' -> reversed -> Code chunks: -> 'zz1' -> \typeout {A} -> 'zz2' -> \typeout {B} -> 'zz3' -> \typeout {C} -> 'zz4' -> \typeout {D} -> Rules: -> 'zz4' after 'zz3' -> Execution order: -> 1: 'zz3' -> 2: 'zz4' -> 3: 'zz2' -> 4: 'zz1'. +<<< Hook: 'Stop' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'zz1' -> \typeout {A} +... 'zz2' -> \typeout {B} +... 'zz3' -> \typeout {C} +... 'zz4' -> \typeout {D} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'zz4' > 'zz3' +... Execution order: +... 'zz3', 'zz4', 'zz2', 'zz1' +>>> Update code for hook 'Start' on input line ...: -==> Hook: 'Start' -> empty. +<<< Hook: 'Start' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Update code for hook 'Stop' on input line ...: -==> Hook: 'Stop' -> reversed. +<<< Hook: 'Stop' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> **** Add to hook Start (one) on input line ... <- \typeout {begin A} **** Add to hook Start (one) on input line ... <- \typeout {begin B} **** Add to hook Start (one) on input line ... <- \typeout {begin C} @@ -348,23 +486,60 @@ Code labels for sorting: Data structure for label rules: one = 0 -> Handled code for one -==> Hook: 'Start' -> Code chunks: -> 'one' -> \typeout {begin A}\typeout {begin B}\typeout {begin C} -> Execution order: -> 1: 'one'. +<<< Hook: 'Start' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'one' -> \typeout {begin A}\typeout {begin B}\typeout {begin C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'one' +>>> Update code for hook 'Stop' on input line ...: Code labels for sorting: one Data structure for label rules: one = 0 -> Handled code for one -==> Hook: 'Stop' -> reversed -> Code chunks: -> 'one' -> \typeout {end C}\typeout {end B}\typeout {end A} -> Execution order: -> 1: 'one'. +<<< Hook: 'Stop' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'one' -> \typeout {end C}\typeout {end B}\typeout {end A} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'one' +>>> **** Add to hook Start (zz1) on input line ... <- \typeout {A} **** Add to hook Start (zz2) on input line ... <- \typeout {B} **** Add to hook Start (zz3) on input line ... <- \typeout {C} @@ -413,18 +588,33 @@ Data structure for label rules: Handled code for zz2 Handled code for zz1 Handled code for zz3 -==> Hook: 'Start' -> Code chunks: -> 'zz1' -> \typeout {A} -> 'zz2' -> \typeout {B} -> 'zz3' -> \typeout {C} -> Default rules: -> 'zz2' before 'zz1' -> 'zz3' after 'zz1' -> Execution order: -> 1: 'zz2' -> 2: 'zz1' -> 3: 'zz3'. +<<< Hook: 'Start' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'zz1' -> \typeout {A} +... 'zz2' -> \typeout {B} +... 'zz3' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... 'zz2' < 'zz1' +... 'zz3' > 'zz1' +... Rules: +... None +... Execution order: +... 'zz2', 'zz1', 'zz3' +>>> Update code for hook 'Stop' on input line ...: default rule zz2|zz1: < found default rule zz3|zz1: > found @@ -437,16 +627,30 @@ Data structure for label rules: Handled code for zz2 Handled code for zz1 Handled code for zz3 -==> Hook: 'Stop' -> reversed -> Code chunks: -> 'zz1' -> \typeout {A} -> 'zz2' -> \typeout {B} -> 'zz3' -> \typeout {C} -> Default rules, to be mirrored: -> 'zz2' before 'zz1' -> 'zz3' after 'zz1' -> Execution order: -> 1: 'zz3' -> 2: 'zz1' -> 3: 'zz2'. +<<< Hook: 'Stop' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'zz1' -> \typeout {A} +... 'zz2' -> \typeout {B} +... 'zz3' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... 'zz2' < 'zz1' +... 'zz3' > 'zz1' +... Rules: +... None +... Execution order: +... 'zz3', 'zz1', 'zz2' +>>> diff --git a/base/testfiles-lthooks/lthooks-020.lvt b/base/testfiles-lthooks/lthooks-020.lvt index e8b5cd539d..b3b5cf2e48 100644 --- a/base/testfiles-lthooks/lthooks-020.lvt +++ b/base/testfiles-lthooks/lthooks-020.lvt @@ -77,8 +77,8 @@ \begin{document} -\LogHook{Nhook1} -\LogHook{Rhook1} +\DebugPrintHook{Nhook1} +\DebugPrintHook{Rhook1} \typeout{Nhook1} \UseHook{Nhook1} @@ -87,8 +87,8 @@ %------------------------------ -\LogHook{Nhook2} -\LogHook{Rhook2} +\DebugPrintHook{Nhook2} +\DebugPrintHook{Rhook2} \typeout{Nhook2} \UseHook{Nhook2} @@ -97,8 +97,8 @@ %------------------------------ -\LogHook{Nhook3} -\LogHook{Rhook3} +\DebugPrintHook{Nhook3} +\DebugPrintHook{Rhook3} \typeout{Nhook3} \UseHook{Nhook3} diff --git a/base/testfiles-lthooks/lthooks-020.tlg b/base/testfiles-lthooks/lthooks-020.tlg index 8b9e1a6566..4c1e30f5a6 100644 --- a/base/testfiles-lthooks/lthooks-020.tlg +++ b/base/testfiles-lthooks/lthooks-020.tlg @@ -20,41 +20,64 @@ 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 .... -==> Hook: 'Nhook1' -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules: -> 'label-3' before 'label-2' -> Execution order: -> 1: 'label-1' -> 2: 'label-3' -> 3: 'label-4' -> 4: 'label-5' -> 5: 'label-6' -> 6: 'label-2'. -==> Hook: 'Rhook1' -> reversed -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules, to be mirrored: -> 'label-3' before 'label-2' -> Execution order: -> 1: 'label-2' -> 2: 'label-6' -> 3: 'label-5' -> 4: 'label-4' -> 5: 'label-3' -> 6: 'label-1'. +<<< Hook: 'Nhook1' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... None +... Execution order: +... 'label-1', 'label-3', 'label-4', 'label-5', 'label-6', 'label-2' +>>> +<<< Hook: 'Rhook1' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... None +... Execution order: +... 'label-2', 'label-6', 'label-5', 'label-4', 'label-3', 'label-1' +>>> Nhook1 A C @@ -69,45 +92,64 @@ E D C A -==> Hook: 'Nhook2' -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules: -> 'label-3' before 'label-2' -> Rules: -> 'label-4' before 'label-3' -> Execution order: -> 1: 'label-1' -> 2: 'label-4' -> 3: 'label-5' -> 4: 'label-6' -> 5: 'label-3' -> 6: 'label-2'. -==> Hook: 'Rhook2' -> reversed -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules, to be mirrored: -> 'label-3' before 'label-2' -> Rules: -> 'label-4' after 'label-3' -> Execution order: -> 1: 'label-2' -> 2: 'label-3' -> 3: 'label-6' -> 4: 'label-5' -> 5: 'label-4' -> 6: 'label-1'. +<<< Hook: 'Nhook2' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... 'label-4' < 'label-3' +... Execution order: +... 'label-1', 'label-4', 'label-5', 'label-6', 'label-3', 'label-2' +>>> +<<< Hook: 'Rhook2' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... 'label-4' > 'label-3' +... Execution order: +... 'label-2', 'label-3', 'label-6', 'label-5', 'label-4', 'label-1' +>>> Nhook2 A D @@ -122,45 +164,64 @@ F E D A -==> Hook: 'Nhook3' -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules: -> 'label-3' before 'label-2' -> Rules: -> 'label-5' voids 'label-2' -> Execution order: -> 1: 'label-1' -> 2: 'label-3' -> 3: 'label-4' -> 4: 'label-5' -> 5: 'label-6' -> 6: 'label-2'. -==> Hook: 'Rhook3' -> reversed -> Code chunks: -> 'label-1' -> \typeout {A} -> 'label-2' -> \typeout {B} -> 'label-3' -> \typeout {C} -> 'label-4' -> \typeout {D} -> 'label-5' -> \typeout {E} -> 'label-6' -> \typeout {F} -> Default rules, to be mirrored: -> 'label-3' before 'label-2' -> Rules: -> 'label-5' voids 'label-2' -> Execution order: -> 1: 'label-2' -> 2: 'label-6' -> 3: 'label-5' -> 4: 'label-4' -> 5: 'label-3' -> 6: 'label-1'. +<<< Hook: 'Nhook3' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... 'label-5' <- 'label-2' +... Execution order: +... 'label-1', 'label-3', 'label-4', 'label-5', 'label-6', 'label-2' +>>> +<<< Hook: 'Rhook3' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-1' -> \typeout {A} +... 'label-2' -> \typeout {B} +... 'label-3' -> \typeout {C} +... 'label-4' -> \typeout {D} +... 'label-5' -> \typeout {E} +... 'label-6' -> \typeout {F} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-3' < 'label-2' +... Rules: +... 'label-5' <- 'label-2' +... Execution order: +... 'label-2', 'label-6', 'label-5', 'label-4', 'label-3', 'label-1' +>>> Nhook3 A C diff --git a/base/testfiles-lthooks/lthooks-021.lvt b/base/testfiles-lthooks/lthooks-021.lvt index 0de25a07fe..109449dc94 100644 --- a/base/testfiles-lthooks/lthooks-021.lvt +++ b/base/testfiles-lthooks/lthooks-021.lvt @@ -24,12 +24,12 @@ % because '??' isn't recognised: \DeclareHookRule{??}{label1}{voids}{label2} -\LogHook{aaa} +\DebugPrintHook{aaa} \ExplSyntaxOn \__hook_initialize_hook_code:n {aaa} \ExplSyntaxOff -\LogHook{aaa} +\DebugPrintHook{aaa} \END diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg index 104405a934..1ad3186b8c 100644 --- a/base/testfiles-lthooks/lthooks-021.tlg +++ b/base/testfiles-lthooks/lthooks-021.tlg @@ -177,15 +177,31 @@ Data structure for label rules: Handled code for label1 Handled code for label2 Update code for hook '??' on input line ...: -==> Hook: 'aaa' -> Code chunks: -> 'label1' -> code1 -> 'label2' -> code2 -> Default rules: -> 'label2' voids 'label1' -> Execution order: -> 1: 'label1' -> 2: 'label2'. +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label1' -> code1 +... 'label2' -> code2 +... 'top level' empty +... next-only empty +... Default rules: +... 'label2' <- 'label1' +... Rules: +... None +... Execution order: +... 'label1', 'label2' +>>> Update code for hook 'aaa' on input line ...: default rule label2|label1: <- found ---> Drop 'label2' code from \g__hook_aaa_code_prop because of 'label1' @@ -196,12 +212,28 @@ Data structure for label rules: label2 = 0 -> Handled code for label1 Handled code for label2 -==> Hook: 'aaa' -> Code chunks: -> 'label1' -> code1 -> 'label2' -> code2 -> Default rules: -> 'label2' voids 'label1' -> Execution order: -> 1: 'label1' -> 2: 'label2'. +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label1' -> code1 +... 'label2' -> code2 +... 'top level' empty +... next-only empty +... Default rules: +... 'label2' <- 'label1' +... Rules: +... None +... Execution order: +... 'label1', 'label2' +>>> diff --git a/base/testfiles-lthooks/lthooks-022.lvt b/base/testfiles-lthooks/lthooks-022.lvt index 44e31f051f..bc8a9a884e 100644 --- a/base/testfiles-lthooks/lthooks-022.lvt +++ b/base/testfiles-lthooks/lthooks-022.lvt @@ -14,16 +14,16 @@ \AddToHook{foo}[label-C]{\typeout{C-code}} \DeclareHookRule{foo}{label-A}{voids}{label-B} -\LogHook{foo} +\DebugPrintHook{foo} \DeclareHookRule{foo}{label-A}{incompatible-warning}{label-B} -\LogHook{foo} +\DebugPrintHook{foo} \DeclareHookRule{foo}{label-A}{unrelated}{label-B} -\LogHook{foo} +\DebugPrintHook{foo} \DeclareHookRule{foo}{label-B}{before}{label-A} -\LogHook{foo} +\DebugPrintHook{foo} @@ -31,7 +31,7 @@ \begin{document} \TIMO -\LogHook{foo} +\DebugPrintHook{foo} \UseHook{foo} \END diff --git a/base/testfiles-lthooks/lthooks-022.tlg b/base/testfiles-lthooks/lthooks-022.tlg index 3ef4583804..b8678974ee 100644 --- a/base/testfiles-lthooks/lthooks-022.tlg +++ b/base/testfiles-lthooks/lthooks-022.tlg @@ -1,60 +1,137 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> Rules: -> 'label-B' voids 'label-A' -> Execution order: -> 1: 'label-A' -> 2: 'label-B' -> 3: 'label-C'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label-B' <- 'label-A' +... Execution order: +... 'label-A', 'label-B', 'label-C' +>>> LaTeX hooks Warning: Labels 'label-B' and 'label-A' are incompatible in hook (hooks) 'foo'. You may see errors later. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> Rules: -> 'label-B' incompatible-warning 'label-A' -> Execution order: -> 1: 'label-A' (Warning) -> 2: 'label-B' (Warning) -> 3: 'label-C'. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> Execution order: -> 1: 'label-A' -> 2: 'label-B' -> 3: 'label-C'. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> Rules: -> 'label-B' before 'label-A' -> Execution order: -> 1: 'label-B' -> 2: 'label-C' -> 3: 'label-A'. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> Rules: -> 'label-B' before 'label-A' -> Execution order: -> 1: 'label-B' -> 2: 'label-C' -> 3: 'label-A'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label-B' xW 'label-A' +... Execution order: +... 'label-A', 'label-B', 'label-C' +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label-A', 'label-B', 'label-C' +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label-B' < 'label-A' +... Execution order: +... 'label-B', 'label-C', 'label-A' +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label-B' < 'label-A' +... Execution order: +... 'label-B', 'label-C', 'label-A' +>>> B-code C-code A-code diff --git a/base/testfiles-lthooks/lthooks-023.lvt b/base/testfiles-lthooks/lthooks-023.lvt index f424c3774d..74e1c7e2ab 100644 --- a/base/testfiles-lthooks/lthooks-023.lvt +++ b/base/testfiles-lthooks/lthooks-023.lvt @@ -29,7 +29,7 @@ % Resolve an incompatibility \DeclareHookRule{foo}{label-C}{voids}{label-A} -\LogHook{foo} +\DebugPrintHook{foo} \UseHook{foo} diff --git a/base/testfiles-lthooks/lthooks-023.tlg b/base/testfiles-lthooks/lthooks-023.tlg index 7bc1a8d5df..0ca7c8791f 100644 --- a/base/testfiles-lthooks/lthooks-023.tlg +++ b/base/testfiles-lthooks/lthooks-023.tlg @@ -8,30 +8,40 @@ LaTeX hooks Warning: Labels 'label-E' and 'label-D' are incompatible. You may (hooks) for both labels will be dropped. For immediate help type H . ... -l. ...\LogHook{foo} +l. ...\DebugPrintHook{foo} LaTeX found two incompatible labels in the same hook. This indicates an incompatibility between packages. -==> Hook: 'foo' -> Code chunks: -> 'label-A' -> \typeout {A-code} -> 'label-B' -> \typeout {B-code} -> 'label-C' -> \typeout {C-code} -> 'label-D' -> \typeout {D-code} -> 'label-E' -> \typeout {E-code} -> 'label-F' -> \typeout {F-code} -> Default rules: -> 'label-E' incompatible-warning 'label-D' -> 'label-F' incompatible-error 'label-D' -> Rules: -> 'label-B' incompatible-warning 'label-A' -> 'label-A' voids 'label-C' -> Execution order: -> 1: 'label-A' (Warning) -> 2: 'label-B' (Warning) -> 3: 'label-C' -> 4: 'label-D' (Error: dropped) -> 5: 'label-E' (Warning) -> 6: 'label-F' (Error: dropped). +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label-A' -> \typeout {A-code} +... 'label-B' -> \typeout {B-code} +... 'label-C' -> \typeout {C-code} +... 'label-D' -> \typeout {D-code} +... 'label-E' -> \typeout {E-code} +... 'label-F' -> \typeout {F-code} +... 'top level' empty +... next-only empty +... Default rules: +... 'label-E' xW 'label-D' +... 'label-F' xE 'label-D' +... Rules: +... 'label-B' xW 'label-A' +... 'label-C' -> 'label-A' +... Execution order: +... 'label-A', 'label-B', 'label-C', 'label-D', 'label-E', 'label-F' +>>> LaTeX hooks Warning: Labels 'label-B' and 'label-A' are incompatible in hook (hooks) 'foo'. You may see errors later. LaTeX hooks Warning: Labels 'label-E' and 'label-D' are incompatible. You may diff --git a/base/testfiles-lthooks/lthooks-024.lvt b/base/testfiles-lthooks/lthooks-024.lvt index c9bc939c80..bf1ceea1a0 100644 --- a/base/testfiles-lthooks/lthooks-024.lvt +++ b/base/testfiles-lthooks/lthooks-024.lvt @@ -31,7 +31,7 @@ \AddToHook{foo}[./foo/]{#1/foo/ } % Valid \AddToHook{foo}[/./foo]{/./foo } \__hook_initialize_hook_code:n {foo} - \LogHook{foo} + \DebugPrintHook{foo} \RemoveFromHook{foo}[*] } \ExplSyntaxOff @@ -48,7 +48,7 @@ \def\testme#1{% \expanded{\AddToHook{foo}[./foo]{#1/foo}} % Valid \csname __hook_initialize_hook_code:n\endcsname {foo} - \LogHook{foo} + \DebugPrintHook{foo} \RemoveFromHook{foo}[*] } diff --git a/base/testfiles-lthooks/lthooks-024.tlg b/base/testfiles-lthooks/lthooks-024.tlg index bc5b28bc5e..9c678b27e1 100644 --- a/base/testfiles-lthooks/lthooks-024.tlg +++ b/base/testfiles-lthooks/lthooks-024.tlg @@ -16,35 +16,41 @@ If you say, e.g., `\def\a1{...}', then you must always put `1' after `\a', since control sequence names are made up of letters only. The macro here has not been followed by the required stuff, so I'm ignoring it. -==> Hook: 'foo' -> Code chunks: -> '..' -> .. -> '../' -> ../ -> '/' -> / -> '//' -> // -> 'top-level/' -> top-level/ -> '/./' -> /./ -> '.x' -> .x -> '/.x' -> /.x -> '.x/' -> .x/ -> 'top-level/foo' -> top-level/foo -> 'top-level/foo/' -> top-level/foo/ -> '/./foo' -> /./foo -> 'top-level' -> top-leveltop-leveltop-level -> Execution order: -> 1: '..' -> 2: '../' -> 3: '/' -> 4: '//' -> 5: 'top-level/' -> 6: '/./' -> 7: '.x' -> 8: '/.x' -> 9: '.x/' -> 10: 'top-level/foo' -> 11: 'top-level/foo/' -> 12: '/./foo' -> 13: 'top-level'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... '..' -> .. +... '../' -> ../ +... '/' -> / +... '//' -> // +... 'top-level/' -> top-level/ +... '/./' -> /./ +... '.x' -> .x +... '/.x' -> /.x +... '.x/' -> .x/ +... 'top-level/foo' -> top-level/foo +... 'top-level/foo/' -> top-level/foo/ +... '/./foo' -> /./foo +... 'top level' -> top-leveltop-leveltop-level +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... '..', '../', '/', '//', 'top-level/', '/./', '.x', '/.x', '.x/', 'top-level/foo', 'top-level/foo/', '/./foo' +>>> ! Use of \??? doesn't match its definition. \??? ! LaTeX hooks Error: Empty code label on line .... Using 'pk... @@ -61,114 +67,387 @@ If you say, e.g., `\def\a1{...}', then you must always put `1' after `\a', since control sequence names are made up of letters only. The macro here has not been followed by the required stuff, so I'm ignoring it. -==> Hook: 'foo' -> Code chunks: -> 'pkg' -> top-leveltop-levelpkg -> '..' -> .. -> '../' -> ../ -> '/' -> / -> '//' -> // -> 'pkg/' -> pkg/ -> '/./' -> /./ -> '.x' -> .x -> '/.x' -> /.x -> '.x/' -> .x/ -> 'pkg/foo' -> pkg/foo -> 'pkg/foo/' -> pkg/foo/ -> '/./foo' -> /./foo -> Execution order: -> 1: 'pkg' -> 2: '..' -> 3: '../' -> 4: '/' -> 5: '//' -> 6: 'pkg/' -> 7: '/./' -> 8: '.x' -> 9: '/.x' -> 10: '.x/' -> 11: 'pkg/foo' -> 12: 'pkg/foo/' -> 13: '/./foo'. -==> Hook: 'foo' -> Code chunks: -> 'top-level/foo' -> top-level/foo -> Execution order: -> 1: 'top-level/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkg' -> top-leveltop-levelpkg +... '..' -> .. +... '../' -> ../ +... '/' -> / +... '//' -> // +... 'pkg/' -> pkg/ +... '/./' -> /./ +... '.x' -> .x +... '/.x' -> /.x +... '.x/' -> .x/ +... 'pkg/foo' -> pkg/foo +... 'pkg/foo/' -> pkg/foo/ +... '/./foo' -> /./foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkg', '..', '../', '/', '//', 'pkg/', '/./', '.x', '/.x', '.x/', 'pkg/foo', 'pkg/foo/', '/./foo' +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top-level/foo' -> top-level/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'top-level/foo' +>>> (lthooks-024-pkgA.sty -==> Hook: 'foo' -> Code chunks: -> 'pkgA/foo' -> pkgA/foo -> Execution order: -> 1: 'pkgA/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgA/foo' -> pkgA/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgA/foo' +>>> (lthooks-024-pkgB.sty -==> Hook: 'foo' -> Code chunks: -> 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo -> Execution order: -> 1: 'lthooks-024-pkgB/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'lthooks-024-pkgB/foo' +>>> (lthooks-024-pkgC.sty -==> Hook: 'foo' -> Code chunks: -> 'pkgC/foo' -> pkgC/foo -> Execution order: -> 1: 'pkgC/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgC/foo' -> pkgC/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgC/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo -> Execution order: -> 1: 'lthooks-024-pkgB/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'lthooks-024-pkgB/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'pkgA/foo' -> pkgA/foo -> Execution order: -> 1: 'pkgA/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgA/foo' -> pkgA/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgA/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'top-level/foo' -> top-level/foo -> Execution order: -> 1: 'top-level/foo'. -==> Hook: 'foo' -> Code chunks: -> 'my-document/foo' -> my-document/foo -> Execution order: -> 1: 'my-document/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top-level/foo' -> top-level/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'top-level/foo' +>>> +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-document/foo' -> my-document/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-document/foo' +>>> (lthooks-024-pkgA.sty -==> Hook: 'foo' -> Code chunks: -> 'pkgA/foo' -> pkgA/foo -> Execution order: -> 1: 'pkgA/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgA/foo' -> pkgA/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgA/foo' +>>> (lthooks-024-pkgB.sty -==> Hook: 'foo' -> Code chunks: -> 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo -> Execution order: -> 1: 'lthooks-024-pkgB/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'lthooks-024-pkgB/foo' +>>> (lthooks-024-pkgC.sty -==> Hook: 'foo' -> Code chunks: -> 'pkgC/foo' -> pkgC/foo -> Execution order: -> 1: 'pkgC/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgC/foo' -> pkgC/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgC/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo -> Execution order: -> 1: 'lthooks-024-pkgB/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'lthooks-024-pkgB/foo' -> lthooks-024-pkgB/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'lthooks-024-pkgB/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'pkgA/foo' -> pkgA/foo -> Execution order: -> 1: 'pkgA/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkgA/foo' -> pkgA/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'pkgA/foo' +>>> ) -==> Hook: 'foo' -> Code chunks: -> 'my-document/foo' -> my-document/foo -> Execution order: -> 1: 'my-document/foo'. +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-document/foo' -> my-document/foo +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-document/foo' +>>> diff --git a/base/testfiles-lthooks/lthooks-026.lvt b/base/testfiles-lthooks/lthooks-026.lvt index f5d905b34e..f20215215e 100644 --- a/base/testfiles-lthooks/lthooks-026.lvt +++ b/base/testfiles-lthooks/lthooks-026.lvt @@ -18,7 +18,7 @@ \AtBeginEnvironment[bar]{quote}{\typeout{quote begin 2}}% env/quote/begin -\LogHook{env/quote/begin} +\DebugPrintHook{env/quote/begin} \begin{document} @@ -28,7 +28,7 @@ \AtEndEnvironment[baz]{quote}{\typeout{quote end 2}}% env/quote/end \AfterEndEnvironment[foobar]{quote}{\typeout{quote after 2}}% env/quote/after -\LogHook{env/quote/after} +\DebugPrintHook{env/quote/after} \ExplSyntaxOn \cs_new_protected:Npn \test #1 diff --git a/base/testfiles-lthooks/lthooks-026.tlg b/base/testfiles-lthooks/lthooks-026.tlg index 3d6939922f..70cc83e6c9 100644 --- a/base/testfiles-lthooks/lthooks-026.tlg +++ b/base/testfiles-lthooks/lthooks-026.tlg @@ -1,13 +1,29 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'env/quote/begin' -> builtin generic -> Code chunks: -> 'bar' -> \typeout {quote begin 2} -> 'top-level' -> \typeout {quote begin (top-level)} -> Execution order: -> 1: 'bar' -> 2: 'top-level'. +<<< Hook: 'env/quote/begin' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'bar' -> \typeout {quote begin 2} +... 'top level' -> \typeout {quote begin (top-level)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'bar' +>>> (../l3backend-pdftex.def File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX) \l__color_backend_stack_int=\count... @@ -34,14 +50,30 @@ quote begin 2 quote begin (top-level) quote end (top-level) quote after (top-level) -==> Hook: 'env/quote/after' -> builtin generic, reversed -> Code chunks: -> 'foobar' -> \typeout {quote after 2} -> 'top-level' -> \typeout {quote after (top-level)} -> Execution order: -> 1: 'top-level' -> 2: 'foobar'. +<<< Hook: 'env/quote/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'foobar' -> \typeout {quote after 2} +... 'top level' -> \typeout {quote after (top-level)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'foobar' +>>> env/quote/before is not reversed env/quote/begin is not reversed env/quote/end is not reversed diff --git a/base/testfiles-lthooks/lthooks-027.lvt b/base/testfiles-lthooks/lthooks-027.lvt index 04f3f92bc5..a044a15c28 100644 --- a/base/testfiles-lthooks/lthooks-027.lvt +++ b/base/testfiles-lthooks/lthooks-027.lvt @@ -32,7 +32,7 @@ \NewHook { -{hook}- } \AddToHook { -{hook}- } {\message{aaa}} \DeclareHookRule { -{hook}- } { . } { after } { x } - \LogHook { -{hook}- } + \DebugPrintHook { -{hook}- } \UseOneTimeHook {-{hook}-} \AddToHook { -{hook}- } [ x ] {\message{bbb}} } @@ -48,7 +48,7 @@ \NewHook { grüße } \AddToHook { grüße } {\message{aaa}} \DeclareHookRule { grüße } { . } { after } { x } - \LogHook { grüße } + \DebugPrintHook { grüße } \UseOneTimeHook {grüße} \AddToHook { grüße } [ x ] {\message{bbb}} } @@ -60,7 +60,7 @@ \NewHook { \hookname } \AddToHook { \hookname } {\message{aaa}} \DeclareHookRule { \hookname } { . } { after } { x } - \LogHook { \hookname } + \DebugPrintHook { \hookname } \UseOneTimeHook {\hookname} \AddToHook { \hookname } [ x ] {\message{bbb}} } @@ -72,7 +72,7 @@ \NewHook { \hookname } \AddToHook { \hookname } {\message{aaa}} \DeclareHookRule { \hookname } { . } { after } { x } - \LogHook { \hookname } + \DebugPrintHook { \hookname } \UseOneTimeHook {\hookname} \AddToHook { \hookname } [ x ] {\message{bbb}} } diff --git a/base/testfiles-lthooks/lthooks-027.tlg b/base/testfiles-lthooks/lthooks-027.tlg index 72d323de8c..c2204e9428 100644 --- a/base/testfiles-lthooks/lthooks-027.tlg +++ b/base/testfiles-lthooks/lthooks-027.tlg @@ -13,11 +13,29 @@ aaa bbb ============================================================ TEST 2: Braces in hook names (expect 'aaa bbb'): ============================================================ -==> Hook: '-{hook}-' -> Code chunks: -> 'top-level' -> \message {aaa} -> Execution order: -> 1: 'top-level'. +<<< Hook: '-{hook}-'(<- ' -{hook}- ') +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \message {aaa} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> aaa bbb ============================================================ ============================================================ @@ -31,31 +49,85 @@ File: after ============================================================ TEST 4: Unicode hook names (expect 'aaa bbb'): ============================================================ -==> Hook: 'gr^^c3^^bc^^c3^^9fe' -> Code chunks: -> 'top-level' -> \message {aaa} -> Execution order: -> 1: 'top-level'. +<<< Hook: 'gr^^c3^^bc^^c3^^9fe'(<- ' gr^^c3^^bc^^c3^^9fe ') +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \message {aaa} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> aaa bbb ============================================================ ============================================================ TEST 5: Macros in hook names (expect 'aaa bbb'): ============================================================ -==> Hook: '^^e9^^89^^a4' -> Code chunks: -> 'top-level' -> \message {aaa} -> Execution order: -> 1: 'top-level'. +<<< Hook: '^^e9^^89^^a4'(<- ' ^^e9^^89^^a4') +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \message {aaa} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> aaa bbb ============================================================ ============================================================ TEST 6: Spaces aren't trimmed if hidden in a macro (expect 'aaa bbb'): ============================================================ -==> Hook: ' <-with spaces-> ' -> Code chunks: -> 'top-level' -> \message {aaa} -> Execution order: -> 1: 'top-level'. +<<< Hook: ' <-with spaces-> '(<- ' <-with spaces-> ') +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \message {aaa} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> aaa bbb ============================================================ (lthooks-027.aux) diff --git a/base/testfiles-lthooks/lthooks-028.lvt b/base/testfiles-lthooks/lthooks-028.lvt index c32d8d3e0e..0a17c7e802 100644 --- a/base/testfiles-lthooks/lthooks-028.lvt +++ b/base/testfiles-lthooks/lthooks-028.lvt @@ -37,7 +37,7 @@ \DeclareHookRule{aaa}{package}{after}{other package} \DeclareHookRule{aaa}{package}{after}{top-level} % does nothing -\ShowHook{aaa} +\DebugPrintHook{aaa} % @@ -49,9 +49,9 @@ \DeclareHookRule{bbb}{package}{after}{other package} \DeclareHookRule{bbb}{package}{after}{top-level} % does nothing -\ShowHook{bbb} +\DebugPrintHook{bbb} \NewHook{bbb} -\ShowHook{bbb} +\DebugPrintHook{bbb} % @@ -63,29 +63,29 @@ \DeclareHookRule{ccc}{package}{after}{other package} \DeclareHookRule{ccc}{package}{after}{top-level} % does nothing -\ShowHook{ccc} +\DebugPrintHook{ccc} \NewReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} % % Add then remove \AddToHook{ddd}[top-level]{\typeout{top-level }} -\ShowHook{ddd} +\DebugPrintHook{ddd} \RemoveFromHook{ddd}[top-level] -\ShowHook{ddd} +\DebugPrintHook{ddd} % Add then remove all \AddToHook{ddd}[top-level]{\typeout{top-level }} -\ShowHook{ddd} +\DebugPrintHook{ddd} \RemoveFromHook{ddd}[*] -\ShowHook{ddd} +\DebugPrintHook{ddd} % Remove then add (the removal is not queued) \RemoveFromHook{ddd}[top-level] -\ShowHook{ddd} +\DebugPrintHook{ddd} \AddToHook{ddd}[top-level]{\typeout{top-level }} -\ShowHook{ddd} +\DebugPrintHook{ddd} diff --git a/base/testfiles-lthooks/lthooks-028.tlg b/base/testfiles-lthooks/lthooks-028.tlg index b57be6364e..01e4e93e83 100644 --- a/base/testfiles-lthooks/lthooks-028.tlg +++ b/base/testfiles-lthooks/lthooks-028.tlg @@ -20,99 +20,267 @@ The 'top-level' label is meant for user code only, and should only be used this package, or another suitable label. from lthooks-028-pkg 'top-level' with default label -==> Hook: 'aaa' -> Code chunks: -> 'package' -> \typeout {package }\typeout {also package } -> 'other package' -> \typeout {other package } -> 'top-level' -> \typeout {top-level }\typeout {also top-level } -> Rules: -> 'package' after 'other package' -> Execution order: -> 1: 'other package' -> 2: 'package' -> 3: 'top-level'. - } -l. ...\ShowHook{aaa} -==> Hook: 'bbb' -> not declared -> Code chunks: -> 'package' -> \typeout {package }\typeout {also package } -> 'other package' -> \typeout {other package } -> 'top-level' -> \typeout {top-level }\typeout {also top-level } -> Rules: -> 'package' after 'other package' -> No execution. - } -l. ...\ShowHook{bbb} -==> Hook: 'bbb' -> Code chunks: -> 'package' -> \typeout {package }\typeout {also package } -> 'other package' -> \typeout {other package } -> 'top-level' -> \typeout {top-level }\typeout {also top-level } -> Rules: -> 'package' after 'other package' -> Execution order: -> 1: 'other package' -> 2: 'package' -> 3: 'top-level'. - } -l. ...\ShowHook{bbb} -==> Hook: 'ccc' -> not declared -> Code chunks: -> 'package' -> \typeout {package }\typeout {also package } -> 'other package' -> \typeout {other package } -> 'top-level' -> \typeout {top-level }\typeout {also top-level } -> Rules: -> 'package' after 'other package' -> No execution. - } -l. ...\ShowHook{ccc} -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'package' -> \typeout {package }\typeout {also package } -> 'other package' -> \typeout {other package } -> 'top-level' -> \typeout {top-level }\typeout {also top-level } -> Rules: -> 'package' after 'other package' -> Execution order: -> 1: 'top-level' -> 2: 'other package' -> 3: 'package'. - } -l. ...\ShowHook{ccc} -==> Hook: 'ddd' -> not declared -> Code chunks: -> 'top-level' -> \typeout {top-level } -> No execution. - } -l. ...\ShowHook{ddd} -==> Hook: 'ddd' -> not declared. - } -l. ...\ShowHook{ddd} -==> Hook: 'ddd' -> not declared -> Code chunks: -> 'top-level' -> \typeout {top-level } -> No execution. - } -l. ...\ShowHook{ddd} -==> Hook: 'ddd' -> not declared. - } -l. ...\ShowHook{ddd} -==> Hook: 'ddd' -> not declared. - } -l. ...\ShowHook{ddd} -==> Hook: 'ddd' -> not declared -> Code chunks: -> 'top-level' -> \typeout {top-level } -> No execution. - } -l. ...\ShowHook{ddd} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package' -> \typeout {package }\typeout {also package } +... 'other package' -> \typeout {other package } +... 'top level' -> \typeout {top-level }\typeout {also top-level } +... next-only empty +... Default rules: +... None +... Rules: +... 'package' > 'other package' +... Execution order: +... 'other package', 'package' +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package' -> \typeout {package }\typeout {also package } +... 'other package' -> \typeout {other package } +... 'top level' -> \typeout {top-level }\typeout {also top-level } +... next-only empty +... Default rules: +... None +... Rules: +... 'package' > 'other package' +... Execution order: +... None +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package' -> \typeout {package }\typeout {also package } +... 'other package' -> \typeout {other package } +... 'top level' -> \typeout {top-level }\typeout {also top-level } +... next-only empty +... Default rules: +... None +... Rules: +... 'package' > 'other package' +... Execution order: +... 'other package', 'package' +>>> +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package' -> \typeout {package }\typeout {also package } +... 'other package' -> \typeout {other package } +... 'top level' -> \typeout {top-level }\typeout {also top-level } +... next-only empty +... Default rules: +... None +... Rules: +... 'package' > 'other package' +... Execution order: +... None +>>> +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package' -> \typeout {package }\typeout {also package } +... 'other package' -> \typeout {other package } +... 'top level' -> \typeout {top-level }\typeout {also top-level } +... next-only empty +... Default rules: +... None +... Rules: +... 'package' > 'other package' +... Execution order: +... 'other package', 'package' +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {top-level } +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {top-level } +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {top-level } +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> (lthooks-028.aux) diff --git a/base/testfiles-lthooks/lthooks-029-deprecated-after.lvt b/base/testfiles-lthooks/lthooks-029-deprecated-after.lvt index 7dfa558b0a..78e9b360c3 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated-after.lvt +++ b/base/testfiles-lthooks/lthooks-029-deprecated-after.lvt @@ -17,66 +17,66 @@ \typeout{------------ all unknown --------------} -\ShowHook{aaa} -\ShowHook{bbb} -\ShowHook{ccc} +\DebugPrintHook{aaa} +\DebugPrintHook{bbb} +\DebugPrintHook{ccc} \NewHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook --------------} \ActivateGenericHook{aaa} % \ProvideHook -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook with data --------------} \AddToHook{aaa}[X]{X1} \ActivateGenericHook{aaa} % \ProvideHook -\ShowHook{aaa} +\DebugPrintHook{aaa} \AddToHook{bbb}[Y]{Y1} \typeout{------------ provide an unknown hook with data --------------} \ActivateGenericHook{bbb} % \ProvideHook -\ShowHook{bbb} +\DebugPrintHook{bbb} \ActivateGenericHook{bbb} % \ProvideHook -\ShowHook{bbb} +\DebugPrintHook{bbb} \typeout{------------ provide an unknown reversed hook --------------} \NewReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an known reversed hook --------------} \ActivateGenericHook{ccc} % \ProvideReversedHook -\ShowHook{ccc} +\DebugPrintHook{ccc} \AddToHook{ccc}[Z]{Z1} \typeout{------------ provide an known reversed hook with data --------------} \ActivateGenericHook{ccc} % \ProvideReversedHook -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an reversed hook on an existing normal hook --------------} \ActivateGenericHook{aaa} % \ProvideReversedHook -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide an normal hook on an existing reversed hook --------------} \ActivateGenericHook{ccc} % \ProvideHook -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide hook that was disabled --------------} \DisableGenericHook{ddd} % \DisableHook \ActivateGenericHook{ddd} % \ProvideHook -\ShowHook{ddd} +\DebugPrintHook{ddd} diff --git a/base/testfiles-lthooks/lthooks-029-deprecated-after.tlg b/base/testfiles-lthooks/lthooks-029-deprecated-after.tlg index f05b315236..4666defe3e 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated-after.tlg +++ b/base/testfiles-lthooks/lthooks-029-deprecated-after.tlg @@ -1,89 +1,341 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ------------ all unknown -------------- -==> Hook: 'aaa' -> not declared. - } -l. ...\ShowHook{aaa} -==> Hook: 'bbb' -> not declared. - } -l. ...\ShowHook{bbb} -==> Hook: 'ccc' -> not declared. - } -l. ...\ShowHook{ccc} -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook -------------- -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook with data -------------- -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an unknown hook with data -------------- -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> ------------ provide an unknown reversed hook -------------- -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook -------------- -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook with data -------------- -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide an reversed hook on an existing normal hook -------------- -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an normal hook on an existing reversed hook -------------- -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide hook that was disabled -------------- LaTeX hooks Warning: Cannot activate hook 'ddd' because it is disabled! -==> Hook: 'ddd' -> not declared, disabled. - } -l. ...\ShowHook{ddd} +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/lthooks-029-deprecated-before.lvt b/base/testfiles-lthooks/lthooks-029-deprecated-before.lvt index ae49b02e50..dc9158b0e0 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated-before.lvt +++ b/base/testfiles-lthooks/lthooks-029-deprecated-before.lvt @@ -20,66 +20,66 @@ \typeout{------------ all unknown --------------} -\ShowHook{aaa} -\ShowHook{bbb} -\ShowHook{ccc} +\DebugPrintHook{aaa} +\DebugPrintHook{bbb} +\DebugPrintHook{ccc} \NewHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook --------------} \ProvideHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook with data --------------} \AddToHook{aaa}[X]{X1} \ProvideHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \AddToHook{bbb}[Y]{Y1} \typeout{------------ provide an unknown hook with data --------------} \ProvideHook{bbb} -\ShowHook{bbb} +\DebugPrintHook{bbb} \ProvideHook{bbb} -\ShowHook{bbb} +\DebugPrintHook{bbb} \typeout{------------ provide an unknown reversed hook --------------} \NewReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an known reversed hook --------------} \ProvideReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \AddToHook{ccc}[Z]{Z1} \typeout{------------ provide an known reversed hook with data --------------} \ProvideReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an reversed hook on an existing normal hook --------------} \ProvideReversedHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide an normal hook on an existing reversed hook --------------} \ProvideHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide hook that was disabled --------------} \DisableHook{ddd} \ProvideHook{ddd} -\ShowHook{ddd} +\DebugPrintHook{ddd} diff --git a/base/testfiles-lthooks/lthooks-029-deprecated-before.tlg b/base/testfiles-lthooks/lthooks-029-deprecated-before.tlg index 9945f540e4..6aba489e03 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated-before.tlg +++ b/base/testfiles-lthooks/lthooks-029-deprecated-before.tlg @@ -1,118 +1,351 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ------------ all unknown -------------- -==> Hook: 'aaa' -> not declared. - } -l. ...\ShowHook{aaa} -==> Hook: 'bbb' -> not declared. - } -l. ...\ShowHook{bbb} -==> Hook: 'ccc' -> not declared. - } -l. ...\ShowHook{ccc} -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook -------------- LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook with data -------------- LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an unknown hook with data -------------- LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> ------------ provide an unknown reversed hook -------------- -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook with data -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide an reversed hook on an existing normal hook -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an normal hook on an existing reversed hook -------------- LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide hook that was disabled -------------- LaTeX hooks Warning: Command \DisableHook is deprecated and will be removed in (hooks) a future release. @@ -123,7 +356,26 @@ LaTeX hooks Warning: Command \ProvideHook is deprecated and will be removed in (hooks) (hooks) Use \ActivateGenericHook instead. LaTeX hooks Warning: Cannot activate hook 'ddd' because it is disabled! -==> Hook: 'ddd' -> not declared, disabled. - } -l. ...\ShowHook{ddd} +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/lthooks-029-deprecated.lvt b/base/testfiles-lthooks/lthooks-029-deprecated.lvt index 39f7abd046..068c0b97d3 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated.lvt +++ b/base/testfiles-lthooks/lthooks-029-deprecated.lvt @@ -10,66 +10,66 @@ \typeout{------------ all unknown --------------} -\ShowHook{aaa} -\ShowHook{bbb} -\ShowHook{ccc} +\DebugPrintHook{aaa} +\DebugPrintHook{bbb} +\DebugPrintHook{ccc} \NewHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook --------------} \ActivateGenericHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide a known hook with data --------------} \AddToHook{aaa}[X]{X1} \ActivateGenericHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \AddToHook{bbb}[Y]{Y1} \typeout{------------ provide an unknown hook with data --------------} \ActivateGenericHook{bbb} -\ShowHook{bbb} +\DebugPrintHook{bbb} \ActivateGenericHook{bbb} -\ShowHook{bbb} +\DebugPrintHook{bbb} \typeout{------------ provide an unknown reversed hook --------------} \NewReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an known reversed hook --------------} \ProvideReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \AddToHook{ccc}[Z]{Z1} \typeout{------------ provide an known reversed hook with data --------------} \ProvideReversedHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide an reversed hook on an existing normal hook --------------} \ProvideReversedHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ provide an normal hook on an existing reversed hook --------------} \ActivateGenericHook{ccc} -\ShowHook{ccc} +\DebugPrintHook{ccc} \typeout{------------ provide hook that was disabled --------------} \DisableGenericHook{ddd} \ActivateGenericHook{ddd} -\ShowHook{ddd} +\DebugPrintHook{ddd} diff --git a/base/testfiles-lthooks/lthooks-029-deprecated.tlg b/base/testfiles-lthooks/lthooks-029-deprecated.tlg index 345528ed12..9426e88cc5 100644 --- a/base/testfiles-lthooks/lthooks-029-deprecated.tlg +++ b/base/testfiles-lthooks/lthooks-029-deprecated.tlg @@ -1,101 +1,353 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ------------ all unknown -------------- -==> Hook: 'aaa' -> not declared. - } -l. ...\ShowHook{aaa} -==> Hook: 'bbb' -> not declared. - } -l. ...\ShowHook{bbb} -==> Hook: 'ccc' -> not declared. - } -l. ...\ShowHook{ccc} -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook -------------- -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide a known hook with data -------------- -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an unknown hook with data -------------- -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} -==> Hook: 'bbb' -> Code chunks: -> 'Y' -> Y1 -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{bbb} +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> +<<< Hook: 'bbb' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> Y1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> ------------ provide an unknown reversed hook -------------- -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'ccc' -> reversed. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ provide an known reversed hook with data -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide an reversed hook on an existing normal hook -------------- LaTeX hooks Warning: Command \ProvideReversedHook is deprecated and will be (hooks) removed in a future release. (hooks) (hooks) Use \ActivateGenericHook instead. -==> Hook: 'aaa' -> Code chunks: -> 'X' -> X1 -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> X1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> ------------ provide an normal hook on an existing reversed hook -------------- -==> Hook: 'ccc' -> reversed -> Code chunks: -> 'Z' -> Z1 -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{ccc} +<<< Hook: 'ccc' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> Z1 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> ------------ provide hook that was disabled -------------- LaTeX hooks Warning: Cannot activate hook 'ddd' because it is disabled! -==> Hook: 'ddd' -> not declared, disabled. - } -l. ...\ShowHook{ddd} +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: N +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-lthooks/lthooks-029.lvt b/base/testfiles-lthooks/lthooks-029.lvt index 13d87d844a..55f430cf7a 100644 --- a/base/testfiles-lthooks/lthooks-029.lvt +++ b/base/testfiles-lthooks/lthooks-029.lvt @@ -13,25 +13,25 @@ \typeout{------------ all unknown --------------} -\ShowHook{aaa} -\ShowHook{env/bbb/begin} -\ShowHook{env/ccc/end} -\ShowHook{ddd} +\DebugPrintHook{aaa} +\DebugPrintHook{env/bbb/begin} +\DebugPrintHook{env/ccc/end} +\DebugPrintHook{ddd} \NewHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ activate a known hook --------------} \ActivateGenericHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \typeout{------------ activate a known hook with data --------------} \AddToHook{aaa}[X]{\typeout{aaa: X1}} \ActivateGenericHook{aaa} -\ShowHook{aaa} +\DebugPrintHook{aaa} \AddToHook{env/bbb/begin}[Y]{\typeout{bbb: Y1}} @@ -43,7 +43,7 @@ \typeout{------------ activate an unknown hook with data --------------} \ActivateGenericHook{env/bbb/begin} -\ShowHook{env/bbb/begin} +\DebugPrintHook{env/bbb/begin} \UseHook{aaa} \UseHook{env/bbb/begin} @@ -53,7 +53,7 @@ \typeout{------------ activate an unknown reversed hook --------------} \ActivateGenericHook{env/ccc/end} -\ShowHook{env/ccc/end} +\DebugPrintHook{env/ccc/end} \UseHook{aaa} \UseHook{env/bbb/begin} @@ -64,7 +64,7 @@ \AddToHook{env/ccc/end}[Z]{\typeout{ccc: Z1}} \ActivateGenericHook{env/ccc/end} -\ShowHook{env/ccc/end} +\DebugPrintHook{env/ccc/end} \UseHook{aaa} \UseHook{env/bbb/begin} @@ -82,7 +82,7 @@ \DisableGenericHook{ddd} \ActivateGenericHook{ddd} -\ShowHook{ddd} +\DebugPrintHook{ddd} \UseHook{ddd} \END diff --git a/base/testfiles-lthooks/lthooks-029.tlg b/base/testfiles-lthooks/lthooks-029.tlg index d311f535bb..13e4797cf9 100644 --- a/base/testfiles-lthooks/lthooks-029.tlg +++ b/base/testfiles-lthooks/lthooks-029.tlg @@ -1,78 +1,277 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ------------ all unknown -------------- -==> Hook: 'aaa' -> not declared. - } -l. ...\ShowHook{aaa} -==> Hook: 'env/bbb/begin' -> builtin generic. - } -l. ...\ShowHook{env/bbb/begin} -==> Hook: 'env/ccc/end' -> builtin generic. - } -l. ...\ShowHook{env/ccc/end} -==> Hook: 'ddd' -> not declared. - } -l. ...\ShowHook{ddd} -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'env/bbb/begin' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'env/ccc/end' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ activate a known hook -------------- -==> Hook: 'aaa' -> empty. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------ activate a known hook with data -------------- -==> Hook: 'aaa' -> Code chunks: -> 'X' -> \typeout {aaa: X1} -> Execution order: -> 1: 'X'. - } -l. ...\ShowHook{aaa} +<<< Hook: 'aaa' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {aaa: X1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> aaa: X1 bbb: Y1 ------------ activate an unknown hook with data -------------- -==> Hook: 'env/bbb/begin' -> builtin generic -> Code chunks: -> 'Y' -> \typeout {bbb: Y1} -> Execution order: -> 1: 'Y'. - } -l. ...\ShowHook{env/bbb/begin} +<<< Hook: 'env/bbb/begin' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Y' -> \typeout {bbb: Y1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Y' +>>> aaa: X1 bbb: Y1 ------------ activate an unknown reversed hook -------------- -==> Hook: 'env/ccc/end' -> builtin generic. - } -l. ...\ShowHook{env/ccc/end} +<<< Hook: 'env/ccc/end' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> aaa: X1 bbb: Y1 ------------ activate an known reversed hook with data -------------- -==> Hook: 'env/ccc/end' -> builtin generic -> Code chunks: -> 'Z' -> \typeout {ccc: Z1} -> Execution order: -> 1: 'Z'. - } -l. ...\ShowHook{env/ccc/end} +<<< Hook: 'env/ccc/end' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'Z' -> \typeout {ccc: Z1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'Z' +>>> aaa: X1 bbb: Y1 ccc: Z1 ------------ activate hook that was disabled -------------- ddd: W1 LaTeX hooks Warning: Cannot activate hook 'ddd' because it is disabled! -==> Hook: 'ddd' -> not declared, disabled -> Code chunks: -> 'W' -> \typeout {ddd: W1} -> No execution. - } -l. ...\ShowHook{ddd} +<<< Hook: 'ddd' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'W' -> \typeout {ddd: W1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'W' +>>> diff --git a/base/testfiles-lthooks/lthooks-029b.lvt b/base/testfiles-lthooks/lthooks-029b.lvt index 376e12edda..5e599f24c3 100644 --- a/base/testfiles-lthooks/lthooks-029b.lvt +++ b/base/testfiles-lthooks/lthooks-029b.lvt @@ -15,7 +15,7 @@ \AddToHook{baz/middle}{\typeout{middle no cmd}} \AddToHook{baz/middle}[X]{\typeout{X middle no cmd}} -\ShowHook{baz/middle} +\DebugPrintHook{baz/middle} \newcommand\baz{\typeout{baz start} \UseHook{cmd/baz/middle} @@ -27,7 +27,7 @@ \ActivateGenericHook{baz/middle} \ActivateGenericHook{cmd/baz/middle} -\ShowHook{baz/middle} +\DebugPrintHook{baz/middle} \baz diff --git a/base/testfiles-lthooks/lthooks-029b.tlg b/base/testfiles-lthooks/lthooks-029b.tlg index 3e1f78140b..b5ee6b47ab 100644 --- a/base/testfiles-lthooks/lthooks-029b.tlg +++ b/base/testfiles-lthooks/lthooks-029b.tlg @@ -1,24 +1,55 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'baz/middle' -> not declared -> Code chunks: -> 'X' -> \typeout {X middle no cmd} -> 'top-level' -> \typeout {middle no cmd} -> No execution. - } -l. ...\ShowHook{baz/middle} +<<< Hook: 'baz/middle' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {X middle no cmd} +... 'top level' -> \typeout {middle no cmd} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> baz start baz end -==> Hook: 'baz/middle' -> Code chunks: -> 'X' -> \typeout {X middle no cmd} -> 'top-level' -> \typeout {middle no cmd} -> Execution order: -> 1: 'X' -> 2: 'top-level'. - } -l. ...\ShowHook{baz/middle} +<<< Hook: 'baz/middle' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'X' -> \typeout {X middle no cmd} +... 'top level' -> \typeout {middle no cmd} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'X' +>>> baz start middle cmd X middle no cmd diff --git a/base/testfiles-lthooks/lthooks-030.lvt b/base/testfiles-lthooks/lthooks-030.lvt index 02c869d7f6..20f1d96499 100644 --- a/base/testfiles-lthooks/lthooks-030.lvt +++ b/base/testfiles-lthooks/lthooks-030.lvt @@ -14,10 +14,10 @@ \AddToHook{?space?}[x]% {\typeout{I have spaces in my name.}}% -\ShowHook{?space?} +\DebugPrintHook{?space?} } -\ShowHook{ space } +\DebugPrintHook{ space } \typeout{Using " space "} \UseHook{ space } diff --git a/base/testfiles-lthooks/lthooks-030.tlg b/base/testfiles-lthooks/lthooks-030.tlg index 816e50f331..040cb018ba 100644 --- a/base/testfiles-lthooks/lthooks-030.tlg +++ b/base/testfiles-lthooks/lthooks-030.tlg @@ -1,16 +1,52 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: ' space ' -> Code chunks: -> 'x' -> \typeout {i have spaces in my name.} -> Execution order: -> 1: 'x'. - } -l. ...} -==> Hook: 'space' -> not declared. - } -l. ...\ShowHook{ space } +<<< Hook: ' space ' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'x' -> \typeout {i have spaces in my name.} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'x' +>>> +<<< Hook: 'space'(<- ' space ') +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Using " space " i have spaces in my name. Using one-time " space " diff --git a/base/testfiles-lthooks/lthooks-031.lvt b/base/testfiles-lthooks/lthooks-031.lvt index 69c42c92fc..ba72e56f34 100644 --- a/base/testfiles-lthooks/lthooks-031.lvt +++ b/base/testfiles-lthooks/lthooks-031.lvt @@ -16,22 +16,22 @@ \AddToHook{begindocument}[A]{\typeout{A2}} \AddToHook{begindocument}[B]{\typeout{B2}} -\ShowHook{include/foo/after} -\ShowHook{begindocument} +\DebugPrintHook{include/foo/after} +\DebugPrintHook{begindocument} \AddToHook{begindocument}[X]{\DeclareHookRule{include/foo/after}{B}{before}{A}} \AddToHook{begindocument}[Y]{\DeclareHookRule{begindocument}{B}{before}{A}} \begin{document} -\ShowHook{include/foo/after} -\ShowHook{begindocument} +\DebugPrintHook{include/foo/after} +\DebugPrintHook{begindocument} Test \include{foo} -\ShowHook{include/foo/after} +\DebugPrintHook{include/foo/after} \AddToHook{include/foo/after}[C]{\typeout{C1}} diff --git a/base/testfiles-lthooks/lthooks-031.tlg b/base/testfiles-lthooks/lthooks-031.tlg index f3ecb6018c..951349a836 100644 --- a/base/testfiles-lthooks/lthooks-031.tlg +++ b/base/testfiles-lthooks/lthooks-031.tlg @@ -1,24 +1,55 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'include/foo/after' -> builtin generic, reversed -> Code chunks: -> 'A' -> \typeout {A1} -> 'B' -> \typeout {B1} -> Execution order: -> 1: 'B' -> 2: 'A'. - } -l. ...\ShowHook{include/foo/after} -==> Hook: 'begindocument' -> Code chunks: -> 'A' -> \typeout {A2} -> 'B' -> \typeout {B2} -> Execution order: -> 1: 'A' -> 2: 'B'. - } -l. ...\ShowHook{begindocument} +<<< Hook: 'include/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A1} +... 'B' -> \typeout {B1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'B', 'A' +>>> +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A2} +... 'B' -> \typeout {B2} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'A', 'B' +>>> (../l3backend-pdftex.def File: l3backend-pdftex.def ....-..-.. L3 backend support: PDF output (pdfTeX) \l__color_backend_stack_int=\count... @@ -50,29 +81,80 @@ You tried to set the ordering of hook 'begindocument' using \DeclareHookRule{begindocument}{B}{before}{A} but hook 'begindocument' was already used as a one-time hook, thus sorting is no longer possible. Declare the rule before the hook is used. -==> Hook: 'include/foo/after' -> builtin generic, reversed -> Code chunks: -> 'A' -> \typeout {A1} -> 'B' -> \typeout {B1} -> Rules: -> 'B' before 'A' -> Execution order: -> 1: 'B' -> 2: 'A'. - } -l. ...\ShowHook{include/foo/after} -==> Hook: 'begindocument' -> empty. - } -l. ...\ShowHook{begindocument} +<<< Hook: 'include/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'A' -> \typeout {A1} +... 'B' -> \typeout {B1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'B' < 'A' +... Execution order: +... 'B', 'A' +>>> +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> [1 ] No file foo.tex. B1 A1 -==> Hook: 'include/foo/after' -> builtin generic. - } -l. ...\ShowHook{include/foo/after} +<<< Hook: 'include/foo/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: Y +... consumed: Y +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> C1 diff --git a/base/testfiles-lthooks/lthooks-033.lvt b/base/testfiles-lthooks/lthooks-033.lvt index a0615f174d..0e6f2394b2 100644 --- a/base/testfiles-lthooks/lthooks-033.lvt +++ b/base/testfiles-lthooks/lthooks-033.lvt @@ -14,22 +14,22 @@ { \def\@foohook{\typeout{foo legacy code ##1}} \NewHook{foo} - \ShowHook{foo} + \DebugPrintHook{foo} \UseHook{foo} % \def\@fooarghook{\typeout{fooarg legacy code ##1}} \NewHookWithArguments{fooarg}{1} - \ShowHook{fooarg} + \DebugPrintHook{fooarg} \UseHook{fooarg}{ERR} % \NewHook{bar} \def\@barhook{\typeout{bar legacy code ##1}} - \ShowHook{bar} + \DebugPrintHook{bar} \UseHook{bar} % \NewHookWithArguments{bararg}{1} \def\@bararghook{\typeout{bararg legacy code ##1}} - \ShowHook{bararg} + \DebugPrintHook{bararg} \UseHook{bararg}{ERR} } @@ -57,7 +57,7 @@ \AddToHook{\hookname}[label]{\typeout{label-hashes(#1,#2)}} \AddToHookWithArguments{\hookname}[label]{\typeout{label-args(#1,#2)}} % - \ShowHook{\hookname} + \DebugPrintHook{\hookname} % \UseHook{\hookname}{foo}{bar} } @@ -84,7 +84,7 @@ \AddToHook{\hookname}[label]{\typeout{label-hashes(#1,#2)}} \AddToHookWithArguments{\hookname}[label]{\typeout{label-args(#1,#2)}} % - \ShowHook{\hookname} + \DebugPrintHook{\hookname} % \UseHook{\hookname}{foo} % @@ -93,7 +93,7 @@ % stored in the code pool will error all over again about any % "Illegal parameter number" added to the code. Not ideal... \DeclareHookRule{\hookname}{foo}{before}{bar} - \ShowHook{\hookname} + \DebugPrintHook{\hookname} } % @@ -118,7 +118,7 @@ \AddToHook{\hookname}[label]{\typeout{label-hashes(#1,#2)}} \AddToHookWithArguments{\hookname}[label]{\typeout{label-args(#1,#2)}} % - \ShowHook{\hookname} + \DebugPrintHook{\hookname} % \UseHook{\hookname} } @@ -134,7 +134,7 @@ \AddToHookWithArguments{test-10}[label]{\typeout{10-label(#1,#2)}} \AddToHookNextWithArguments{test-10}{\typeout{10-next(#1,#2)}} % - \ShowHook{test-10} + \DebugPrintHook{test-10} % \UseHook{test-10}{foo}{bar}% {3}{4}{5}{6}{7}{8}{9} @@ -162,12 +162,12 @@ \NewHookWithArguments{use-once}{2} \AddToHookWithArguments{use-once}{\typeout{once(#1,#2)}} % - \ShowHook{use-once} + \DebugPrintHook{use-once} % \UseOneTimeHookWithArguments{use-once}{2}{foo}{bar} \AddToHookWithArguments{use-once}{\typeout{twice(#1,#2)}} % - \ShowHook{use-once} + \DebugPrintHook{use-once} } % @@ -181,7 +181,7 @@ \AddToHookNextWithArguments{not-declared}{\typeout{next-args(#1,#2)}} \AddToHookNext{not-declared}{\typeout{next-hashes(#1,#2)}} % - \ShowHook{not-declared} + \DebugPrintHook{not-declared} % \NewHookWithArguments{not-declared}{2} % @@ -192,7 +192,7 @@ \AddToHookNextWithArguments{not-declared}{\typeout{next-more-args(#1,#2)}} \AddToHookNext{not-declared}{\typeout{next-more-hashes(#1,#2)}} % - \ShowHook{not-declared} + \DebugPrintHook{not-declared} % \UseHookWithArguments{not-declared}{2}{foo}{bar} } @@ -208,7 +208,7 @@ \AddToHookNextWithArguments{not-nine}{\typeout{next-args(#1,#9)}} \AddToHookNext{not-nine}{\typeout{next-hashes(#1,#9)}} % - \ShowHook{not-nine} + \DebugPrintHook{not-nine} % \NewHookWithArguments{not-nine}{9} % @@ -219,7 +219,7 @@ \AddToHookNextWithArguments{not-nine}{\typeout{next-more-args(#1,#9)}} \AddToHookNext{not-nine}{\typeout{next-more-hashes(#1,#9)}} % - \ShowHook{not-nine} + \DebugPrintHook{not-nine} % \UseHookWithArguments{not-nine}{9}{foo}2345678{bar} } @@ -235,7 +235,7 @@ \AddToHookNext{liar}{\typeout{next-hash(#1)}} \AddToHook{liar}[label]{\typeout{label-hash(#1)}} % - \ShowHook{liar} + \DebugPrintHook{liar} % \NewHook{liar} % @@ -243,7 +243,7 @@ \AddToHookNext{liar}{\typeout{more-next-hash(#1)}} \AddToHook{liar}[label]{\typeout{more-label-hash(#1)}} % - \ShowHook{liar} + \DebugPrintHook{liar} % \UseHook{liar} } diff --git a/base/testfiles-lthooks/lthooks-033.tlg b/base/testfiles-lthooks/lthooks-033.tlg index d883b7704c..db4ac47d71 100644 --- a/base/testfiles-lthooks/lthooks-033.tlg +++ b/base/testfiles-lthooks/lthooks-033.tlg @@ -3,56 +3,134 @@ Don't change this file in any respect. ============================================================ TEST 1: Add with hooks, but declare without ============================================================ -==> Hook: 'foo' -> Code chunks: -> 'legacy' -> \typeout {foo legacy code ##1} -> Execution order: -> 1: 'legacy'. - } -l. ... } +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> \typeout {foo legacy code ##1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'legacy' +>>> foo legacy code ##1 -==> Hook: 'fooarg' -> 1 argument -> Code chunks: -> 'legacy' -> \typeout {fooarg legacy code ##1} -> Execution order: -> 1: 'legacy'. - } -l. ... } +<<< Hook: 'fooarg' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'legacy' -> \typeout {fooarg legacy code ##1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'legacy' +>>> fooarg legacy code ##1 -==> Hook: 'bar' -> Code chunks: -> 'legacy' -> \typeout {bar legacy code ##1} -> Execution order: -> 1: 'legacy'. - } -l. ... } +<<< Hook: 'bar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'legacy' -> \typeout {bar legacy code ##1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'legacy' +>>> bar legacy code ##1 -==> Hook: 'bararg' -> 1 argument -> Code chunks: -> 'legacy' -> \typeout {bararg legacy code ##1} -> Execution order: -> 1: 'legacy'. - } -l. ... } +<<< Hook: 'bararg' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'legacy' -> \typeout {bararg legacy code ##1} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'legacy' +>>> bararg legacy code ##1 ============================================================ ============================================================ TEST 2: Two arguments ============================================================ -==> Hook: 'test-2' -> 2 arguments -> Code chunks: -> 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,#2)} -> 'top-level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,#2)} -> next-only -> \typeout {next-hashes(##1,##2)}\typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(#1,#2)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'test-2' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,#2)} +... 'top level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,#2)} +... next-only-> \typeout {next-hashes(##1,##2)}\typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(#1,#2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-hashes(##1,##2) label-args(foo,bar) label-hashes(##1,##2) @@ -113,18 +191,30 @@ l. ... } You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'test-1' -> 1 argument -> Code chunks: -> 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)} -> 'top-level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)} -> next-only -> \typeout {next-hashes(##1,##2)}\typeout {next-args(#1,##2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(#1,##2)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'test-1' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)} +... 'top level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)} +... next-only-> \typeout {next-hashes(##1,##2)}\typeout {next-args(#1,##2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(#1,##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-hashes(##1,##2) label-args(foo,##2) label-hashes(##1,##2) @@ -137,16 +227,30 @@ next-hashes(##1,##2) next-args(foo,##2) next-hashes(##1,##2) next-args(foo,##2) -==> Hook: 'test-1' -> 1 argument -> Code chunks: -> 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)} -> 'top-level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)} -> Execution order: -> 1: 'label' -> 2: 'top-level'. - } -l. ... } +<<< Hook: 'test-1' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 1 +... Code chunks: +... 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(#1,##2)} +... 'top level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(#1,##2)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> ============================================================ ============================================================ TEST 4: Zero arguments @@ -195,17 +299,30 @@ l. ... } You tried to use \AddToHookWithArguments on a hook that takes no arguments. Check the usage of the hook or use \AddToHook instead. LaTeX will use \AddToHook. -==> Hook: 'test-0' -> Code chunks: -> 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(##1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(##1,##2)} -> 'top-level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(##1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(##1,##2)} -> next-only -> \typeout {next-hashes(##1,##2)}\typeout {next-args(##1,##2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(##1,##2)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'test-0' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {label-hashes(##1,##2)}\typeout {label-args(##1,##2)}\typeout {label-hashes(##1,##2)}\typeout {label-args(##1,##2)} +... 'top level' -> \typeout {top-hashes(##1,##2)}\typeout {top-args(##1,##2)}\typeout {top-hashes(##1,##2)}\typeout {top-args(##1,##2)} +... next-only-> \typeout {next-hashes(##1,##2)}\typeout {next-args(##1,##2)}\typeout {next-hashes(##1,##2)}\typeout {next-args(##1,##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-hashes(##1,##2) label-args(##1,##2) label-hashes(##1,##2) @@ -228,18 +345,30 @@ For immediate help type H . l. ... } You tried to declare a hook with 10 arguments, but a hook can only have up to nine. LaTeX will define this hook with nine arguments. -==> Hook: 'test-10' -> 9 arguments -> Code chunks: -> 'label' -> \typeout {10-label(#1,#2)} -> 'top-level' -> \typeout {10-top-level(#1,#2)} -> next-only -> \typeout {10-next(#1,#2)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'test-10' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'label' -> \typeout {10-label(#1,#2)} +... 'top level' -> \typeout {10-top-level(#1,#2)} +... next-only-> \typeout {10-next(#1,#2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> 10-label(foo,bar) 10-top-level(foo,bar) 10-next(foo,bar) @@ -279,14 +408,29 @@ no-next(##1,##2) ============================================================ TEST 7: One-time hook with arguments ============================================================ -==> Hook: 'use-once' -> 2 arguments -> Code chunks: -> 'top-level' -> \typeout {once(#1,#2)} -> Execution order: -> 1: 'top-level'. - } -l. ... } +<<< Hook: 'use-once' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'top level' -> \typeout {once(#1,#2)} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> once(foo,bar) ! LaTeX hooks Error: You can't have arguments in used one-time hook (hooks) 'use-once'. @@ -298,35 +442,81 @@ been used. You have to add the code before the hook is used, or add the code without arguments using \AddToHook instead. LaTeX will use \AddToHook. twice(##1,##2) -==> Hook: 'use-once' -> 2 arguments. - } -l. ... } +<<< Hook: 'use-once' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 2 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ============================================================ ============================================================ TEST 8: Add with arguments before hook is declared ============================================================ -==> Hook: 'not-declared' -> not declared -> Code chunks: -> 'label' -> \typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)} -> 'top-level' -> \typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)} -> next-only -> \typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)} -> No execution. - } -l. ... } -==> Hook: 'not-declared' -> 2 arguments -> Code chunks: -> 'label' -> \typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)}\typeout {label-more-args(#1,#2)}\typeout {label-more-hashes(##1,##2)} -> 'top-level' -> \typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)}\typeout {top-more-args(#1,#2)}\typeout {top-more-hashes(##1,##2)} -> next-only -> \typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)}\typeout {next-more-args(#1,#2)}\typeout {next-more-hashes(##1,##2)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'not-declared' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)} +... 'top level' -> \typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)} +... next-only-> \typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'not-declared' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'label' -> \typeout {label-args(#1,#2)}\typeout {label-hashes(##1,##2)}\typeout {label-more-args(#1,#2)}\typeout {label-more-hashes(##1,##2)} +... 'top level' -> \typeout {top-args(#1,#2)}\typeout {top-hashes(##1,##2)}\typeout {top-more-args(#1,#2)}\typeout {top-more-hashes(##1,##2)} +... next-only-> \typeout {next-args(#1,#2)}\typeout {next-hashes(##1,##2)}\typeout {next-more-args(#1,#2)}\typeout {next-more-hashes(##1,##2)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-args(foo,bar) label-hashes(##1,##2) label-more-args(foo,bar) @@ -343,27 +533,54 @@ next-more-hashes(##1,##2) ============================================================ TEST 9: Testing with nine arguments ============================================================ -==> Hook: 'not-nine' -> not declared -> Code chunks: -> 'label' -> \typeout {label-args(#1,#9)}\typeout {label-hashes(##1,##9)} -> 'top-level' -> \typeout {top-args(#1,#9)}\typeout {top-hashes(##1,##9)} -> next-only -> \typeout {next-args(#1,#9)}\typeout {next-hashes(##1,##9)} -> No execution. - } -l. ... } -==> Hook: 'not-nine' -> 9 arguments -> Code chunks: -> 'label' -> \typeout {label-args(#1,#9)}\typeout {label-hashes(##1,##9)}\typeout {label-more-args(#1,#9)}\typeout {label-more-hashes(##1,##9)} -> 'top-level' -> \typeout {top-args(#1,#9)}\typeout {top-hashes(##1,##9)}\typeout {top-more-args(#1,#9)}\typeout {top-more-hashes(##1,##9)} -> next-only -> \typeout {next-args(#1,#9)}\typeout {next-hashes(##1,##9)}\typeout {next-more-args(#1,#9)}\typeout {next-more-hashes(##1,##9)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'not-nine' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {label-args(#1,#9)}\typeout {label-hashes(##1,##9)} +... 'top level' -> \typeout {top-args(#1,#9)}\typeout {top-hashes(##1,##9)} +... next-only-> \typeout {next-args(#1,#9)}\typeout {next-hashes(##1,##9)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'not-nine' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'label' -> \typeout {label-args(#1,#9)}\typeout {label-hashes(##1,##9)}\typeout {label-more-args(#1,#9)}\typeout {label-more-hashes(##1,##9)} +... 'top level' -> \typeout {top-args(#1,#9)}\typeout {top-hashes(##1,##9)}\typeout {top-more-args(#1,#9)}\typeout {top-more-hashes(##1,##9)} +... next-only-> \typeout {next-args(#1,#9)}\typeout {next-hashes(##1,##9)}\typeout {next-more-args(#1,#9)}\typeout {next-more-hashes(##1,##9)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-args(foo,bar) label-hashes(##1,##9) label-more-args(foo,bar) @@ -380,15 +597,30 @@ next-more-hashes(##1,##9) ============================================================ TEST 10: Add with hooks, but declare without ============================================================ -==> Hook: 'liar' -> not declared -> Code chunks: -> 'label' -> \typeout {label-arg(#1)}\typeout {label-hash(##1)} -> 'top-level' -> \typeout {top-arg(#1)}\typeout {top-hash(##1)} -> next-only -> \typeout {next-arg(#1)}\typeout {next-hash(##1)} -> No execution. - } -l. ... } +<<< Hook: 'liar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {label-arg(#1)}\typeout {label-hash(##1)} +... 'top level' -> \typeout {top-arg(#1)}\typeout {top-hash(##1)} +... next-only-> \typeout {next-arg(#1)}\typeout {next-hash(##1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ! Illegal parameter number in definition of \__hook_toplevel liar. 1 @@ -411,17 +643,30 @@ l. ... } You meant to type ## instead of #, right? Or maybe a } was forgotten somewhere earlier, and things are all screwed up? I'm going to assume that you meant ##. -==> Hook: 'liar' -> Code chunks: -> 'label' -> \typeout {label-arg(##1)}\typeout {label-hash(##1)}\typeout {more-label-hash(##1)} -> 'top-level' -> \typeout {top-arg(##1)}\typeout {top-hash(##1)}\typeout {more-top-hash(##1)} -> next-only -> \typeout {next-arg(##1)}\typeout {next-hash(##1)}\typeout {more-next-hash(##1)} -> Execution order: -> 1: 'label' -> 2: 'top-level' -> 3: next-only. - } -l. ... } +<<< Hook: 'liar' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label' -> \typeout {label-arg(##1)}\typeout {label-hash(##1)}\typeout {more-label-hash(##1)} +... 'top level' -> \typeout {top-arg(##1)}\typeout {top-hash(##1)}\typeout {more-top-hash(##1)} +... next-only-> \typeout {next-arg(##1)}\typeout {next-hash(##1)}\typeout {more-next-hash(##1)} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'label' +>>> label-arg(##1) label-hash(##1) more-label-hash(##1) diff --git a/base/testfiles-lthooks/lthooks-034.lvt b/base/testfiles-lthooks/lthooks-034.lvt index 2f3d44a045..3574512bba 100644 --- a/base/testfiles-lthooks/lthooks-034.lvt +++ b/base/testfiles-lthooks/lthooks-034.lvt @@ -10,13 +10,13 @@ \AddToHook{foo}[pkgb]{\typeout{pkgb}} \DeclareHookRule{foo}{pkga}{after}{pkgb} \typeout{====== A} -\ShowHook{foo} +\DebugPrintHook{foo} \typeout{====== B} \UseHook{foo} \typeout{====== C} \NewHook{foo} \typeout{====== D} -\ShowHook{foo} +\DebugPrintHook{foo} \typeout{====== E} \UseHook{foo} diff --git a/base/testfiles-lthooks/lthooks-034.tlg b/base/testfiles-lthooks/lthooks-034.tlg index 830e732220..2e24692e75 100644 --- a/base/testfiles-lthooks/lthooks-034.tlg +++ b/base/testfiles-lthooks/lthooks-034.tlg @@ -1,30 +1,59 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ====== A -==> Hook: 'foo' -> not declared -> Code chunks: -> 'pkga' -> \typeout {pkga} -> 'pkgb' -> \typeout {pkgb} -> Rules: -> 'pkgb' before 'pkga' -> No execution. - } -l. ...\ShowHook{foo} +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkga' -> \typeout {pkga} +... 'pkgb' -> \typeout {pkgb} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'pkgb' < 'pkga' +... Execution order: +... None +>>> ====== B ====== C ====== D -==> Hook: 'foo' -> Code chunks: -> 'pkga' -> \typeout {pkga} -> 'pkgb' -> \typeout {pkgb} -> Rules: -> 'pkgb' before 'pkga' -> Execution order: -> 1: 'pkgb' -> 2: 'pkga'. - } -l. ...\ShowHook{foo} +<<< Hook: 'foo' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'pkga' -> \typeout {pkga} +... 'pkgb' -> \typeout {pkgb} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'pkgb' < 'pkga' +... Execution order: +... 'pkgb', 'pkga' +>>> ====== E pkgb pkga diff --git a/base/testfiles-lthooks/lthooks-debug.lvt b/base/testfiles-lthooks/lthooks-debug.lvt new file mode 100644 index 0000000000..3f8e2dcc7e --- /dev/null +++ b/base/testfiles-lthooks/lthooks-debug.lvt @@ -0,0 +1,128 @@ +\input{regression-test} + +\ExplSyntaxOn +\debug_on:n { check-declarations , deprecation } +\ExplSyntaxOff + +\documentclass{article} + +% There are many different hook profiles. + +\START + +\BEGINTEST{Generic} + \BEGINTEST{builtin} + \BEGINTEST{Raw generic hook} + \DebugPrintHook{cmd/?/before} % generic + \ENDTEST + \BEGINTEST{Automatically activated by \AddToHook} + \AddToHook{cmd/?/before}{\TYPE{...}} + \DebugPrintHook{cmd/?/before} + \ENDTEST + \BEGINTEST{Disabled} + \DisableGenericHook{cmd/?/before} + \DebugPrintHook{cmd/?/before} + \ENDTEST + \BEGINTEST{Reversed} + \DebugPrintHook{cmd/?/after} % generic + \ENDTEST + \BEGINTEST{Automatically activated by \AddToHook} + \AddToHook{cmd/?/after}{\TYPE{...}} + \DebugPrintHook{cmd/?/after} + \ENDTEST + \BEGINTEST{Deprecated generic} + \DebugPrintHook{file/before/...} % + \ENDTEST + \ENDTEST + \BEGINTEST{Custom} + \BEGINTEST{Before and after \ActivateGenericHook} + \DebugPrintHook{Custom} + \ActivateGenericHook{Custom} + \DebugPrintHook{Custom} + \ENDTEST + \BEGINTEST{\DisableGenericHook} + \ENDTEST + \DisableGenericHook{Custom} + \DebugPrintHook{Custom} + \ENDTEST +\ENDTEST + +\BEGINTEST{One-time} + \def\TEST#1{% + \BEGINTEST{One-time/#1} + \UseOneTimeHook{One-time/#1} + \DebugPrintHook{One-time/#1} + \ENDTEST + } + \NewHook{One-time/basic} + \TEST{basic} + \NewReversedHook{One-time/reverse} + \TEST{reverse} + \def\TEST#1{% + \BEGINTEST{One-time/#1} + \UseOneTimeHookWithArguments{One-time/#1}{2}{arg_1}{arg_2} + \DebugPrintHook{One-time/#1} + \ENDTEST + } + \NewHookWithArguments{One-time/arguments}{2} + \TEST{arguments} + \NewReversedHookWithArguments{One-time/reverse/arguments}{2} + \TEST{reverse/arguments} +\ENDTEST + +\BEGINTEST{Code chunks} + \def\TEST#1{% + \BEGINTEST{Code chunks/#1} + \AddToHook{Code chunks/#1}[top-level]{\TYPE{TOP-LEVEL}} + \AddToHook{Code chunks/#1}[LABEL_A]{\TYPE{CODE_A}} + \AddToHook{Code chunks/#1}[LABEL_B]{\TYPE{CODE_B}} + \AddToHook{Code chunks/#1}[LABEL_C]{\TYPE{CODE_C}} + \AddToHookNext{Code chunks/#1}{\TYPE{NEXT-ONLY}} + \DebugPrintHook{Code chunks/#1} + \ENDTEST + } + \NewHook{Code chunks/Normal} + \TEST{Normal} + \NewReversedHook{Code chunks/Reversed} + \TEST{Reversed} + \def\TEST#1{% + \BEGINTEST{Code chunks/#1} + \AddToHookWithArguments{Code chunks/#1}[top-level]{\TYPE{TOP-LEVEL}} + \AddToHookWithArguments{Code chunks/#1}[LABEL_A]{\TYPE{CODE_A}} + \AddToHookWithArguments{Code chunks/#1}[LABEL_B]{\TYPE{CODE_B}} + \AddToHookWithArguments{Code chunks/#1}[LABEL_C]{\TYPE{CODE_C}} + \AddToHookWithArguments{Code chunks/#1}{\TYPE{NEXT-ONLY}} + \DebugPrintHook{Code chunks/#1} + \ENDTEST + } + \NewHookWithArguments{Code chunks/With arguments}{2} + \TEST{With arguments} + \NewReversedHookWithArguments{Code chunks/Reversed with arguments}{2} + \TEST{Reversed with arguments} +\ENDTEST + +\BEGINTEST{Rules} + \NewHook{Rules} + \AddToHook{Rules}[LABEL_A]{\TYPE{CODE_A}} + \AddToHook{Rules}[LABEL_B]{\TYPE{CODE_B}} + \AddToHook{Rules}[LABEL_C]{\TYPE{CODE_C}} + \DeclareDefaultHookRule{LABEL_A}<{LABEL_B} + \DeclareDefaultHookRule{LABEL_B}<{LABEL_C} + \DeclareDefaultHookRule{LABEL_C}>{LABEL_A} + \DeclareHookRule{Rules}{LABEL_A}>{LABEL_B} + \DeclareHookRule{Rules}{LABEL_B}>{LABEL_C} + \DeclareHookRule{Rules}{LABEL_C}<{LABEL_A} + \BEGINTEST{Named rules override default ones} + \DebugPrintHook{Rules} + \ENDTEST + \DeclareHookRule{Rules}{LABEL_A}{unrelated}{LABEL_B} + \DeclareHookRule{Rules}{LABEL_B}{unrelated}{LABEL_C} + \DeclareHookRule{Rules}{LABEL_C}{unrelated}{LABEL_A} + \BEGINTEST{Default rules} + \DebugPrintHook{Rules} + \ENDTEST +\ENDTEST + +\TYPE{!!!! If this test changes the documentation needs updating !!!!} + +\END diff --git a/base/testfiles-lthooks/lthooks-debug.tlg b/base/testfiles-lthooks/lthooks-debug.tlg new file mode 100644 index 0000000000..5bb24b36b5 --- /dev/null +++ b/base/testfiles-lthooks/lthooks-debug.tlg @@ -0,0 +1,558 @@ +This is a generated file for the l3build validation system. +Don't change this file in any respect. +============================================================ +TEST 1: Generic +============================================================ +============================================================ +TEST 2: builtin +============================================================ +============================================================ +TEST 3: Raw generic hook +============================================================ +<<< Hook: 'cmd/?/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 4: Automatically activated by \AddToHook +============================================================ +<<< Hook: 'cmd/?/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \TYPE {...} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 5: Disabled +============================================================ +<<< Hook: 'cmd/?/before' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \TYPE {...} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 6: Reversed +============================================================ +<<< Hook: 'cmd/?/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 7: Automatically activated by \AddToHook +============================================================ +<<< Hook: 'cmd/?/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 9 +... Code chunks: +... 'top level' -> \TYPE {...} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 8: Deprecated generic +============================================================ +<<< Hook: 'file/before/...' +... Attributes: +... deprecated_generic: Y +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +============================================================ +TEST 9: Custom +============================================================ +============================================================ +TEST 10: Before and after \ActivateGenericHook +============================================================ +<<< Hook: 'Custom' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'Custom' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 11: \DisableGenericHook +============================================================ +============================================================ +<<< Hook: 'Custom' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: N +... disabled: Y +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +============================================================ +TEST 12: One-time +============================================================ +============================================================ +TEST 13: One-time/basic +============================================================ +<<< Hook: 'One-time/basic' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 14: One-time/reverse +============================================================ +<<< Hook: 'One-time/reverse' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 15: One-time/arguments +============================================================ +<<< Hook: 'One-time/arguments' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 2 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +TEST 16: One-time/reverse/arguments +============================================================ +<<< Hook: 'One-time/reverse/arguments' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: Y +... # of arguments: 2 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +============================================================ +============================================================ +============================================================ +TEST 17: Code chunks +============================================================ +============================================================ +TEST 18: Code chunks/Normal +============================================================ +<<< Hook: 'Code chunks/Normal' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' -> \TYPE {TOP-LEVEL} +... next-only-> \TYPE {NEXT-ONLY} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'LABEL_A', 'LABEL_B', 'LABEL_C' +>>> +============================================================ +============================================================ +TEST 19: Code chunks/Reversed +============================================================ +<<< Hook: 'Code chunks/Reversed' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' -> \TYPE {TOP-LEVEL} +... next-only-> \TYPE {NEXT-ONLY} +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'LABEL_C', 'LABEL_B', 'LABEL_A' +>>> +============================================================ +============================================================ +TEST 20: Code chunks/With arguments +============================================================ +<<< Hook: 'Code chunks/With arguments' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' -> \TYPE {TOP-LEVEL}\TYPE {NEXT-ONLY} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'LABEL_A', 'LABEL_B', 'LABEL_C' +>>> +============================================================ +============================================================ +TEST 21: Code chunks/Reversed with arguments +============================================================ +<<< Hook: 'Code chunks/Reversed with arguments' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: N +... consumed: N +... # of arguments: 2 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' -> \TYPE {TOP-LEVEL}\TYPE {NEXT-ONLY} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'LABEL_C', 'LABEL_B', 'LABEL_A' +>>> +============================================================ +============================================================ +============================================================ +TEST 22: Rules +============================================================ +============================================================ +TEST 23: Named rules override default ones +============================================================ +<<< Hook: 'Rules' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'LABEL_B' < 'LABEL_A' +... 'LABEL_C' < 'LABEL_A' +... 'LABEL_C' < 'LABEL_B' +... Execution order: +... 'LABEL_C', 'LABEL_B', 'LABEL_A' +>>> +============================================================ +============================================================ +TEST 24: Default rules +============================================================ +<<< Hook: 'Rules' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'LABEL_A' -> \TYPE {CODE_A} +... 'LABEL_B' -> \TYPE {CODE_B} +... 'LABEL_C' -> \TYPE {CODE_C} +... 'top level' empty +... next-only empty +... Default rules: +... 'LABEL_B' > 'LABEL_A' +... 'LABEL_C' > 'LABEL_A' +... 'LABEL_C' > 'LABEL_B' +... Rules: +... None +... Execution order: +... 'LABEL_A', 'LABEL_B', 'LABEL_C' +>>> +============================================================ +============================================================ +!!!! If this test changes the documentation needs updating !!!! diff --git a/base/testfiles-lthooks/lthooks-doc-examples.lvt b/base/testfiles-lthooks/lthooks-doc-examples.lvt index cc74d8452d..0864773cae 100644 --- a/base/testfiles-lthooks/lthooks-doc-examples.lvt +++ b/base/testfiles-lthooks/lthooks-doc-examples.lvt @@ -20,7 +20,7 @@ \AddToHookNext{example-hook}{[one-time code]} \DeclareHookRule{example-hook}{baz}{before}{foo} \DeclareDefaultHookRule{bar}{after}{baz} -\ShowHook{example-hook} +\DebugPrintHook{example-hook} \typeout{============================================} @@ -29,13 +29,13 @@ \AddToHook{myhook}[packageA]{\typeout{A}} \AddToHook{myhook}[packageB]{\typeout{B}} \AddToHook{myhook}[packageC]{\typeout{C}} -\ShowHook{myhook} +\DebugPrintHook{myhook} \typeout{============================================} \DeclareHookRule{myhook}{packageA}{before}{packageB} -\ShowHook{myhook} +\DebugPrintHook{myhook} \typeout{============================================} @@ -44,7 +44,7 @@ \AddToHook{env/quote/after} [package-1]{\end{itshape}} \AddToHook{env/quote/before}[package-too]{\begin{color}{blue}} \AddToHook{env/quote/after} [package-too]{\end{color}} -\ShowHook{env/quote/after} +\DebugPrintHook{env/quote/after} \typeout{============================================} diff --git a/base/testfiles-lthooks/lthooks-doc-examples.tlg b/base/testfiles-lthooks/lthooks-doc-examples.tlg index cf90ed80d7..77f8a41ffc 100644 --- a/base/testfiles-lthooks/lthooks-doc-examples.tlg +++ b/base/testfiles-lthooks/lthooks-doc-examples.tlg @@ -16,25 +16,32 @@ Data structure for label rules: Handled code for baz Handled code for foo Handled code for bar -==> Hook: 'example-hook' -> Code chunks: -> 'foo' -> [code from package 'foo'] -> 'bar' -> [from package 'bar'] -> 'baz' -> [package 'baz' is here] -> 'top-level' -> [code from 'top-level'] -> next-only -> [one-time code] -> Default rules: -> 'baz' before 'bar' -> Rules: -> 'foo' after 'baz' -> Execution order: -> 1: 'baz' -> 2: 'foo' -> 3: 'bar' -> 4: 'top-level' -> 5: next-only. - } -l. ...\ShowHook{example-hook} +<<< Hook: 'example-hook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'foo' -> [code from package 'foo'] +... 'bar' -> [from package 'bar'] +... 'baz' -> [package 'baz' is here] +... 'top level' -> [code from 'top-level'] +... next-only-> [one-time code] +... Default rules: +... 'baz' < 'bar' +... Rules: +... 'foo' > 'baz' +... Execution order: +... 'baz', 'foo', 'bar' +>>> ============================================ **** Add to hook myhook (packageA) on input line ... <- \typeout {A} **** Add to hook myhook (packageB) on input line ... <- \typeout {B} @@ -49,17 +56,32 @@ Data structure for label rules: Handled code for packageA Handled code for packageB Handled code for packageC -==> Hook: 'myhook' -> Code chunks: -> 'packageA' -> \typeout {A} -> 'packageB' -> \typeout {B} -> 'packageC' -> \typeout {C} -> Execution order: -> 1: 'packageA' -> 2: 'packageB' -> 3: 'packageC'. - } -l. ...\ShowHook{myhook} +<<< Hook: 'myhook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'packageA' -> \typeout {A} +... 'packageB' -> \typeout {B} +... 'packageC' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'packageA', 'packageB', 'packageC' +>>> ============================================ Update code for hook 'myhook' on input line ...: normal rule packageB|packageA: > found @@ -72,19 +94,32 @@ Data structure for label rules: Handled code for packageA Handled code for packageC Handled code for packageB -==> Hook: 'myhook' -> Code chunks: -> 'packageA' -> \typeout {A} -> 'packageB' -> \typeout {B} -> 'packageC' -> \typeout {C} -> Rules: -> 'packageB' after 'packageA' -> Execution order: -> 1: 'packageA' -> 2: 'packageC' -> 3: 'packageB'. - } -l. ...\ShowHook{myhook} +<<< Hook: 'myhook' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'packageA' -> \typeout {A} +... 'packageB' -> \typeout {B} +... 'packageC' -> \typeout {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'packageB' > 'packageA' +... Execution order: +... 'packageA', 'packageC', 'packageB' +>>> ============================================ **** Add to hook env/quote/before (package-1) on input line ... <- \begin {itshape} **** Add to hook env/quote/after (package-1) on input line ... <- \end {itshape} @@ -98,15 +133,30 @@ Data structure for label rules: package-too = 0 -> Handled code for package-1 Handled code for package-too -==> Hook: 'env/quote/after' -> builtin generic, reversed -> Code chunks: -> 'package-1' -> \end {itshape} -> 'package-too' -> \end {color} -> Execution order: -> 1: 'package-too' -> 2: 'package-1'. - } -l. ...\ShowHook{env/quote/after} +<<< Hook: 'env/quote/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'package-1' -> \end {itshape} +... 'package-too' -> \end {color} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'package-too', 'package-1' +>>> ============================================ !!!! If this test changes the documentation needs updating !!!! diff --git a/base/testfiles-lthooks/lthooks-errors-deprecated.lvt b/base/testfiles-lthooks/lthooks-errors-deprecated.lvt index cb671d7d29..42ba2ade51 100644 --- a/base/testfiles-lthooks/lthooks-errors-deprecated.lvt +++ b/base/testfiles-lthooks/lthooks-errors-deprecated.lvt @@ -50,7 +50,7 @@ % labels-incompatible error \DeclareHookRule {xxx} {label1} {incompatible-error} {label5} -\LogHook{xxx} +\DebugPrintHook{xxx} \makeatletter \@expl@@@filehook@file@pop@@ diff --git a/base/testfiles-lthooks/lthooks-errors-deprecated.tlg b/base/testfiles-lthooks/lthooks-errors-deprecated.tlg index 0b065af757..1bc6b8250b 100644 --- a/base/testfiles-lthooks/lthooks-errors-deprecated.tlg +++ b/base/testfiles-lthooks/lthooks-errors-deprecated.tlg @@ -55,25 +55,38 @@ LaTeX hooks Warning: Labels 'label4' and 'label3' are incompatible in hook (hooks) 'xxx'. The code for both labels will be dropped. For immediate help type H . ... -l. ...\LogHook{xxx} +l. ...\DebugPrintHook{xxx} LaTeX found two incompatible labels in the same hook. This indicates an incompatibility between packages. -==> Hook: 'xxx' -> Code chunks: -> 'label1' -> foo1 -> 'label2' -> foo2 -> 'label3' -> foo2 -> 'label4' -> foo3 -> 'label5' -> foo5 -> Rules: -> 'label4' incompatible-warning 'label3' -> 'label5' incompatible-error 'label1' -> Execution order: -> 1: 'label1' (Error: dropped) -> 2: 'label2' -> 3: 'label3' (Warning) -> 4: 'label4' (Warning) -> 5: 'label5' (Error: dropped). +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label1' -> foo1 +... 'label2' -> foo2 +... 'label3' -> foo2 +... 'label4' -> foo3 +... 'label5' -> foo5 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label4' xW 'label3' +... 'label5' xE 'label1' +... Execution order: +... 'label1', 'label2', 'label3', 'label4', 'label5' +>>> ! LaTeX kernel Error: This should not happen. Tried to pop from an empty file (kernel) name stack. (kernel) Please report at https://github.com/latex3/latex2e. diff --git a/base/testfiles-lthooks/lthooks-errors.lvt b/base/testfiles-lthooks/lthooks-errors.lvt index 07ae6a6d9b..e606b24ed3 100644 --- a/base/testfiles-lthooks/lthooks-errors.lvt +++ b/base/testfiles-lthooks/lthooks-errors.lvt @@ -42,7 +42,7 @@ % labels-incompatible error \DeclareHookRule {xxx} {label1} {incompatible-error} {label5} -\LogHook{xxx} +\DebugPrintHook{xxx} \makeatletter \@expl@@@filehook@file@pop@@ diff --git a/base/testfiles-lthooks/lthooks-errors.tlg b/base/testfiles-lthooks/lthooks-errors.tlg index c05b860bd0..d1a8a17ed5 100644 --- a/base/testfiles-lthooks/lthooks-errors.tlg +++ b/base/testfiles-lthooks/lthooks-errors.tlg @@ -39,18 +39,35 @@ l. ......HookRule {xxx} {label1} {unknown} {label2} The relation used not known to the system. Allowed values are 'before' or '<', 'after' or '>', 'incompatible-warning', 'incompatible-error', 'voids' or 'unrelated'. -==> Hook: 'xxx' -> not declared -> Code chunks: -> 'label1' -> foo1 -> 'label2' -> foo2 -> 'label3' -> foo2 -> 'label4' -> foo3 -> 'label5' -> foo5 -> Rules: -> 'label4' incompatible-warning 'label3' -> 'label5' incompatible-error 'label1' -> No execution. +<<< Hook: 'xxx' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'label1' -> foo1 +... 'label2' -> foo2 +... 'label3' -> foo2 +... 'label4' -> foo3 +... 'label5' -> foo5 +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'label4' xW 'label3' +... 'label5' xE 'label1' +... Execution order: +... None +>>> ! LaTeX kernel Error: This should not happen. Tried to pop from an empty file (kernel) name stack. (kernel) Please report at https://github.com/latex3/latex2e. diff --git a/base/testfiles-lthooks/lthooks-rollback-args.tlg b/base/testfiles-lthooks/lthooks-rollback-args.tlg index 8692cc5c63..313f8e529c 100644 --- a/base/testfiles-lthooks/lthooks-rollback-args.tlg +++ b/base/testfiles-lthooks/lthooks-rollback-args.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles-lthooks2/github-0431.lvt b/base/testfiles-lthooks2/github-0431.lvt index 677ae27bd4..809aabbbe2 100644 --- a/base/testfiles-lthooks2/github-0431.lvt +++ b/base/testfiles-lthooks2/github-0431.lvt @@ -18,8 +18,8 @@ \START -\ShowHook{shipout/background} -\ShowHook{shipout/lastpage} +\DebugPrintHook{shipout/background} +\DebugPrintHook{shipout/lastpage} test diff --git a/base/testfiles-lthooks2/github-0431.tlg b/base/testfiles-lthooks2/github-0431.tlg index 97ada7727e..664b573f5e 100644 --- a/base/testfiles-lthooks2/github-0431.tlg +++ b/base/testfiles-lthooks2/github-0431.tlg @@ -1,13 +1,51 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'shipout/background' -> empty. - } -l. ...\ShowHook{shipout/background} -==> Hook: 'shipout/lastpage' -> empty. - } -l. ...\ShowHook{shipout/lastpage} +<<< Hook: 'shipout/background' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'shipout/lastpage' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Absolute page = 1 (target: 2) Before background shipout [1 diff --git a/base/testfiles-lthooks2/lthooks2-002.lvt b/base/testfiles-lthooks2/lthooks2-002.lvt index 79447e95f7..a4707234a3 100644 --- a/base/testfiles-lthooks2/lthooks2-002.lvt +++ b/base/testfiles-lthooks2/lthooks2-002.lvt @@ -17,17 +17,17 @@ \AfterEndDocument{\typeout{in preamble}} -\LogHook{begindocument} +\DebugPrintHook{begindocument} \begin{document} \AfterEndDocument{\typeout{after preamble}} -\LogHook{enddocument} -\LogHook{enddocument/afterlastpage} -\LogHook{enddocument/afteraux} -\LogHook{enddocument/info} -\LogHook{enddocument/end} +\DebugPrintHook{enddocument} +\DebugPrintHook{enddocument/afterlastpage} +\DebugPrintHook{enddocument/afteraux} +\DebugPrintHook{enddocument/info} +\DebugPrintHook{enddocument/end} \typeout{Without updates to etoolbox the order will get reversed:} diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg index b7b11594ca..f4822f072e 100644 --- a/base/testfiles-lthooks2/lthooks2-002.tlg +++ b/base/testfiles-lthooks2/lthooks2-002.tlg @@ -10,8 +10,29 @@ 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 ...: -==> Hook: 'begindocument' -> empty. +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> 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 ...: @@ -173,32 +194,127 @@ LaTeX Font Info: Checking defaults for U/cmr/m/n on input line .... 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 ...: -==> Hook: 'enddocument' -> empty. -==> Hook: 'enddocument/afterlastpage' -> empty. -==> Hook: 'enddocument/afteraux' -> empty. -==> Hook: 'enddocument/info' -> Code chunks: -> 'kernel/filelist' -> \@dofilelist -> 'kernel/warnings' -> \@enddocument@kernel@warnings -> 'kernel/release' -> \let \show@release@info \wlog \show@release@info { ***********}\the \LaTeXReleaseInfo \show@release@info { ***********} -> 'kernel/testmode' -> -> Rules: -> 'kernel/warnings' after 'kernel/filelist' -> 'kernel/release' before 'kernel/filelist' -> 'kernel/release' voids 'kernel/testmode' -> Execution order: -> 1: 'kernel/release' -> 2: 'kernel/testmode' -> 3: 'kernel/filelist' -> 4: 'kernel/warnings'. -==> Hook: 'enddocument/end' -> Code chunks: -> 'top-level' -> \typeout {in preamble}\typeout {after preamble} -> Execution order: -> 1: 'top-level'. +<<< Hook: 'enddocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'enddocument/afterlastpage' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'enddocument/afteraux' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> +<<< Hook: 'enddocument/info' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'kernel/filelist' -> \@dofilelist +... 'kernel/warnings' -> \@enddocument@kernel@warnings +... 'kernel/release' -> \let \show@release@info \wlog \show@release@info { ***********}\the \LaTeXReleaseInfo \show@release@info { ***********} +... 'kernel/testmode' -> +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'kernel/warnings' > 'kernel/filelist' +... 'kernel/release' < 'kernel/filelist' +... 'kernel/testmode' -> 'kernel/release' +... Execution order: +... 'kernel/release', 'kernel/testmode', 'kernel/filelist', 'kernel/warnings' +>>> +<<< Hook: 'enddocument/end' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \typeout {in preamble}\typeout {after preamble} +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Without updates to etoolbox the order will get reversed: (lthooks2-002.aux) in preamble diff --git a/base/testfiles-lthooks2/lthooks2-006.lvt b/base/testfiles-lthooks2/lthooks2-006.lvt index 62a0867d75..41f8979bc6 100644 --- a/base/testfiles-lthooks2/lthooks2-006.lvt +++ b/base/testfiles-lthooks2/lthooks2-006.lvt @@ -13,7 +13,7 @@ { \iow_term:n {-------------------} \iow_term:n {#1} - \hook_log:n + \DebugPrintHook } \ExplSyntaxOff diff --git a/base/testfiles-lthooks2/lthooks2-006.tlg b/base/testfiles-lthooks2/lthooks2-006.tlg index b0bcdfc370..b6102c3dec 100644 --- a/base/testfiles-lthooks2/lthooks2-006.tlg +++ b/base/testfiles-lthooks2/lthooks2-006.tlg @@ -2,71 +2,311 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ------------------- my-package added CODE: -==> Hook: 'some-hook-a' -> Code chunks: -> 'my-package' -> CODE -> Execution order: -> 1: 'my-package'. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-package' +>>> ------------------- Adding a rule: -==> Hook: 'some-hook-a' -> Code chunks: -> 'my-package' -> CODE -> Execution order: -> 1: 'my-package'. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-package' +>>> ------------------- Now there are no code chunks: -==> Hook: 'some-hook-a' -> empty. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- my-package added CODE: -==> Hook: 'some-hook-b' -> not declared -> Code chunks: -> 'my-package' -> CODE -> No execution. +<<< Hook: 'some-hook-b' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- Adding a rule: -==> Hook: 'some-hook-a' -> empty. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- Now there are no code chunks: -==> Hook: 'some-hook-b' -> not declared. +<<< Hook: 'some-hook-b' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> LaTeX hooks Warning: Cannot remove chunk 'my-package' from hook 'some-hook-a' (hooks) because it does not exist in that hook. ------------------- No code: -==> Hook: 'some-hook-a' -> empty. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- Adding a rule: -==> Hook: 'some-hook-a' -> empty. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- Still no code: -==> Hook: 'some-hook-a' -> Code chunks: -> 'my-package' -> CODE -> Execution order: -> 1: 'my-package'. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-package' +>>> LaTeX hooks Warning: Cannot remove chunk 'my-package' from hook 'some-hook-b' (hooks) because it does not exist in that hook. ------------------- No code: -==> Hook: 'some-hook-b' -> not declared. +<<< Hook: 'some-hook-b' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> ------------------- Adding a rule: -==> Hook: 'some-hook-a' -> Code chunks: -> 'my-package' -> CODE -> Execution order: -> 1: 'my-package'. +<<< Hook: 'some-hook-a' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'my-package' +>>> ------------------- Still no code: -==> Hook: 'some-hook-b' -> not declared -> Code chunks: -> 'my-package' -> CODE -> No execution. +<<< Hook: 'some-hook-b' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: N +... structure_exist: Y +... usable: N +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'my-package' -> CODE +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/base/testfiles-search/tlb-CJK-001.lvt b/base/testfiles-search/tlb-CJK-001.lvt index 0795f94b60..f502903d04 100644 --- a/base/testfiles-search/tlb-CJK-001.lvt +++ b/base/testfiles-search/tlb-CJK-001.lvt @@ -5,7 +5,7 @@ \START \ShowCommand\selectfont -\ShowHook{selectfont} +\DebugPrintHook{selectfont} \OMIT @@ -14,7 +14,7 @@ \TIMO \ShowCommand\selectfont -\ShowHook{selectfont} +\DebugPrintHook{selectfont} \END diff --git a/base/testfiles-search/tlb-CJK-001.tlg b/base/testfiles-search/tlb-CJK-001.tlg index ccb31873bd..5b8366983f 100644 --- a/base/testfiles-search/tlb-CJK-001.tlg +++ b/base/testfiles-search/tlb-CJK-001.tlg @@ -3,29 +3,59 @@ Don't change this file in any respect. > \selectfont=robust macro: ->\protect \selectfont . > \selectfont =\long macro: -->\ifx \f@linespread \baselinestretch \else \set@fontsize \baselinestretch \f@size \f@baselineskip \fi \ifx \delayed@f@adjustment \@empty \else \let \f@shape@saved \f@shape \let \f@series@saved \f@series \delayed@f@adjustment \maybe@load@fontshape \ifcsname \f@encoding /\f@family /\f@series /\f@shape \endcsname \else \let \f@shape \f@shape@saved \let \f@series \f@series@saved \let \delayed@merge@font@shape \merge@font@shape \let \delayed@merge@font@series \merge@font@series \delayed@f@adjustment \let \delayed@merge@font@shape \merge@font@shape@without@substitution \let \delayed@merge@font@series \merge@font@series@without@substitution \fi \let \delayed@f@adjustment \@empty \fi \xdef \font@name {\csname \curr@fontshape /\f@size \endcsname }\pickup@font \font@name \UseHook {selectfont}\size@update \enc@update . +->\ifx \f@linespread \baselinestretch \else \set@fontsize \baselinestretch \f@size \f@baselineskip \fi \ifx \delayed@f@adjustment \@empty \else \let \f@shape@saved \f@shape \let \f@series@saved \f@series \delayed@f@adjustment \maybe@load@fontshape \ifcsname \f@encoding /\f@family /\f@series /\f@shape \endcsname \else \let \f@shape \f@shape@saved \let \f@series \f@series@saved \let \delayed@merge@font@shape \merge@font@shape \let \delayed@merge@font@series \merge@font@series \delayed@f@adjustment \let \delayed@merge@font@shape \merge@font@shape@without@substitution \let \delayed@merge@font@series \merge@font@series@without@substitution \fi \let \delayed@f@adjustment \@empty \fi \@forced@seriesfalse \xdef \font@name {\csname \curr@fontshape /\f@size \endcsname }\pickup@font \font@name \UseHook {selectfont}\size@update \enc@update . \selectfont l. ...\ShowCommand\selectfont --> The hook 'selectfont': -> The hook is empty. - } -l. ...\ShowHook{selectfont} +<<< Hook: 'selectfont' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> > \selectfont=robust macro: ->\protect \selectfont . > \selectfont =\long macro: -->\ifx \f@linespread \baselinestretch \else \set@fontsize \baselinestretch \f@size \f@baselineskip \fi \ifx \delayed@f@adjustment \@empty \else \let \f@shape@saved \f@shape \let \f@series@saved \f@series \delayed@f@adjustment \maybe@load@fontshape \ifcsname \f@encoding /\f@family /\f@series /\f@shape \endcsname \else \let \f@shape \f@shape@saved \let \f@series \f@series@saved \let \delayed@merge@font@shape \merge@font@shape \let \delayed@merge@font@series \merge@font@series \delayed@f@adjustment \let \delayed@merge@font@shape \merge@font@shape@without@substitution \let \delayed@merge@font@series \merge@font@series@without@substitution \fi \let \delayed@f@adjustment \@empty \fi \xdef \font@name {\csname \curr@fontshape /\f@size \endcsname }\pickup@font \font@name \UseHook {selectfont}\size@update \enc@update . +->\ifx \f@linespread \baselinestretch \else \set@fontsize \baselinestretch \f@size \f@baselineskip \fi \ifx \delayed@f@adjustment \@empty \else \let \f@shape@saved \f@shape \let \f@series@saved \f@series \delayed@f@adjustment \maybe@load@fontshape \ifcsname \f@encoding /\f@family /\f@series /\f@shape \endcsname \else \let \f@shape \f@shape@saved \let \f@series \f@series@saved \let \delayed@merge@font@shape \merge@font@shape \let \delayed@merge@font@series \merge@font@series \delayed@f@adjustment \let \delayed@merge@font@shape \merge@font@shape@without@substitution \let \delayed@merge@font@series \merge@font@series@without@substitution \fi \let \delayed@f@adjustment \@empty \fi \@forced@seriesfalse \xdef \font@name {\csname \curr@fontshape /\f@size \endcsname }\pickup@font \font@name \UseHook {selectfont}\size@update \enc@update . \selectfont l. ...\ShowCommand\selectfont --> The hook 'selectfont': -> Code chunks: -> CJK -> \expandafter \ifx \csname CJK@\curr@fontshape \endcsname \relax \else \CJK@bold@false \csname CJK@\curr@fontshape \endcsname \fi -> Document-level (top-level) code (executed last): -> --- -> Extra code for next invocation: -> --- -> Rules: -> --- -> Execution order: -> CJK. - } -l. ...\ShowHook{selectfont} +<<< Hook: 'selectfont' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'CJK' -> \expandafter \ifx \csname CJK@\curr@fontshape \endcsname \relax \else \CJK@bold@false \csname CJK@\curr@fontshape \endcsname \fi +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'CJK' +>>> diff --git a/base/testfiles/github-0424.lvt b/base/testfiles/github-0424.lvt index 2947dfd3a5..58ab100ac1 100644 --- a/base/testfiles/github-0424.lvt +++ b/base/testfiles/github-0424.lvt @@ -9,7 +9,7 @@ \nocite{C} -\ShowHook{begindocument/end} +\DebugPrintHook{begindocument/end} \SHOWFILE{\jobname.aux} diff --git a/base/testfiles/github-0424.tlg b/base/testfiles/github-0424.tlg index 24e6b0e0e7..212014e475 100644 --- a/base/testfiles/github-0424.tlg +++ b/base/testfiles/github-0424.tlg @@ -1,12 +1,29 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -==> Hook: 'begindocument/end' -> Code chunks: -> 'kernel' -> \nocite {A,B}\nocite {C} -> Execution order: -> 1: 'kernel'. - } -l. ...\ShowHook{begindocument/end} +<<< Hook: 'begindocument/end' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'kernel' -> \nocite {A,B}\nocite {C} +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'kernel' +>>> -------- github-0424.aux (start) --------- (github-0424.aux) \relax^^M \citation{A}^^M diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg index 48d5683d91..1da7ff2a9b 100644 --- a/base/testfiles/github-0479-often.luatex.tlg +++ b/base/testfiles/github-0479-often.luatex.tlg @@ -202,6 +202,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg index 97ce04a148..9d610fcba6 100644 --- a/base/testfiles/github-0479-often.tlg +++ b/base/testfiles/github-0479-often.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg index e34e8e5d23..321c33aaef 100644 --- a/base/testfiles/github-0479-often.xetex.tlg +++ b/base/testfiles/github-0479-often.xetex.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/github-0944.lvt b/base/testfiles/github-0944.lvt index 5ab8242267..3aa71d752f 100644 --- a/base/testfiles/github-0944.lvt +++ b/base/testfiles/github-0944.lvt @@ -27,7 +27,7 @@ \START -\ShowHook{enddocument/info} +\DebugPrintHook{enddocument/info} X \ref{unknown} % get a warning diff --git a/base/testfiles/github-0944.tlg b/base/testfiles/github-0944.tlg index 79fad274d6..6aa6014479 100644 --- a/base/testfiles/github-0944.tlg +++ b/base/testfiles/github-0944.tlg @@ -1,21 +1,33 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -==> Hook: 'enddocument/info' -> Code chunks: -> 'kernel/filelist' -> \@dofilelist -> 'kernel/warnings' -> \@enddocument@kernel@warnings -> 'kernel/release' -> \let \show@release@info \wlog \show@release@info { ***********}\the \LaTeXReleaseInfo \show@release@info { ***********} -> 'kernel/testmode' -> -> Rules: -> 'kernel/warnings' after 'kernel/filelist' -> 'kernel/release' before 'kernel/filelist' -> Execution order: -> 1: 'kernel/release' -> 2: 'kernel/testmode' -> 3: 'kernel/filelist' -> 4: 'kernel/warnings'. - } -l. ...\ShowHook{enddocument/info} +<<< Hook: 'enddocument/info' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'kernel/filelist' -> \@dofilelist +... 'kernel/warnings' -> \@enddocument@kernel@warnings +... 'kernel/release' -> \let \show@release@info \wlog \show@release@info { ***********}\the \LaTeXReleaseInfo \show@release@info { ***********} +... 'kernel/testmode' -> +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... 'kernel/warnings' > 'kernel/filelist' +... 'kernel/release' < 'kernel/filelist' +... Execution order: +... 'kernel/release', 'kernel/testmode', 'kernel/filelist', 'kernel/warnings' +>>> LaTeX Warning: Reference `unknown' on page 1 undefined on input line .... [1 ] (github-0944.aux) diff --git a/base/testfiles/github-0962b.luatex.tlg b/base/testfiles/github-0962b.luatex.tlg index 50f8c5c1b4..2cd5d18449 100644 --- a/base/testfiles/github-0962b.luatex.tlg +++ b/base/testfiles/github-0962b.luatex.tlg @@ -1,14 +1,30 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -==> Hook: 'begindocument' -> Code chunks: -> '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 } -> Execution order: -> 1: 'doc' -> 2: 'ltxdoc'. - } -l. ...\ShowHook{begindocument} +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... '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 } +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'doc', 'ltxdoc' +>>> > \PrintMacroName=macro: #1->{\MacroFont \string #1}. \PrintMacroName diff --git a/base/testfiles/github-0962b.lvt b/base/testfiles/github-0962b.lvt index 6d02d0c1b1..173748d976 100644 --- a/base/testfiles/github-0962b.lvt +++ b/base/testfiles/github-0962b.lvt @@ -11,7 +11,7 @@ \START -\ShowHook{begindocument} +\DebugPrintHook{begindocument} \OMIT \begin{document} diff --git a/base/testfiles/github-0962b.tlg b/base/testfiles/github-0962b.tlg index f5d7b5c4b2..58394f1d3c 100644 --- a/base/testfiles/github-0962b.tlg +++ b/base/testfiles/github-0962b.tlg @@ -1,14 +1,30 @@ This is a generated file for the LaTeX2e validation system. Don't change this file in any respect. -==> Hook: 'begindocument' -> Code chunks: -> '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 } -> Execution order: -> 1: 'doc' -> 2: 'ltxdoc'. - } -l. ...\ShowHook{begindocument} +<<< Hook: 'begindocument' +... Attributes: +... deprecated_generic: N +... generic: N +... declared: Y +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: N +... generic_reversed: N +... consumed: N +... # of arguments: 0 +... Code chunks: +... '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 } +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... 'doc', 'ltxdoc' +>>> > \PrintMacroName=macro: #1->{\MacroFont \string #1}. \PrintMacroName diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg index c4f74b7b08..72c2734ed3 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg @@ -184,6 +184,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... @@ -959,6 +960,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg index 31e4887270..32496f5ca7 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg @@ -178,6 +178,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... @@ -943,6 +944,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg index 9a654c4b46..361af35e67 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg @@ -178,6 +178,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... @@ -952,6 +953,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg index 0a00235f43..591ec73599 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg @@ -202,6 +202,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg index ecb8fbe1ee..224f4a80b5 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg index ccb1dc7036..3143c5ed9e 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg index dfc4ea229a..c4954ac9fb 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg @@ -203,6 +203,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg index 493a49cb38..145a255898 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg index 65ea606a3c..51dd98a096 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg index bfeb095a9a..e2273ed633 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg @@ -203,6 +203,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg index f3c0606628..e1770bc1e5 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg index aafbbce15d..a10857100c 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg index 636c2540b7..a9bfa75b1c 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg @@ -204,6 +204,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg index a7b103a45f..756bb4844a 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg @@ -193,6 +193,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg index 8645bedea4..96e18a4088 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg @@ -193,6 +193,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg index 1aaa357fee..0a8bb78b3c 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg @@ -204,6 +204,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg index 0be2224061..441b0337cc 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg @@ -193,6 +193,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg index 7b71af5cd5..2b151f9195 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg @@ -193,6 +193,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg index a6690978cf..c07eefaf19 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.luatex.tlg @@ -204,6 +204,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg index 2128c4dfef..d6042e1812 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg @@ -193,6 +193,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg index 33969bdc41..49a9d5ca75 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg @@ -193,6 +193,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg index 3728a503f9..2c0e5fcaa7 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.luatex.tlg @@ -204,6 +204,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg index f9b8327c79..26f613781b 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.tlg @@ -193,6 +193,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg index 5d4d454627..3e2cb35597 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg @@ -193,6 +193,7 @@ Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Applying: [....-..-..] Hooks with args on input line .... Already applied: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg index 9d420c4df8..7a6def4531 100644 --- a/base/testfiles/tlb-rollback-004-often.luatex.tlg +++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg @@ -203,6 +203,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg index 8def97f84d..7eade4be1f 100644 --- a/base/testfiles/tlb-rollback-004-often.tlg +++ b/base/testfiles/tlb-rollback-004-often.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg index e0cdd26f69..bb68d08a96 100644 --- a/base/testfiles/tlb-rollback-004-often.xetex.tlg +++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg @@ -192,6 +192,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg index f63027c1ed..73897556eb 100644 --- a/base/testfiles/tlb-rollback-005.luatex.tlg +++ b/base/testfiles/tlb-rollback-005.luatex.tlg @@ -206,6 +206,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg index d7566507b2..f3fde6aa91 100644 --- a/base/testfiles/tlb-rollback-005.tlg +++ b/base/testfiles/tlb-rollback-005.tlg @@ -196,6 +196,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg index 28fc680d9c..7961fc39d3 100644 --- a/base/testfiles/tlb-rollback-005.xetex.tlg +++ b/base/testfiles/tlb-rollback-005.xetex.tlg @@ -196,6 +196,7 @@ Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... +Skipping: [....-..-..] Test or debug on input line .... Skipping: [....-..-..] Hooks with args on input line .... Applying: [....-..-..] Hooks with args on input line .... Skipping: [....-..-..] Hooks with args on input line .... diff --git a/base/update-lthooks-tests.sh b/base/update-lthooks-tests.sh index b41f685352..3541c71845 100755 --- a/base/update-lthooks-tests.sh +++ b/base/update-lthooks-tests.sh @@ -44,6 +44,10 @@ l3build save -cconfig-lthooks \ ltcmdhooks-009 \ ltcmdhooks-010 \ ltcmdhooks-011 \ + ltcmdhooks-012 \ + ltcmdhooks-013 \ + ltcmdhooks-014 \ + ltcmdhooks-015 \ filehook-001 \ filehook-002 \ filehook-003 \ @@ -53,6 +57,9 @@ l3build save -cconfig-lthooks \ filehook-007 \ filehook-008 \ filehook-009 \ + filehook-010 \ + filehook-011 \ + filehook-012 \ filehook-013 \ filehook-bug-140 \ lthooks-000 \ @@ -84,11 +91,15 @@ l3build save -cconfig-lthooks \ lthooks-028 \ lthooks-029 \ lthooks-029-deprecated \ + lthooks-029-deprecated-after \ + lthooks-029-deprecated-before \ + lthooks-029b \ lthooks-030 \ lthooks-031 \ lthooks-032 \ lthooks-033 \ lthooks-034 \ + lthooks-debug \ lthooks-errors \ lthooks-errors-deprecated \ lthooks-etoolbox \ @@ -110,7 +121,10 @@ l3build save -cconfig-lthooks \ github-0606 \ github-0648 \ github-0648b \ - github-0818 + github-0818 \ + github-0888 \ + github-1052 \ + github-1078 diff --git a/base/update-rollback-tests.sh b/base/update-rollback-tests.sh index 8c144906e7..201d52564d 100755 --- a/base/update-rollback-tests.sh +++ b/base/update-rollback-tests.sh @@ -5,6 +5,7 @@ l3build save -epdftex,xetex,luatex \ tlb-latexrelease-rollback-2022-06-01 \ tlb-latexrelease-rollback-2022-11-01 \ tlb-latexrelease-rollback-2023-06-01 \ + tlb-latexrelease-rollback-2023-11-01 \ tlb-latexrelease-rollback-003-often \ tlb-rollback-004-often \ tlb-rollback-005 \ diff --git a/required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg b/required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg index 20fe729e6f..926bb2dc05 100644 --- a/required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg +++ b/required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg @@ -1,6 +1,25 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'file/biditools.sty/after' -> builtin generic. - } -l. ...\ShowHook{file/biditools.sty/after} +<<< Hook: 'file/biditools.sty/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> diff --git a/required/firstaid/testfiles-TU/firstaid-bidi.lvt b/required/firstaid/testfiles-TU/firstaid-bidi.lvt index 0561f39bfe..81eb1ee1f1 100644 --- a/required/firstaid/testfiles-TU/firstaid-bidi.lvt +++ b/required/firstaid/testfiles-TU/firstaid-bidi.lvt @@ -3,7 +3,7 @@ \START -\ShowHook{file/biditools.sty/after} +\DebugPrintHook{file/biditools.sty/after} \OMIT \usepackage{bidi} diff --git a/required/firstaid/testfiles-TU/firstaid-bidi.tlg b/required/firstaid/testfiles-TU/firstaid-bidi.tlg index e5365a97f0..8065ea2d88 100644 --- a/required/firstaid/testfiles-TU/firstaid-bidi.tlg +++ b/required/firstaid/testfiles-TU/firstaid-bidi.tlg @@ -1,9 +1,28 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'file/biditools.sty/after' -> builtin generic. - } -l. ...\ShowHook{file/biditools.sty/after} +<<< Hook: 'file/biditools.sty/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: N +... usable: N +... disabled: N +... empty: Y +... reversed: N +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' empty +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> (../l3backend-xetex.def File: l3backend-xetex.def ....-..-.. L3 backend support: XeTeX \g__graphics_track_int=\count... diff --git a/required/firstaid/testfiles-TU/firstaid-unicode-math.luatex.tlg b/required/firstaid/testfiles-TU/firstaid-unicode-math.luatex.tlg index fb187b61ba..a17cdc018b 100644 --- a/required/firstaid/testfiles-TU/firstaid-unicode-math.luatex.tlg +++ b/required/firstaid/testfiles-TU/firstaid-unicode-math.luatex.tlg @@ -1,13 +1,28 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'package/unicode-math/after' -> builtin generic, reversed -> Code chunks: -> 'top-level' -> \AddToHook {cmd/mod@math@codes/after}{\mathcode `\|=28796 } -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{package/unicode-math/after} +<<< Hook: 'package/unicode-math/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \AddToHook {cmd/mod@math@codes/after}{\mathcode `\|=28796 } +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> Completed box being shipped out [1] \vbox(633.0+0.0)x407.0, direction TLT .\hbox(0.0+0.0)x0.0, direction TLT diff --git a/required/firstaid/testfiles-TU/firstaid-unicode-math.lvt b/required/firstaid/testfiles-TU/firstaid-unicode-math.lvt index 6c57de10c2..1f62311f3c 100644 --- a/required/firstaid/testfiles-TU/firstaid-unicode-math.lvt +++ b/required/firstaid/testfiles-TU/firstaid-unicode-math.lvt @@ -6,7 +6,7 @@ \START -\ShowHook{package/unicode-math/after} +\DebugPrintHook{package/unicode-math/after} \OMIT \usepackage{doc} diff --git a/required/firstaid/testfiles-TU/firstaid-unicode-math.tlg b/required/firstaid/testfiles-TU/firstaid-unicode-math.tlg index f8f3a637eb..4a4e874875 100644 --- a/required/firstaid/testfiles-TU/firstaid-unicode-math.tlg +++ b/required/firstaid/testfiles-TU/firstaid-unicode-math.tlg @@ -1,13 +1,28 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==> Hook: 'package/unicode-math/after' -> builtin generic, reversed -> Code chunks: -> 'top-level' -> \AddToHook {cmd/mod@math@codes/after}{\mathcode `\|=28796 } -> Execution order: -> 1: 'top-level'. - } -l. ...\ShowHook{package/unicode-math/after} +<<< Hook: 'package/unicode-math/after' +... Attributes: +... deprecated_generic: N +... generic: Y +... declared: N +... structure_exist: Y +... usable: Y +... disabled: N +... empty: N +... reversed: Y +... generic_reversed: Y +... consumed: N +... # of arguments: 0 +... Code chunks: +... 'top level' -> \AddToHook {cmd/mod@math@codes/after}{\mathcode `\|=28796 } +... next-only empty +... Default rules: +... None +... Rules: +... None +... Execution order: +... None +>>> LaTeX Font Info: Font shape `TU/latinmodern-math.otf(2)/m/n' will be (Font) scaled to size 9.00096pt on input line .... LaTeX Font Info: Font shape `TU/latinmodern-math.otf(2)/m/n' will be diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.luatex.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.luatex.tpf index b7cd6b4bec..a773424726 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.luatex.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.luatex.tpf @@ -1378,61 +1378,61 @@ endobj << /Marked true >> endobj 239 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 103 0 R >> endobj 241 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 242 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 105 0 R >> endobj 244 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 245 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 107 0 R >> endobj 247 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 248 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 109 0 R >> endobj 250 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 251 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 111 0 R >> endobj 253 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 254 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 113 0 R >> endobj 256 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 257 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 115 0 R >> endobj 259 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 260 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 117 0 R >> endobj 262 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 263 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 119 0 R >> endobj 265 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 266 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 121 0 R >> endobj 268 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2321,88 +2321,88 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000056131 00000 n -0000037963 00000 n -0000042407 00000 n -0000040724 00000 n +0000056251 00000 n +0000038083 00000 n +0000042527 00000 n +0000040844 00000 n 0000000011 00000 f -0000040792 00000 n +0000040912 00000 n 0000000013 00000 f -0000040862 00000 n +0000040982 00000 n 0000000021 00000 f -0000041625 00000 n -0000040943 00000 n -0000041903 00000 n -0000041732 00000 n -0000042211 00000 n -0000042010 00000 n -0000042320 00000 n +0000041745 00000 n +0000041063 00000 n +0000042023 00000 n +0000041852 00000 n +0000042331 00000 n +0000042130 00000 n +0000042440 00000 n 0000000000 00000 f 0000004772 00000 n -0000042475 00000 n -0000042623 00000 n -0000042724 00000 n -0000042848 00000 n -0000042994 00000 n -0000043161 00000 n -0000043300 00000 n +0000042595 00000 n +0000042743 00000 n +0000042844 00000 n +0000042968 00000 n +0000043114 00000 n +0000043281 00000 n +0000043420 00000 n 0000005015 00000 n -0000043475 00000 n +0000043595 00000 n 0000000020 00000 n -0000043598 00000 n -0000043738 00000 n -0000043877 00000 n +0000043718 00000 n +0000043858 00000 n +0000043997 00000 n 0000005234 00000 n 0000000074 00000 n -0000044010 00000 n -0000044127 00000 n -0000044291 00000 n -0000044431 00000 n +0000044130 00000 n +0000044247 00000 n +0000044411 00000 n +0000044551 00000 n 0000005449 00000 n -0000044606 00000 n +0000044726 00000 n 0000000128 00000 n -0000044729 00000 n -0000044832 00000 n -0000045004 00000 n -0000045144 00000 n +0000044849 00000 n +0000044952 00000 n +0000045124 00000 n +0000045264 00000 n 0000005669 00000 n -0000045321 00000 n +0000045441 00000 n 0000000182 00000 n -0000045445 00000 n -0000045593 00000 n -0000045733 00000 n +0000045565 00000 n +0000045713 00000 n +0000045853 00000 n 0000005893 00000 n -0000045910 00000 n +0000046030 00000 n 0000000236 00000 n -0000046034 00000 n -0000046206 00000 n -0000046346 00000 n +0000046154 00000 n +0000046326 00000 n +0000046466 00000 n 0000006118 00000 n -0000046523 00000 n +0000046643 00000 n 0000000290 00000 n -0000046647 00000 n -0000046811 00000 n -0000046951 00000 n +0000046767 00000 n +0000046931 00000 n +0000047071 00000 n 0000006338 00000 n -0000047128 00000 n +0000047248 00000 n 0000000344 00000 n -0000047252 00000 n -0000047392 00000 n -0000047532 00000 n +0000047372 00000 n +0000047512 00000 n +0000047652 00000 n 0000006558 00000 n 0000000398 00000 n -0000047666 00000 n -0000047769 00000 n -0000047937 00000 n -0000048077 00000 n +0000047786 00000 n +0000047889 00000 n +0000048057 00000 n +0000048197 00000 n 0000006774 00000 n -0000048254 00000 n +0000048374 00000 n 0000000452 00000 n -0000048378 00000 n -0000048538 00000 n -0000048678 00000 n +0000048498 00000 n +0000048658 00000 n +0000048798 00000 n 0000006993 00000 n -0000048855 00000 n +0000048975 00000 n 0000000506 00000 n 0000007555 00000 n 0000000560 00000 n @@ -2412,11 +2412,11 @@ xref 0000007387 00000 n 0000007440 00000 n 0000007502 00000 n -0000111253 00000 n -0000109301 00000 n -0000058220 00000 n -0000113200 00000 n -0000113361 00000 n +0000111373 00000 n +0000109421 00000 n +0000058340 00000 n +0000113320 00000 n +0000113481 00000 n 0000004924 00000 n 0000012967 00000 n 0000013031 00000 n @@ -2438,27 +2438,27 @@ xref 0000023778 00000 n 0000036395 00000 n 0000036459 00000 n -0000048979 00000 n -0000049082 00000 n -0000049209 00000 n -0000049345 00000 n -0000049552 00000 n -0000049695 00000 n +0000049099 00000 n +0000049202 00000 n +0000049329 00000 n +0000049465 00000 n +0000049672 00000 n +0000049815 00000 n 0000011317 00000 n -0000049876 00000 n +0000049996 00000 n 0000011117 00000 n 0000007654 00000 n -0000050002 00000 n -0000050217 00000 n -0000050360 00000 n +0000050122 00000 n +0000050337 00000 n +0000050480 00000 n 0000011537 00000 n -0000050541 00000 n +0000050661 00000 n 0000007711 00000 n -0000050667 00000 n -0000050850 00000 n -0000050994 00000 n +0000050787 00000 n +0000050970 00000 n +0000051114 00000 n 0000011753 00000 n -0000051176 00000 n +0000051296 00000 n 0000007768 00000 n 0000012208 00000 n 0000007825 00000 n @@ -2473,81 +2473,81 @@ xref 0000019526 00000 n 0000023476 00000 n 0000023540 00000 n -0000051303 00000 n -0000051406 00000 n -0000051533 00000 n +0000051423 00000 n +0000051526 00000 n +0000051653 00000 n 0000013202 00000 n 0000012711 00000 n 0000012296 00000 n 0000012850 00000 n 0000012913 00000 n -0000051721 00000 n -0000051825 00000 n -0000051952 00000 n -0000052056 00000 n -0000052194 00000 n +0000051841 00000 n +0000051945 00000 n +0000052072 00000 n +0000052176 00000 n +0000052314 00000 n 0000016191 00000 n 0000016007 00000 n 0000013290 00000 n -0000052331 00000 n -0000052432 00000 n -0000052531 00000 n -0000052635 00000 n -0000052762 00000 n -0000052866 00000 n -0000052993 00000 n -0000053097 00000 n -0000053224 00000 n -0000053328 00000 n +0000052451 00000 n +0000052552 00000 n +0000052651 00000 n +0000052755 00000 n +0000052882 00000 n +0000052986 00000 n +0000053113 00000 n +0000053217 00000 n +0000053344 00000 n +0000053448 00000 n 0000017004 00000 n 0000013347 00000 n 0000016411 00000 n 0000016474 00000 n 0000016162 00000 n -0000053455 00000 n -0000053559 00000 n -0000053686 00000 n -0000053790 00000 n -0000053928 00000 n +0000053575 00000 n +0000053679 00000 n +0000053806 00000 n +0000053910 00000 n +0000054048 00000 n 0000019126 00000 n 0000018942 00000 n 0000017092 00000 n -0000054065 00000 n -0000054166 00000 n +0000054185 00000 n +0000054286 00000 n 0000019700 00000 n 0000017149 00000 n 0000019345 00000 n 0000019408 00000 n 0000019097 00000 n -0000054265 00000 n -0000054369 00000 n -0000054496 00000 n -0000054600 00000 n +0000054385 00000 n +0000054489 00000 n +0000054616 00000 n +0000054720 00000 n 0000020901 00000 n 0000020527 00000 n 0000019788 00000 n 0000020666 00000 n 0000020729 00000 n -0000054727 00000 n -0000054859 00000 n -0000054963 00000 n -0000055090 00000 n -0000055194 00000 n -0000055332 00000 n +0000054847 00000 n +0000054979 00000 n +0000055083 00000 n +0000055210 00000 n +0000055314 00000 n +0000055452 00000 n 0000023139 00000 n 0000022955 00000 n 0000020989 00000 n -0000055469 00000 n -0000055570 00000 n +0000055589 00000 n +0000055690 00000 n 0000023833 00000 n 0000021046 00000 n 0000023359 00000 n 0000023422 00000 n 0000023110 00000 n -0000055669 00000 n -0000055773 00000 n -0000055900 00000 n -0000056004 00000 n +0000055789 00000 n +0000055893 00000 n +0000056020 00000 n +0000056124 00000 n 0000023921 00000 n 0000036514 00000 n 0000036140 00000 n @@ -2556,63 +2556,63 @@ xref 0000036342 00000 n 0000036649 00000 n 0000036686 00000 n -0000114413 00000 n -0000036733 00000 n -0000036822 00000 n -0000114281 00000 n -0000036866 00000 n -0000036920 00000 n -0000114163 00000 n -0000036967 00000 n -0000037054 00000 n -0000114084 00000 n -0000037106 00000 n -0000037203 00000 n -0000114005 00000 n -0000037255 00000 n -0000037319 00000 n -0000113912 00000 n -0000037366 00000 n -0000037463 00000 n -0000113833 00000 n -0000037510 00000 n -0000037597 00000 n -0000113715 00000 n -0000037641 00000 n -0000037695 00000 n -0000113636 00000 n -0000037742 00000 n -0000037834 00000 n -0000113557 00000 n -0000037881 00000 n -0000038710 00000 n -0000039627 00000 n -0000040589 00000 n -0000040669 00000 n -0000056237 00000 n -0000056620 00000 n -0000057244 00000 n -0000056653 00000 n -0000057467 00000 n -0000058376 00000 n -0000058579 00000 n -0000058839 00000 n -0000074431 00000 n -0000059139 00000 n -0000089012 00000 n -0000074640 00000 n -0000107304 00000 n -0000089221 00000 n -0000107511 00000 n -0000109463 00000 n -0000111415 00000 n -0000113480 00000 n -0000114492 00000 n -0000115023 00000 n -0000115061 00000 n -0000115295 00000 n +0000114533 00000 n +0000036745 00000 n +0000036834 00000 n +0000114401 00000 n +0000036890 00000 n +0000036944 00000 n +0000114283 00000 n +0000037003 00000 n +0000037090 00000 n +0000114204 00000 n +0000037154 00000 n +0000037251 00000 n +0000114125 00000 n +0000037315 00000 n +0000037379 00000 n +0000114032 00000 n +0000037438 00000 n +0000037535 00000 n +0000113953 00000 n +0000037594 00000 n +0000037681 00000 n +0000113835 00000 n +0000037737 00000 n +0000037791 00000 n +0000113756 00000 n +0000037850 00000 n +0000037942 00000 n +0000113677 00000 n +0000038001 00000 n +0000038830 00000 n +0000039747 00000 n +0000040709 00000 n +0000040789 00000 n +0000056357 00000 n +0000056740 00000 n +0000057364 00000 n +0000056773 00000 n +0000057587 00000 n +0000058496 00000 n +0000058699 00000 n +0000058959 00000 n +0000074551 00000 n +0000059259 00000 n +0000089132 00000 n +0000074760 00000 n +0000107424 00000 n +0000089341 00000 n +0000107631 00000 n +0000109583 00000 n +0000111535 00000 n +0000113600 00000 n +0000114612 00000 n +0000115143 00000 n +0000115181 00000 n +0000115415 00000 n trailer << /Size 295 /Root 293 0 R /Info 294 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -115505 +115625 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.tpf index 7556113f32..3a2cc43248 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-1.tpf @@ -1280,61 +1280,61 @@ endobj << /Marked true >> endobj 235 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 102 0 R >> endobj 237 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 238 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 104 0 R >> endobj 240 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 241 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 106 0 R >> endobj 243 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 244 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 108 0 R >> endobj 246 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 247 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 110 0 R >> endobj 249 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 250 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 112 0 R >> endobj 252 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 253 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 114 0 R >> endobj 255 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 256 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 116 0 R >> endobj 258 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 259 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 118 0 R >> endobj 261 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 262 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 120 0 R >> endobj 264 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2460,88 +2460,88 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000059548 00000 n -0000040228 00000 n -0000044910 00000 n -0000043227 00000 n +0000059668 00000 n +0000040348 00000 n +0000045030 00000 n +0000043347 00000 n 0000000011 00000 f -0000043295 00000 n +0000043415 00000 n 0000000013 00000 f -0000043365 00000 n +0000043485 00000 n 0000000021 00000 f -0000044128 00000 n -0000043446 00000 n -0000044406 00000 n -0000044235 00000 n -0000044714 00000 n -0000044513 00000 n -0000044823 00000 n +0000044248 00000 n +0000043566 00000 n +0000044526 00000 n +0000044355 00000 n +0000044834 00000 n +0000044633 00000 n +0000044943 00000 n 0000000000 00000 f 0000007525 00000 n -0000044978 00000 n -0000045126 00000 n -0000045227 00000 n -0000045349 00000 n -0000045495 00000 n -0000045662 00000 n -0000045863 00000 n +0000045098 00000 n +0000045246 00000 n +0000045347 00000 n +0000045469 00000 n +0000045615 00000 n +0000045782 00000 n +0000045983 00000 n 0000007743 00000 n -0000046034 00000 n +0000046154 00000 n 0000000015 00000 n -0000046155 00000 n -0000046295 00000 n -0000046497 00000 n +0000046275 00000 n +0000046415 00000 n +0000046617 00000 n 0000007960 00000 n 0000000069 00000 n -0000046628 00000 n -0000046745 00000 n -0000046909 00000 n -0000047113 00000 n +0000046748 00000 n +0000046865 00000 n +0000047029 00000 n +0000047233 00000 n 0000008173 00000 n -0000047286 00000 n +0000047406 00000 n 0000000123 00000 n -0000047408 00000 n -0000047511 00000 n -0000047683 00000 n -0000047887 00000 n +0000047528 00000 n +0000047631 00000 n +0000047803 00000 n +0000048007 00000 n 0000008391 00000 n -0000048060 00000 n +0000048180 00000 n 0000000177 00000 n -0000048182 00000 n -0000048330 00000 n -0000048534 00000 n +0000048302 00000 n +0000048450 00000 n +0000048654 00000 n 0000008613 00000 n -0000048707 00000 n +0000048827 00000 n 0000000231 00000 n -0000048829 00000 n -0000049001 00000 n -0000049205 00000 n +0000048949 00000 n +0000049121 00000 n +0000049325 00000 n 0000008836 00000 n -0000049378 00000 n +0000049498 00000 n 0000000285 00000 n -0000049500 00000 n -0000049664 00000 n -0000049868 00000 n +0000049620 00000 n +0000049784 00000 n +0000049988 00000 n 0000009054 00000 n -0000050041 00000 n +0000050161 00000 n 0000000339 00000 n -0000050163 00000 n -0000050303 00000 n -0000050507 00000 n +0000050283 00000 n +0000050423 00000 n +0000050627 00000 n 0000009272 00000 n 0000000393 00000 n -0000050639 00000 n -0000050742 00000 n -0000050910 00000 n -0000051114 00000 n +0000050759 00000 n +0000050862 00000 n +0000051030 00000 n +0000051234 00000 n 0000009486 00000 n -0000051287 00000 n +0000051407 00000 n 0000000447 00000 n -0000051409 00000 n -0000051569 00000 n -0000051773 00000 n +0000051529 00000 n +0000051689 00000 n +0000051893 00000 n 0000009703 00000 n -0000051946 00000 n +0000052066 00000 n 0000000501 00000 n 0000010251 00000 n 0000000555 00000 n @@ -2551,11 +2551,11 @@ xref 0000010089 00000 n 0000010140 00000 n 0000010200 00000 n -0000116409 00000 n -0000114458 00000 n -0000119230 00000 n -0000118355 00000 n -0000119397 00000 n +0000116529 00000 n +0000114578 00000 n +0000119350 00000 n +0000118475 00000 n +0000119517 00000 n 0000018228 00000 n 0000018290 00000 n 0000018342 00000 n @@ -2576,27 +2576,27 @@ xref 0000026302 00000 n 0000038673 00000 n 0000038735 00000 n -0000052068 00000 n -0000052171 00000 n +0000052188 00000 n +0000052291 00000 n 0000016530 00000 n -0000052296 00000 n -0000052432 00000 n -0000052639 00000 n -0000052846 00000 n +0000052416 00000 n +0000052552 00000 n +0000052759 00000 n +0000052966 00000 n 0000016705 00000 n -0000053023 00000 n +0000053143 00000 n 0000010351 00000 n -0000053147 00000 n -0000053362 00000 n -0000053571 00000 n +0000053267 00000 n +0000053482 00000 n +0000053691 00000 n 0000016923 00000 n -0000053749 00000 n +0000053869 00000 n 0000010408 00000 n -0000053873 00000 n -0000054056 00000 n -0000054266 00000 n +0000053993 00000 n +0000054176 00000 n +0000054386 00000 n 0000017137 00000 n -0000054445 00000 n +0000054565 00000 n 0000010465 00000 n 0000017582 00000 n 0000010522 00000 n @@ -2610,80 +2610,80 @@ xref 0000023061 00000 n 0000026010 00000 n 0000026072 00000 n -0000054570 00000 n -0000054673 00000 n +0000054690 00000 n +0000054793 00000 n 0000017976 00000 n -0000054798 00000 n +0000054918 00000 n 0000018455 00000 n 0000017671 00000 n 0000018115 00000 n 0000018176 00000 n -0000054986 00000 n -0000055090 00000 n +0000055106 00000 n +0000055210 00000 n 0000020281 00000 n -0000055215 00000 n -0000055319 00000 n -0000055488 00000 n +0000055335 00000 n +0000055439 00000 n +0000055608 00000 n 0000020440 00000 n 0000018544 00000 n -0000055623 00000 n -0000055724 00000 n -0000055852 00000 n -0000055956 00000 n -0000056081 00000 n -0000056185 00000 n -0000056310 00000 n -0000056414 00000 n -0000056539 00000 n -0000056643 00000 n +0000055743 00000 n +0000055844 00000 n +0000055972 00000 n +0000056076 00000 n +0000056201 00000 n +0000056305 00000 n +0000056430 00000 n +0000056534 00000 n +0000056659 00000 n +0000056763 00000 n 0000021231 00000 n 0000018601 00000 n 0000020658 00000 n 0000020719 00000 n -0000056768 00000 n -0000056872 00000 n +0000056888 00000 n +0000056992 00000 n 0000022510 00000 n -0000056997 00000 n -0000057101 00000 n -0000057270 00000 n +0000057117 00000 n +0000057221 00000 n +0000057390 00000 n 0000022669 00000 n 0000021320 00000 n -0000057405 00000 n -0000057506 00000 n +0000057525 00000 n +0000057626 00000 n 0000023229 00000 n 0000021377 00000 n 0000022886 00000 n 0000022947 00000 n -0000057634 00000 n -0000057738 00000 n +0000057754 00000 n +0000057858 00000 n 0000023817 00000 n -0000057863 00000 n -0000057967 00000 n +0000057983 00000 n +0000058087 00000 n 0000024183 00000 n 0000023318 00000 n 0000023956 00000 n 0000024017 00000 n -0000058092 00000 n -0000058224 00000 n -0000058328 00000 n +0000058212 00000 n +0000058344 00000 n +0000058448 00000 n 0000025520 00000 n -0000058453 00000 n -0000058557 00000 n -0000058726 00000 n +0000058573 00000 n +0000058677 00000 n +0000058846 00000 n 0000025679 00000 n 0000024272 00000 n -0000058861 00000 n -0000058962 00000 n +0000058981 00000 n +0000059082 00000 n 0000026355 00000 n 0000024329 00000 n 0000025897 00000 n 0000025958 00000 n -0000119513 00000 n -0000059090 00000 n -0000059194 00000 n +0000119633 00000 n +0000059210 00000 n +0000059314 00000 n 0000038422 00000 n -0000059319 00000 n -0000059423 00000 n +0000059439 00000 n +0000059543 00000 n 0000026444 00000 n 0000038788 00000 n 0000037925 00000 n @@ -2691,70 +2691,70 @@ xref 0000038622 00000 n 0000038924 00000 n 0000038961 00000 n -0000120600 00000 n -0000039008 00000 n -0000039096 00000 n -0000120468 00000 n -0000039140 00000 n -0000039193 00000 n -0000120350 00000 n -0000039240 00000 n -0000039326 00000 n -0000120271 00000 n -0000039378 00000 n -0000039474 00000 n -0000120192 00000 n -0000039526 00000 n -0000039589 00000 n -0000120099 00000 n -0000039636 00000 n -0000039732 00000 n -0000120020 00000 n -0000039779 00000 n -0000039865 00000 n -0000119902 00000 n -0000039909 00000 n -0000039962 00000 n -0000119823 00000 n -0000040009 00000 n -0000040100 00000 n -0000119744 00000 n -0000040147 00000 n -0000041213 00000 n -0000042130 00000 n -0000043092 00000 n -0000043172 00000 n -0000059654 00000 n -0000060271 00000 n -0000060296 00000 n -0000060709 00000 n -0000061146 00000 n -0000076415 00000 n -0000076718 00000 n -0000091067 00000 n -0000091385 00000 n -0000109445 00000 n -0000109784 00000 n -0000112449 00000 n -0000112669 00000 n -0000114620 00000 n -0000116571 00000 n -0000118516 00000 n -0000119598 00000 n -0000119667 00000 n -0000120679 00000 n -0000120851 00000 n -0000121013 00000 n -0000121191 00000 n -0000121392 00000 n -0000121494 00000 n -0000121532 00000 n -0000121766 00000 n +0000120720 00000 n +0000039020 00000 n +0000039108 00000 n +0000120588 00000 n +0000039164 00000 n +0000039217 00000 n +0000120470 00000 n +0000039276 00000 n +0000039362 00000 n +0000120391 00000 n +0000039426 00000 n +0000039522 00000 n +0000120312 00000 n +0000039586 00000 n +0000039649 00000 n +0000120219 00000 n +0000039708 00000 n +0000039804 00000 n +0000120140 00000 n +0000039863 00000 n +0000039949 00000 n +0000120022 00000 n +0000040005 00000 n +0000040058 00000 n +0000119943 00000 n +0000040117 00000 n +0000040208 00000 n +0000119864 00000 n +0000040267 00000 n +0000041333 00000 n +0000042250 00000 n +0000043212 00000 n +0000043292 00000 n +0000059774 00000 n +0000060391 00000 n +0000060416 00000 n +0000060829 00000 n +0000061266 00000 n +0000076535 00000 n +0000076838 00000 n +0000091187 00000 n +0000091505 00000 n +0000109565 00000 n +0000109904 00000 n +0000112569 00000 n +0000112789 00000 n +0000114740 00000 n +0000116691 00000 n +0000118636 00000 n +0000119718 00000 n +0000119787 00000 n +0000120799 00000 n +0000120971 00000 n +0000121133 00000 n +0000121311 00000 n +0000121512 00000 n +0000121614 00000 n +0000121652 00000 n +0000121886 00000 n trailer << /Size 295 /Root 293 0 R /Info 294 0 R /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >> startxref -121976 +122096 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.luatex.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.luatex.tpf index 8b3aaae3d2..ebd7684026 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.luatex.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.luatex.tpf @@ -1356,61 +1356,61 @@ endobj << /Marked true >> endobj 239 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 103 0 R >> endobj 241 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 242 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 105 0 R >> endobj 244 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 245 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 107 0 R >> endobj 247 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 248 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 109 0 R >> endobj 250 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 251 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 111 0 R >> endobj 253 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 254 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 113 0 R >> endobj 256 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 257 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 115 0 R >> endobj 259 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 260 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 117 0 R >> endobj 262 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 263 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 119 0 R >> endobj 265 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 266 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 121 0 R >> endobj 268 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2299,87 +2299,87 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000055327 00000 n -0000037627 00000 n -0000041991 00000 n -0000040308 00000 n +0000055447 00000 n +0000037747 00000 n +0000042111 00000 n +0000040428 00000 n 0000000011 00000 f -0000040376 00000 n +0000040496 00000 n 0000000013 00000 f -0000040446 00000 n +0000040566 00000 n 0000000021 00000 f -0000041209 00000 n -0000040527 00000 n -0000041487 00000 n -0000041316 00000 n -0000041795 00000 n -0000041594 00000 n -0000041904 00000 n +0000041329 00000 n +0000040647 00000 n +0000041607 00000 n +0000041436 00000 n +0000041915 00000 n +0000041714 00000 n +0000042024 00000 n 0000000000 00000 f 0000004524 00000 n -0000042059 00000 n -0000042207 00000 n -0000042308 00000 n -0000042432 00000 n -0000042578 00000 n -0000042745 00000 n -0000042892 00000 n -0000043015 00000 n +0000042179 00000 n +0000042327 00000 n +0000042428 00000 n +0000042552 00000 n +0000042698 00000 n +0000042865 00000 n +0000043012 00000 n +0000043135 00000 n 0000004767 00000 n 0000000020 00000 n -0000043148 00000 n -0000043288 00000 n -0000043427 00000 n +0000043268 00000 n +0000043408 00000 n +0000043547 00000 n 0000004986 00000 n 0000000074 00000 n -0000043560 00000 n -0000043677 00000 n -0000043841 00000 n -0000043988 00000 n -0000044111 00000 n +0000043680 00000 n +0000043797 00000 n +0000043961 00000 n +0000044108 00000 n +0000044231 00000 n 0000005201 00000 n 0000000128 00000 n -0000044244 00000 n -0000044347 00000 n -0000044519 00000 n -0000044667 00000 n -0000044790 00000 n +0000044364 00000 n +0000044467 00000 n +0000044639 00000 n +0000044787 00000 n +0000044910 00000 n 0000005421 00000 n 0000000182 00000 n -0000044924 00000 n -0000045072 00000 n -0000045220 00000 n -0000045344 00000 n +0000045044 00000 n +0000045192 00000 n +0000045340 00000 n +0000045464 00000 n 0000005645 00000 n 0000000236 00000 n -0000045478 00000 n -0000045650 00000 n -0000045798 00000 n -0000045922 00000 n +0000045598 00000 n +0000045770 00000 n +0000045918 00000 n +0000046042 00000 n 0000005870 00000 n 0000000290 00000 n -0000046056 00000 n -0000046220 00000 n -0000046368 00000 n -0000046492 00000 n +0000046176 00000 n +0000046340 00000 n +0000046488 00000 n +0000046612 00000 n 0000006090 00000 n 0000000344 00000 n -0000046626 00000 n -0000046766 00000 n -0000046906 00000 n +0000046746 00000 n +0000046886 00000 n +0000047026 00000 n 0000006310 00000 n 0000000398 00000 n -0000047040 00000 n -0000047143 00000 n -0000047311 00000 n -0000047459 00000 n -0000047583 00000 n +0000047160 00000 n +0000047263 00000 n +0000047431 00000 n +0000047579 00000 n +0000047703 00000 n 0000006527 00000 n 0000000452 00000 n -0000047717 00000 n -0000047877 00000 n -0000048025 00000 n -0000048149 00000 n +0000047837 00000 n +0000047997 00000 n +0000048145 00000 n +0000048269 00000 n 0000006746 00000 n 0000000506 00000 n 0000007308 00000 n @@ -2390,11 +2390,11 @@ xref 0000007140 00000 n 0000007193 00000 n 0000007255 00000 n -0000110449 00000 n -0000108497 00000 n -0000057416 00000 n -0000112396 00000 n -0000112557 00000 n +0000110569 00000 n +0000108617 00000 n +0000057536 00000 n +0000112516 00000 n +0000112677 00000 n 0000004676 00000 n 0000012631 00000 n 0000012695 00000 n @@ -2416,26 +2416,26 @@ xref 0000023442 00000 n 0000036059 00000 n 0000036123 00000 n -0000048283 00000 n -0000048386 00000 n -0000048513 00000 n -0000048649 00000 n -0000048856 00000 n -0000049008 00000 n -0000049134 00000 n +0000048403 00000 n +0000048506 00000 n +0000048633 00000 n +0000048769 00000 n +0000048976 00000 n +0000049128 00000 n +0000049254 00000 n 0000010977 00000 n 0000010777 00000 n 0000007407 00000 n -0000049271 00000 n -0000049486 00000 n -0000049638 00000 n -0000049764 00000 n +0000049391 00000 n +0000049606 00000 n +0000049758 00000 n +0000049884 00000 n 0000011197 00000 n 0000007464 00000 n -0000049901 00000 n -0000050084 00000 n -0000050236 00000 n -0000050362 00000 n +0000050021 00000 n +0000050204 00000 n +0000050356 00000 n +0000050482 00000 n 0000011417 00000 n 0000007521 00000 n 0000011872 00000 n @@ -2451,81 +2451,81 @@ xref 0000019190 00000 n 0000023140 00000 n 0000023204 00000 n -0000050499 00000 n -0000050602 00000 n -0000050729 00000 n +0000050619 00000 n +0000050722 00000 n +0000050849 00000 n 0000012866 00000 n 0000012375 00000 n 0000011960 00000 n 0000012514 00000 n 0000012577 00000 n -0000050917 00000 n -0000051021 00000 n -0000051148 00000 n -0000051252 00000 n -0000051390 00000 n +0000051037 00000 n +0000051141 00000 n +0000051268 00000 n +0000051372 00000 n +0000051510 00000 n 0000015855 00000 n 0000015671 00000 n 0000012954 00000 n -0000051527 00000 n -0000051628 00000 n -0000051727 00000 n -0000051831 00000 n -0000051958 00000 n -0000052062 00000 n -0000052189 00000 n -0000052293 00000 n -0000052420 00000 n -0000052524 00000 n +0000051647 00000 n +0000051748 00000 n +0000051847 00000 n +0000051951 00000 n +0000052078 00000 n +0000052182 00000 n +0000052309 00000 n +0000052413 00000 n +0000052540 00000 n +0000052644 00000 n 0000016668 00000 n 0000013011 00000 n 0000016075 00000 n 0000016138 00000 n 0000015826 00000 n -0000052651 00000 n -0000052755 00000 n -0000052882 00000 n -0000052986 00000 n -0000053124 00000 n +0000052771 00000 n +0000052875 00000 n +0000053002 00000 n +0000053106 00000 n +0000053244 00000 n 0000018790 00000 n 0000018606 00000 n 0000016756 00000 n -0000053261 00000 n -0000053362 00000 n +0000053381 00000 n +0000053482 00000 n 0000019364 00000 n 0000016813 00000 n 0000019009 00000 n 0000019072 00000 n 0000018761 00000 n -0000053461 00000 n -0000053565 00000 n -0000053692 00000 n -0000053796 00000 n +0000053581 00000 n +0000053685 00000 n +0000053812 00000 n +0000053916 00000 n 0000020565 00000 n 0000020191 00000 n 0000019452 00000 n 0000020330 00000 n 0000020393 00000 n -0000053923 00000 n -0000054055 00000 n -0000054159 00000 n -0000054286 00000 n -0000054390 00000 n -0000054528 00000 n +0000054043 00000 n +0000054175 00000 n +0000054279 00000 n +0000054406 00000 n +0000054510 00000 n +0000054648 00000 n 0000022803 00000 n 0000022619 00000 n 0000020653 00000 n -0000054665 00000 n -0000054766 00000 n +0000054785 00000 n +0000054886 00000 n 0000023497 00000 n 0000020710 00000 n 0000023023 00000 n 0000023086 00000 n 0000022774 00000 n -0000054865 00000 n -0000054969 00000 n -0000055096 00000 n -0000055200 00000 n +0000054985 00000 n +0000055089 00000 n +0000055216 00000 n +0000055320 00000 n 0000023585 00000 n 0000036178 00000 n 0000035804 00000 n @@ -2534,63 +2534,63 @@ xref 0000036006 00000 n 0000036313 00000 n 0000036350 00000 n -0000113609 00000 n -0000036397 00000 n -0000036486 00000 n -0000113477 00000 n -0000036530 00000 n -0000036584 00000 n -0000113359 00000 n -0000036631 00000 n -0000036718 00000 n -0000113280 00000 n -0000036770 00000 n -0000036867 00000 n -0000113201 00000 n -0000036919 00000 n -0000036983 00000 n -0000113108 00000 n -0000037030 00000 n -0000037127 00000 n -0000113029 00000 n -0000037174 00000 n -0000037261 00000 n -0000112911 00000 n -0000037305 00000 n -0000037359 00000 n -0000112832 00000 n -0000037406 00000 n -0000037498 00000 n -0000112753 00000 n -0000037545 00000 n -0000038294 00000 n -0000039211 00000 n -0000040173 00000 n -0000040253 00000 n -0000055433 00000 n -0000055816 00000 n -0000056440 00000 n -0000055849 00000 n -0000056663 00000 n -0000057572 00000 n -0000057775 00000 n -0000058035 00000 n -0000073627 00000 n -0000058335 00000 n -0000088208 00000 n -0000073836 00000 n -0000106500 00000 n -0000088417 00000 n -0000106707 00000 n -0000108659 00000 n -0000110611 00000 n -0000112676 00000 n -0000113688 00000 n -0000114219 00000 n -0000114257 00000 n -0000114491 00000 n +0000113729 00000 n +0000036409 00000 n +0000036498 00000 n +0000113597 00000 n +0000036554 00000 n +0000036608 00000 n +0000113479 00000 n +0000036667 00000 n +0000036754 00000 n +0000113400 00000 n +0000036818 00000 n +0000036915 00000 n +0000113321 00000 n +0000036979 00000 n +0000037043 00000 n +0000113228 00000 n +0000037102 00000 n +0000037199 00000 n +0000113149 00000 n +0000037258 00000 n +0000037345 00000 n +0000113031 00000 n +0000037401 00000 n +0000037455 00000 n +0000112952 00000 n +0000037514 00000 n +0000037606 00000 n +0000112873 00000 n +0000037665 00000 n +0000038414 00000 n +0000039331 00000 n +0000040293 00000 n +0000040373 00000 n +0000055553 00000 n +0000055936 00000 n +0000056560 00000 n +0000055969 00000 n +0000056783 00000 n +0000057692 00000 n +0000057895 00000 n +0000058155 00000 n +0000073747 00000 n +0000058455 00000 n +0000088328 00000 n +0000073956 00000 n +0000106620 00000 n +0000088537 00000 n +0000106827 00000 n +0000108779 00000 n +0000110731 00000 n +0000112796 00000 n +0000113808 00000 n +0000114339 00000 n +0000114377 00000 n +0000114611 00000 n trailer << /Size 295 /Root 293 0 R /Info 294 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -114701 +114821 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.tpf index e599d57b74..ad0623cf9e 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-2.tpf @@ -1280,61 +1280,61 @@ endobj << /Marked true >> endobj 235 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 102 0 R >> endobj 237 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 238 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 104 0 R >> endobj 240 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 241 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 106 0 R >> endobj 243 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 244 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 108 0 R >> endobj 246 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 247 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 110 0 R >> endobj 249 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 250 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 112 0 R >> endobj 252 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 253 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 114 0 R >> endobj 255 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 256 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 116 0 R >> endobj 258 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 259 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 118 0 R >> endobj 261 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 262 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 120 0 R >> endobj 264 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2460,87 +2460,87 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000059553 00000 n -0000040233 00000 n -0000044915 00000 n -0000043232 00000 n +0000059673 00000 n +0000040353 00000 n +0000045035 00000 n +0000043352 00000 n 0000000011 00000 f -0000043300 00000 n +0000043420 00000 n 0000000013 00000 f -0000043370 00000 n +0000043490 00000 n 0000000021 00000 f -0000044133 00000 n -0000043451 00000 n -0000044411 00000 n -0000044240 00000 n -0000044719 00000 n -0000044518 00000 n -0000044828 00000 n +0000044253 00000 n +0000043571 00000 n +0000044531 00000 n +0000044360 00000 n +0000044839 00000 n +0000044638 00000 n +0000044948 00000 n 0000000000 00000 f 0000007525 00000 n -0000044983 00000 n -0000045131 00000 n -0000045232 00000 n -0000045354 00000 n -0000045500 00000 n -0000045667 00000 n -0000045908 00000 n -0000046029 00000 n +0000045103 00000 n +0000045251 00000 n +0000045352 00000 n +0000045474 00000 n +0000045620 00000 n +0000045787 00000 n +0000046028 00000 n +0000046149 00000 n 0000007743 00000 n 0000000015 00000 n -0000046160 00000 n -0000046300 00000 n -0000046502 00000 n +0000046280 00000 n +0000046420 00000 n +0000046622 00000 n 0000007960 00000 n 0000000069 00000 n -0000046633 00000 n -0000046750 00000 n -0000046914 00000 n -0000047159 00000 n -0000047281 00000 n +0000046753 00000 n +0000046870 00000 n +0000047034 00000 n +0000047279 00000 n +0000047401 00000 n 0000008173 00000 n 0000000123 00000 n -0000047413 00000 n -0000047516 00000 n -0000047688 00000 n -0000047933 00000 n -0000048055 00000 n +0000047533 00000 n +0000047636 00000 n +0000047808 00000 n +0000048053 00000 n +0000048175 00000 n 0000008391 00000 n 0000000177 00000 n -0000048187 00000 n -0000048335 00000 n -0000048580 00000 n -0000048702 00000 n +0000048307 00000 n +0000048455 00000 n +0000048700 00000 n +0000048822 00000 n 0000008613 00000 n 0000000231 00000 n -0000048834 00000 n -0000049006 00000 n -0000049251 00000 n -0000049373 00000 n +0000048954 00000 n +0000049126 00000 n +0000049371 00000 n +0000049493 00000 n 0000008836 00000 n 0000000285 00000 n -0000049505 00000 n -0000049669 00000 n -0000049914 00000 n -0000050036 00000 n +0000049625 00000 n +0000049789 00000 n +0000050034 00000 n +0000050156 00000 n 0000009054 00000 n 0000000339 00000 n -0000050168 00000 n -0000050308 00000 n -0000050512 00000 n +0000050288 00000 n +0000050428 00000 n +0000050632 00000 n 0000009272 00000 n 0000000393 00000 n -0000050644 00000 n -0000050747 00000 n -0000050915 00000 n -0000051160 00000 n -0000051282 00000 n +0000050764 00000 n +0000050867 00000 n +0000051035 00000 n +0000051280 00000 n +0000051402 00000 n 0000009487 00000 n 0000000447 00000 n -0000051414 00000 n -0000051574 00000 n -0000051819 00000 n -0000051941 00000 n +0000051534 00000 n +0000051694 00000 n +0000051939 00000 n +0000052061 00000 n 0000009704 00000 n 0000000501 00000 n 0000010252 00000 n @@ -2551,11 +2551,11 @@ xref 0000010090 00000 n 0000010141 00000 n 0000010201 00000 n -0000116414 00000 n -0000114463 00000 n -0000119235 00000 n -0000118360 00000 n -0000119402 00000 n +0000116534 00000 n +0000114583 00000 n +0000119355 00000 n +0000118480 00000 n +0000119522 00000 n 0000018233 00000 n 0000018295 00000 n 0000018347 00000 n @@ -2576,26 +2576,26 @@ xref 0000026307 00000 n 0000038678 00000 n 0000038740 00000 n -0000052073 00000 n -0000052176 00000 n +0000052193 00000 n +0000052296 00000 n 0000016531 00000 n -0000052301 00000 n -0000052437 00000 n -0000052644 00000 n -0000052893 00000 n -0000053017 00000 n +0000052421 00000 n +0000052557 00000 n +0000052764 00000 n +0000053013 00000 n +0000053137 00000 n 0000016706 00000 n 0000010352 00000 n -0000053152 00000 n -0000053367 00000 n -0000053618 00000 n -0000053742 00000 n +0000053272 00000 n +0000053487 00000 n +0000053738 00000 n +0000053862 00000 n 0000016924 00000 n 0000010409 00000 n -0000053878 00000 n -0000054061 00000 n -0000054314 00000 n -0000054439 00000 n +0000053998 00000 n +0000054181 00000 n +0000054434 00000 n +0000054559 00000 n 0000017142 00000 n 0000010466 00000 n 0000017587 00000 n @@ -2610,80 +2610,80 @@ xref 0000023066 00000 n 0000026015 00000 n 0000026077 00000 n -0000054575 00000 n -0000054678 00000 n +0000054695 00000 n +0000054798 00000 n 0000017981 00000 n -0000054803 00000 n +0000054923 00000 n 0000018460 00000 n 0000017676 00000 n 0000018120 00000 n 0000018181 00000 n -0000054991 00000 n -0000055095 00000 n +0000055111 00000 n +0000055215 00000 n 0000020286 00000 n -0000055220 00000 n -0000055324 00000 n -0000055493 00000 n +0000055340 00000 n +0000055444 00000 n +0000055613 00000 n 0000020445 00000 n 0000018549 00000 n -0000055628 00000 n -0000055729 00000 n -0000055857 00000 n -0000055961 00000 n -0000056086 00000 n -0000056190 00000 n -0000056315 00000 n -0000056419 00000 n -0000056544 00000 n -0000056648 00000 n +0000055748 00000 n +0000055849 00000 n +0000055977 00000 n +0000056081 00000 n +0000056206 00000 n +0000056310 00000 n +0000056435 00000 n +0000056539 00000 n +0000056664 00000 n +0000056768 00000 n 0000021236 00000 n 0000018606 00000 n 0000020663 00000 n 0000020724 00000 n -0000056773 00000 n -0000056877 00000 n +0000056893 00000 n +0000056997 00000 n 0000022515 00000 n -0000057002 00000 n -0000057106 00000 n -0000057275 00000 n +0000057122 00000 n +0000057226 00000 n +0000057395 00000 n 0000022674 00000 n 0000021325 00000 n -0000057410 00000 n -0000057511 00000 n +0000057530 00000 n +0000057631 00000 n 0000023234 00000 n 0000021382 00000 n 0000022891 00000 n 0000022952 00000 n -0000057639 00000 n -0000057743 00000 n +0000057759 00000 n +0000057863 00000 n 0000023822 00000 n -0000057868 00000 n -0000057972 00000 n +0000057988 00000 n +0000058092 00000 n 0000024188 00000 n 0000023323 00000 n 0000023961 00000 n 0000024022 00000 n -0000058097 00000 n -0000058229 00000 n -0000058333 00000 n +0000058217 00000 n +0000058349 00000 n +0000058453 00000 n 0000025525 00000 n -0000058458 00000 n -0000058562 00000 n -0000058731 00000 n +0000058578 00000 n +0000058682 00000 n +0000058851 00000 n 0000025684 00000 n 0000024277 00000 n -0000058866 00000 n -0000058967 00000 n +0000058986 00000 n +0000059087 00000 n 0000026360 00000 n 0000024334 00000 n 0000025902 00000 n 0000025963 00000 n -0000119518 00000 n -0000059095 00000 n -0000059199 00000 n +0000119638 00000 n +0000059215 00000 n +0000059319 00000 n 0000038427 00000 n -0000059324 00000 n -0000059428 00000 n +0000059444 00000 n +0000059548 00000 n 0000026449 00000 n 0000038793 00000 n 0000037930 00000 n @@ -2691,70 +2691,70 @@ xref 0000038627 00000 n 0000038929 00000 n 0000038966 00000 n -0000120605 00000 n -0000039013 00000 n -0000039101 00000 n -0000120473 00000 n -0000039145 00000 n -0000039198 00000 n -0000120355 00000 n -0000039245 00000 n -0000039331 00000 n -0000120276 00000 n -0000039383 00000 n -0000039479 00000 n -0000120197 00000 n -0000039531 00000 n -0000039594 00000 n -0000120104 00000 n -0000039641 00000 n -0000039737 00000 n -0000120025 00000 n -0000039784 00000 n -0000039870 00000 n -0000119907 00000 n -0000039914 00000 n -0000039967 00000 n -0000119828 00000 n -0000040014 00000 n -0000040105 00000 n -0000119749 00000 n -0000040152 00000 n -0000041218 00000 n -0000042135 00000 n -0000043097 00000 n -0000043177 00000 n -0000059659 00000 n -0000060276 00000 n -0000060301 00000 n -0000060714 00000 n -0000061151 00000 n -0000076420 00000 n -0000076723 00000 n -0000091072 00000 n -0000091390 00000 n -0000109450 00000 n -0000109789 00000 n -0000112454 00000 n -0000112674 00000 n -0000114625 00000 n -0000116576 00000 n -0000118521 00000 n -0000119603 00000 n -0000119672 00000 n -0000120684 00000 n -0000120856 00000 n -0000121018 00000 n -0000121196 00000 n -0000121397 00000 n -0000121499 00000 n -0000121537 00000 n -0000121771 00000 n +0000120725 00000 n +0000039025 00000 n +0000039113 00000 n +0000120593 00000 n +0000039169 00000 n +0000039222 00000 n +0000120475 00000 n +0000039281 00000 n +0000039367 00000 n +0000120396 00000 n +0000039431 00000 n +0000039527 00000 n +0000120317 00000 n +0000039591 00000 n +0000039654 00000 n +0000120224 00000 n +0000039713 00000 n +0000039809 00000 n +0000120145 00000 n +0000039868 00000 n +0000039954 00000 n +0000120027 00000 n +0000040010 00000 n +0000040063 00000 n +0000119948 00000 n +0000040122 00000 n +0000040213 00000 n +0000119869 00000 n +0000040272 00000 n +0000041338 00000 n +0000042255 00000 n +0000043217 00000 n +0000043297 00000 n +0000059779 00000 n +0000060396 00000 n +0000060421 00000 n +0000060834 00000 n +0000061271 00000 n +0000076540 00000 n +0000076843 00000 n +0000091192 00000 n +0000091510 00000 n +0000109570 00000 n +0000109909 00000 n +0000112574 00000 n +0000112794 00000 n +0000114745 00000 n +0000116696 00000 n +0000118641 00000 n +0000119723 00000 n +0000119792 00000 n +0000120804 00000 n +0000120976 00000 n +0000121138 00000 n +0000121316 00000 n +0000121517 00000 n +0000121619 00000 n +0000121657 00000 n +0000121891 00000 n trailer << /Size 295 /Root 293 0 R /Info 294 0 R /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >> startxref -121981 +122101 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.luatex.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.luatex.tpf index de26124dee..7dd05d5073 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.luatex.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.luatex.tpf @@ -1456,61 +1456,61 @@ endobj << /Marked true >> endobj 278 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 133 0 R >> endobj 280 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 281 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 135 0 R >> endobj 283 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 284 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 137 0 R >> endobj 286 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 287 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 139 0 R >> endobj 289 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 290 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 141 0 R >> endobj 292 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 293 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 143 0 R >> endobj 295 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 296 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 145 0 R >> endobj 298 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 299 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 147 0 R >> endobj 301 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 302 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 149 0 R >> endobj 304 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 305 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 151 0 R >> endobj 307 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2451,117 +2451,117 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000061596 00000 n -0000041614 00000 n -0000046437 00000 n -0000044754 00000 n +0000061716 00000 n +0000041734 00000 n +0000046557 00000 n +0000044874 00000 n 0000000011 00000 f -0000044822 00000 n +0000044942 00000 n 0000000013 00000 f -0000044892 00000 n +0000045012 00000 n 0000000021 00000 f -0000045655 00000 n -0000044973 00000 n -0000045933 00000 n -0000045762 00000 n -0000046241 00000 n -0000046040 00000 n -0000046350 00000 n +0000045775 00000 n +0000045093 00000 n +0000046053 00000 n +0000045882 00000 n +0000046361 00000 n +0000046160 00000 n +0000046470 00000 n 0000000000 00000 f 0000005271 00000 n -0000046505 00000 n -0000046653 00000 n -0000046754 00000 n -0000046878 00000 n -0000047024 00000 n -0000047191 00000 n -0000047304 00000 n +0000046625 00000 n +0000046773 00000 n +0000046874 00000 n +0000046998 00000 n +0000047144 00000 n +0000047311 00000 n +0000047424 00000 n 0000005590 00000 n -0000047479 00000 n +0000047599 00000 n 0000000020 00000 n -0000047602 00000 n +0000047722 00000 n 0000005809 00000 n 0000000074 00000 n -0000047735 00000 n -0000047875 00000 n -0000047988 00000 n +0000047855 00000 n +0000047995 00000 n +0000048108 00000 n 0000006028 00000 n 0000000128 00000 n -0000048121 00000 n +0000048241 00000 n 0000006244 00000 n 0000000182 00000 n -0000048254 00000 n -0000048371 00000 n -0000048535 00000 n -0000048648 00000 n +0000048374 00000 n +0000048491 00000 n +0000048655 00000 n +0000048768 00000 n 0000006460 00000 n -0000048823 00000 n +0000048943 00000 n 0000000236 00000 n -0000048946 00000 n +0000049066 00000 n 0000006680 00000 n 0000000290 00000 n -0000049080 00000 n -0000049183 00000 n -0000049355 00000 n -0000049468 00000 n +0000049200 00000 n +0000049303 00000 n +0000049475 00000 n +0000049588 00000 n 0000006900 00000 n -0000049645 00000 n +0000049765 00000 n 0000000344 00000 n -0000049769 00000 n +0000049889 00000 n 0000007124 00000 n 0000000398 00000 n -0000049903 00000 n -0000050051 00000 n -0000050164 00000 n +0000050023 00000 n +0000050171 00000 n +0000050284 00000 n 0000007348 00000 n -0000050341 00000 n +0000050461 00000 n 0000000452 00000 n -0000050465 00000 n +0000050585 00000 n 0000007573 00000 n 0000000506 00000 n -0000050599 00000 n -0000050771 00000 n -0000050884 00000 n +0000050719 00000 n +0000050891 00000 n +0000051004 00000 n 0000007798 00000 n -0000051061 00000 n +0000051181 00000 n 0000000560 00000 n -0000051185 00000 n +0000051305 00000 n 0000008018 00000 n 0000000614 00000 n -0000051319 00000 n -0000051483 00000 n -0000051596 00000 n +0000051439 00000 n +0000051603 00000 n +0000051716 00000 n 0000008238 00000 n -0000051773 00000 n +0000051893 00000 n 0000000668 00000 n -0000051897 00000 n +0000052017 00000 n 0000008458 00000 n 0000000722 00000 n -0000052031 00000 n -0000052171 00000 n -0000052284 00000 n +0000052151 00000 n +0000052291 00000 n +0000052404 00000 n 0000008678 00000 n 0000000776 00000 n -0000052418 00000 n +0000052538 00000 n 0000008894 00000 n 0000000830 00000 n -0000052552 00000 n -0000052657 00000 n -0000052827 00000 n -0000052944 00000 n +0000052672 00000 n +0000052777 00000 n +0000052947 00000 n +0000053064 00000 n 0000009111 00000 n -0000053125 00000 n +0000053245 00000 n 0000000884 00000 n -0000053251 00000 n +0000053371 00000 n 0000009331 00000 n 0000000940 00000 n -0000053388 00000 n -0000053550 00000 n -0000053667 00000 n +0000053508 00000 n +0000053670 00000 n +0000053787 00000 n 0000009551 00000 n -0000053848 00000 n +0000053968 00000 n 0000000996 00000 n -0000053974 00000 n +0000054094 00000 n 0000009771 00000 n 0000001052 00000 n 0000010340 00000 n @@ -2572,11 +2572,11 @@ xref 0000010169 00000 n 0000010223 00000 n 0000010286 00000 n -0000116720 00000 n -0000114767 00000 n -0000063685 00000 n -0000118668 00000 n -0000118830 00000 n +0000116840 00000 n +0000114887 00000 n +0000063805 00000 n +0000118788 00000 n +0000118950 00000 n 0000005425 00000 n 0000016600 00000 n 0000016664 00000 n @@ -2598,35 +2598,35 @@ xref 0000027423 00000 n 0000040043 00000 n 0000040107 00000 n -0000054111 00000 n -0000054214 00000 n -0000054341 00000 n -0000054477 00000 n -0000054684 00000 n -0000054801 00000 n +0000054231 00000 n +0000054334 00000 n +0000054461 00000 n +0000054597 00000 n +0000054804 00000 n +0000054921 00000 n 0000014287 00000 n -0000054982 00000 n +0000055102 00000 n 0000014063 00000 n 0000010444 00000 n -0000055108 00000 n +0000055228 00000 n 0000014507 00000 n 0000010501 00000 n -0000055245 00000 n -0000055460 00000 n -0000055577 00000 n +0000055365 00000 n +0000055580 00000 n +0000055697 00000 n 0000014727 00000 n -0000055758 00000 n +0000055878 00000 n 0000010558 00000 n -0000055884 00000 n +0000056004 00000 n 0000014943 00000 n 0000010615 00000 n -0000056021 00000 n -0000056204 00000 n -0000056321 00000 n +0000056141 00000 n +0000056324 00000 n +0000056441 00000 n 0000015163 00000 n -0000056503 00000 n +0000056623 00000 n 0000010672 00000 n -0000056630 00000 n +0000056750 00000 n 0000015383 00000 n 0000010729 00000 n 0000015838 00000 n @@ -2642,81 +2642,81 @@ xref 0000023165 00000 n 0000027121 00000 n 0000027185 00000 n -0000056768 00000 n -0000056871 00000 n -0000056998 00000 n +0000056888 00000 n +0000056991 00000 n +0000057118 00000 n 0000016835 00000 n 0000016344 00000 n 0000015929 00000 n 0000016483 00000 n 0000016546 00000 n -0000057186 00000 n -0000057290 00000 n -0000057417 00000 n -0000057521 00000 n -0000057659 00000 n +0000057306 00000 n +0000057410 00000 n +0000057537 00000 n +0000057641 00000 n +0000057779 00000 n 0000019827 00000 n 0000019643 00000 n 0000016926 00000 n -0000057796 00000 n -0000057897 00000 n -0000057996 00000 n -0000058100 00000 n -0000058227 00000 n -0000058331 00000 n -0000058458 00000 n -0000058562 00000 n -0000058689 00000 n -0000058793 00000 n +0000057916 00000 n +0000058017 00000 n +0000058116 00000 n +0000058220 00000 n +0000058347 00000 n +0000058451 00000 n +0000058578 00000 n +0000058682 00000 n +0000058809 00000 n +0000058913 00000 n 0000020640 00000 n 0000016983 00000 n 0000020047 00000 n 0000020110 00000 n 0000019798 00000 n -0000058920 00000 n -0000059024 00000 n -0000059151 00000 n -0000059255 00000 n -0000059393 00000 n +0000059040 00000 n +0000059144 00000 n +0000059271 00000 n +0000059375 00000 n +0000059513 00000 n 0000022765 00000 n 0000022581 00000 n 0000020731 00000 n -0000059530 00000 n -0000059631 00000 n +0000059650 00000 n +0000059751 00000 n 0000023339 00000 n 0000020788 00000 n 0000022984 00000 n 0000023047 00000 n 0000022736 00000 n -0000059730 00000 n -0000059834 00000 n -0000059961 00000 n -0000060065 00000 n +0000059850 00000 n +0000059954 00000 n +0000060081 00000 n +0000060185 00000 n 0000024543 00000 n 0000024169 00000 n 0000023430 00000 n 0000024308 00000 n 0000024371 00000 n -0000060192 00000 n -0000060324 00000 n -0000060428 00000 n -0000060555 00000 n -0000060659 00000 n -0000060797 00000 n +0000060312 00000 n +0000060444 00000 n +0000060548 00000 n +0000060675 00000 n +0000060779 00000 n +0000060917 00000 n 0000026784 00000 n 0000026600 00000 n 0000024634 00000 n -0000060934 00000 n -0000061035 00000 n +0000061054 00000 n +0000061155 00000 n 0000027478 00000 n 0000024691 00000 n 0000027004 00000 n 0000027067 00000 n 0000026755 00000 n -0000061134 00000 n -0000061238 00000 n -0000061365 00000 n -0000061469 00000 n +0000061254 00000 n +0000061358 00000 n +0000061485 00000 n +0000061589 00000 n 0000027569 00000 n 0000040162 00000 n 0000039788 00000 n @@ -2725,63 +2725,63 @@ xref 0000039990 00000 n 0000040300 00000 n 0000040337 00000 n -0000119882 00000 n -0000040384 00000 n -0000040473 00000 n -0000119750 00000 n -0000040517 00000 n -0000040571 00000 n -0000119632 00000 n -0000040618 00000 n -0000040705 00000 n -0000119553 00000 n -0000040757 00000 n -0000040854 00000 n -0000119474 00000 n -0000040906 00000 n -0000040970 00000 n -0000119381 00000 n -0000041017 00000 n -0000041114 00000 n -0000119302 00000 n -0000041161 00000 n -0000041248 00000 n -0000119184 00000 n -0000041292 00000 n -0000041346 00000 n -0000119105 00000 n -0000041393 00000 n -0000041485 00000 n -0000119026 00000 n -0000041532 00000 n -0000042506 00000 n -0000043423 00000 n -0000044385 00000 n -0000044699 00000 n -0000061702 00000 n -0000062085 00000 n -0000062709 00000 n -0000062118 00000 n -0000062932 00000 n -0000063842 00000 n -0000064045 00000 n -0000064305 00000 n -0000079897 00000 n -0000064605 00000 n -0000094478 00000 n -0000080106 00000 n -0000112770 00000 n -0000094687 00000 n -0000112977 00000 n -0000114930 00000 n -0000116883 00000 n -0000118949 00000 n -0000119961 00000 n -0000120495 00000 n -0000120533 00000 n -0000120767 00000 n +0000120002 00000 n +0000040396 00000 n +0000040485 00000 n +0000119870 00000 n +0000040541 00000 n +0000040595 00000 n +0000119752 00000 n +0000040654 00000 n +0000040741 00000 n +0000119673 00000 n +0000040805 00000 n +0000040902 00000 n +0000119594 00000 n +0000040966 00000 n +0000041030 00000 n +0000119501 00000 n +0000041089 00000 n +0000041186 00000 n +0000119422 00000 n +0000041245 00000 n +0000041332 00000 n +0000119304 00000 n +0000041388 00000 n +0000041442 00000 n +0000119225 00000 n +0000041501 00000 n +0000041593 00000 n +0000119146 00000 n +0000041652 00000 n +0000042626 00000 n +0000043543 00000 n +0000044505 00000 n +0000044819 00000 n +0000061822 00000 n +0000062205 00000 n +0000062829 00000 n +0000062238 00000 n +0000063052 00000 n +0000063962 00000 n +0000064165 00000 n +0000064425 00000 n +0000080017 00000 n +0000064725 00000 n +0000094598 00000 n +0000080226 00000 n +0000112890 00000 n +0000094807 00000 n +0000113097 00000 n +0000115050 00000 n +0000117003 00000 n +0000119069 00000 n +0000120081 00000 n +0000120615 00000 n +0000120653 00000 n +0000120887 00000 n trailer << /Size 334 /Root 332 0 R /Info 333 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -120977 +121097 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.tpf b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.tpf index d19db30fb0..a23b42b063 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-article-hyperref-3.tpf @@ -1488,61 +1488,61 @@ endobj << /Marked true >> endobj 274 0 obj -<< /S /GoTo /D (section.1) >> +<< /S /GoTo /D (section.1) /SD 132 0 R >> endobj 276 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 277 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 134 0 R >> endobj 279 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 280 0 obj -<< /S /GoTo /D (section.2) >> +<< /S /GoTo /D (section.2) /SD 136 0 R >> endobj 282 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000b\000e\000a\000r\000s) endobj 283 0 obj -<< /S /GoTo /D (subsection.2.1) >> +<< /S /GoTo /D (subsection.2.1) /SD 138 0 R >> endobj 285 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 286 0 obj -<< /S /GoTo /D (subsection.2.2) >> +<< /S /GoTo /D (subsection.2.2) /SD 140 0 R >> endobj 288 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 289 0 obj -<< /S /GoTo /D (section.3) >> +<< /S /GoTo /D (section.3) /SD 142 0 R >> endobj 291 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 292 0 obj -<< /S /GoTo /D (section.4) >> +<< /S /GoTo /D (section.4) /SD 144 0 R >> endobj 294 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 295 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 146 0 R >> endobj 297 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 298 0 obj -<< /S /GoTo /D (section.5) >> +<< /S /GoTo /D (section.5) /SD 148 0 R >> endobj 300 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 301 0 obj -<< /S /GoTo /D (section.6) >> +<< /S /GoTo /D (section.6) /SD 150 0 R >> endobj 303 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -2720,117 +2720,117 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000066905 00000 n -0000044711 00000 n -0000049968 00000 n -0000048285 00000 n +0000067025 00000 n +0000044831 00000 n +0000050088 00000 n +0000048405 00000 n 0000000011 00000 f -0000048353 00000 n +0000048473 00000 n 0000000013 00000 f -0000048423 00000 n +0000048543 00000 n 0000000021 00000 f -0000049186 00000 n -0000048504 00000 n -0000049464 00000 n -0000049293 00000 n -0000049772 00000 n -0000049571 00000 n -0000049881 00000 n +0000049306 00000 n +0000048624 00000 n +0000049584 00000 n +0000049413 00000 n +0000049892 00000 n +0000049691 00000 n +0000050001 00000 n 0000000000 00000 f 0000008684 00000 n -0000050036 00000 n -0000050184 00000 n -0000050285 00000 n -0000050407 00000 n -0000050553 00000 n -0000050720 00000 n -0000050961 00000 n +0000050156 00000 n +0000050304 00000 n +0000050405 00000 n +0000050527 00000 n +0000050673 00000 n +0000050840 00000 n +0000051081 00000 n 0000008978 00000 n -0000051132 00000 n +0000051252 00000 n 0000000015 00000 n -0000051253 00000 n +0000051373 00000 n 0000009195 00000 n 0000000069 00000 n -0000051384 00000 n -0000051524 00000 n -0000051768 00000 n +0000051504 00000 n +0000051644 00000 n +0000051888 00000 n 0000009412 00000 n 0000000123 00000 n -0000051900 00000 n +0000052020 00000 n 0000009626 00000 n 0000000177 00000 n -0000052032 00000 n -0000052149 00000 n -0000052313 00000 n -0000052558 00000 n +0000052152 00000 n +0000052269 00000 n +0000052433 00000 n +0000052678 00000 n 0000009840 00000 n -0000052731 00000 n +0000052851 00000 n 0000000231 00000 n -0000052853 00000 n +0000052973 00000 n 0000010058 00000 n 0000000285 00000 n -0000052985 00000 n -0000053088 00000 n -0000053260 00000 n -0000053505 00000 n +0000053105 00000 n +0000053208 00000 n +0000053380 00000 n +0000053625 00000 n 0000010276 00000 n -0000053678 00000 n +0000053798 00000 n 0000000339 00000 n -0000053800 00000 n +0000053920 00000 n 0000010498 00000 n 0000000393 00000 n -0000053932 00000 n -0000054080 00000 n -0000054325 00000 n +0000054052 00000 n +0000054200 00000 n +0000054445 00000 n 0000010720 00000 n -0000054498 00000 n +0000054618 00000 n 0000000447 00000 n -0000054620 00000 n +0000054740 00000 n 0000010943 00000 n 0000000501 00000 n -0000054752 00000 n -0000054924 00000 n -0000055169 00000 n +0000054872 00000 n +0000055044 00000 n +0000055289 00000 n 0000011166 00000 n -0000055342 00000 n +0000055462 00000 n 0000000555 00000 n -0000055464 00000 n +0000055584 00000 n 0000011384 00000 n 0000000609 00000 n -0000055596 00000 n -0000055760 00000 n -0000056005 00000 n +0000055716 00000 n +0000055880 00000 n +0000056125 00000 n 0000011602 00000 n -0000056178 00000 n +0000056298 00000 n 0000000663 00000 n -0000056300 00000 n +0000056420 00000 n 0000011820 00000 n 0000000717 00000 n -0000056432 00000 n -0000056572 00000 n -0000056817 00000 n +0000056552 00000 n +0000056692 00000 n +0000056937 00000 n 0000012038 00000 n 0000000771 00000 n -0000056949 00000 n +0000057069 00000 n 0000012252 00000 n 0000000825 00000 n -0000057081 00000 n -0000057186 00000 n -0000057356 00000 n -0000057605 00000 n +0000057201 00000 n +0000057306 00000 n +0000057476 00000 n +0000057725 00000 n 0000012467 00000 n -0000057782 00000 n +0000057902 00000 n 0000000879 00000 n -0000057906 00000 n +0000058026 00000 n 0000012685 00000 n 0000000935 00000 n -0000058041 00000 n -0000058203 00000 n -0000058452 00000 n +0000058161 00000 n +0000058323 00000 n +0000058572 00000 n 0000012903 00000 n -0000058629 00000 n +0000058749 00000 n 0000000991 00000 n -0000058753 00000 n +0000058873 00000 n 0000013121 00000 n 0000001047 00000 n 0000013676 00000 n @@ -2841,11 +2841,11 @@ xref 0000013511 00000 n 0000013563 00000 n 0000013624 00000 n -0000123767 00000 n -0000121815 00000 n -0000126590 00000 n -0000125714 00000 n -0000126758 00000 n +0000123887 00000 n +0000121935 00000 n +0000126710 00000 n +0000125834 00000 n +0000126878 00000 n 0000022693 00000 n 0000022755 00000 n 0000022807 00000 n @@ -2866,35 +2866,35 @@ xref 0000030779 00000 n 0000043153 00000 n 0000043215 00000 n -0000058888 00000 n -0000058991 00000 n +0000059008 00000 n +0000059111 00000 n 0000020314 00000 n -0000059116 00000 n -0000059252 00000 n -0000059459 00000 n -0000059708 00000 n +0000059236 00000 n +0000059372 00000 n +0000059579 00000 n +0000059828 00000 n 0000020513 00000 n -0000059885 00000 n +0000060005 00000 n 0000013781 00000 n -0000060009 00000 n +0000060129 00000 n 0000020731 00000 n 0000013838 00000 n -0000060144 00000 n -0000060359 00000 n -0000060611 00000 n +0000060264 00000 n +0000060479 00000 n +0000060731 00000 n 0000020949 00000 n -0000060790 00000 n +0000060910 00000 n 0000013895 00000 n -0000060915 00000 n +0000061035 00000 n 0000021163 00000 n 0000013952 00000 n -0000061051 00000 n -0000061234 00000 n -0000061487 00000 n +0000061171 00000 n +0000061354 00000 n +0000061607 00000 n 0000021381 00000 n -0000061666 00000 n +0000061786 00000 n 0000014009 00000 n -0000061791 00000 n +0000061911 00000 n 0000021599 00000 n 0000014066 00000 n 0000022044 00000 n @@ -2909,80 +2909,80 @@ xref 0000027532 00000 n 0000030487 00000 n 0000030549 00000 n -0000061927 00000 n -0000062030 00000 n +0000062047 00000 n +0000062150 00000 n 0000022441 00000 n -0000062155 00000 n +0000062275 00000 n 0000022920 00000 n 0000022136 00000 n 0000022580 00000 n 0000022641 00000 n -0000062343 00000 n -0000062447 00000 n +0000062463 00000 n +0000062567 00000 n 0000024749 00000 n -0000062572 00000 n -0000062676 00000 n -0000062845 00000 n +0000062692 00000 n +0000062796 00000 n +0000062965 00000 n 0000024908 00000 n 0000023012 00000 n -0000062980 00000 n -0000063081 00000 n -0000063209 00000 n -0000063313 00000 n -0000063438 00000 n -0000063542 00000 n -0000063667 00000 n -0000063771 00000 n -0000063896 00000 n -0000064000 00000 n +0000063100 00000 n +0000063201 00000 n +0000063329 00000 n +0000063433 00000 n +0000063558 00000 n +0000063662 00000 n +0000063787 00000 n +0000063891 00000 n +0000064016 00000 n +0000064120 00000 n 0000025699 00000 n 0000023069 00000 n 0000025126 00000 n 0000025187 00000 n -0000064125 00000 n -0000064229 00000 n +0000064245 00000 n +0000064349 00000 n 0000026981 00000 n -0000064354 00000 n -0000064458 00000 n -0000064627 00000 n +0000064474 00000 n +0000064578 00000 n +0000064747 00000 n 0000027140 00000 n 0000025791 00000 n -0000064762 00000 n -0000064863 00000 n +0000064882 00000 n +0000064983 00000 n 0000027700 00000 n 0000025848 00000 n 0000027357 00000 n 0000027418 00000 n -0000064991 00000 n -0000065095 00000 n +0000065111 00000 n +0000065215 00000 n 0000028291 00000 n -0000065220 00000 n -0000065324 00000 n +0000065340 00000 n +0000065444 00000 n 0000028657 00000 n 0000027792 00000 n 0000028430 00000 n 0000028491 00000 n -0000065449 00000 n -0000065581 00000 n -0000065685 00000 n +0000065569 00000 n +0000065701 00000 n +0000065805 00000 n 0000029997 00000 n -0000065810 00000 n -0000065914 00000 n -0000066083 00000 n +0000065930 00000 n +0000066034 00000 n +0000066203 00000 n 0000030156 00000 n 0000028749 00000 n -0000066218 00000 n -0000066319 00000 n +0000066338 00000 n +0000066439 00000 n 0000030832 00000 n 0000028806 00000 n 0000030374 00000 n 0000030435 00000 n -0000126874 00000 n -0000066447 00000 n -0000066551 00000 n +0000126994 00000 n +0000066567 00000 n +0000066671 00000 n 0000042902 00000 n -0000066676 00000 n -0000066780 00000 n +0000066796 00000 n +0000066900 00000 n 0000030924 00000 n 0000043268 00000 n 0000042405 00000 n @@ -2990,70 +2990,70 @@ xref 0000043102 00000 n 0000043407 00000 n 0000043444 00000 n -0000127961 00000 n -0000043491 00000 n -0000043579 00000 n -0000127829 00000 n -0000043623 00000 n -0000043676 00000 n -0000127711 00000 n -0000043723 00000 n -0000043809 00000 n -0000127632 00000 n -0000043861 00000 n -0000043957 00000 n -0000127553 00000 n -0000044009 00000 n -0000044072 00000 n -0000127460 00000 n -0000044119 00000 n -0000044215 00000 n -0000127381 00000 n -0000044262 00000 n -0000044348 00000 n -0000127263 00000 n -0000044392 00000 n -0000044445 00000 n -0000127184 00000 n -0000044492 00000 n -0000044583 00000 n -0000127105 00000 n -0000044630 00000 n -0000046037 00000 n -0000046954 00000 n -0000047916 00000 n -0000048230 00000 n -0000067011 00000 n -0000067628 00000 n -0000067653 00000 n -0000068066 00000 n -0000068503 00000 n -0000083772 00000 n -0000084075 00000 n -0000098424 00000 n -0000098742 00000 n -0000116802 00000 n -0000117141 00000 n -0000119806 00000 n -0000120026 00000 n -0000121978 00000 n -0000123930 00000 n -0000125876 00000 n -0000126959 00000 n -0000127028 00000 n -0000128040 00000 n -0000128214 00000 n -0000128376 00000 n -0000128555 00000 n -0000128756 00000 n -0000128858 00000 n -0000128896 00000 n -0000129130 00000 n +0000128081 00000 n +0000043503 00000 n +0000043591 00000 n +0000127949 00000 n +0000043647 00000 n +0000043700 00000 n +0000127831 00000 n +0000043759 00000 n +0000043845 00000 n +0000127752 00000 n +0000043909 00000 n +0000044005 00000 n +0000127673 00000 n +0000044069 00000 n +0000044132 00000 n +0000127580 00000 n +0000044191 00000 n +0000044287 00000 n +0000127501 00000 n +0000044346 00000 n +0000044432 00000 n +0000127383 00000 n +0000044488 00000 n +0000044541 00000 n +0000127304 00000 n +0000044600 00000 n +0000044691 00000 n +0000127225 00000 n +0000044750 00000 n +0000046157 00000 n +0000047074 00000 n +0000048036 00000 n +0000048350 00000 n +0000067131 00000 n +0000067748 00000 n +0000067773 00000 n +0000068186 00000 n +0000068623 00000 n +0000083892 00000 n +0000084195 00000 n +0000098544 00000 n +0000098862 00000 n +0000116922 00000 n +0000117261 00000 n +0000119926 00000 n +0000120146 00000 n +0000122098 00000 n +0000124050 00000 n +0000125996 00000 n +0000127079 00000 n +0000127148 00000 n +0000128160 00000 n +0000128334 00000 n +0000128496 00000 n +0000128675 00000 n +0000128876 00000 n +0000128978 00000 n +0000129016 00000 n +0000129250 00000 n trailer << /Size 334 /Root 332 0 R /Info 333 0 R /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >> startxref -129340 +129460 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.luatex.tpf b/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.luatex.tpf index 9e9cf4fbeb..1ab7361503 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.luatex.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.luatex.tpf @@ -1904,73 +1904,73 @@ endobj << /Marked true >> endobj 323 0 obj -<< /S /GoTo /D (chapter.1) >> +<< /S /GoTo /D (chapter.1) /SD 116 0 R >> endobj 325 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 326 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 118 0 R >> endobj 328 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 329 0 obj -<< /S /GoTo /D (chapter.2) >> +<< /S /GoTo /D (chapter.2) /SD 120 0 R >> endobj 331 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000B\000e\000a\000r\000s) endobj 332 0 obj -<< /S /GoTo /D (section.2.1) >> +<< /S /GoTo /D (section.2.1) /SD 122 0 R >> endobj 334 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 335 0 obj -<< /S /GoTo /D (section.2.2) >> +<< /S /GoTo /D (section.2.2) /SD 124 0 R >> endobj 337 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 338 0 obj -<< /S /GoTo /D (subsection.2.2.1) >> +<< /S /GoTo /D (subsection.2.2.1) /SD 126 0 R >> endobj 340 0 obj (\376\377\000M\000u\000s\000i\000c\000\040\000i\000n\000s\000t\000r\000u\000m\000e\000n\000t) endobj 341 0 obj -<< /S /GoTo /D (subsection.2.2.2) >> +<< /S /GoTo /D (subsection.2.2.2) /SD 128 0 R >> endobj 343 0 obj (\376\377\000B\000o\000o\000k\000s) endobj 344 0 obj -<< /S /GoTo /D (chapter.3) >> +<< /S /GoTo /D (chapter.3) /SD 130 0 R >> endobj 346 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 347 0 obj -<< /S /GoTo /D (chapter.4) >> +<< /S /GoTo /D (chapter.4) /SD 132 0 R >> endobj 349 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 350 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 134 0 R >> endobj 352 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 353 0 obj -<< /S /GoTo /D (chapter.5) >> +<< /S /GoTo /D (chapter.5) /SD 136 0 R >> endobj 355 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 356 0 obj -<< /S /GoTo /D (chapter.6) >> +<< /S /GoTo /D (chapter.6) /SD 138 0 R >> endobj 358 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -3101,101 +3101,101 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000072458 00000 n -0000049889 00000 n -0000055029 00000 n -0000053346 00000 n +0000072602 00000 n +0000050033 00000 n +0000055173 00000 n +0000053490 00000 n 0000000011 00000 f -0000053414 00000 n +0000053558 00000 n 0000000013 00000 f -0000053484 00000 n +0000053628 00000 n 0000000021 00000 f -0000054247 00000 n -0000053565 00000 n -0000054525 00000 n -0000054354 00000 n -0000054833 00000 n -0000054632 00000 n -0000054942 00000 n +0000054391 00000 n +0000053709 00000 n +0000054669 00000 n +0000054498 00000 n +0000054977 00000 n +0000054776 00000 n +0000055086 00000 n 0000000000 00000 f 0000006094 00000 n -0000055097 00000 n -0000055261 00000 n -0000055362 00000 n -0000055486 00000 n -0000055632 00000 n -0000055799 00000 n -0000055938 00000 n +0000055241 00000 n +0000055405 00000 n +0000055506 00000 n +0000055630 00000 n +0000055776 00000 n +0000055943 00000 n +0000056082 00000 n 0000006353 00000 n -0000056113 00000 n +0000056257 00000 n 0000000020 00000 n -0000056236 00000 n -0000056376 00000 n -0000056515 00000 n +0000056380 00000 n +0000056520 00000 n +0000056659 00000 n 0000006572 00000 n 0000000074 00000 n -0000056648 00000 n -0000056765 00000 n -0000056929 00000 n -0000057069 00000 n +0000056792 00000 n +0000056909 00000 n +0000057073 00000 n +0000057213 00000 n 0000006787 00000 n -0000057244 00000 n +0000057388 00000 n 0000000128 00000 n -0000057367 00000 n -0000057477 00000 n -0000057649 00000 n -0000057789 00000 n +0000057511 00000 n +0000057621 00000 n +0000057793 00000 n +0000057933 00000 n 0000007006 00000 n -0000057966 00000 n +0000058110 00000 n 0000000182 00000 n -0000058090 00000 n -0000058238 00000 n -0000058378 00000 n +0000058234 00000 n +0000058382 00000 n +0000058522 00000 n 0000007228 00000 n -0000058555 00000 n +0000058699 00000 n 0000000236 00000 n -0000058679 00000 n -0000058782 00000 n -0000058966 00000 n -0000059106 00000 n +0000058823 00000 n +0000058926 00000 n +0000059110 00000 n +0000059250 00000 n 0000007449 00000 n -0000059283 00000 n +0000059427 00000 n 0000000290 00000 n -0000059407 00000 n -0000059547 00000 n -0000059687 00000 n +0000059551 00000 n +0000059691 00000 n +0000059831 00000 n 0000007676 00000 n -0000059864 00000 n +0000060008 00000 n 0000000344 00000 n -0000059988 00000 n -0000060160 00000 n -0000060300 00000 n +0000060132 00000 n +0000060304 00000 n +0000060444 00000 n 0000007901 00000 n -0000060477 00000 n +0000060621 00000 n 0000000398 00000 n -0000060601 00000 n -0000060765 00000 n -0000060905 00000 n +0000060745 00000 n +0000060909 00000 n +0000061049 00000 n 0000008121 00000 n -0000061082 00000 n +0000061226 00000 n 0000000452 00000 n -0000061206 00000 n -0000061346 00000 n -0000061486 00000 n +0000061350 00000 n +0000061490 00000 n +0000061630 00000 n 0000008341 00000 n 0000000506 00000 n -0000061620 00000 n -0000061723 00000 n -0000061891 00000 n -0000062031 00000 n +0000061764 00000 n +0000061867 00000 n +0000062035 00000 n +0000062175 00000 n 0000008558 00000 n -0000062208 00000 n +0000062352 00000 n 0000000560 00000 n -0000062332 00000 n -0000062492 00000 n -0000062632 00000 n +0000062476 00000 n +0000062636 00000 n +0000062776 00000 n 0000008778 00000 n -0000062810 00000 n +0000062954 00000 n 0000000614 00000 n 0000009347 00000 n 0000000669 00000 n @@ -3205,11 +3205,11 @@ xref 0000009176 00000 n 0000009230 00000 n 0000009293 00000 n -0000142713 00000 n -0000140760 00000 n -0000074752 00000 n -0000144661 00000 n -0000146775 00000 n +0000142857 00000 n +0000140904 00000 n +0000074896 00000 n +0000144805 00000 n +0000146919 00000 n 0000006248 00000 n 0000016697 00000 n 0000016761 00000 n @@ -3240,28 +3240,28 @@ xref 0000009451 00000 n 0000009833 00000 n 0000009897 00000 n -0000146613 00000 n -0000062934 00000 n -0000063037 00000 n -0000063164 00000 n -0000063300 00000 n -0000063507 00000 n -0000063650 00000 n +0000146757 00000 n +0000063078 00000 n +0000063181 00000 n +0000063308 00000 n +0000063444 00000 n +0000063651 00000 n +0000063794 00000 n 0000013720 00000 n -0000063831 00000 n +0000063975 00000 n 0000013520 00000 n 0000010029 00000 n -0000063957 00000 n -0000064172 00000 n -0000064315 00000 n +0000064101 00000 n +0000064316 00000 n +0000064459 00000 n 0000013941 00000 n -0000064496 00000 n +0000064640 00000 n 0000010086 00000 n -0000064622 00000 n -0000064805 00000 n +0000064766 00000 n 0000064949 00000 n +0000065093 00000 n 0000014163 00000 n -0000065131 00000 n +0000065275 00000 n 0000010143 00000 n 0000014621 00000 n 0000010200 00000 n @@ -3281,13 +3281,13 @@ xref 0000014712 00000 n 0000015307 00000 n 0000015371 00000 n -0000065258 00000 n -0000065361 00000 n -0000065488 00000 n -0000065591 00000 n -0000065718 00000 n -0000065821 00000 n -0000065948 00000 n +0000065402 00000 n +0000065505 00000 n +0000065632 00000 n +0000065735 00000 n +0000065862 00000 n +0000065965 00000 n +0000066092 00000 n 0000016934 00000 n 0000016439 00000 n 0000015516 00000 n @@ -3298,42 +3298,42 @@ xref 0000017025 00000 n 0000017641 00000 n 0000017705 00000 n -0000066184 00000 n -0000066288 00000 n -0000066415 00000 n -0000066519 00000 n -0000066646 00000 n -0000066750 00000 n -0000066888 00000 n +0000066328 00000 n +0000066432 00000 n +0000066559 00000 n +0000066663 00000 n +0000066790 00000 n +0000066894 00000 n +0000067032 00000 n 0000020056 00000 n 0000019872 00000 n 0000017851 00000 n -0000067025 00000 n -0000067126 00000 n +0000067169 00000 n +0000067270 00000 n 0000020633 00000 n 0000017908 00000 n 0000020276 00000 n 0000020340 00000 n 0000020027 00000 n -0000067225 00000 n -0000067329 00000 n -0000067456 00000 n -0000067560 00000 n +0000067369 00000 n +0000067473 00000 n +0000067600 00000 n +0000067704 00000 n 0000022110 00000 n 0000021733 00000 n 0000020724 00000 n 0000021872 00000 n 0000021936 00000 n -0000067687 00000 n -0000067791 00000 n -0000067918 00000 n -0000068022 00000 n -0000068149 00000 n -0000068253 00000 n -0000068380 00000 n -0000068484 00000 n -0000068611 00000 n -0000068715 00000 n +0000067831 00000 n +0000067935 00000 n +0000068062 00000 n +0000068166 00000 n +0000068293 00000 n +0000068397 00000 n +0000068524 00000 n +0000068628 00000 n +0000068755 00000 n +0000068859 00000 n 0000024621 00000 n 0000024006 00000 n 0000022214 00000 n @@ -3344,35 +3344,35 @@ xref 0000024725 00000 n 0000025438 00000 n 0000025502 00000 n -0000068842 00000 n -0000068946 00000 n -0000069073 00000 n -0000069177 00000 n -0000069304 00000 n -0000069408 00000 n -0000069546 00000 n +0000068986 00000 n +0000069090 00000 n +0000069217 00000 n +0000069321 00000 n +0000069448 00000 n +0000069552 00000 n +0000069690 00000 n 0000027764 00000 n 0000027579 00000 n 0000025648 00000 n -0000069683 00000 n -0000069784 00000 n +0000069827 00000 n +0000069928 00000 n 0000028341 00000 n 0000025705 00000 n 0000027984 00000 n 0000028048 00000 n -0000146926 00000 n +0000147070 00000 n 0000027735 00000 n 0000029272 00000 n 0000029013 00000 n 0000028432 00000 n 0000029153 00000 n 0000029217 00000 n -0000069883 00000 n -0000069987 00000 n -0000070114 00000 n -0000070218 00000 n -0000070345 00000 n -0000070449 00000 n +0000070027 00000 n +0000070131 00000 n +0000070258 00000 n +0000070362 00000 n +0000070489 00000 n +0000070593 00000 n 0000030548 00000 n 0000030171 00000 n 0000029363 00000 n @@ -3383,19 +3383,19 @@ xref 0000030639 00000 n 0000031355 00000 n 0000031419 00000 n -0000070576 00000 n -0000070724 00000 n -0000070828 00000 n -0000070955 00000 n -0000071059 00000 n -0000071186 00000 n -0000071290 00000 n -0000071428 00000 n +0000070720 00000 n +0000070868 00000 n +0000070972 00000 n +0000071099 00000 n +0000071203 00000 n +0000071330 00000 n +0000071434 00000 n +0000071572 00000 n 0000033790 00000 n 0000033605 00000 n 0000031564 00000 n -0000071565 00000 n -0000071666 00000 n +0000071709 00000 n +0000071810 00000 n 0000034487 00000 n 0000031621 00000 n 0000034011 00000 n @@ -3406,12 +3406,12 @@ xref 0000034578 00000 n 0000035296 00000 n 0000035360 00000 n -0000071765 00000 n -0000071869 00000 n -0000071996 00000 n -0000072100 00000 n -0000072227 00000 n -0000072331 00000 n +0000071909 00000 n +0000072013 00000 n +0000072140 00000 n +0000072244 00000 n +0000072371 00000 n +0000072475 00000 n 0000035506 00000 n 0000048169 00000 n 0000047792 00000 n @@ -3420,76 +3420,76 @@ xref 0000047996 00000 n 0000048307 00000 n 0000048344 00000 n -0000148256 00000 n -0000048391 00000 n -0000048480 00000 n -0000148124 00000 n -0000048524 00000 n -0000048578 00000 n -0000148006 00000 n -0000048625 00000 n -0000048712 00000 n -0000147927 00000 n -0000048761 00000 n -0000048858 00000 n -0000147809 00000 n -0000048907 00000 n -0000048971 00000 n -0000147730 00000 n -0000049025 00000 n -0000049137 00000 n -0000147651 00000 n -0000049191 00000 n -0000049245 00000 n -0000147558 00000 n -0000049292 00000 n -0000049389 00000 n -0000147479 00000 n -0000049436 00000 n -0000049523 00000 n -0000147361 00000 n -0000049567 00000 n -0000049621 00000 n -0000147282 00000 n -0000049668 00000 n -0000049760 00000 n -0000147203 00000 n -0000049807 00000 n -0000050819 00000 n -0000051731 00000 n -0000052689 00000 n -0000053291 00000 n -0000072564 00000 n -0000072753 00000 n -0000073152 00000 n -0000073776 00000 n -0000073185 00000 n -0000073999 00000 n -0000074909 00000 n -0000075112 00000 n -0000075374 00000 n -0000090957 00000 n -0000075676 00000 n -0000105868 00000 n -0000091166 00000 n -0000125083 00000 n -0000106077 00000 n -0000138761 00000 n -0000125290 00000 n -0000138970 00000 n -0000140923 00000 n -0000142876 00000 n -0000144823 00000 n -0000147053 00000 n -0000147126 00000 n -0000148335 00000 n -0000149005 00000 n -0000149160 00000 n -0000149252 00000 n -0000149290 00000 n -0000149524 00000 n +0000148400 00000 n +0000048403 00000 n +0000048492 00000 n +0000148268 00000 n +0000048548 00000 n +0000048602 00000 n +0000148150 00000 n +0000048661 00000 n +0000048748 00000 n +0000148071 00000 n +0000048809 00000 n +0000048906 00000 n +0000147953 00000 n +0000048967 00000 n +0000049031 00000 n +0000147874 00000 n +0000049097 00000 n +0000049209 00000 n +0000147795 00000 n +0000049275 00000 n +0000049329 00000 n +0000147702 00000 n +0000049388 00000 n +0000049485 00000 n +0000147623 00000 n +0000049544 00000 n +0000049631 00000 n +0000147505 00000 n +0000049687 00000 n +0000049741 00000 n +0000147426 00000 n +0000049800 00000 n +0000049892 00000 n +0000147347 00000 n +0000049951 00000 n +0000050963 00000 n +0000051875 00000 n +0000052833 00000 n +0000053435 00000 n +0000072708 00000 n +0000072897 00000 n +0000073296 00000 n +0000073920 00000 n +0000073329 00000 n +0000074143 00000 n +0000075053 00000 n +0000075256 00000 n +0000075518 00000 n +0000091101 00000 n +0000075820 00000 n +0000106012 00000 n +0000091310 00000 n +0000125227 00000 n +0000106221 00000 n +0000138905 00000 n +0000125434 00000 n +0000139114 00000 n +0000141067 00000 n +0000143020 00000 n +0000144967 00000 n +0000147197 00000 n +0000147270 00000 n +0000148479 00000 n +0000149149 00000 n +0000149304 00000 n +0000149396 00000 n +0000149434 00000 n +0000149668 00000 n trailer << /Size 392 /Root 390 0 R /Info 391 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -149734 +149878 %%EOF diff --git a/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.tpf b/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.tpf index 1bc1de7561..72eda0d283 100644 --- a/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.tpf +++ b/required/latex-lab/testfiles-toc/toc-ex-book-hyperref-1.tpf @@ -1773,73 +1773,73 @@ endobj << /Marked true >> endobj 319 0 obj -<< /S /GoTo /D (chapter.1) >> +<< /S /GoTo /D (chapter.1) /SD 115 0 R >> endobj 321 0 obj (\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n) endobj 322 0 obj -<< /S /GoTo /D (part.1) >> +<< /S /GoTo /D (part.1) /SD 117 0 R >> endobj 324 0 obj (\376\377\000B\000e\000a\000r\000s) endobj 325 0 obj -<< /S /GoTo /D (chapter.2) >> +<< /S /GoTo /D (chapter.2) /SD 119 0 R >> endobj 327 0 obj (\376\377\000S\000w\000i\000s\000s\000\040\000B\000e\000a\000r\000s) endobj 328 0 obj -<< /S /GoTo /D (section.2.1) >> +<< /S /GoTo /D (section.2.1) /SD 121 0 R >> endobj 330 0 obj (\376\377\000L\000i\000v\000i\000n\000g\000\040\000g\000r\000o\000u\000n\000d) endobj 331 0 obj -<< /S /GoTo /D (section.2.2) >> +<< /S /GoTo /D (section.2.2) /SD 123 0 R >> endobj 333 0 obj (\376\377\000H\000o\000b\000b\000i\000e\000s) endobj 334 0 obj -<< /S /GoTo /D (subsection.2.2.1) >> +<< /S /GoTo /D (subsection.2.2.1) /SD 125 0 R >> endobj 336 0 obj (\376\377\000M\000u\000s\000i\000c\000\040\000i\000n\000s\000t\000r\000u\000m\000e\000n\000t) endobj 337 0 obj -<< /S /GoTo /D (subsection.2.2.2) >> +<< /S /GoTo /D (subsection.2.2.2) /SD 127 0 R >> endobj 339 0 obj (\376\377\000B\000o\000o\000k\000s) endobj 340 0 obj -<< /S /GoTo /D (chapter.3) >> +<< /S /GoTo /D (chapter.3) /SD 129 0 R >> endobj 342 0 obj (\376\377\000I\000t\000a\000l\000i\000a\000n\000\040\000b\000e\000a\000r\000s) endobj 343 0 obj -<< /S /GoTo /D (chapter.4) >> +<< /S /GoTo /D (chapter.4) /SD 131 0 R >> endobj 345 0 obj (\376\377\000M\000a\000s\000k\000e\000d\000\040\000b\000e\000a\000r) endobj 346 0 obj -<< /S /GoTo /D (part.2) >> +<< /S /GoTo /D (part.2) /SD 133 0 R >> endobj 348 0 obj (\376\377\000D\000u\000c\000k\000s) endobj 349 0 obj -<< /S /GoTo /D (chapter.5) >> +<< /S /GoTo /D (chapter.5) /SD 135 0 R >> endobj 351 0 obj (\376\377\000H\000u\000g\000g\000i\000n\000g\000\040\000d\000u\000c\000k) endobj 352 0 obj -<< /S /GoTo /D (chapter.6) >> +<< /S /GoTo /D (chapter.6) /SD 137 0 R >> endobj 354 0 obj (\376\377\000W\000i\000t\000c\000h\000\040\000d\000u\000c\000k) @@ -3264,101 +3264,101 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000009 00000 f -0000076206 00000 n -0000052325 00000 n -0000057767 00000 n -0000056084 00000 n +0000076350 00000 n +0000052469 00000 n +0000057911 00000 n +0000056228 00000 n 0000000011 00000 f -0000056152 00000 n +0000056296 00000 n 0000000013 00000 f -0000056222 00000 n +0000056366 00000 n 0000000021 00000 f -0000056985 00000 n -0000056303 00000 n -0000057263 00000 n -0000057092 00000 n -0000057571 00000 n -0000057370 00000 n -0000057680 00000 n +0000057129 00000 n +0000056447 00000 n +0000057407 00000 n +0000057236 00000 n +0000057715 00000 n +0000057514 00000 n +0000057824 00000 n 0000000000 00000 f 0000011116 00000 n -0000057835 00000 n -0000057999 00000 n -0000058100 00000 n -0000058222 00000 n -0000058368 00000 n -0000058535 00000 n -0000058736 00000 n +0000057979 00000 n +0000058143 00000 n +0000058244 00000 n +0000058366 00000 n +0000058512 00000 n +0000058679 00000 n +0000058880 00000 n 0000011350 00000 n -0000058907 00000 n +0000059051 00000 n 0000000015 00000 n -0000059028 00000 n -0000059168 00000 n -0000059370 00000 n +0000059172 00000 n +0000059312 00000 n +0000059514 00000 n 0000011567 00000 n 0000000069 00000 n -0000059501 00000 n -0000059618 00000 n -0000059782 00000 n -0000059986 00000 n +0000059645 00000 n +0000059762 00000 n +0000059926 00000 n +0000060130 00000 n 0000011780 00000 n -0000060159 00000 n +0000060303 00000 n 0000000123 00000 n -0000060281 00000 n -0000060391 00000 n -0000060563 00000 n -0000060767 00000 n +0000060425 00000 n +0000060535 00000 n +0000060707 00000 n +0000060911 00000 n 0000011997 00000 n -0000060940 00000 n +0000061084 00000 n 0000000177 00000 n -0000061062 00000 n -0000061210 00000 n -0000061414 00000 n +0000061206 00000 n +0000061354 00000 n +0000061558 00000 n 0000012217 00000 n -0000061587 00000 n +0000061731 00000 n 0000000231 00000 n -0000061709 00000 n -0000061812 00000 n -0000061996 00000 n -0000062200 00000 n +0000061853 00000 n +0000061956 00000 n +0000062140 00000 n +0000062344 00000 n 0000012436 00000 n -0000062373 00000 n +0000062517 00000 n 0000000285 00000 n -0000062495 00000 n -0000062635 00000 n -0000062839 00000 n +0000062639 00000 n +0000062779 00000 n +0000062983 00000 n 0000012661 00000 n -0000063012 00000 n +0000063156 00000 n 0000000339 00000 n -0000063134 00000 n -0000063306 00000 n -0000063510 00000 n +0000063278 00000 n +0000063450 00000 n +0000063654 00000 n 0000012884 00000 n -0000063683 00000 n +0000063827 00000 n 0000000393 00000 n -0000063805 00000 n -0000063969 00000 n -0000064173 00000 n +0000063949 00000 n +0000064113 00000 n +0000064317 00000 n 0000013102 00000 n -0000064346 00000 n +0000064490 00000 n 0000000447 00000 n -0000064468 00000 n -0000064608 00000 n -0000064812 00000 n +0000064612 00000 n +0000064752 00000 n +0000064956 00000 n 0000013320 00000 n 0000000501 00000 n -0000064944 00000 n -0000065047 00000 n -0000065215 00000 n -0000065419 00000 n +0000065088 00000 n +0000065191 00000 n +0000065359 00000 n +0000065563 00000 n 0000013535 00000 n -0000065592 00000 n +0000065736 00000 n 0000000555 00000 n -0000065714 00000 n -0000065874 00000 n -0000066078 00000 n +0000065858 00000 n +0000066018 00000 n +0000066222 00000 n 0000013753 00000 n -0000066252 00000 n +0000066396 00000 n 0000000609 00000 n 0000014308 00000 n 0000000664 00000 n @@ -3368,11 +3368,11 @@ xref 0000014143 00000 n 0000014195 00000 n 0000014256 00000 n -0000148437 00000 n -0000146485 00000 n -0000153211 00000 n -0000150384 00000 n -0000153379 00000 n +0000148581 00000 n +0000146629 00000 n +0000153355 00000 n +0000150528 00000 n +0000153523 00000 n 0000023840 00000 n 0000023902 00000 n 0000023954 00000 n @@ -3402,28 +3402,28 @@ xref 0000014413 00000 n 0000014751 00000 n 0000014813 00000 n -0000152335 00000 n -0000066374 00000 n -0000066477 00000 n +0000152479 00000 n +0000066518 00000 n +0000066621 00000 n 0000021130 00000 n -0000066602 00000 n -0000066738 00000 n -0000066945 00000 n -0000067152 00000 n +0000066746 00000 n +0000066882 00000 n +0000067089 00000 n +0000067296 00000 n 0000021305 00000 n -0000067329 00000 n +0000067473 00000 n 0000014944 00000 n -0000067453 00000 n -0000067668 00000 n -0000067877 00000 n +0000067597 00000 n +0000067812 00000 n +0000068021 00000 n 0000021524 00000 n -0000068055 00000 n +0000068199 00000 n 0000015001 00000 n -0000068179 00000 n -0000068362 00000 n -0000068572 00000 n +0000068323 00000 n +0000068506 00000 n +0000068716 00000 n 0000021744 00000 n -0000068751 00000 n +0000068895 00000 n 0000015058 00000 n 0000022192 00000 n 0000015115 00000 n @@ -3442,14 +3442,14 @@ xref 0000022284 00000 n 0000022731 00000 n 0000022793 00000 n -0000068876 00000 n -0000068979 00000 n +0000069020 00000 n +0000069123 00000 n 0000023586 00000 n -0000069104 00000 n -0000069207 00000 n -0000069332 00000 n -0000069435 00000 n -0000069560 00000 n +0000069248 00000 n +0000069351 00000 n +0000069476 00000 n +0000069579 00000 n +0000069704 00000 n 0000024069 00000 n 0000022937 00000 n 0000023725 00000 n @@ -3459,43 +3459,43 @@ xref 0000024161 00000 n 0000024620 00000 n 0000024682 00000 n -0000069796 00000 n -0000069900 00000 n +0000069940 00000 n +0000070044 00000 n 0000026146 00000 n -0000070025 00000 n -0000070129 00000 n -0000070254 00000 n -0000070358 00000 n -0000070527 00000 n +0000070169 00000 n +0000070273 00000 n +0000070398 00000 n +0000070502 00000 n +0000070671 00000 n 0000026305 00000 n 0000024827 00000 n -0000070662 00000 n -0000070763 00000 n +0000070806 00000 n +0000070907 00000 n 0000026868 00000 n 0000024884 00000 n 0000026523 00000 n 0000026585 00000 n -0000153495 00000 n -0000070891 00000 n -0000070995 00000 n +0000153639 00000 n +0000071035 00000 n +0000071139 00000 n 0000027607 00000 n -0000071120 00000 n -0000071224 00000 n +0000071264 00000 n +0000071368 00000 n 0000027976 00000 n 0000026960 00000 n 0000027746 00000 n 0000027808 00000 n -0000071349 00000 n -0000071453 00000 n +0000071493 00000 n +0000071597 00000 n 0000029218 00000 n -0000071578 00000 n -0000071682 00000 n -0000071807 00000 n -0000071911 00000 n -0000072036 00000 n -0000072140 00000 n -0000072265 00000 n -0000072369 00000 n +0000071722 00000 n +0000071826 00000 n +0000071951 00000 n +0000072055 00000 n +0000072180 00000 n +0000072284 00000 n +0000072409 00000 n +0000072513 00000 n 0000029817 00000 n 0000028081 00000 n 0000029357 00000 n @@ -3505,18 +3505,18 @@ xref 0000029922 00000 n 0000030428 00000 n 0000030490 00000 n -0000072494 00000 n -0000072598 00000 n +0000072638 00000 n +0000072742 00000 n 0000031913 00000 n -0000072723 00000 n -0000072827 00000 n -0000072952 00000 n -0000073056 00000 n -0000073225 00000 n +0000072867 00000 n +0000072971 00000 n +0000073096 00000 n +0000073200 00000 n +0000073369 00000 n 0000032073 00000 n 0000030635 00000 n -0000073360 00000 n -0000073461 00000 n +0000073504 00000 n +0000073605 00000 n 0000032636 00000 n 0000030692 00000 n 0000032291 00000 n @@ -3526,36 +3526,36 @@ xref 0000032728 00000 n 0000033241 00000 n 0000033303 00000 n -0000073589 00000 n -0000073693 00000 n +0000073733 00000 n +0000073837 00000 n 0000034034 00000 n -0000073818 00000 n -0000073922 00000 n -0000074047 00000 n -0000074151 00000 n +0000073962 00000 n +0000074066 00000 n +0000074191 00000 n +0000074295 00000 n 0000034403 00000 n 0000033448 00000 n 0000034174 00000 n 0000034236 00000 n -0000153612 00000 n +0000153756 00000 n 0000035116 00000 n 0000034862 00000 n 0000034495 00000 n 0000035002 00000 n 0000035064 00000 n -0000074276 00000 n -0000074424 00000 n -0000074528 00000 n +0000074420 00000 n +0000074568 00000 n +0000074672 00000 n 0000036545 00000 n -0000074653 00000 n -0000074757 00000 n -0000074882 00000 n -0000074986 00000 n -0000075155 00000 n +0000074797 00000 n +0000074901 00000 n +0000075026 00000 n +0000075130 00000 n +0000075299 00000 n 0000036705 00000 n 0000035208 00000 n -0000075290 00000 n -0000075391 00000 n +0000075434 00000 n +0000075535 00000 n 0000037384 00000 n 0000035265 00000 n 0000036924 00000 n @@ -3565,13 +3565,13 @@ xref 0000037476 00000 n 0000037982 00000 n 0000038044 00000 n -0000075519 00000 n -0000075623 00000 n +0000075663 00000 n +0000075767 00000 n 0000050247 00000 n -0000075748 00000 n -0000075852 00000 n -0000075977 00000 n -0000076081 00000 n +0000075892 00000 n +0000075996 00000 n +0000076121 00000 n +0000076225 00000 n 0000038189 00000 n 0000050616 00000 n 0000049668 00000 n @@ -3579,82 +3579,82 @@ xref 0000050449 00000 n 0000050755 00000 n 0000050792 00000 n -0000154929 00000 n -0000050839 00000 n -0000050927 00000 n -0000154797 00000 n -0000050971 00000 n -0000051024 00000 n -0000154679 00000 n -0000051071 00000 n -0000051157 00000 n -0000154600 00000 n -0000051206 00000 n -0000051302 00000 n -0000154482 00000 n -0000051351 00000 n -0000051414 00000 n -0000154403 00000 n -0000051468 00000 n -0000051579 00000 n -0000154324 00000 n -0000051633 00000 n -0000051686 00000 n -0000154231 00000 n -0000051733 00000 n +0000155073 00000 n +0000050851 00000 n +0000050939 00000 n +0000154941 00000 n +0000050995 00000 n +0000051048 00000 n +0000154823 00000 n +0000051107 00000 n +0000051193 00000 n +0000154744 00000 n +0000051254 00000 n +0000051350 00000 n +0000154626 00000 n +0000051411 00000 n +0000051474 00000 n +0000154547 00000 n +0000051540 00000 n +0000051651 00000 n +0000154468 00000 n +0000051717 00000 n +0000051770 00000 n +0000154375 00000 n 0000051829 00000 n -0000154152 00000 n -0000051876 00000 n -0000051962 00000 n -0000154034 00000 n -0000052006 00000 n -0000052059 00000 n -0000153955 00000 n -0000052106 00000 n -0000052197 00000 n -0000153876 00000 n -0000052244 00000 n -0000053557 00000 n -0000054469 00000 n -0000055427 00000 n -0000056029 00000 n -0000076312 00000 n -0000076550 00000 n -0000077188 00000 n -0000077213 00000 n -0000077626 00000 n -0000078063 00000 n -0000093321 00000 n -0000093620 00000 n -0000108299 00000 n -0000108615 00000 n -0000127709 00000 n -0000128073 00000 n -0000141521 00000 n -0000141811 00000 n -0000144476 00000 n -0000144696 00000 n -0000146648 00000 n -0000148600 00000 n -0000150546 00000 n -0000152497 00000 n -0000153721 00000 n -0000153799 00000 n -0000155008 00000 n -0000155196 00000 n -0000155386 00000 n -0000155554 00000 n -0000155720 00000 n -0000155882 00000 n -0000156067 00000 n -0000156187 00000 n -0000156225 00000 n -0000156459 00000 n +0000051925 00000 n +0000154296 00000 n +0000051984 00000 n +0000052070 00000 n +0000154178 00000 n +0000052126 00000 n +0000052179 00000 n +0000154099 00000 n +0000052238 00000 n +0000052329 00000 n +0000154020 00000 n +0000052388 00000 n +0000053701 00000 n +0000054613 00000 n +0000055571 00000 n +0000056173 00000 n +0000076456 00000 n +0000076694 00000 n +0000077332 00000 n +0000077357 00000 n +0000077770 00000 n +0000078207 00000 n +0000093465 00000 n +0000093764 00000 n +0000108443 00000 n +0000108759 00000 n +0000127853 00000 n +0000128217 00000 n +0000141665 00000 n +0000141955 00000 n +0000144620 00000 n +0000144840 00000 n +0000146792 00000 n +0000148744 00000 n +0000150690 00000 n +0000152641 00000 n +0000153865 00000 n +0000153943 00000 n +0000155152 00000 n +0000155340 00000 n +0000155530 00000 n +0000155698 00000 n +0000155864 00000 n +0000156026 00000 n +0000156211 00000 n +0000156331 00000 n +0000156369 00000 n +0000156603 00000 n trailer << /Size 391 /Root 389 0 R /Info 390 0 R /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >> startxref -156669 +156813 %%EOF