diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-05 21:10:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-05 21:10:24 +0000 |
commit | 9c010ac1d8ca51f8cc3735f106cb91f4dd1c8690 (patch) | |
tree | 5cc38c1c7a2c26a3dc483b67cdf6eb27c3ce3984 /Master/texmf-dist/tex/latex-dev | |
parent | 5b7ef85ce25670aae3176daeee0a21757631bebc (diff) |
latex-dev (5jun21)
git-svn-id: svn://tug.org/texlive/trunk@59474 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev')
20 files changed, 370 insertions, 389 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty index 04009333a6a..c3040a1ed08 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsbsy.sty @@ -6,8 +6,8 @@ %% %% amsbsy.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty index b3c42bc318f..f40a034f730 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amscd.sty @@ -6,8 +6,8 @@ %% %% amscd.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty index 67acd4b5fdb..238cfa74018 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsgen.sty @@ -6,8 +6,8 @@ %% %% amsgen.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty index 6bcb03e2177..ab45172a32d 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath-2018-12-01.sty @@ -6,8 +6,8 @@ %% %% amsmath.dtx %% -%% Copyright 1995, 1999, 2000, 2013 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty index 2aea15ef70c..196660228a9 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsmath.sty @@ -6,8 +6,8 @@ %% %% amsmath.dtx %% -%% Copyright 1995, 1999, 2000, 2013 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999, 2000, 2013 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later @@ -27,7 +27,7 @@ \providecommand\DeclareCurrentRelease[2]{} \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty} \DeclareCurrentRelease{}{2019-04-01} -\ProvidesPackage{amsmath}[2020/09/23 v2.17i AMS math features] +\ProvidesPackage{amsmath}[2021/04/20 v2.17j AMS math features] \edef\@temp{\catcode 96=\number\catcode 96 } \catcode\string `\`=12 \def\do#1{\catcode\number`#1=\number\catcode`#1} @@ -1162,7 +1162,7 @@ ill-advised in LaTeX.% unbreakable box\MessageBreak (e.g., split, aligned, gathered, ...).}% } -\def\math@cr{\relax\iffalse{\fi\ifnum0=`}\fi +\protected\def\math@cr{\relax\iffalse{\fi\ifnum0=`}\fi \@ifstar{\global\@eqpen\@M\math@cr@}% {\global\@eqpen \ifnum\dspbrk@lvl <\z@ \interdisplaylinepenalty diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty index eb5e1e7a5fb..2f6b69e7590 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsopn.sty @@ -6,8 +6,8 @@ %% %% amsopn.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty index 6ce36f52c9c..e620746a548 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amstex.sty @@ -1,8 +1,8 @@ % % \iffalse meta-comment % -% Copyright 1995, 1999 American Mathematical Society. -% Copyright 2016 LaTeX3 Project and American Mathematical Society. +% Copyright (C) 1995, 1999 American Mathematical Society. +% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -14,7 +14,7 @@ % % This work has the LPPL maintenance status `maintained'. % -% The Current Maintainer of this work is the LaTeX3 Project. +% The Current Maintainer of this work is the LaTeX Project. % % \fi % diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty index b94cfb5f4e9..10efe0f7c7c 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amstext.sty @@ -6,8 +6,8 @@ %% %% amstext.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [1994/12/01]% LaTeX date must be December 1994 or later diff --git a/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty b/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty index 67d2e099be4..cba041ab95c 100644 --- a/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty +++ b/Master/texmf-dist/tex/latex-dev/amsmath/amsxtra.sty @@ -6,8 +6,8 @@ %% %% amsxtra.dtx %% -%% Copyright 1995, 1999 American Mathematical Society. -%% Copyright 2016 LaTeX3 Project and American Mathematical Society. +%% Copyright (C) 1995, 1999 American Mathematical Society. +%% Copyright (C) 2016-2021 LaTeX Project and American Mathematical Society. %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is the LaTeX3 project. +%% The Current Maintainer of this work is the LaTeX Project. %% \ProvidesPackage{amsxtra}[1999/11/15 v1.2c AMS extra commands] \@ifpackageloaded{amstex}{}{% diff --git a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty index 663b13db340..d2ef0cbd8d7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/base/atveryend-ltx.sty @@ -42,8 +42,8 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0j} -\providecommand\ltfilehookdate{2021/04/29} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ProvidesPackage{atveryend-ltx} [2020/08/19 v1.0a Emulation of the original atvery package^^Jwith kernel methods] diff --git a/Master/texmf-dist/tex/latex-dev/base/doc.sty b/Master/texmf-dist/tex/latex-dev/base/doc.sty index 87391f58d6e..444849f2e76 100644 --- a/Master/texmf-dist/tex/latex-dev/base/doc.sty +++ b/Master/texmf-dist/tex/latex-dev/base/doc.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{doc} - [2020/11/23 v2.1m + [2021/05/28 v2.1n Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e @@ -274,7 +274,7 @@ \obeylines% \gdef\verb@eol@error{\obeylines% \def^^M{\verb@egroup\@latex@error{% - Text for \noexpand\verb command ended by end of line}\@ehc}}% + \noexpand\verb ended by end of line}\@ehc}}% \endgroup \def\verbatim@nolig@list{\do\`\do\<\do\>\do\,\do\'\do\-} \def\do@noligs#1{% diff --git a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty index 1c1e3f24272..b40772e3498 100644 --- a/Master/texmf-dist/tex/latex-dev/base/fltrace.sty +++ b/Master/texmf-dist/tex/latex-dev/base/fltrace.sty @@ -112,7 +112,7 @@ \global \advance \@colht \@tempdima \ifx \@dbltoplist \@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \let \@dbltoplist \@empty \fi \@cons \@dbltoplist \@currbox diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 942de9c0a35..9bcdf0112d9 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx @@ -691,8 +691,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2021-06-01} -\def\patch@level{-3} + {2021-12-01} +\def\patch@level{0} \edef\development@branch@name{develop \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1365,7 +1365,7 @@ \count@=\escapechar \escapechar=`\\ \@ifundefined{\expandafter\@gobble\string#1}{% - \@latex@error{The control sequence `\string#1' is undefined!% + \@latex@error{Command `\string#1' is undefined!% \MessageBreak There is nothing here to make robust}% \@eha }% @@ -1385,7 +1385,7 @@ \noexpand\protect\expandafter\noexpand \csname\expandafter\@gobble\string#1\space\endcsname}% }% - {\@latex@info{The control sequence `\string#1' is already robust}}% + {\@latex@info{Command `\string#1' is already robust}}% }% \escapechar=\count@ }% @@ -1672,8 +1672,8 @@ \xdef#1{\the\toks@}% \endgroup} %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.0d} -\def\ltcmddate{2021-04-19} +\def\ltcmdversion{v1.0e} +\def\ltcmddate{2021-05-24} \message{document commands,} \ExplSyntaxOn \tl_new:N \l__cmd_arg_spec_tl @@ -1714,7 +1714,8 @@ \tl_new:N \l__cmd_tmpa_tl \tl_new:N \l__cmd_tmpb_tl \cs_new_eq:NN \__cmd_tmp:w ? -\msg_redirect_module:nnn { LaTeX / ltcmd } { info } { none } +\msg_redirect_module:nnn { cmd } { info } { none } +\prop_gput:Nnn \g_msg_module_type_prop { cmd } { LaTeX } \cs_new_protected:Npn \__cmd_declare_cmd:Nnn { \bool_set_false:N \l__cmd_expandable_bool @@ -1729,7 +1730,7 @@ { \cs_if_exist:NTF #1 { - \__kernel_msg_info:nnxx { ltcmd } { redefine-command } + \msg_info:nnxx { cmd } { redefine-command } { \token_to_str:N #1 } { \tl_to_str:n {#2} } } { @@ -1737,10 +1738,10 @@ { \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } } { \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } } { - \__kernel_msg_warning:nnx { ltcmd } { unsupported-let } + \msg_warning:nnx { cmd } { unsupported-let } { \token_to_str:N #1 } } - \__kernel_msg_info:nnxx { ltcmd } { define-command } + \msg_info:nnxx { cmd } { define-command } { \token_to_str:N #1 } { \tl_to_str:n {#2} } } \bool_set_false:N \l__cmd_environment_bool @@ -1846,11 +1847,11 @@ { \tl_trim_spaces:o { \l__cmd_environment_str } } \cs_if_exist:cTF { \l__cmd_environment_str } { - \__kernel_msg_info:nnxx { ltcmd } { redefine-environment } + \msg_info:nnxx { cmd } { redefine-environment } { \l__cmd_environment_str } { \tl_to_str:n {#2} } } { - \__kernel_msg_info:nnxx { ltcmd } { define-environment } + \msg_info:nnxx { cmd } { define-environment } { \l__cmd_environment_str } { \tl_to_str:n {#2} } } \bool_set_false:N \l__cmd_expandable_bool @@ -1938,7 +1939,7 @@ } \cs_new_protected:Npn \__cmd_defaults_error:w \q_recursion_stop { - \__kernel_msg_error:nnx { ltcmd } { loop-in-defaults } + \msg_error:nnx { cmd } { loop-in-defaults } { \__cmd_environment_or_command: } } \cs_new_protected:Npn \__cmd_defaults_def: @@ -2009,8 +2010,7 @@ \__cmd_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3 { } { } { } { } { } { } { } { } { } { } { - \__kernel_msg_expandable_error:nnf - { ltcmd } { loop-in-defaults } + \msg_expandable_error:nnf { cmd } { loop-in-defaults } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N #4 } } \use_iv:nnnn } @@ -2052,7 +2052,7 @@ \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop \int_compare:nNnT \l__cmd_current_arg_int > 9 { - \__kernel_msg_error:nnxx { ltcmd } { too-many-arguments } + \msg_error:nnxx { cmd } { too-many-arguments } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2060,7 +2060,7 @@ { \tl_if_empty:NF \l__cmd_last_delimiters_tl { - \__kernel_msg_error:nnxx { ltcmd } { expandable-ending-optional } + \msg_error:nnxx { cmd } { expandable-ending-optional } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2084,11 +2084,11 @@ { \str_if_eq_p:nn {#1} { u } } } { - \__kernel_msg_error:nnxx { ltcmd } { xparse-argument-type } + \msg_error:nnxx { cmd } { xparse-argument-type } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } } { - \__kernel_msg_error:nnxx { ltcmd } { unknown-argument-type } + \msg_error:nnxx { cmd } { unknown-argument-type } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } } \__cmd_bad_def:wn @@ -2124,7 +2124,7 @@ \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnxx { ltcmd } { processor-in-expandable } + \msg_error:nnxx { cmd } { processor-in-expandable } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2138,7 +2138,7 @@ \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_long_bool { - \__kernel_msg_error:nnxx { ltcmd } { two-markers } + \msg_error:nnxx { cmd } { two-markers } { \__cmd_environment_or_command: } { + } \__cmd_bad_def:wn } @@ -2151,7 +2151,7 @@ \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_obey_spaces_bool { - \__kernel_msg_error:nnxx { ltcmd } { two-markers } + \msg_error:nnxx { cmd } { two-markers } { \__cmd_environment_or_command: } { ! } \__cmd_bad_def:wn } @@ -2234,15 +2234,14 @@ { \bool_if:NF \l__cmd_environment_bool { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-command-arg } + \msg_error:nnxx { cmd } { invalid-command-arg } { \__cmd_environment_or_command: } { b } \__cmd_bad_def:wn } \tl_clear:N \l__cmd_last_delimiters_tl \__cmd_add_arg_spec:n { b } \quark_if_recursion_tail_stop:n {#1} - \__kernel_msg_error:nnxx { ltcmd } { arg-after-body } + \msg_error:nnxx { cmd } { arg-after-body } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn @@ -2251,7 +2250,7 @@ { \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF { - \__kernel_msg_error:nnxx { ltcmd } { not-single-token } + \msg_error:nnxx { cmd } { not-single-token } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2266,8 +2265,7 @@ { \use_none:n } } { - \__kernel_msg_error:nnxxx - { ltcmd } { forbidden-implicit-group-token } + \msg_error:nnxxx { cmd } { forbidden-implicit-group-token } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } { \token_if_eq_meaning:NNTF #1 \c_group_begin_token @@ -2280,8 +2278,7 @@ { \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-expandable-argument-type } + \msg_error:nnxx { cmd } { invalid-expandable-argument-type } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2293,8 +2290,7 @@ { \tl_if_empty:NF \l__cmd_last_delimiters_tl { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-after-optional-expandably } + \msg_error:nnxx { cmd } { invalid-after-optional-expandably } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2306,14 +2302,14 @@ { \tl_if_eq:nnT {##1} {#1} { - \__kernel_msg_warning:nnxx { ltcmd } { optional-mandatory } + \msg_warning:nnxx { cmd } { optional-mandatory } {#2} {#3} } } } \cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 { - \__kernel_msg_error:nnxx { ltcmd } { bad-arg-spec } + \msg_error:nnxx { cmd } { bad-arg-spec } { \__cmd_environment_or_command: } { \tl_to_str:n {#2} } } \cs_new_protected:Npn \__cmd_bad_def:wn #1 \__cmd_break_point:n #2 { } @@ -2325,7 +2321,7 @@ { \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnx { ltcmd } { inconsistent-long } + \msg_error:nnx { cmd } { inconsistent-long } { \iow_char:N \\ \l__cmd_function_tl } \__cmd_bad_def:wn } @@ -2347,7 +2343,7 @@ { \bool_if:NT \l__cmd_some_obey_spaces_bool { - \__kernel_msg_error:nnxx { ltcmd } { non-trailing-obey-spaces } + \msg_error:nnxx { cmd } { non-trailing-obey-spaces } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2898,7 +2894,7 @@ \__cmd_peek_nonspace_remove:NTF #1 { \__cmd_grab_D_call:Nw #1 } { - \__kernel_msg_error:nnxx { ltcmd } { missing-required } + \msg_error:nnxx { cmd } { missing-required } { \__cmd_environment_or_command: } { \token_to_str:N #1 } \__cmd_add_arg:o \c_novalue_tl @@ -3042,14 +3038,14 @@ \exp_after:wN \exp_after:wN \exp_after:wN \peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 } { - \__kernel_msg_error:nnxxx { ltcmd } { verbatim-newline } + \msg_error:nnxxx { cmd } { verbatim-newline } { \__cmd_environment_or_command: } { \tl_to_str:N \l__cmd_v_arg_tl } { \tl_to_str:n {#1} } \__cmd_add_arg:o \c_novalue_tl } { - \__kernel_msg_error:nnxxx { ltcmd } { verbatim-tokenized } + \msg_error:nnxxx { cmd } { verbatim-tokenized } { \__cmd_environment_or_command: } { \tl_to_str:N \l__cmd_v_arg_tl } { \tl_to_str:n {#1} } @@ -3219,8 +3215,7 @@ \q_nil { } ##2 \ERROR \q__cmd \ERROR } { - \__kernel_msg_expandable_error:nnff - { ltcmd } { missing-required } + \msg_expandable_error:nnff { cmd } { missing-required } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##5 } } { \tl_to_str:n {##2} } ##4 {#1} \q__cmd ##5 ##6 {##7} @@ -3247,8 +3242,7 @@ ##6 \ERROR } { - \__kernel_msg_expandable_error:nnff - { ltcmd } { missing-required } + \msg_expandable_error:nnff { cmd } { missing-required } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##4 } } { \tl_to_str:n {##2} } ##3 {#1} \q__cmd ##4 ##5 {##6} @@ -3329,7 +3323,7 @@ \ProcessedArgument \q_stop } - \__kernel_msg_error:nnxxx { ltcmd } { split-excess-tokens } + \msg_error:nnxxx { cmd } { split-excess-tokens } { \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } } { \tl_to_str:n {#4} } } @@ -3369,11 +3363,11 @@ { #1 { - \__kernel_msg_error:nnx { ltcmd } { non-xparse } + \msg_error:nnx { cmd } { non-xparse } { \__cmd_environment_or_command: } } { - \__kernel_msg_error:nnx { ltcmd } { unknown } + \msg_error:nnx { cmd } { unknown } { \__cmd_environment_or_command: } } } @@ -3435,11 +3429,11 @@ } { \group_end: \use_ii:nnn } { - \__kernel_msg_error:nnxx { ltcmd } { not-definable } + \msg_error:nnxx { cmd } { not-definable } { \tl_to_str:n {#1} } { \token_to_str:N #2 } } { - \__kernel_msg_error:nnxx { ltcmd } { not-one-token } + \msg_error:nnxx { cmd } { not-one-token } { \tl_to_str:n {#1} } { \token_to_str:N #2 } } } @@ -3555,49 +3549,49 @@ ' } } -\__kernel_msg_new:nnnn { ltcmd } { arg-after-body } +\msg_new:nnnn { cmd } { arg-after-body } { In~the~definition~of~#1,~b~(body)~argument~must~be~last. } { The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~ specification~of~the~#1.~This~is~not~allowed. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { bad-arg-spec } +\msg_new:nnnn { cmd } { bad-arg-spec } { Bad~argument~specification~'#2'~for~#1. } { The~argument~specification~provided~was~not~valid:~ one~or~more~mandatory~pieces~of~information~were~missing. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { command-already-defined } +\msg_new:nnnn { cmd } { command-already-defined } { Command~'#1'~already~defined! } { You~have~used~#2~ with~a~command~that~already~has~a~definition. \\ \\ The~existing~definition~of~'#1'~will~not~be~altered. } -\__kernel_msg_new:nnnn { ltcmd } { command-not-yet-defined } +\msg_new:nnnn { cmd } { command-not-yet-defined } { Command ~'#1'~not~yet~defined! } { You~have~used~#2~ with~a~command~that~was~never~defined. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { environment-already-defined } +\msg_new:nnnn { cmd } { environment-already-defined } { Environment~'#1'~already~defined! } { You~have~used~\NewDocumentEnvironment with~an~environment~that~already~has~a~definition. \\ \\ The~existing~definition~of~'#1'~will~not~be~altered. } -\__kernel_msg_new:nnnn { ltcmd } { environment-not-yet-defined } +\msg_new:nnnn { cmd } { environment-not-yet-defined } { Environment~'#1'~not~yet~defined! } { You~have~used~\RenewDocumentEnvironment with~an~environment~that~was~never~defined. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { expandable-ending-optional } +\msg_new:nnnn { cmd } { expandable-ending-optional } { Argument~specification~'#2'~for~expandable~command~'#1'~ ends~with~optional~argument. @@ -3607,13 +3601,13 @@ (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~ argument~with~expandable~commands. } -\__kernel_msg_new:nnnn { ltcmd } { inconsistent-long } +\msg_new:nnnn { cmd } { inconsistent-long } { Inconsistent~long~arguments~for~expandable~command~'#1'. } { The~arguments~for~an~expandable~command~must~not~involve~short~ arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types. } -\__kernel_msg_new:nnnn { ltcmd } { invalid-command-arg } +\msg_new:nnnn { cmd } { invalid-command-arg } { Argument~type~'#2'~not~available~for~#1. } { The~letter~'#2'~can~only~be~used~in~environment~argument~ @@ -3621,14 +3615,14 @@ \\ \\ LaTeX~will~ignore~this~entire~definition. } -\__kernel_msg_new:nnnn { ltcmd } { invalid-expandable-argument-type } +\msg_new:nnnn { cmd } { invalid-expandable-argument-type } { Argument~type~'#2'~not~available~for~expandable~command~'#1'. } { The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ in~an~expandable~command. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { invalid-after-optional-expandably } +\msg_new:nnnn { cmd } { invalid-after-optional-expandably } { Argument~type~'#2'~not~available~after~optional~argument~ for~expandable~command~'#1'. @@ -3638,13 +3632,13 @@ in~an~expandable~command~after~an~optional~argument. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { non-trailing-obey-spaces } +\msg_new:nnnn { cmd } { non-trailing-obey-spaces } { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. } { The~prefix~'!'~can~only~apply~to~trailing~optional~arguments. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-definable } +\msg_new:nnnn { cmd } { not-definable } { First~argument~of~'#2'~must~be~a~command. } { The~first~argument~of~'#2'~should~be~the~document~command~that~will~ @@ -3652,7 +3646,7 @@ backslash~is~missing? \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-one-token } +\msg_new:nnnn { cmd } { not-one-token } { First~argument~of~'#2'~must~be~a~command. } { The~first~argument~of~'#2'~should~be~the~document~command~that~will~ @@ -3660,7 +3654,7 @@ token.~Perhaps~a~backslash~is~missing? \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-single-token } +\msg_new:nnnn { cmd } { not-single-token } { Argument~delimiter~'#2'~for~the~#1~should~be~ a~single~non-space~token. @@ -3670,80 +3664,80 @@ where~a~single~token~is~required,~LaTeX~found~'#2'. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { forbidden-implicit-group-token } +\msg_new:nnnn { cmd } { forbidden-implicit-group-token } { Argument~delimiter~'#2'~for~the~#1~is~not~allowed. } { The~argument~specification~provided~was~not~valid:~the~implicit~ #3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { processor-in-expandable } +\msg_new:nnnn { cmd } { processor-in-expandable } { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. } { The~argument~specification~for~#1~contains~a~processor~function:~ this~is~only~supported~for~standard~robust~commands. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { too-many-arguments } +\msg_new:nnnn { cmd } { too-many-arguments } { Too~many~arguments~in~argument~specification~'#2'~of~#1. } { The~argument~specification~provided~has~more~than~9~arguments.~ This~cannot~be~implemented. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { two-markers } +\msg_new:nnnn { cmd } { two-markers } { Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. } { The~argument~specification~provided~has~two~markers~'#2'~applying~ to~the~same~argument;~these~are~redundant. } -\__kernel_msg_new:nnnn { ltcmd } { unknown-argument-type } +\msg_new:nnnn { cmd } { unknown-argument-type } { Unknown~argument~type~'#2'~for~the~#1. } { The~letter~'#2'~does~not~specify~a~known~argument~type. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { xparse-argument-type } +\msg_new:nnnn { cmd } { xparse-argument-type } { Deprecated~argument~type~'#2'~for~the~#1~requires~xparse. } { The~letter~'#2'~specifies~a~known~argument~type~that~requires~ the~xparse~package. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnn { ltcmd } { if-boolean } +\msg_new:nnn { cmd } { if-boolean } { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } -\__kernel_msg_new:nnnn { ltcmd } { loop-in-defaults } +\msg_new:nnnn { cmd } { loop-in-defaults } { Defaults~of~#1~have~circular~dependency. } { The~default~values~of~two~or~more~arguments~of~the~#1~ depend~on~each~other~in~a~way~that~cannot~be~resolved. } -\__kernel_msg_new:nnnn { ltcmd } { missing-required } +\msg_new:nnnn { cmd } { missing-required } { Missing~required~argument~for~#1. } { The~current~#1~expects~an~argument~starting~with~'#2'.~ LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed. } -\__kernel_msg_new:nnnn { ltcmd } { non-xparse } +\msg_new:nnnn { cmd } { non-xparse } { \str_uppercase:n #1~not~defined~using~xparse. } { You~have~asked~for~the~argument~specification~for~the~#1,~ but~this~was~not~defined~using~xparse. } -\__kernel_msg_new:nnnn { ltcmd } { split-excess-tokens } +\msg_new:nnnn { cmd } { split-excess-tokens } { Too~many~'#1'~tokens~when~trying~to~split~argument. } { LaTeX~was~asked~to~split~the~input~'#3'~ at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~ There~were~too~many~'#1'~tokens. } -\__kernel_msg_new:nnnn { ltcmd } { unknown } +\msg_new:nnnn { cmd } { unknown } { Unknown~document~#1. } { You~have~asked~for~the~argument~specification~for~the~#1,~ but~it~is~not~defined. } -\__kernel_msg_new:nnnn { ltcmd } { verbatim-newline } +\msg_new:nnnn { cmd } { verbatim-newline } { Verbatim~argument~of~#1~ended~by~end~of~line. } { The~verbatim~argument~of~the~#1~cannot~contain~more~than~one~line,~ @@ -3753,7 +3747,7 @@ \\ \\ LaTeX~will~ignore~'#2'. } -\__kernel_msg_new:nnnn { ltcmd } { verbatim-tokenized } +\msg_new:nnnn { cmd } { verbatim-tokenized } { The~verbatim~#1~cannot~be~used~inside~an~argument. } { The~#1~takes~a~verbatim~argument.~ @@ -3762,33 +3756,33 @@ \\ \\ LaTeX~will~ignore~'#2'. } -\__kernel_msg_new:nnn { ltcmd } { define-command } +\msg_new:nnn { cmd } { define-command } { Defining~command~#1~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { define-environment } +\msg_new:nnn { cmd } { define-environment } { Defining~environment~'#1'~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { redefine-command } +\msg_new:nnn { cmd } { redefine-command } { Redefining~command~#1~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { redefine-environment } +\msg_new:nnn { cmd } { redefine-environment } { Redefining~environment~'#1'~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { optional-mandatory } +\msg_new:nnn { cmd } { optional-mandatory } { Since~the~mandatory~argument~'#1'~has~the~same~delimiter~'#2'~ as~a~previous~optional~argument,~it~will~not~be~possible~to~ omit~all~optional~arguments~when~calling~this~command. } -\__kernel_msg_new:nnn { ltcmd } { unsupported-let } +\msg_new:nnn { cmd } { unsupported-let } { The~command~'#1'~was~undefined~but~not~the~associated~commands~ '#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~ @@ -3802,7 +3796,7 @@ { \cs_if_exist:NTF #1 { - \__kernel_msg_error:nnxx { ltcmd } { command-already-defined } + \msg_error:nnxx { cmd } { command-already-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \NewDocumentCommand } } @@ -3816,7 +3810,7 @@ \cs_if_exist:NTF #1 { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } { - \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined } + \msg_error:nnxx { cmd } { command-not-yet-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \RenewDocumentCommand } } @@ -3835,14 +3829,14 @@ \cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4 { \cs_if_exist:cTF {#1} - { \__kernel_msg_error:nnx { ltcmd } { environment-already-defined } {#1} } + { \msg_error:nnx { cmd } { environment-already-defined } {#1} } { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } \cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4 { \cs_if_exist:cTF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } - { \__kernel_msg_error:nnx { ltcmd } { environment-not-yet-defined } {#1} } + { \msg_error:nnx { cmd } { environment-not-yet-defined } {#1} } } \cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4 { \cs_if_exist:cF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } @@ -3854,7 +3848,7 @@ { \cs_if_exist:NTF #1 { - \__kernel_msg_error:nnxx { ltcmd } { command-already-defined } + \msg_error:nnxx { cmd } { command-already-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \NewExpandableDocumentCommand } } @@ -3868,7 +3862,7 @@ \cs_if_exist:NTF #1 { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } { - \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined } + \msg_error:nnxx { cmd } { command-not-yet-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \RenewExpandableDocumentCommand } } @@ -3900,7 +3894,7 @@ \prg_break:n { \use:n } \prg_break_point: { - \__kernel_msg_expandable_error:nnn { ltcmd } { if-boolean } {#1} + \msg_expandable_error:nnn { cmd } { if-boolean } {#1} \use_ii:nn } } @@ -3932,8 +3926,8 @@ \cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \__cmd_show_arg_spec:n \ExplSyntaxOff %%% From File: lthooks.dtx -\def\lthooksversion{v1.0m} -\def\lthooksdate{2021/04/29} +\def\lthooksversion{v1.0n} +\def\lthooksdate{2021/05/26} \ExplSyntaxOn \bool_new:N \g__hook_debug_bool @@ -4006,7 +4000,7 @@ \cs_new_protected:Npn \__hook_new:n #1 { \__hook_if_declared:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { exists } {#1} } + { \msg_error:nnn { hooks } { exists } {#1} } { \tl_new:c { g__hook_#1_declared_tl } \__hook_make_usable:n {#1} @@ -4076,12 +4070,12 @@ \cs_new_protected:Npn \__hook_provide:nn #1 #2 { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_warning:nnn { hooks } { provide-disabled } {#1} } + { \msg_warning:nnn { hooks } { provide-disabled } {#1} } { \__hook_if_declared:nTF {#1} { \str_if_eq:eeF { \tl_use:c { g__hook_#1_reversed_tl } } {#2} - { \__kernel_msg_error:nnn { hooks } { provide-error } {#1} } + { \msg_error:nnn { hooks } { provide-error } {#1} } } { \tl_new:c { g__hook_#1_declared_tl } @@ -4102,7 +4096,7 @@ { \tl_if_empty:nTF {#1} { - \__kernel_msg_expandable_error:nn { hooks } { empty-label } + \msg_expandable_error:nn { hooks } { empty-label } \__hook_currname_or_default: } { @@ -4130,7 +4124,7 @@ { \tl_if_empty:NTF \@currname { - \__kernel_msg_expandable_error:nnn { hooks } { should-not-happen } + \msg_expandable_error:nnn { kernel } { should-not-happen } { Empty~default~label. } \__hook_make_name:n { label-missing } } @@ -4194,7 +4188,7 @@ } { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} } + { \msg_error:nnn { hooks } { hook-disabled } {#1} } { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } } } @@ -4214,7 +4208,7 @@ \__hook_init_structure:n {#1} \__hook_tl_gput_right:cn { __hook_toplevel~#1 } {#3} } - { \__kernel_msg_error:nnn { hooks } { misused-top-level } {#1} } + { \msg_error:nnn { hooks } { misused-top-level } {#1} } } { \prop_get:cnNTF { g__hook_#1_code_prop } {#2} \l__hook_return_tl @@ -4376,7 +4370,7 @@ {#1} {#2} {#4} \__hook_update_hook_code:n {#1} } - { \__kernel_msg_error:nnnnnn { hooks } { unknown-rule } + { \msg_error:nnnnnn { hooks } { unknown-rule } {#1} {#2} {#3} {#4} } } \cs_new_protected:Npn \__hook_rule_before_gset:nnn #1#2#3 @@ -4595,7 +4589,7 @@ \cs_new_protected:cpn { __hook_apply_rule_xE:nnn } #1#2#3 { \__hook_debug:n { \__hook_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 { __hook_apply_rule_->:nnn } {#1} {#2} {#3} \use:c { __hook_apply_rule_<-:nnn } {#1} {#2} {#3} @@ -4603,7 +4597,7 @@ \cs_new_protected:cpn { __hook_apply_rule_xW:nnn } #1#2#3 { \__hook_debug:n { \__hook_msg_pair_found:nnn {#1} {#2} {#3} } - \__kernel_msg_warning:nnnnnn { hooks } { labels-incompatible } + \msg_warning:nnnnnn { hooks } { labels-incompatible } {#1} {#2} {#3} { 0 } } \cs_new_protected:cpn { __hook_apply_rule_->:nnn } #1#2#3 @@ -4803,7 +4797,7 @@ \cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2 { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} } + { \msg_error:nnn { hooks } { hook-disabled } {#1} } { \__hook_init_structure:n {#1} \__hook_if_usable:nTF {#1} @@ -4929,7 +4923,9 @@ \prg_return_false: \fi: } -\__kernel_msg_new:nnnn { hooks } { labels-incompatible } +\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX } +\prop_gput:Nnn \g_msg_module_type_prop { kernel } { LaTeX } +\msg_new:nnnn { hooks } { labels-incompatible } { Labels~'#1'~and~'#2'~are~incompatible \str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~ @@ -4939,29 +4935,29 @@ } { LaTeX~found~two~incompatible~labels~in~the~same~hook.~ This~indicates~an~incompatibility~between~packages. } -\__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.\\ Please~ use~ a~ different~ name~ for~ your~ hook.} -\__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~ with~\iow_char:N\\hook_disable:n~or~\iow_char:N\\DisableHook,~so~ it~cannot~have~code~added~to~it. } -\__kernel_msg_new:nnn { hooks } { empty-label } +\msg_new:nnn { hooks } { empty-label } { Empty~code~label~\msg_line_context:.~ Using~'\__hook_currname_or_default:'~instead. } -\__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. } -\__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' }. ~ @@ -4976,9 +4972,9 @@ 'voids'~ or~ 'unrelated'. } -\__kernel_msg_new:nnnn { hooks } { misused-top-level } +\msg_new:nnnn { hooks } { misused-top-level } { - Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ + Illegal~use~of~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ 'top-level'~is~reserved~for~the~user's~document. } { @@ -4987,38 +4983,32 @@ '\__hook_currname_or_default:'~for~this~\@cls@pkg,~or~another~ suitable~label. } -\__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} \\ \msg_line_context:. } -\__kernel_msg_new:nnn { hooks } { ddhl-deprecated } - { - \iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\ - Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\ - The~deprecated~name~will~be~removed~in~the~next~release. - } -\__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. } -\__kernel_msg_new:nnn { hooks } { should-not-happen } +\msg_new:nnn { kernel } { should-not-happen } { - ERROR!~This~should~not~happen.~#1 \\ + This~should~not~happen.~#1 \\ Please~report~at~https://github.com/latex3/latex2e. } -\__kernel_msg_new:nnn { hooks } { provide-disabled } +\msg_new:nnn { hooks } { provide-disabled } { - Can't~ provide~ hook~ '#1'~ because~ it~ is~ disabled! + Cannot~ provide~ hook~ '#1'~ because~ it~ is~ disabled! } -\__kernel_msg_new:nnnn { hooks } { provide-error } +\msg_new:nnnn { hooks } { provide-error } { Hook~'#1'~ already~ declared~ as~ a~ \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook! @@ -5049,11 +5039,11 @@ \cs_new_protected:Npn \__hook_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} } { @@ -5066,7 +5056,7 @@ { \seq_gpop:NNTF \g__hook_name_stack_seq \l__hook_return_tl { \tl_gset_eq:NN \g__hook_hook_curr_name_tl \l__hook_return_tl } - { \__kernel_msg_error:nn { hooks } { extra-pop-label } } + { \msg_error:nn { hooks } { extra-pop-label } } } \tl_gput_right:Nn \@kernel@after@enddocument@afterlastpage { \__hook_end_document_label_check: } @@ -5074,7 +5064,7 @@ { \seq_gpop:NNT \g__hook_name_stack_seq \l__hook_return_tl { - \__kernel_msg_error:nnx { hooks } { missing-pop-label } + \msg_error:nnx { hooks } { missing-pop-label } { \g__hook_hook_curr_name_tl } \tl_gset_eq:NN \g__hook_hook_curr_name_tl \l__hook_return_tl \__hook_end_document_label_check: @@ -5084,7 +5074,7 @@ { \seq_if_empty:NTF \g__hook_name_stack_seq { - \__kernel_msg_error:nnnnn { hooks } { set-top-level } + \msg_error:nnnnn { hooks } { set-top-level } { for } { SetDefaultHookLabel } {#1} } { \exp_args:Nx \__hook_set_default_label:n { \__hook_make_name:n {#1} } } @@ -5093,16 +5083,11 @@ { \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_hook_curr_name_tl {#1} } } -\NewDocumentCommand \DeclareDefaultHookLabel { m } - { - \__kernel_msg_error:nn { hooks } { ddhl-deprecated } - \SetDefaultHookLabel {#1} - } \NewDocumentCommand \PushDefaultHookLabel { m } { \__hook_curr_name_push:n {#1} } \NewDocumentCommand \PopDefaultHookLabel { } @@ -5138,8 +5123,8 @@ %% File: ltcmdhooks.dtx (C) Copyright 2020-2021 %% Frank Mittelbach, Phelype Oleinik, LaTeX Team %%% From File: ltcmdhooks.dtx -\def\ltcmdhooksversion{v1.0a} -\def\ltcmdhooksdate{2021/04/30} +\def\ltcmdhooksversion{v1.0b} +\def\ltcmdhooksdate{2021/05/26} \ExplSyntaxOn \tl_new:N \g_hook_patch_action_list_tl \int_new:N \l__hook_patch_num_args_int @@ -5159,7 +5144,7 @@ \str_case:nnTF {#3} { { before } { } { after } { } } { \exp_args:Nc \__hook_patch_cmd_or_delay:Nnn {#2} {#2} {#3} } - { \__kernel_msg_error:nnn { hooks } { wrong-cmd-hook } {#2} {#3} } + { \msg_error:nnnn { hooks } { wrong-cmd-hook } {#2} {#3} } } \cs_new_protected:Npn \__hook_patch_cmd_or_delay:Nnn #1 #2 #3 { @@ -5216,7 +5201,7 @@ { #1 #2 {#4} { - \__kernel_msg_error:nnxx { hooks } { cant-patch } + \msg_error:nnxx { hooks } { cant-patch } { \token_to_str:N #2 } {#3} } } @@ -5346,7 +5331,7 @@ } \q_recursion_tail \q_recursion_stop { - \__kernel_msg_error:nnxx { hooks } { cant-patch } + \msg_error:nnxx { hooks } { cant-patch } { \c_backslash_str #2 } { retok } } } @@ -5418,24 +5403,21 @@ \tl_rescan:nV { #4 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl \cs_set_eq:NN #1 \kerneltmpDoNotUse } -\__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'. + Generic~hook~`cmd/#1/#2'~is~invalid. } { - You~tried~to~add~a~hook~to~command~\iow_char:N \\#1,~but~`#2'~ - is~an~invalid~position.~Only~`before'~or~`after'~are~allowed. + You~tried~to~add~a~generic~hook~to~command~\iow_char:N \\#1,~but~`#2'~ + is~an~invalid~component.~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~ - \__hook_unpatchable_cases:n {#2} . + Generic~hooks~cannot~be~added~to~'#1'. } { - You~tried~to~add~a~hook~to~`#1',~but~LaTeX~was~not~able~to~ - add~the~hook~to~that~command~because~`#1'~ - \__hook_unpatchable_cases:n {#2} . + You~tried~to~add~a~hook~to~'#1',~but~LaTeX~was~unable~to~ + patch~the~command~because~it~\__hook_unpatchable_cases:n {#2}. } \cs_new:Npn \__hook_unpatchable_cases:n #1 { @@ -5740,8 +5722,8 @@ Type H <return> for immediate help.}% \def\@restorepar{\def\par{\@par}} %% File: ltpara.dtx (C) Copyright 2020-2021 %%% From File: ltpara.dtx -\def\ltparaversion{v1.0f} -\def\ltparadate{2021/04/16} +\def\ltparaversion{v1.0g} +\def\ltparadate{2021/05/27} \ExplSyntaxOn @@ -5757,7 +5739,7 @@ Type H <return> for immediate help.}% \group_begin: \tex_par:D \group_end: - \tex_everypar:D { \__kernel_msg_error:nnnn {para}{mode}{before}{vertical} } + \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } \@kernel@before@para@before \hook_use:n {para/before} \group_begin: @@ -5769,7 +5751,7 @@ Type H <return> for immediate help.}% \@kernel@before@para@begin \hook_use:n {para/begin} \if_mode_horizontal: \else: - \__kernel_msg_error:nnnn {para}{mode}{begin}{vertical} \fi: + \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: \__para_handle_indent: } \tex_everypar:D{\g__para_standard_everypar_tl} @@ -5805,7 +5787,7 @@ Type H <return> for immediate help.}% \hook_use:n{para/after} \@kernel@after@para@after } - { \__kernel_msg_error:nnnn {para}{mode}{end}{horizontal} } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } } } \tex_par:D @@ -5819,7 +5801,7 @@ Type H <return> for immediate help.}% \__para_handle_indent: \the\everypar } } - { \__kernel_msg_error:nn {para}{raw} } + { \msg_error:nn { kernel }{ raw-para } } \tex_indent:D } \cs_new:Npn \para_raw_noindent: { @@ -5829,7 +5811,7 @@ Type H <return> for immediate help.}% \tex_everypar:D { \g__para_standard_everypar_tl } \the\everypar } } - { \__kernel_msg_error:nn {para}{raw} } + { \msg_error:nn { kernel }{ raw-para } } \tex_noindent:D } \cs_new_eq:NN \para_raw_end: \tex_par:D @@ -5840,7 +5822,7 @@ Type H <return> for immediate help.}% \cs_set_eq:NN \@@par \para_end: \cs_set_eq:NN \endgraf \para_end: \everypar{\@nodocument} %% To get an error if text appears before the -\__kernel_msg_new:nnnn {para} {mode} +\msg_new:nnnn { hooks } { para-mode } { Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ Hook~ code~ did~ not~ remain~ in~ #2~ mode. @@ -5849,16 +5831,18 @@ Type H <return> for immediate help.}% Paragraph~ hooks~ cannot~ change~ the~ TeX~ mode~ without~ causing~ endless~ recursion.~ The~ hook~ code~ in~ 'para/#1'~ needs~ to~ stay~ in~ #2~ mode,~ but~ it~ didn't.~ Examine~ the~ hook~ - code~ with~ \ShowHook~ to~ find~ the~ issue. + code~ with~ \iow_char:N \\ShowHook~ to~ find~ the~ issue. } -\__kernel_msg_new:nnnn {para} {raw} +\msg_new:nnnn { kernel } { raw-para } { - Paragraph started while not in vertical mode. + Not~ in~ vertical~ mode. } { - Starting a paragraph with \RawIndent or \RawNoindent - (or \para_raw_indent: or \para_raw_noindent:) is only - allowed if LaTeX is in vertical mode. + Starting~ a~ paragraph~ with~ \iow_char:N \\RawIndent~ or~ + \iow_char:N \\RawNoindent \\ + (or~ \iow_char:N \\para_raw_indent:~ or~ + \iow_char:N \\para_raw_noindent:)~ is~ only~ allowed \\ + if~ LaTeX~ is~ in~ vertical~ mode. } \ExplSyntaxOff @@ -12787,6 +12771,7 @@ Type H <return> for immediate help.}% \let\@declaredoptions\@empty \let\@classoptionslist\relax \@onlypreamble\@classoptionslist +\let\@raw@classoptionslist\relax \let\@unusedoptionlist\@empty \@onlypreamble\@unusedoptionlist \let\CurrentOption\@empty @@ -13658,8 +13643,8 @@ Type H <return> for immediate help.}% \fi } %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0j} -\providecommand\ltfilehookdate{2021/04/29} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ExplSyntaxOn \tl_new:N \CurrentFile \tl_new:N \CurrentFilePath @@ -13712,7 +13697,7 @@ Type H <return> for immediate help.}% \seq_gpop:NNTF \g__filehook_input_file_seq \l__filehook_internal_tl { \exp_after:wN \__filehook_file_pop_assign:nnnn \l__filehook_internal_tl } { - \__kernel_msg_error:nnn { hooks } { should-not-happen } + \msg_error:nnn { kernel } { should-not-happen } { Tried~to~pop~from~an~empty~file~name~stack. } } } @@ -14542,7 +14527,7 @@ Type H <return> for immediate help.}% \global \advance \@colht \@tempdima \ifx \@dbltoplist \@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \let \@dbltoplist \@empty \fi \@cons \@dbltoplist \@currbox @@ -14655,7 +14640,7 @@ Type H <return> for immediate help.}% \global \@colroom \@colht \ifx \@currlist\@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \global \let \@currlist \@empty \fi \@makefcolumn\@deferlist @@ -15226,17 +15211,17 @@ Type H <return> for immediate help.}% \gdef\@enlargepage#1#2{% \@tempskipa#2\relax \ifdim \@tempskipa>.5\maxdimen - \@latexerr{Suggested\space extra\space height\space - (\the\@tempskipa)\space dangerously\space - large}\@eha + \@latex@error{Suggested\space extra\space height\space + (\the\@tempskipa)\space dangerously\space + large}\@eha \else \ifdim \vsize<.5\maxdimen \@bsphack \insert\@kludgeins{#1\vskip-\@tempskipa}% \@esphack \else - \@latexerr{Page\space height\space already\space - too\space large}\@eha + \@latex@error{Page\space height\space already\space + too\space large}\@eha \fi \fi } diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty index 4bdca00b45e..858ffa91844 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty @@ -287,7 +287,7 @@ } %%% From File: ltvers.dtx \edef\latexreleaseversion - {2021-06-01} + {2021-12-01} \newif\if@includeinrelease \@includeinreleasefalse \def\IncludeInRelease#1{% @@ -1326,7 +1326,7 @@ of this package available from CTAN} \count@=\escapechar \escapechar=`\\ \@ifundefined{\expandafter\@gobble\string#1}{% - \@latex@error{The control sequence `\string#1' is undefined!% + \@latex@error{Command `\string#1' is undefined!% \MessageBreak There is nothing here to make robust}% \@eha }% @@ -1346,7 +1346,7 @@ of this package available from CTAN} \noexpand\protect\expandafter\noexpand \csname\expandafter\@gobble\string#1\space\endcsname}% }% - {\@latex@info{The control sequence `\string#1' is already robust}}% + {\@latex@info{Command `\string#1' is already robust}}% }% \escapechar=\count@ }% @@ -1781,8 +1781,8 @@ of this package available from CTAN} \EndIncludeInRelease %%% From File: ltcmd.dtx -\def\ltcmdversion{v1.0d} -\def\ltcmddate{2021-04-19} +\def\ltcmdversion{v1.0e} +\def\ltcmddate{2021-05-24} \edef\@latexrelease@catcode@null{\the\catcode`\^^@ } \catcode`\^^@=12 \ExplSyntaxOn @@ -1826,7 +1826,8 @@ of this package available from CTAN} \tl_new:N \l__cmd_tmpa_tl \tl_new:N \l__cmd_tmpb_tl \cs_new_eq:NN \__cmd_tmp:w ? -\msg_redirect_module:nnn { LaTeX / ltcmd } { info } { none } +\msg_redirect_module:nnn { cmd } { info } { none } +\prop_gput:Nnn \g_msg_module_type_prop { cmd } { LaTeX } \cs_new_protected:Npn \__cmd_declare_cmd:Nnn { \bool_set_false:N \l__cmd_expandable_bool @@ -1841,7 +1842,7 @@ of this package available from CTAN} { \cs_if_exist:NTF #1 { - \__kernel_msg_info:nnxx { ltcmd } { redefine-command } + \msg_info:nnxx { cmd } { redefine-command } { \token_to_str:N #1 } { \tl_to_str:n {#2} } } { @@ -1849,10 +1850,10 @@ of this package available from CTAN} { \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } } { \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } } { - \__kernel_msg_warning:nnx { ltcmd } { unsupported-let } + \msg_warning:nnx { cmd } { unsupported-let } { \token_to_str:N #1 } } - \__kernel_msg_info:nnxx { ltcmd } { define-command } + \msg_info:nnxx { cmd } { define-command } { \token_to_str:N #1 } { \tl_to_str:n {#2} } } \bool_set_false:N \l__cmd_environment_bool @@ -1958,11 +1959,11 @@ of this package available from CTAN} { \tl_trim_spaces:o { \l__cmd_environment_str } } \cs_if_exist:cTF { \l__cmd_environment_str } { - \__kernel_msg_info:nnxx { ltcmd } { redefine-environment } + \msg_info:nnxx { cmd } { redefine-environment } { \l__cmd_environment_str } { \tl_to_str:n {#2} } } { - \__kernel_msg_info:nnxx { ltcmd } { define-environment } + \msg_info:nnxx { cmd } { define-environment } { \l__cmd_environment_str } { \tl_to_str:n {#2} } } \bool_set_false:N \l__cmd_expandable_bool @@ -2050,7 +2051,7 @@ of this package available from CTAN} } \cs_new_protected:Npn \__cmd_defaults_error:w \q_recursion_stop { - \__kernel_msg_error:nnx { ltcmd } { loop-in-defaults } + \msg_error:nnx { cmd } { loop-in-defaults } { \__cmd_environment_or_command: } } \cs_new_protected:Npn \__cmd_defaults_def: @@ -2121,8 +2122,7 @@ of this package available from CTAN} \__cmd_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3 { } { } { } { } { } { } { } { } { } { } { - \__kernel_msg_expandable_error:nnf - { ltcmd } { loop-in-defaults } + \msg_expandable_error:nnf { cmd } { loop-in-defaults } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N #4 } } \use_iv:nnnn } @@ -2164,7 +2164,7 @@ of this package available from CTAN} \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop \int_compare:nNnT \l__cmd_current_arg_int > 9 { - \__kernel_msg_error:nnxx { ltcmd } { too-many-arguments } + \msg_error:nnxx { cmd } { too-many-arguments } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2172,7 +2172,7 @@ of this package available from CTAN} { \tl_if_empty:NF \l__cmd_last_delimiters_tl { - \__kernel_msg_error:nnxx { ltcmd } { expandable-ending-optional } + \msg_error:nnxx { cmd } { expandable-ending-optional } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2196,11 +2196,11 @@ of this package available from CTAN} { \str_if_eq_p:nn {#1} { u } } } { - \__kernel_msg_error:nnxx { ltcmd } { xparse-argument-type } + \msg_error:nnxx { cmd } { xparse-argument-type } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } } { - \__kernel_msg_error:nnxx { ltcmd } { unknown-argument-type } + \msg_error:nnxx { cmd } { unknown-argument-type } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } } \__cmd_bad_def:wn @@ -2236,7 +2236,7 @@ of this package available from CTAN} \quark_if_recursion_tail_stop_do:nn {#2} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnxx { ltcmd } { processor-in-expandable } + \msg_error:nnxx { cmd } { processor-in-expandable } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2250,7 +2250,7 @@ of this package available from CTAN} \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_long_bool { - \__kernel_msg_error:nnxx { ltcmd } { two-markers } + \msg_error:nnxx { cmd } { two-markers } { \__cmd_environment_or_command: } { + } \__cmd_bad_def:wn } @@ -2263,7 +2263,7 @@ of this package available from CTAN} \quark_if_recursion_tail_stop_do:nn {#1} { \__cmd_bad_arg_spec:wn } \bool_if:NT \l__cmd_obey_spaces_bool { - \__kernel_msg_error:nnxx { ltcmd } { two-markers } + \msg_error:nnxx { cmd } { two-markers } { \__cmd_environment_or_command: } { ! } \__cmd_bad_def:wn } @@ -2346,15 +2346,14 @@ of this package available from CTAN} { \bool_if:NF \l__cmd_environment_bool { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-command-arg } + \msg_error:nnxx { cmd } { invalid-command-arg } { \__cmd_environment_or_command: } { b } \__cmd_bad_def:wn } \tl_clear:N \l__cmd_last_delimiters_tl \__cmd_add_arg_spec:n { b } \quark_if_recursion_tail_stop:n {#1} - \__kernel_msg_error:nnxx { ltcmd } { arg-after-body } + \msg_error:nnxx { cmd } { arg-after-body } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn @@ -2363,7 +2362,7 @@ of this package available from CTAN} { \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF { - \__kernel_msg_error:nnxx { ltcmd } { not-single-token } + \msg_error:nnxx { cmd } { not-single-token } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2378,8 +2377,7 @@ of this package available from CTAN} { \use_none:n } } { - \__kernel_msg_error:nnxxx - { ltcmd } { forbidden-implicit-group-token } + \msg_error:nnxxx { cmd } { forbidden-implicit-group-token } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } { \token_if_eq_meaning:NNTF #1 \c_group_begin_token @@ -2392,8 +2390,7 @@ of this package available from CTAN} { \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-expandable-argument-type } + \msg_error:nnxx { cmd } { invalid-expandable-argument-type } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2405,8 +2402,7 @@ of this package available from CTAN} { \tl_if_empty:NF \l__cmd_last_delimiters_tl { - \__kernel_msg_error:nnxx - { ltcmd } { invalid-after-optional-expandably } + \msg_error:nnxx { cmd } { invalid-after-optional-expandably } { \iow_char:N \\ \l__cmd_function_tl } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -2418,14 +2414,14 @@ of this package available from CTAN} { \tl_if_eq:nnT {##1} {#1} { - \__kernel_msg_warning:nnxx { ltcmd } { optional-mandatory } + \msg_warning:nnxx { cmd } { optional-mandatory } {#2} {#3} } } } \cs_new_protected:Npn \__cmd_bad_arg_spec:wn #1 \__cmd_break_point:n #2 { - \__kernel_msg_error:nnxx { ltcmd } { bad-arg-spec } + \msg_error:nnxx { cmd } { bad-arg-spec } { \__cmd_environment_or_command: } { \tl_to_str:n {#2} } } \cs_new_protected:Npn \__cmd_bad_def:wn #1 \__cmd_break_point:n #2 { } @@ -2437,7 +2433,7 @@ of this package available from CTAN} { \bool_if:NT \l__cmd_expandable_bool { - \__kernel_msg_error:nnx { ltcmd } { inconsistent-long } + \msg_error:nnx { cmd } { inconsistent-long } { \iow_char:N \\ \l__cmd_function_tl } \__cmd_bad_def:wn } @@ -2459,7 +2455,7 @@ of this package available from CTAN} { \bool_if:NT \l__cmd_some_obey_spaces_bool { - \__kernel_msg_error:nnxx { ltcmd } { non-trailing-obey-spaces } + \msg_error:nnxx { cmd } { non-trailing-obey-spaces } { \__cmd_environment_or_command: } { \tl_to_str:n {#1} } \__cmd_bad_def:wn } @@ -3010,7 +3006,7 @@ of this package available from CTAN} \__cmd_peek_nonspace_remove:NTF #1 { \__cmd_grab_D_call:Nw #1 } { - \__kernel_msg_error:nnxx { ltcmd } { missing-required } + \msg_error:nnxx { cmd } { missing-required } { \__cmd_environment_or_command: } { \token_to_str:N #1 } \__cmd_add_arg:o \c_novalue_tl @@ -3154,14 +3150,14 @@ of this package available from CTAN} \exp_after:wN \exp_after:wN \exp_after:wN \peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 } { - \__kernel_msg_error:nnxxx { ltcmd } { verbatim-newline } + \msg_error:nnxxx { cmd } { verbatim-newline } { \__cmd_environment_or_command: } { \tl_to_str:N \l__cmd_v_arg_tl } { \tl_to_str:n {#1} } \__cmd_add_arg:o \c_novalue_tl } { - \__kernel_msg_error:nnxxx { ltcmd } { verbatim-tokenized } + \msg_error:nnxxx { cmd } { verbatim-tokenized } { \__cmd_environment_or_command: } { \tl_to_str:N \l__cmd_v_arg_tl } { \tl_to_str:n {#1} } @@ -3331,8 +3327,7 @@ of this package available from CTAN} \q_nil { } ##2 \ERROR \q__cmd \ERROR } { - \__kernel_msg_expandable_error:nnff - { ltcmd } { missing-required } + \msg_expandable_error:nnff { cmd } { missing-required } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##5 } } { \tl_to_str:n {##2} } ##4 {#1} \q__cmd ##5 ##6 {##7} @@ -3359,8 +3354,7 @@ of this package available from CTAN} ##6 \ERROR } { - \__kernel_msg_expandable_error:nnff - { ltcmd } { missing-required } + \msg_expandable_error:nnff { cmd } { missing-required } { \exp_args:Nf \tl_trim_spaces:n { \token_to_str:N ##4 } } { \tl_to_str:n {##2} } ##3 {#1} \q__cmd ##4 ##5 {##6} @@ -3441,7 +3435,7 @@ of this package available from CTAN} \ProcessedArgument \q_stop } - \__kernel_msg_error:nnxxx { ltcmd } { split-excess-tokens } + \msg_error:nnxxx { cmd } { split-excess-tokens } { \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } } { \tl_to_str:n {#4} } } @@ -3481,11 +3475,11 @@ of this package available from CTAN} { #1 { - \__kernel_msg_error:nnx { ltcmd } { non-xparse } + \msg_error:nnx { cmd } { non-xparse } { \__cmd_environment_or_command: } } { - \__kernel_msg_error:nnx { ltcmd } { unknown } + \msg_error:nnx { cmd } { unknown } { \__cmd_environment_or_command: } } } @@ -3549,11 +3543,11 @@ of this package available from CTAN} } { \group_end: \use_ii:nnn } { - \__kernel_msg_error:nnxx { ltcmd } { not-definable } + \msg_error:nnxx { cmd } { not-definable } { \tl_to_str:n {#1} } { \token_to_str:N #2 } } { - \__kernel_msg_error:nnxx { ltcmd } { not-one-token } + \msg_error:nnxx { cmd } { not-one-token } { \tl_to_str:n {#1} } { \token_to_str:N #2 } } } @@ -3669,49 +3663,49 @@ of this package available from CTAN} ' } } -\__kernel_msg_new:nnnn { ltcmd } { arg-after-body } +\msg_new:nnnn { cmd } { arg-after-body } { In~the~definition~of~#1,~b~(body)~argument~must~be~last. } { The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~ specification~of~the~#1.~This~is~not~allowed. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { bad-arg-spec } +\msg_new:nnnn { cmd } { bad-arg-spec } { Bad~argument~specification~'#2'~for~#1. } { The~argument~specification~provided~was~not~valid:~ one~or~more~mandatory~pieces~of~information~were~missing. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { command-already-defined } +\msg_new:nnnn { cmd } { command-already-defined } { Command~'#1'~already~defined! } { You~have~used~#2~ with~a~command~that~already~has~a~definition. \\ \\ The~existing~definition~of~'#1'~will~not~be~altered. } -\__kernel_msg_new:nnnn { ltcmd } { command-not-yet-defined } +\msg_new:nnnn { cmd } { command-not-yet-defined } { Command ~'#1'~not~yet~defined! } { You~have~used~#2~ with~a~command~that~was~never~defined. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { environment-already-defined } +\msg_new:nnnn { cmd } { environment-already-defined } { Environment~'#1'~already~defined! } { You~have~used~\NewDocumentEnvironment with~an~environment~that~already~has~a~definition. \\ \\ The~existing~definition~of~'#1'~will~not~be~altered. } -\__kernel_msg_new:nnnn { ltcmd } { environment-not-yet-defined } +\msg_new:nnnn { cmd } { environment-not-yet-defined } { Environment~'#1'~not~yet~defined! } { You~have~used~\RenewDocumentEnvironment with~an~environment~that~was~never~defined. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { expandable-ending-optional } +\msg_new:nnnn { cmd } { expandable-ending-optional } { Argument~specification~'#2'~for~expandable~command~'#1'~ ends~with~optional~argument. @@ -3721,13 +3715,13 @@ of this package available from CTAN} (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~ argument~with~expandable~commands. } -\__kernel_msg_new:nnnn { ltcmd } { inconsistent-long } +\msg_new:nnnn { cmd } { inconsistent-long } { Inconsistent~long~arguments~for~expandable~command~'#1'. } { The~arguments~for~an~expandable~command~must~not~involve~short~ arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types. } -\__kernel_msg_new:nnnn { ltcmd } { invalid-command-arg } +\msg_new:nnnn { cmd } { invalid-command-arg } { Argument~type~'#2'~not~available~for~#1. } { The~letter~'#2'~can~only~be~used~in~environment~argument~ @@ -3735,14 +3729,14 @@ of this package available from CTAN} \\ \\ LaTeX~will~ignore~this~entire~definition. } -\__kernel_msg_new:nnnn { ltcmd } { invalid-expandable-argument-type } +\msg_new:nnnn { cmd } { invalid-expandable-argument-type } { Argument~type~'#2'~not~available~for~expandable~command~'#1'. } { The~letter~'#2'~specifies~an~argument~type~which~cannot~be~used~ in~an~expandable~command. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { invalid-after-optional-expandably } +\msg_new:nnnn { cmd } { invalid-after-optional-expandably } { Argument~type~'#2'~not~available~after~optional~argument~ for~expandable~command~'#1'. @@ -3752,13 +3746,13 @@ of this package available from CTAN} in~an~expandable~command~after~an~optional~argument. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { non-trailing-obey-spaces } +\msg_new:nnnn { cmd } { non-trailing-obey-spaces } { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. } { The~prefix~'!'~can~only~apply~to~trailing~optional~arguments. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-definable } +\msg_new:nnnn { cmd } { not-definable } { First~argument~of~'#2'~must~be~a~command. } { The~first~argument~of~'#2'~should~be~the~document~command~that~will~ @@ -3766,7 +3760,7 @@ of this package available from CTAN} backslash~is~missing? \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-one-token } +\msg_new:nnnn { cmd } { not-one-token } { First~argument~of~'#2'~must~be~a~command. } { The~first~argument~of~'#2'~should~be~the~document~command~that~will~ @@ -3774,7 +3768,7 @@ of this package available from CTAN} token.~Perhaps~a~backslash~is~missing? \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { not-single-token } +\msg_new:nnnn { cmd } { not-single-token } { Argument~delimiter~'#2'~for~the~#1~should~be~ a~single~non-space~token. @@ -3784,80 +3778,80 @@ of this package available from CTAN} where~a~single~token~is~required,~LaTeX~found~'#2'. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { forbidden-implicit-group-token } +\msg_new:nnnn { cmd } { forbidden-implicit-group-token } { Argument~delimiter~'#2'~for~the~#1~is~not~allowed. } { The~argument~specification~provided~was~not~valid:~the~implicit~ #3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { processor-in-expandable } +\msg_new:nnnn { cmd } { processor-in-expandable } { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. } { The~argument~specification~for~#1~contains~a~processor~function:~ this~is~only~supported~for~standard~robust~commands. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { too-many-arguments } +\msg_new:nnnn { cmd } { too-many-arguments } { Too~many~arguments~in~argument~specification~'#2'~of~#1. } { The~argument~specification~provided~has~more~than~9~arguments.~ This~cannot~be~implemented. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { two-markers } +\msg_new:nnnn { cmd } { two-markers } { Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. } { The~argument~specification~provided~has~two~markers~'#2'~applying~ to~the~same~argument;~these~are~redundant. } -\__kernel_msg_new:nnnn { ltcmd } { unknown-argument-type } +\msg_new:nnnn { cmd } { unknown-argument-type } { Unknown~argument~type~'#2'~for~the~#1. } { The~letter~'#2'~does~not~specify~a~known~argument~type. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnnn { ltcmd } { xparse-argument-type } +\msg_new:nnnn { cmd } { xparse-argument-type } { Deprecated~argument~type~'#2'~for~the~#1~requires~xparse. } { The~letter~'#2'~specifies~a~known~argument~type~that~requires~ the~xparse~package. \c__cmd_ignore_def_tl } -\__kernel_msg_new:nnn { ltcmd } { if-boolean } +\msg_new:nnn { cmd } { if-boolean } { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} } -\__kernel_msg_new:nnnn { ltcmd } { loop-in-defaults } +\msg_new:nnnn { cmd } { loop-in-defaults } { Defaults~of~#1~have~circular~dependency. } { The~default~values~of~two~or~more~arguments~of~the~#1~ depend~on~each~other~in~a~way~that~cannot~be~resolved. } -\__kernel_msg_new:nnnn { ltcmd } { missing-required } +\msg_new:nnnn { cmd } { missing-required } { Missing~required~argument~for~#1. } { The~current~#1~expects~an~argument~starting~with~'#2'.~ LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed. } -\__kernel_msg_new:nnnn { ltcmd } { non-xparse } +\msg_new:nnnn { cmd } { non-xparse } { \str_uppercase:n #1~not~defined~using~xparse. } { You~have~asked~for~the~argument~specification~for~the~#1,~ but~this~was~not~defined~using~xparse. } -\__kernel_msg_new:nnnn { ltcmd } { split-excess-tokens } +\msg_new:nnnn { cmd } { split-excess-tokens } { Too~many~'#1'~tokens~when~trying~to~split~argument. } { LaTeX~was~asked~to~split~the~input~'#3'~ at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~ There~were~too~many~'#1'~tokens. } -\__kernel_msg_new:nnnn { ltcmd } { unknown } +\msg_new:nnnn { cmd } { unknown } { Unknown~document~#1. } { You~have~asked~for~the~argument~specification~for~the~#1,~ but~it~is~not~defined. } -\__kernel_msg_new:nnnn { ltcmd } { verbatim-newline } +\msg_new:nnnn { cmd } { verbatim-newline } { Verbatim~argument~of~#1~ended~by~end~of~line. } { The~verbatim~argument~of~the~#1~cannot~contain~more~than~one~line,~ @@ -3867,7 +3861,7 @@ of this package available from CTAN} \\ \\ LaTeX~will~ignore~'#2'. } -\__kernel_msg_new:nnnn { ltcmd } { verbatim-tokenized } +\msg_new:nnnn { cmd } { verbatim-tokenized } { The~verbatim~#1~cannot~be~used~inside~an~argument. } { The~#1~takes~a~verbatim~argument.~ @@ -3876,33 +3870,33 @@ of this package available from CTAN} \\ \\ LaTeX~will~ignore~'#2'. } -\__kernel_msg_new:nnn { ltcmd } { define-command } +\msg_new:nnn { cmd } { define-command } { Defining~command~#1~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { define-environment } +\msg_new:nnn { cmd } { define-environment } { Defining~environment~'#1'~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { redefine-command } +\msg_new:nnn { cmd } { redefine-command } { Redefining~command~#1~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { redefine-environment } +\msg_new:nnn { cmd } { redefine-environment } { Redefining~environment~'#1'~ with~sig.~'#2'~\msg_line_context:. } -\__kernel_msg_new:nnn { ltcmd } { optional-mandatory } +\msg_new:nnn { cmd } { optional-mandatory } { Since~the~mandatory~argument~'#1'~has~the~same~delimiter~'#2'~ as~a~previous~optional~argument,~it~will~not~be~possible~to~ omit~all~optional~arguments~when~calling~this~command. } -\__kernel_msg_new:nnn { ltcmd } { unsupported-let } +\msg_new:nnn { cmd } { unsupported-let } { The~command~'#1'~was~undefined~but~not~the~associated~commands~ '#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~ @@ -3916,7 +3910,7 @@ of this package available from CTAN} { \cs_if_exist:NTF #1 { - \__kernel_msg_error:nnxx { ltcmd } { command-already-defined } + \msg_error:nnxx { cmd } { command-already-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \NewDocumentCommand } } @@ -3930,7 +3924,7 @@ of this package available from CTAN} \cs_if_exist:NTF #1 { \__cmd_declare_cmd:Nnn #1 {#2} {#3} } { - \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined } + \msg_error:nnxx { cmd } { command-not-yet-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \RenewDocumentCommand } } @@ -3949,14 +3943,14 @@ of this package available from CTAN} \cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4 { \cs_if_exist:cTF {#1} - { \__kernel_msg_error:nnx { ltcmd } { environment-already-defined } {#1} } + { \msg_error:nnx { cmd } { environment-already-defined } {#1} } { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } \cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4 { \cs_if_exist:cTF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } - { \__kernel_msg_error:nnx { ltcmd } { environment-not-yet-defined } {#1} } + { \msg_error:nnx { cmd } { environment-not-yet-defined } {#1} } } \cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4 { \cs_if_exist:cF {#1} { \__cmd_declare_env:nnnn {#1} {#2} {#3} {#4} } } @@ -3968,7 +3962,7 @@ of this package available from CTAN} { \cs_if_exist:NTF #1 { - \__kernel_msg_error:nnxx { ltcmd } { command-already-defined } + \msg_error:nnxx { cmd } { command-already-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \NewExpandableDocumentCommand } } @@ -3982,7 +3976,7 @@ of this package available from CTAN} \cs_if_exist:NTF #1 { \__cmd_declare_expandable_cmd:Nnn #1 {#2} {#3} } { - \__kernel_msg_error:nnxx { ltcmd } { command-not-yet-defined } + \msg_error:nnxx { cmd } { command-not-yet-defined } { \use:nnn \token_to_str:N #1 { } } { \token_to_str:N \RenewExpandableDocumentCommand } } @@ -4014,7 +4008,7 @@ of this package available from CTAN} \prg_break:n { \use:n } \prg_break_point: { - \__kernel_msg_expandable_error:nnn { ltcmd } { if-boolean } {#1} + \msg_expandable_error:nnn { cmd } { if-boolean } {#1} \use_ii:nn } } @@ -4055,8 +4049,8 @@ of this package available from CTAN} \@ifundefined{ExplSyntaxOff}{}{\latexrelease@postexpl} \catcode`\^^@=\@latexrelease@catcode@null\relax %%% From File: lthooks.dtx -\def\lthooksversion{v1.0m} -\def\lthooksdate{2021/04/29} +\def\lthooksversion{v1.0n} +\def\lthooksdate{2021/05/26} \ExplSyntaxOn \NewModuleRelease{2020/10/01}{lthooks} @@ -4131,7 +4125,7 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_new:n #1 { \__hook_if_declared:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { exists } {#1} } + { \msg_error:nnn { hooks } { exists } {#1} } { \tl_new:c { g__hook_#1_declared_tl } \__hook_make_usable:n {#1} @@ -4212,12 +4206,12 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_provide:nn #1 #2 { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_warning:nnn { hooks } { provide-disabled } {#1} } + { \msg_warning:nnn { hooks } { provide-disabled } {#1} } { \__hook_if_declared:nTF {#1} { \str_if_eq:eeF { \tl_use:c { g__hook_#1_reversed_tl } } {#2} - { \__kernel_msg_error:nnn { hooks } { provide-error } {#1} } + { \msg_error:nnn { hooks } { provide-error } {#1} } } { \tl_new:c { g__hook_#1_declared_tl } @@ -4247,7 +4241,7 @@ of this package available from CTAN} { \tl_if_empty:nTF {#1} { - \__kernel_msg_expandable_error:nn { hooks } { empty-label } + \msg_expandable_error:nn { hooks } { empty-label } \__hook_currname_or_default: } { @@ -4275,7 +4269,7 @@ of this package available from CTAN} { \tl_if_empty:NTF \@currname { - \__kernel_msg_expandable_error:nnn { hooks } { should-not-happen } + \msg_expandable_error:nnn { kernel } { should-not-happen } { Empty~default~label. } \__hook_make_name:n { label-missing } } @@ -4339,7 +4333,7 @@ of this package available from CTAN} } { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} } + { \msg_error:nnn { hooks } { hook-disabled } {#1} } { \__hook_try_declaring_generic_hook:nnn {#1} {#2} {#3} } } } @@ -4359,7 +4353,7 @@ of this package available from CTAN} \__hook_init_structure:n {#1} \__hook_tl_gput_right:cn { __hook_toplevel~#1 } {#3} } - { \__kernel_msg_error:nnn { hooks } { misused-top-level } {#1} } + { \msg_error:nnn { hooks } { misused-top-level } {#1} } } { \prop_get:cnNTF { g__hook_#1_code_prop } {#2} \l__hook_return_tl @@ -4549,7 +4543,7 @@ of this package available from CTAN} {#1} {#2} {#4} \__hook_update_hook_code:n {#1} } - { \__kernel_msg_error:nnnnnn { hooks } { unknown-rule } + { \msg_error:nnnnnn { hooks } { unknown-rule } {#1} {#2} {#3} {#4} } } \cs_new_protected:Npn \__hook_rule_before_gset:nnn #1#2#3 @@ -4768,7 +4762,7 @@ of this package available from CTAN} \cs_new_protected:cpn { __hook_apply_rule_xE:nnn } #1#2#3 { \__hook_debug:n { \__hook_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 { __hook_apply_rule_->:nnn } {#1} {#2} {#3} \use:c { __hook_apply_rule_<-:nnn } {#1} {#2} {#3} @@ -4776,7 +4770,7 @@ of this package available from CTAN} \cs_new_protected:cpn { __hook_apply_rule_xW:nnn } #1#2#3 { \__hook_debug:n { \__hook_msg_pair_found:nnn {#1} {#2} {#3} } - \__kernel_msg_warning:nnnnnn { hooks } { labels-incompatible } + \msg_warning:nnnnnn { hooks } { labels-incompatible } {#1} {#2} {#3} { 0 } } \cs_new_protected:cpn { __hook_apply_rule_->:nnn } #1#2#3 @@ -4976,7 +4970,7 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_gput_next_code:nn #1 #2 { \__hook_if_disabled:nTF {#1} - { \__kernel_msg_error:nnn { hooks } { hook-disabled } {#1} } + { \msg_error:nnn { hooks } { hook-disabled } {#1} } { \__hook_init_structure:n {#1} \__hook_if_usable:nTF {#1} @@ -5102,7 +5096,9 @@ of this package available from CTAN} \prg_return_false: \fi: } -\__kernel_msg_new:nnnn { hooks } { labels-incompatible } +\prop_gput:Nnn \g_msg_module_type_prop { hooks } { LaTeX } +\prop_gput:Nnn \g_msg_module_type_prop { kernel } { LaTeX } +\msg_new:nnnn { hooks } { labels-incompatible } { Labels~'#1'~and~'#2'~are~incompatible \str_if_eq:nnF {#3} {??} { ~in~hook~'#3' } .~ @@ -5112,29 +5108,29 @@ of this package available from CTAN} } { LaTeX~found~two~incompatible~labels~in~the~same~hook.~ This~indicates~an~incompatibility~between~packages. } -\__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.\\ Please~ use~ a~ different~ name~ for~ your~ hook.} -\__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~ with~\iow_char:N\\hook_disable:n~or~\iow_char:N\\DisableHook,~so~ it~cannot~have~code~added~to~it. } -\__kernel_msg_new:nnn { hooks } { empty-label } +\msg_new:nnn { hooks } { empty-label } { Empty~code~label~\msg_line_context:.~ Using~'\__hook_currname_or_default:'~instead. } -\__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. } -\__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' }. ~ @@ -5149,9 +5145,9 @@ of this package available from CTAN} 'voids'~ or~ 'unrelated'. } -\__kernel_msg_new:nnnn { hooks } { misused-top-level } +\msg_new:nnnn { hooks } { misused-top-level } { - Illegal~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ + Illegal~use~of~\iow_char:N \\AddToHook{#1}[top-level]{...}.\\ 'top-level'~is~reserved~for~the~user's~document. } { @@ -5160,38 +5156,32 @@ of this package available from CTAN} '\__hook_currname_or_default:'~for~this~\@cls@pkg,~or~another~ suitable~label. } -\__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} \\ \msg_line_context:. } -\__kernel_msg_new:nnn { hooks } { ddhl-deprecated } - { - \iow_char:N \\DeclareDefaultHookLabel~is~deprecated.\\ - Use~\iow_char:N \\SetDefaultHookLabel~instead.\\ \\ - The~deprecated~name~will~be~removed~in~the~next~release. - } -\__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. } -\__kernel_msg_new:nnn { hooks } { should-not-happen } +\msg_new:nnn { kernel } { should-not-happen } { - ERROR!~This~should~not~happen.~#1 \\ + This~should~not~happen.~#1 \\ Please~report~at~https://github.com/latex3/latex2e. } -\__kernel_msg_new:nnn { hooks } { provide-disabled } +\msg_new:nnn { hooks } { provide-disabled } { - Can't~ provide~ hook~ '#1'~ because~ it~ is~ disabled! + Cannot~ provide~ hook~ '#1'~ because~ it~ is~ disabled! } -\__kernel_msg_new:nnnn { hooks } { provide-error } +\msg_new:nnnn { hooks } { provide-error } { Hook~'#1'~ already~ declared~ as~ a~ \__hook_if_reversed:nTF {#1} { reversed } { normal }~ hook! @@ -5246,11 +5236,11 @@ of this package available from CTAN} \cs_new_protected:Npn \__hook_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} } { @@ -5263,7 +5253,7 @@ of this package available from CTAN} { \seq_gpop:NNTF \g__hook_name_stack_seq \l__hook_return_tl { \tl_gset_eq:NN \g__hook_hook_curr_name_tl \l__hook_return_tl } - { \__kernel_msg_error:nn { hooks } { extra-pop-label } } + { \msg_error:nn { hooks } { extra-pop-label } } } \tl_gput_right:Nn \@kernel@after@enddocument@afterlastpage { \__hook_end_document_label_check: } @@ -5271,7 +5261,7 @@ of this package available from CTAN} { \seq_gpop:NNT \g__hook_name_stack_seq \l__hook_return_tl { - \__kernel_msg_error:nnx { hooks } { missing-pop-label } + \msg_error:nnx { hooks } { missing-pop-label } { \g__hook_hook_curr_name_tl } \tl_gset_eq:NN \g__hook_hook_curr_name_tl \l__hook_return_tl \__hook_end_document_label_check: @@ -5281,7 +5271,7 @@ of this package available from CTAN} { \seq_if_empty:NTF \g__hook_name_stack_seq { - \__kernel_msg_error:nnnnn { hooks } { set-top-level } + \msg_error:nnnnn { hooks } { set-top-level } { for } { SetDefaultHookLabel } {#1} } { \exp_args:Nx \__hook_set_default_label:n { \__hook_make_name:n {#1} } } @@ -5290,16 +5280,11 @@ of this package available from CTAN} { \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_hook_curr_name_tl {#1} } } -\NewDocumentCommand \DeclareDefaultHookLabel { m } - { - \__kernel_msg_error:nn { hooks } { ddhl-deprecated } - \SetDefaultHookLabel {#1} - } \NewDocumentCommand \PushDefaultHookLabel { m } { \__hook_curr_name_push:n {#1} } \NewDocumentCommand \PopDefaultHookLabel { } @@ -5365,8 +5350,8 @@ of this package available from CTAN} %% File: ltcmdhooks.dtx (C) Copyright 2020-2021 %% Frank Mittelbach, Phelype Oleinik, LaTeX Team %%% From File: ltcmdhooks.dtx -\def\ltcmdhooksversion{v1.0a} -\def\ltcmdhooksdate{2021/04/30} +\def\ltcmdhooksversion{v1.0b} +\def\ltcmdhooksdate{2021/05/26} \ExplSyntaxOn \NewModuleRelease{2021/06/01}{ltcmdhooks} {The~hook~management~system~for~commands} @@ -5388,7 +5373,7 @@ of this package available from CTAN} \str_case:nnTF {#3} { { before } { } { after } { } } { \exp_args:Nc \__hook_patch_cmd_or_delay:Nnn {#2} {#2} {#3} } - { \__kernel_msg_error:nnn { hooks } { wrong-cmd-hook } {#2} {#3} } + { \msg_error:nnnn { hooks } { wrong-cmd-hook } {#2} {#3} } } \cs_new_protected:Npn \__hook_patch_cmd_or_delay:Nnn #1 #2 #3 { @@ -5445,7 +5430,7 @@ of this package available from CTAN} { #1 #2 {#4} { - \__kernel_msg_error:nnxx { hooks } { cant-patch } + \msg_error:nnxx { hooks } { cant-patch } { \token_to_str:N #2 } {#3} } } @@ -5575,7 +5560,7 @@ of this package available from CTAN} } \q_recursion_tail \q_recursion_stop { - \__kernel_msg_error:nnxx { hooks } { cant-patch } + \msg_error:nnxx { hooks } { cant-patch } { \c_backslash_str #2 } { retok } } } @@ -5647,24 +5632,21 @@ of this package available from CTAN} \tl_rescan:nV { #4 \__hook_patch_required_catcodes: } \l__hook_tmpa_tl \cs_set_eq:NN #1 \kerneltmpDoNotUse } -\__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'. + Generic~hook~`cmd/#1/#2'~is~invalid. } { - You~tried~to~add~a~hook~to~command~\iow_char:N \\#1,~but~`#2'~ - is~an~invalid~position.~Only~`before'~or~`after'~are~allowed. + You~tried~to~add~a~generic~hook~to~command~\iow_char:N \\#1,~but~`#2'~ + is~an~invalid~component.~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~ - \__hook_unpatchable_cases:n {#2} . + Generic~hooks~cannot~be~added~to~'#1'. } { - You~tried~to~add~a~hook~to~`#1',~but~LaTeX~was~not~able~to~ - add~the~hook~to~that~command~because~`#1'~ - \__hook_unpatchable_cases:n {#2} . + You~tried~to~add~a~hook~to~'#1',~but~LaTeX~was~unable~to~ + patch~the~command~because~it~\__hook_unpatchable_cases:n {#2}. } \cs_new:Npn \__hook_unpatchable_cases:n #1 { @@ -5689,8 +5671,8 @@ of this package available from CTAN} %%% From File: ltpar.dtx %% File: ltpara.dtx (C) Copyright 2020-2021 %%% From File: ltpara.dtx -\def\ltparaversion{v1.0f} -\def\ltparadate{2021/04/16} +\def\ltparaversion{v1.0g} +\def\ltparadate{2021/05/27} \ExplSyntaxOn @@ -5708,7 +5690,7 @@ of this package available from CTAN} \group_begin: \tex_par:D \group_end: - \tex_everypar:D { \__kernel_msg_error:nnnn {para}{mode}{before}{vertical} } + \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } \@kernel@before@para@before \hook_use:n {para/before} \group_begin: @@ -5720,7 +5702,7 @@ of this package available from CTAN} \@kernel@before@para@begin \hook_use:n {para/begin} \if_mode_horizontal: \else: - \__kernel_msg_error:nnnn {para}{mode}{begin}{vertical} \fi: + \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: \__para_handle_indent: } \tex_everypar:D{\g__para_standard_everypar_tl} @@ -5756,7 +5738,7 @@ of this package available from CTAN} \hook_use:n{para/after} \@kernel@after@para@after } - { \__kernel_msg_error:nnnn {para}{mode}{end}{horizontal} } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } } } \tex_par:D @@ -5770,7 +5752,7 @@ of this package available from CTAN} \__para_handle_indent: \the\everypar } } - { \__kernel_msg_error:nn {para}{raw} } + { \msg_error:nn { kernel }{ raw-para } } \tex_indent:D } \cs_new:Npn \para_raw_noindent: { @@ -5780,7 +5762,7 @@ of this package available from CTAN} \tex_everypar:D { \g__para_standard_everypar_tl } \the\everypar } } - { \__kernel_msg_error:nn {para}{raw} } + { \msg_error:nn { kernel }{ raw-para } } \tex_noindent:D } \cs_new_eq:NN \para_raw_end: \tex_par:D @@ -5791,7 +5773,7 @@ of this package available from CTAN} \cs_set_eq:NN \@@par \para_end: \cs_set_eq:NN \endgraf \para_end: \everypar{\@nodocument} %% To get an error if text appears before the -\__kernel_msg_new:nnnn {para} {mode} +\msg_new:nnnn { hooks } { para-mode } { Illegal~mode~ change~ in~ hook~ 'para/#1'.\\ Hook~ code~ did~ not~ remain~ in~ #2~ mode. @@ -5800,16 +5782,18 @@ of this package available from CTAN} Paragraph~ hooks~ cannot~ change~ the~ TeX~ mode~ without~ causing~ endless~ recursion.~ The~ hook~ code~ in~ 'para/#1'~ needs~ to~ stay~ in~ #2~ mode,~ but~ it~ didn't.~ Examine~ the~ hook~ - code~ with~ \ShowHook~ to~ find~ the~ issue. + code~ with~ \iow_char:N \\ShowHook~ to~ find~ the~ issue. } -\__kernel_msg_new:nnnn {para} {raw} +\msg_new:nnnn { kernel } { raw-para } { - Paragraph started while not in vertical mode. + Not~ in~ vertical~ mode. } { - Starting a paragraph with \RawIndent or \RawNoindent - (or \para_raw_indent: or \para_raw_noindent:) is only - allowed if LaTeX is in vertical mode. + Starting~ a~ paragraph~ with~ \iow_char:N \\RawIndent~ or~ + \iow_char:N \\RawNoindent \\ + (or~ \iow_char:N \\para_raw_indent:~ or~ + \iow_char:N \\para_raw_noindent:)~ is~ only~ allowed \\ + if~ LaTeX~ is~ in~ vertical~ mode. } \IncludeInRelease{0000/00/00}% @@ -12705,8 +12689,8 @@ of this package available from CTAN} \endgroup% \EndIncludeInRelease %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0j} -\providecommand\ltfilehookdate{2021/04/29} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \IncludeInRelease{2020/10/01}% {\CurrentFile}{Hook management file}% \ExplSyntaxOn @@ -12773,7 +12757,7 @@ of this package available from CTAN} \seq_gpop:NNTF \g__filehook_input_file_seq \l__filehook_internal_tl { \exp_after:wN \__filehook_file_pop_assign:nnnn \l__filehook_internal_tl } { - \__kernel_msg_error:nnn { hooks } { should-not-happen } + \msg_error:nnn { kernel } { should-not-happen } { Tried~to~pop~from~an~empty~file~name~stack. } } } @@ -13727,7 +13711,7 @@ of this package available from CTAN} \global \@colroom \@colht \ifx \@currlist\@empty \else - \@latexerr{Float(s) lost}\@ehb + \@latex@error{Float(s) lost}\@ehb \global \let \@currlist \@empty \fi \@makefcolumn\@deferlist diff --git a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty index aeaa46f12ee..1aa89066c06 100644 --- a/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex-dev/base/shortvrb.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2020/11/23 v2.1m + [2021/05/28 v2.1n Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e diff --git a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty index 8257719886b..968059fd6d7 100644 --- a/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty +++ b/Master/texmf-dist/tex/latex-dev/base/structuredlog.sty @@ -42,8 +42,8 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %%% From File: ltfilehook.dtx -\providecommand\ltfilehookversion{v1.0j} -\providecommand\ltfilehookdate{2021/04/29} +\providecommand\ltfilehookversion{v1.0k} +\providecommand\ltfilehookdate{2021/05/25} \ProvidesExplPackage {structuredlog}{\ltfilehookdate}{\ltfilehookversion} {Structuring the TeX transcript file} diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty index c8a984b7e6e..2480b6db3fa 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty @@ -30,7 +30,8 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020,2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. \ProvidesPackage{everysel-ltx} diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty index 643a3d92667..2c80f60003b 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty @@ -30,7 +30,8 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020,2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. \newcommand\AtBeginOfEveryFile [1] diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx index 233dfed70fa..101edc715d0 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx @@ -30,11 +30,12 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020,2021 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2021 +%% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2021/02/24} -\def\LaTeXFirstAidVersion{v1.0k} +\def\LaTeXFirstAidDate{2021/03/15} +\def\LaTeXFirstAidVersion{v1.0l} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -102,6 +103,15 @@ % for version {2020/10/04 v3.7n configurable book, report, article document class}% \let\footref\@undefined } +\AddToHook{file/after/bigfoot.sty}{% + \ifnum\count10<\insc@unt + \global\count10=\insc@unt + \fi + \def\FN@allmarks#1{\@elt{#1}% + \ifnum#1<\count256 %<--- problem: 266 isn't the counter for marks + \expandafter\FN@allmarks\expandafter{\number\numexpr#1+\@ne}% + \fi}% +} \endinput %% %% End of file `latex2e-first-aid-for-external-files.ltx'. diff --git a/Master/texmf-dist/tex/latex-dev/tools/longtable.sty b/Master/texmf-dist/tex/latex-dev/tools/longtable.sty index 6c3dcc62fb9..7f8043b018a 100644 --- a/Master/texmf-dist/tex/latex-dev/tools/longtable.sty +++ b/Master/texmf-dist/tex/latex-dev/tools/longtable.sty @@ -43,7 +43,7 @@ \DeclareCurrentRelease{}{2020-02-07} \ProvidesPackage{longtable} - [2021-04-21 v4.15 Multi-page Table package (DPC)] + [2021-05-07 v4.16 Multi-page Table package (DPC)] \def\LT@err{\PackageError{longtable}} \def\LT@warn{\PackageWarning{longtable}} \def\LT@final@warn{% @@ -389,7 +389,7 @@ \def\@tempa{#2}% \ifx\@tempa\@empty\else {\let\\\space - \addcontentsline{lot}{table}{\protect\numberline{\thetable}{#2}}}% + \addcontentsline{\ext@table}{table}{\protect\numberline{\thetable}{#2}}}% \fi} \def\LT@capti@n{% \@ifstar |