[latex3-commits] [git/LaTeX3-latex3-latex2e] kernel-msgs: move "hooks" to normal msg system (e99e25c0)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun May 16 14:18:06 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : kernel-msgs
Link : https://github.com/latex3/latex2e/commit/e99e25c033e8178151f4c339887241ab8480c6e9
>---------------------------------------------------------------
commit e99e25c033e8178151f4c339887241ab8480c6e9
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun May 16 14:18:06 2021 +0200
move "hooks" to normal msg system
>---------------------------------------------------------------
e99e25c033e8178151f4c339887241ab8480c6e9
base/ltcmdhooks.dtx | 10 ++---
base/ltfilehook.dtx | 2 +-
base/lthooks.dtx | 69 +++++++++++++++++--------------
base/ltpara.dtx | 6 +++
base/testfiles-lthooks/ltcmdhooks-001.tlg | 3 +-
base/testfiles-lthooks/ltcmdhooks-008.tlg | 10 ++---
base/testfiles-lthooks/ltcmdhooks-009.tlg | 4 +-
base/testfiles-lthooks/lthooks-005.tlg | 2 +-
base/testfiles-lthooks/lthooks-006.tlg | 4 +-
base/testfiles-lthooks/lthooks-019.tlg | 2 +-
base/testfiles-lthooks/lthooks-022.tlg | 4 +-
base/testfiles-lthooks/lthooks-023.tlg | 24 +++++------
base/testfiles-lthooks/lthooks-024.tlg | 16 +++----
base/testfiles-lthooks/lthooks-028.tlg | 8 ++--
base/testfiles-lthooks/lthooks-029.tlg | 6 +--
base/testfiles-lthooks/lthooks-errors.tlg | 58 +++++++++++++-------------
16 files changed, 121 insertions(+), 107 deletions(-)
diff --git a/base/ltcmdhooks.dtx b/base/ltcmdhooks.dtx
index cc67f5ea..6d0d0ac4 100644
--- a/base/ltcmdhooks.dtx
+++ b/base/ltcmdhooks.dtx
@@ -413,7 +413,7 @@
\str_case:nnTF {#3}
{ { before } { } { after } { } }
{ \exp_args:Nc \@@_patch_cmd_or_delay:Nnn {#2} {#2} {#3} }
- { \__kernel_msg_error:nnn { hooks } { wrong-cmd-hook } {#2} {#3} }
+ { \msg_error:nnn { hooks } { wrong-cmd-hook } {#2} {#3} }
}
% \end{macrocode}
% \end{macro}
@@ -520,7 +520,7 @@
{
#1 #2 {#4}
{
- \__kernel_msg_error:nnxx { hooks } { cant-patch }
+ \msg_error:nnxx { hooks } { cant-patch }
{ \token_to_str:N #2 } {#3}
}
}
@@ -833,7 +833,7 @@
% command isn't changed in any way in that case.
% \begin{macrocode}
{
- \__kernel_msg_error:nnxx { hooks } { cant-patch }
+ \msg_error:nnxx { hooks } { cant-patch }
{ \c_backslash_str #2 } { retok }
}
}
@@ -1036,7 +1036,7 @@
% \subsection{Messages}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { wrong-cmd-hook }
+\msg_new:nnnn { hooks } { wrong-cmd-hook }
{
Command~hook~`cmd/#1/#2'~invalid.\\
The~hook~should~be~`cmd/#1/before'~or~`cmd/#1/after'.
@@ -1045,7 +1045,7 @@
You~tried~to~add~a~hook~to~command~\iow_char:N \\#1,~but~`#2'~
is~an~invalid~position.~Only~`before'~or~`after'~are~allowed.
}
-\__kernel_msg_new:nnnn { hooks } { cant-patch }
+\msg_new:nnnn { hooks } { cant-patch }
{
Command~`#1'~cannot~have~hooks~because~it~
\@@_unpatchable_cases:n {#2} .
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index e9309c41..a009d664 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -605,7 +605,7 @@
\seq_gpop:NNTF \g_@@_input_file_seq \l_@@_internal_tl
{ \exp_after:wN \@@_file_pop_assign:nnnn \l_@@_internal_tl }
{
- \__kernel_msg_error:nnn { hooks } { should-not-happen }
+ \msg_error:nnn { hooks } { should-not-happen }
{ Tried~to~pop~from~an~empty~file~name~stack. }
}
}
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 45d6a78a..28bf4004 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -2230,7 +2230,7 @@
% \cs{hook_new:n} is used.
% \begin{macrocode}
\@@_if_declared:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { exists } {#1} }
+ { \msg_error:nnn { hooks } { exists } {#1} }
{
\tl_new:c { g_@@_#1_declared_tl }
\@@_make_usable:n {#1}
@@ -2484,7 +2484,7 @@
% may change).
% \begin{macrocode}
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_warning:nnn { hooks } { provide-disabled } {#1} }
+ { \msg_warning:nnn { hooks } { provide-disabled } {#1} }
% \end{macrocode}
% Otherwise we check if it was already declared.
% \begin{macrocode}
@@ -2496,7 +2496,7 @@
% the already existing one is not (or vice versa).
% \begin{macrocode}
\str_if_eq:eeF { \tl_use:c { g_@@_#1_reversed_tl } } {#2}
- { \__kernel_msg_error:nnn { hooks } { provide-error } {#1} }
+ { \msg_error:nnn { hooks } { provide-error } {#1} }
}
% \end{macrocode}
% If it wasn't declared, we declared as a normal or reversed hook
@@ -2572,7 +2572,7 @@
{
\tl_if_empty:nTF {#1}
{
- \__kernel_msg_expandable_error:nn { hooks } { empty-label }
+ \msg_expandable_error:nn { hooks } { empty-label }
\@@_currname_or_default:
}
{
@@ -2609,7 +2609,7 @@
{
\tl_if_empty:NTF \@currname
{
- \__kernel_msg_expandable_error:nnn { hooks } { should-not-happen }
+ \msg_expandable_error:nnn { hooks } { should-not-happen }
{ Empty~default~label. }
\@@_make_name:n { label-missing }
}
@@ -2750,7 +2750,7 @@
% \begin{macrocode}
{
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} }
+ { \msg_error:nnn { hooks } { hook-disabled } {#1} }
{ \@@_try_declaring_generic_hook:nnn {#1} {#2} {#3} }
}
}
@@ -2793,7 +2793,7 @@
\@@_init_structure:n {#1}
\@@_tl_gput_right:cn { @@_toplevel~#1 } {#3}
}
- { \__kernel_msg_error:nnn { hooks } { misused-top-level } {#1} }
+ { \msg_error:nnn { hooks } { misused-top-level } {#1} }
}
{
\prop_get:cnNTF { g_@@_#1_code_prop } {#2} \l_@@_return_tl
@@ -3279,7 +3279,7 @@
{#1} {#2} {#4}
\@@_update_hook_code:n {#1}
}
- { \__kernel_msg_error:nnnnnn { hooks } { unknown-rule }
+ { \msg_error:nnnnnn { hooks } { unknown-rule }
{#1} {#2} {#3} {#4} }
}
% \end{macrocode}
@@ -3887,7 +3887,7 @@
\cs_new_protected:cpn { @@_apply_rule_xE:nnn } #1#2#3
{
\@@_debug:n { \@@_msg_pair_found:nnn {#1} {#2} {#3} }
- \__kernel_msg_error:nnnnnn { hooks } { labels-incompatible }
+ \msg_error:nnnnnn { hooks } { labels-incompatible }
{#1} {#2} {#3} { 1 }
\use:c { @@_apply_rule_->:nnn } {#1} {#2} {#3}
\use:c { @@_apply_rule_<-:nnn } {#1} {#2} {#3}
@@ -3895,7 +3895,7 @@
\cs_new_protected:cpn { @@_apply_rule_xW:nnn } #1#2#3
{
\@@_debug:n { \@@_msg_pair_found:nnn {#1} {#2} {#3} }
- \__kernel_msg_warning:nnnnnn { hooks } { labels-incompatible }
+ \msg_warning:nnnnnn { hooks } { labels-incompatible }
{#1} {#2} {#3} { 0 }
}
% \end{macrocode}
@@ -4239,7 +4239,7 @@
\cs_new_protected:Npn \@@_gput_next_code:nn #1 #2
{
\@@_if_disabled:nTF {#1}
- { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} }
+ { \msg_error:nnn { hooks } { hook-disabled } {#1} }
{
\@@_init_structure:n {#1}
\@@_if_usable:nTF {#1}
@@ -4538,7 +4538,12 @@
% \subsection{Messages}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { labels-incompatible }
+\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX }
+%\prop_gput:Nnn \g_msg_module_name_prop { hooks } { }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\msg_new:nnnn { hooks } { labels-incompatible }
{
Labels~'#1'~and~'#2'~are~incompatible
\str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~
@@ -4551,7 +4556,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { exists }
+\msg_new:nnnn { hooks } { exists }
{ Hook~'#1'~ has~ already~ been~ declared. }
{ There~ already~ exists~ a~ hook~ declaration~ with~ this~
name.\\
@@ -4560,7 +4565,7 @@
%
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { hook-disabled }
+\msg_new:nnnn { hooks } { hook-disabled }
{ Cannot~add~code~to~disabled~hook~'#1'. }
{
The~hook~'#1'~you~tried~to~add~code~to~was~previously~disabled~
@@ -4570,7 +4575,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { empty-label }
+\msg_new:nnn { hooks } { empty-label }
{
Empty~code~label~\msg_line_context:.~
Using~'\@@_currname_or_default:'~instead.
@@ -4578,7 +4583,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { no-default-label }
+\msg_new:nnn { hooks } { no-default-label }
{
Missing~(empty)~default~label~\msg_line_context:. \\
This~command~was~ignored.
@@ -4586,7 +4591,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { unknown-rule }
+\msg_new:nnnn { hooks } { unknown-rule }
{ Unknown~ relationship~ '#3'~
between~ labels~ '#2'~ and~ '#4'~
\str_if_eq:nnF {#1} {??} { ~in~hook~'#1' }. ~
@@ -4604,7 +4609,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { misused-top-level }
+\msg_new:nnnn { hooks } { misused-top-level }
{
Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\
'top-level'~is~reserved~for~the~user's~document.
@@ -4618,7 +4623,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { set-top-level }
+\msg_new:nnn { hooks } { set-top-level }
{
You~cannot~change~the~default~label~#1~'top-level'.~Illegal \\
\use:nn { ~ } { ~ } \iow_char:N \\#2{#3} \\
@@ -4627,7 +4632,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { ddhl-deprecated }
+\msg_new:nnn { hooks } { ddhl-deprecated }
{
\iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\
Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\
@@ -4636,12 +4641,12 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { extra-pop-label }
+\msg_new:nnn { hooks } { extra-pop-label }
{
Extra~\iow_char:N \\PopDefaultHookLabel. \\
This~command~will~be~ignored.
}
-\__kernel_msg_new:nnn { hooks } { missing-pop-label }
+\msg_new:nnn { hooks } { missing-pop-label }
{
Missing~\iow_char:N \\PopDefaultHookLabel. \\
The~label~'#1'~was~pushed~but~never~popped.~Something~is~wrong.
@@ -4649,7 +4654,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { should-not-happen }
+\msg_new:nnn { hooks } { should-not-happen }
{
ERROR!~This~should~not~happen.~#1 \\
Please~report~at~https://github.com/latex3/latex2e.
@@ -4659,14 +4664,14 @@
%
%
% \begin{macrocode}
-\__kernel_msg_new:nnn { hooks } { provide-disabled }
+\msg_new:nnn { hooks } { provide-disabled }
{
Can't~ provide~ hook~ '#1'~ because~ it~ is~ disabled!
}
% \end{macrocode}
%
% \begin{macrocode}
-\__kernel_msg_new:nnnn { hooks } { provide-error }
+\msg_new:nnnn { hooks } { provide-error }
{
Hook~'#1'~ already~ declared~ as~ a~
\@@_if_reversed:nTF {#1} { reversed } { normal }~ hook!
@@ -4829,11 +4834,11 @@
\cs_new_protected:Npn \@@_curr_name_push_aux:n #1
{
\tl_if_blank:nTF {#1}
- { \__kernel_msg_error:nn { hooks } { no-default-label } }
+ { \msg_error:nn { hooks } { no-default-label } }
{
\str_if_eq:nnTF {#1} { top-level }
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ to } { PushDefaultHookLabel } {#1}
}
{
@@ -4851,7 +4856,7 @@
{
\seq_gpop:NNTF \g_@@_name_stack_seq \l_@@_return_tl
{ \tl_gset_eq:NN \g_@@_hook_curr_name_tl \l_@@_return_tl }
- { \__kernel_msg_error:nn { hooks } { extra-pop-label } }
+ { \msg_error:nn { hooks } { extra-pop-label } }
}
% \end{macrocode}
%
@@ -4866,7 +4871,7 @@
{
\seq_gpop:NNT \g_@@_name_stack_seq \l_@@_return_tl
{
- \__kernel_msg_error:nnx { hooks } { missing-pop-label }
+ \msg_error:nnx { hooks } { missing-pop-label }
{ \g_@@_hook_curr_name_tl }
\tl_gset_eq:NN \g_@@_hook_curr_name_tl \l_@@_return_tl
\@@_end_document_label_check:
@@ -4884,7 +4889,7 @@
{
\seq_if_empty:NTF \g_@@_name_stack_seq
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ for } { SetDefaultHookLabel } {#1}
}
{ \exp_args:Nx \@@_set_default_label:n { \@@_make_name:n {#1} } }
@@ -4893,14 +4898,14 @@
{
\str_if_eq:nnTF {#1} { top-level }
{
- \__kernel_msg_error:nnnnn { hooks } { set-top-level }
+ \msg_error:nnnnn { hooks } { set-top-level }
{ to } { SetDefaultHookLabel } {#1}
}
{ \tl_gset:Nn \g_@@_hook_curr_name_tl {#1} }
}
\NewDocumentCommand \DeclareDefaultHookLabel { m }
{
- \__kernel_msg_error:nn { hooks } { ddhl-deprecated }
+ \msg_error:nn { hooks } { ddhl-deprecated }
\SetDefaultHookLabel {#1}
}
% \end{macrocode}
diff --git a/base/ltpara.dtx b/base/ltpara.dtx
index ad503b68..481baa04 100644
--- a/base/ltpara.dtx
+++ b/base/ltpara.dtx
@@ -1158,6 +1158,12 @@
% paragraph.
% The first argument is the hook name second the mode
% it should have stayed in but didn't.
+%
+% \begin{macrocode}
+\prop_gput:Nnn \g_msg_module_type_prop { para } { LaTeX }
+%\prop_gput:Nnn \g_msg_module_name_prop { para } { }
+% \end{macrocode}
+%
% \begin{macrocode}
\__kernel_msg_new:nnnn {para} {mode}
{
diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg
index c6329405..e65c9402 100644
--- a/base/testfiles-lthooks/ltcmdhooks-001.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg
@@ -214,7 +214,8 @@ before 1 before 2 FOO hello world after 2 after 1
-> Adding cmd hook to 'baz' (before):
[lthooks] analyzing '\baz'
[lthooks] \baz=\relax
-! LaTeX3 Error: Command `\baz' cannot have hooks because it doesn't exist.
+! LaTeX hooks Error: Command `\baz' cannot have hooks because it doesn't
+(hooks) exist.
For immediate help type H <return>.
...
l. ...\AddToHook{cmd/baz/before}{error}
diff --git a/base/testfiles-lthooks/ltcmdhooks-008.tlg b/base/testfiles-lthooks/ltcmdhooks-008.tlg
index d24dd861..f544102d 100644
--- a/base/testfiles-lthooks/ltcmdhooks-008.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-008.tlg
@@ -30,7 +30,7 @@ l. ...\AddToHook{\foo}{before} \ShowHook{\foo}
> Not set because the hook is disabled.
<recently read> }
l. ...\DisableHook{\foo} \ShowHook{\foo}
-! LaTeX3 Error: Cannot add code to disabled hook 'foo'.
+! LaTeX hooks Error: Cannot add code to disabled hook 'foo'.
For immediate help type H <return>.
...
l. ...\AddToHook{\foo}{after}
@@ -102,7 +102,7 @@ l. ...\DisableHook{\foo} \ShowHook{\foo}
> The hook is empty.
<recently read> }
l. ...\DisableHook{\foo} \ShowHook{\foo}
-! LaTeX3 Error: Cannot add code to disabled hook 'baz'.
+! LaTeX hooks Error: Cannot add code to disabled hook 'baz'.
For immediate help type H <return>.
...
l. ...\AddToHookNext{\foo}{after}
@@ -122,7 +122,7 @@ l. ...\AddToHookNext{\foo}{after} \ShowHook{\foo}
> The hook is empty.
<recently read> }
l. ...\DisableHook{\foo} \ShowHook{\foo}
-! LaTeX3 Error: Cannot add code to disabled hook 'env/foo/before'.
+! LaTeX hooks Error: Cannot add code to disabled hook 'env/foo/before'.
For immediate help type H <return>.
...
l. ...\AddToHookNext{\foo}{after}
@@ -142,7 +142,7 @@ l. ...\AddToHookNext{\foo}{after} \ShowHook{\foo}
> The hook is empty.
<recently read> }
l. ...\DisableHook{\foo} \ShowHook{\foo}
-! LaTeX3 Error: Cannot add code to disabled hook 'cmd/test/before'.
+! LaTeX hooks Error: Cannot add code to disabled hook 'cmd/test/before'.
For immediate help type H <return>.
...
l. ...\AddToHook{\foo}{after}
@@ -169,7 +169,7 @@ l. ...\AddToHook{\foo}{after} \ShowHook{\foo}
> XXX.
<recently read> }
l. ...\ShowHook{\foo}
-! LaTeX3 Error: Cannot add code to disabled hook 'cmd/mycmd/after'.
+! LaTeX hooks Error: Cannot add code to disabled hook 'cmd/mycmd/after'.
For immediate help type H <return>.
...
l. ...\AddToHook{\foo}{\ERROR 3}
diff --git a/base/testfiles-lthooks/ltcmdhooks-009.tlg b/base/testfiles-lthooks/ltcmdhooks-009.tlg
index 51a3ecf2..21248b23 100644
--- a/base/testfiles-lthooks/ltcmdhooks-009.tlg
+++ b/base/testfiles-lthooks/ltcmdhooks-009.tlg
@@ -1,7 +1,7 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-! LaTeX3 Error: Command `\alsoundefined' cannot have hooks because it doesn't
-(LaTeX3) exist.
+! LaTeX hooks Error: Command `\alsoundefined' cannot have hooks because it
+(hooks) doesn't exist.
For immediate help type H <return>.
...
l. ...\AddToHook{cmd/alsoundefined/after}{Error}
diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg
index 2dd2602e..5587270a 100644
--- a/base/testfiles-lthooks/lthooks-005.tlg
+++ b/base/testfiles-lthooks/lthooks-005.tlg
@@ -1,6 +1,6 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-! LaTeX3 Error: Hook 'xxx' has already been declared.
+! LaTeX hooks Error: Hook 'xxx' has already been declared.
For immediate help type H <return>.
...
l. ...\NewHook{xxx}
diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg
index 70eebc2d..52d92e39 100644
--- a/base/testfiles-lthooks/lthooks-006.tlg
+++ b/base/testfiles-lthooks/lthooks-006.tlg
@@ -135,8 +135,8 @@ Handled code for firstaid
Update code for hook 'file/after/bigfoot.sty' on input line ...:
Update code for hook 'xxx' on input line ...:
normal rule label2|label1: xW found
-LaTeX3 Warning: Labels 'label2' and 'label1' are incompatible in hook 'xxx'.
-(LaTeX3) You may see errors later.
+LaTeX hooks Warning: Labels 'label2' and 'label1' are incompatible in hook
+(hooks) 'xxx'. You may see errors later.
normal rule label3|label2: < found
Code labels for sorting:
label1, label2 and label3
diff --git a/base/testfiles-lthooks/lthooks-019.tlg b/base/testfiles-lthooks/lthooks-019.tlg
index 78528b99..7456cde7 100644
--- a/base/testfiles-lthooks/lthooks-019.tlg
+++ b/base/testfiles-lthooks/lthooks-019.tlg
@@ -1,6 +1,6 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-! LaTeX3 Error: Hook 'yy' has already been declared.
+! LaTeX hooks Error: Hook 'yy' has already been declared.
For immediate help type H <return>.
...
l. ...\NewReversedHook{yy}
diff --git a/base/testfiles-lthooks/lthooks-022.tlg b/base/testfiles-lthooks/lthooks-022.tlg
index 7f10883b..0cc8b5a5 100644
--- a/base/testfiles-lthooks/lthooks-022.tlg
+++ b/base/testfiles-lthooks/lthooks-022.tlg
@@ -13,8 +13,8 @@ Don't change this file in any respect.
> label-B|label-A with relation <-
> Execution order (after applying rules):
> label-A, label-B, label-C.
-LaTeX3 Warning: Labels 'label-B' and 'label-A' are incompatible in hook 'foo'.
-(LaTeX3) You may see errors later.
+LaTeX hooks Warning: Labels 'label-B' and 'label-A' are incompatible in hook
+(hooks) 'foo'. You may see errors later.
-> The hook 'foo':
> Code chunks:
> label-A -> \typeout {A-code}
diff --git a/base/testfiles-lthooks/lthooks-023.tlg b/base/testfiles-lthooks/lthooks-023.tlg
index 23aa130a..c7ab6fa8 100644
--- a/base/testfiles-lthooks/lthooks-023.tlg
+++ b/base/testfiles-lthooks/lthooks-023.tlg
@@ -1,11 +1,11 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-LaTeX3 Warning: Labels 'label-B' and 'label-A' are incompatible in hook 'foo'.
-(LaTeX3) You may see errors later.
-LaTeX3 Warning: Labels 'label-E' and 'label-D' are incompatible. You may see
-(LaTeX3) errors later.
-! LaTeX3 Error: Labels 'label-F' and 'label-D' are incompatible. The code for
-(LaTeX3) both labels will be dropped.
+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
+(hooks) see errors later.
+! LaTeX hooks Error: Labels 'label-F' and 'label-D' are incompatible. The code
+(hooks) for both labels will be dropped.
For immediate help type H <return>.
...
l. ...\LogHook{foo}
@@ -30,12 +30,12 @@ incompatibility between packages.
> label-F|label-D with default relation xE
> Execution order (after applying rules):
> label-A, label-B, label-C, label-D, label-E, label-F.
-LaTeX3 Warning: Labels 'label-B' and 'label-A' are incompatible in hook 'foo'.
-(LaTeX3) You may see errors later.
-LaTeX3 Warning: Labels 'label-E' and 'label-D' are incompatible. You may see
-(LaTeX3) errors later.
-! LaTeX3 Error: Labels 'label-F' and 'label-D' are incompatible. The code for
-(LaTeX3) both labels will be dropped.
+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
+(hooks) see errors later.
+! LaTeX hooks Error: Labels 'label-F' and 'label-D' are incompatible. The code
+(hooks) for both labels will be dropped.
For immediate help type H <return>.
...
l. ...\UseHook{foo}
diff --git a/base/testfiles-lthooks/lthooks-024.tlg b/base/testfiles-lthooks/lthooks-024.tlg
index 6869c6de..0e6f56c2 100644
--- a/base/testfiles-lthooks/lthooks-024.tlg
+++ b/base/testfiles-lthooks/lthooks-024.tlg
@@ -1,8 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
! Undefined control sequence.
-<argument> \LaTeX3 error:
- Empty code label on line .... Using 'top-level' in...
+<argument> \::error
+ ! hooks: Empty code label on line .... Using 'top-level' ...
l. ...\testme{top-level}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -10,8 +10,8 @@ misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
-<argument> \LaTeX3 error:
- Empty code label on line .... Using 'top-level' in...
+<argument> \::error
+ ! hooks: Empty code label on line .... Using 'top-level' ...
l. ...\testme{top-level}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -42,8 +42,8 @@ and I'll forget about whatever was undefined.
> .., ../, /, //, top-level/, /./, .x, /.x, .x/, top-level/foo,
top-level/foo/, /./foo.
! Undefined control sequence.
-<argument> \LaTeX3 error:
- Empty code label on line .... Using 'pkg' instead.
+<argument> \::error
+ ! hooks: Empty code label on line .... Using 'pkg' instead.
l. ... \testme{pkg}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -51,8 +51,8 @@ misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
-<argument> \LaTeX3 error:
- Empty code label on line .... Using 'pkg' instead.
+<argument> \::error
+ ! hooks: Empty code label on line .... Using 'pkg' instead.
l. ... \testme{pkg}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/base/testfiles-lthooks/lthooks-028.tlg b/base/testfiles-lthooks/lthooks-028.tlg
index c6b14236..d776c7d3 100644
--- a/base/testfiles-lthooks/lthooks-028.tlg
+++ b/base/testfiles-lthooks/lthooks-028.tlg
@@ -1,8 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
(lthooks-028-pkg.sty
-! LaTeX3 Error: Illegal \AddToHook{begindocument}[top-level]{...}.
-(LaTeX3) 'top-level' is reserved for the user's document.
+! LaTeX hooks Error: Illegal \AddToHook{begindocument}[top-level]{...}.
+(hooks) 'top-level' is reserved for the user's document.
For immediate help type H <return>.
...
l. ......ypeout{'top-level' from \jobname-pkg}\OMIT}
@@ -10,8 +10,8 @@ The 'top-level' label is meant for user code only, and should only be used
(sparingly) in the main document. Use the default label 'lthooks-028-pkg' for
this package, or another suitable label.
)
-! LaTeX3 Error: Illegal \AddToHook{begindocument}[top-level]{...}.
-(LaTeX3) 'top-level' is reserved for the user's document.
+! LaTeX hooks Error: Illegal \AddToHook{begindocument}[top-level]{...}.
+(hooks) 'top-level' is reserved for the user's document.
For immediate help type H <return>.
...
l. ......eout{'top-level' with changed label}\OMIT}
diff --git a/base/testfiles-lthooks/lthooks-029.tlg b/base/testfiles-lthooks/lthooks-029.tlg
index d7d2647a..958b4907 100644
--- a/base/testfiles-lthooks/lthooks-029.tlg
+++ b/base/testfiles-lthooks/lthooks-029.tlg
@@ -91,7 +91,7 @@ l. ...\ShowHook{ccc}
<recently read> }
l. ...\ShowHook{ccc}
------------ provide an reversed hook on an existing normal hook --------------
-! LaTeX3 Error: Hook 'aaa' already declared as a normal hook!
+! LaTeX hooks Error: Hook 'aaa' already declared as a normal hook!
For immediate help type H <return>.
...
l. ...\ProvideReversedHook{aaa}
@@ -111,7 +111,7 @@ previously declared as a normal hook. A redeclaration is not possible.
<recently read> }
l. ...\ShowHook{aaa}
------------ provide an normal hook on an existing reversed hook --------------
-! LaTeX3 Error: Hook 'ccc' already declared as a reversed hook!
+! LaTeX hooks Error: Hook 'ccc' already declared as a reversed hook!
For immediate help type H <return>.
...
l. ...\ProvideHook{ccc}
@@ -131,7 +131,7 @@ previously declared as a reversed hook. A redeclaration is not possible.
<recently read> }
l. ...\ShowHook{ccc}
------------ provide hook that was disabled --------------
-LaTeX3 Warning: Can't provide hook 'ddd' because it is disabled!
+LaTeX hooks Warning: Can't provide hook 'ddd' because it is disabled!
-> The hook 'ddd':
> The hook is not declared.
> The hook is disabled.
diff --git a/base/testfiles-lthooks/lthooks-errors.tlg b/base/testfiles-lthooks/lthooks-errors.tlg
index 43adf6a0..6bd5038d 100644
--- a/base/testfiles-lthooks/lthooks-errors.tlg
+++ b/base/testfiles-lthooks/lthooks-errors.tlg
@@ -1,17 +1,17 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-! LaTeX3 Error: Unknown relationship 'unknown' between labels 'label1' and
-(LaTeX3) 'label2' in hook 'xxx'. Perhaps a missspelling?
+! LaTeX hooks Error: Unknown relationship 'unknown' between labels 'label1'
+(hooks) and 'label2' in hook 'xxx'. Perhaps a missspelling?
For immediate help type H <return>.
...
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'.
-LaTeX3 Warning: Labels 'label4' and 'label3' are incompatible in hook 'xxx'.
-(LaTeX3) You may see errors later.
-! LaTeX3 Error: Labels 'label5' and 'label1' are incompatible in hook 'xxx'.
-(LaTeX3) The code for both labels will be dropped.
+LaTeX hooks Warning: Labels 'label4' and 'label3' are incompatible in hook
+(hooks) 'xxx'. You may see errors later.
+! LaTeX hooks Error: Labels 'label5' and 'label1' are incompatible in hook
+(hooks) 'xxx'. The code for both labels will be dropped.
For immediate help type H <return>.
...
l. ...\LogHook{xxx}
@@ -33,43 +33,45 @@ incompatibility between packages.
> label5|label1 with relation xE
> Execution order (after applying rules):
> label1, label2, label3, label4, label5.
-! LaTeX3 Error: ERROR! This should not happen. Tried to pop from an empty file
-(LaTeX3) name stack.
-(LaTeX3) Please report at https://github.com/latex3/latex2e.
+! LaTeX hooks Error: ERROR! This should not happen. Tried to pop from an empty
+(hooks) file name stack.
+(hooks) Please report at https://github.com/latex3/latex2e.
Type <return> to continue.
...
l. ...\@expl@@@filehook at file@pop@@
LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
-! LaTeX3 Error: You cannot change the default label for 'top-level'. Illegal
-(LaTeX3) \SetDefaultHookLabel{my-document}
-(LaTeX3) on line ....
+! LaTeX hooks Error: You cannot change the default label for 'top-level'.
+(hooks) Illegal
+(hooks) \SetDefaultHookLabel{my-document}
+(hooks) on line ....
Type <return> to continue.
...
l. ...\SetDefaultHookLabel{my-document}
LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
-! LaTeX3 Error: Illegal \AddToHook{begindocument}[top-level]{...}.
-(LaTeX3) 'top-level' is reserved for the user's document.
+! LaTeX hooks Error: Illegal \AddToHook{begindocument}[top-level]{...}.
+(hooks) 'top-level' is reserved for the user's document.
For immediate help type H <return>.
...
l. ......ook{begindocument}[top-level]{not allowed}
The 'top-level' label is meant for user code only, and should only be used
(sparingly) in the main document. Use the default label 'my-document' for this
package, or another suitable label.
-! LaTeX3 Error: You cannot change the default label to 'top-level'. Illegal
-(LaTeX3) \SetDefaultHookLabel{top-level}
-(LaTeX3) on line ....
+! LaTeX hooks Error: You cannot change the default label to 'top-level'.
+(hooks) Illegal
+(hooks) \SetDefaultHookLabel{top-level}
+(hooks) on line ....
Type <return> to continue.
...
l. ... \SetDefaultHookLabel{top-level}
LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
-! LaTeX3 Error: Extra \PopDefaultHookLabel.
-(LaTeX3) This command will be ignored.
+! LaTeX hooks Error: Extra \PopDefaultHookLabel.
+(hooks) This command will be ignored.
Type <return> to continue.
...
l. ...\PopDefaultHookLabel
@@ -77,27 +79,27 @@ LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
allowed
-! LaTeX3 Error: Missing \PopDefaultHookLabel.
-(LaTeX3) The label 'this' was pushed but never popped. Something is
-(LaTeX3) wrong.
+! LaTeX hooks Error: Missing \PopDefaultHookLabel.
+(hooks) The label 'this' was pushed but never popped. Something
+(hooks) is wrong.
Type <return> to continue.
...
l. ...\end{document}
LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
-! LaTeX3 Error: Missing \PopDefaultHookLabel.
-(LaTeX3) The label 'should' was pushed but never popped. Something is
-(LaTeX3) wrong.
+! LaTeX hooks Error: Missing \PopDefaultHookLabel.
+(hooks) The label 'should' was pushed but never popped.
+(hooks) Something is wrong.
Type <return> to continue.
...
l. ...\end{document}
LaTeX does not know anything more about this error, sorry.
Try typing <return> to proceed.
If that doesn't work, type X <return> to quit.
-! LaTeX3 Error: Missing \PopDefaultHookLabel.
-(LaTeX3) The label 'error' was pushed but never popped. Something is
-(LaTeX3) wrong.
+! LaTeX hooks Error: Missing \PopDefaultHookLabel.
+(hooks) The label 'error' was pushed but never popped.
+(hooks) Something is wrong.
Type <return> to continue.
...
l. ...\end{document}
More information about the latex3-commits
mailing list.