diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3msg.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | 380 |
1 files changed, 196 insertions, 184 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 940c93558ed..a18c7b553ff 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3msg.dtx Copyright (C) 2009-2017 The LaTeX3 Project +%% File: l3msg.dtx Copyright (C) 2009-2018 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2017/12/16} +% \date{Released 2018/02/21} % % \maketitle % @@ -530,10 +530,10 @@ % but have their own functions. This allows some text to be pre-defined, % and also ensures that serious errors can be handled properly. % -% \begin{function}[updated = 2011-08-16] -% {\__msg_kernel_new:nnnn, \__msg_kernel_new:nnn} +% \begin{function}[added = 2017-12-17] +% {\__kernel_msg_new:nnnn, \__kernel_msg_new:nnn} % \begin{syntax} -% \cs{__msg_kernel_new:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text} +% \cs{__kernel_msg_new:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text} % \end{syntax} % Creates a kernel \meta{message} for a given \meta{module}. % The message is defined to first give \meta{text} and then @@ -544,9 +544,10 @@ % An error is raised if the \meta{message} already exists. % \end{function} % -% \begin{function}{\__msg_kernel_set:nnnn, \__msg_kernel_set:nnn} +% \begin{function}[added = 2017-12-17] +% {\__kernel_msg_set:nnnn, \__kernel_msg_set:nnn} % \begin{syntax} -% \cs{__msg_kernel_set:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text} +% \cs{__kernel_msg_set:nnnn} \Arg{module} \Arg{message} \Arg{text} \Arg{more text} % \end{syntax} % Sets up the text for a kernel \meta{message} for a given \meta{module}. % The message is defined to first give \meta{text} and then @@ -556,40 +557,40 @@ % these will be supplied and expanded at the time the message is used. % \end{function} % -% \begin{function}[updated = 2012-08-11] +% \begin{function}[added = 2017-12-17] % { -% \__msg_kernel_fatal:nnnnnn , -% \__msg_kernel_fatal:nnnnn , -% \__msg_kernel_fatal:nnnn , -% \__msg_kernel_fatal:nnn , -% \__msg_kernel_fatal:nn , -% \__msg_kernel_fatal:nnxxxx , -% \__msg_kernel_fatal:nnxxx , -% \__msg_kernel_fatal:nnxx , -% \__msg_kernel_fatal:nnx +% \__kernel_msg_fatal:nnnnnn , +% \__kernel_msg_fatal:nnnnn , +% \__kernel_msg_fatal:nnnn , +% \__kernel_msg_fatal:nnn , +% \__kernel_msg_fatal:nn , +% \__kernel_msg_fatal:nnxxxx , +% \__kernel_msg_fatal:nnxxx , +% \__kernel_msg_fatal:nnxx , +% \__kernel_msg_fatal:nnx % } % \begin{syntax} -% \cs{__msg_kernel_fatal:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \cs{__kernel_msg_fatal:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} % \end{syntax} % Issues kernel \meta{module} error \meta{message}, passing \meta{arg one} % to \meta{arg four} to the text-creating functions. After issuing a % fatal error the \TeX{} run halts. Cannot be redirected. % \end{function} % -% \begin{function}[updated = 2012-08-11] +% \begin{function}[added = 2017-12-17] % { -% \__msg_kernel_error:nnnnnn , -% \__msg_kernel_error:nnnnn , -% \__msg_kernel_error:nnnn , -% \__msg_kernel_error:nnn , -% \__msg_kernel_error:nn , -% \__msg_kernel_error:nnxxxx , -% \__msg_kernel_error:nnxxx , -% \__msg_kernel_error:nnxx , -% \__msg_kernel_error:nnx +% \__kernel_msg_error:nnnnnn , +% \__kernel_msg_error:nnnnn , +% \__kernel_msg_error:nnnn , +% \__kernel_msg_error:nnn , +% \__kernel_msg_error:nn , +% \__kernel_msg_error:nnxxxx , +% \__kernel_msg_error:nnxxx , +% \__kernel_msg_error:nnxx , +% \__kernel_msg_error:nnx % } % \begin{syntax} -% \cs{__msg_kernel_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \cs{__kernel_msg_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} % \end{syntax} % Issues kernel \meta{module} error \meta{message}, passing \meta{arg one} % to @@ -598,20 +599,20 @@ % the run continues. Cannot be redirected. % \end{function} % -% \begin{function}[updated = 2012-08-11] +% \begin{function}[added = 2017-12-17] % { -% \__msg_kernel_warning:nnnnnn , -% \__msg_kernel_warning:nnnnn , -% \__msg_kernel_warning:nnnn , -% \__msg_kernel_warning:nnn , -% \__msg_kernel_warning:nn , -% \__msg_kernel_warning:nnxxxx , -% \__msg_kernel_warning:nnxxx , -% \__msg_kernel_warning:nnxx , -% \__msg_kernel_warning:nnx +% \__kernel_msg_warning:nnnnnn , +% \__kernel_msg_warning:nnnnn , +% \__kernel_msg_warning:nnnn , +% \__kernel_msg_warning:nnn , +% \__kernel_msg_warning:nn , +% \__kernel_msg_warning:nnxxxx , +% \__kernel_msg_warning:nnxxx , +% \__kernel_msg_warning:nnxx , +% \__kernel_msg_warning:nnx % } % \begin{syntax} -% \cs{__msg_kernel_warning:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \cs{__kernel_msg_warning:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} % \end{syntax} % Issues kernel \meta{module} warning \meta{message}, passing % \meta{arg one} to @@ -619,20 +620,20 @@ % is added to the log file, but the \TeX{} run is not interrupted. % \end{function} % -% \begin{function}[updated = 2012-08-11] +% \begin{function}[added = 2017-12-17] % { -% \__msg_kernel_info:nnnnnn , -% \__msg_kernel_info:nnnnn , -% \__msg_kernel_info:nnnn , -% \__msg_kernel_info:nnn , -% \__msg_kernel_info:nn , -% \__msg_kernel_info:nnxxxx , -% \__msg_kernel_info:nnxxx , -% \__msg_kernel_info:nnxx , -% \__msg_kernel_info:nnx +% \__kernel_msg_info:nnnnnn , +% \__kernel_msg_info:nnnnn , +% \__kernel_msg_info:nnnn , +% \__kernel_msg_info:nnn , +% \__kernel_msg_info:nn , +% \__kernel_msg_info:nnxxxx , +% \__kernel_msg_info:nnxxx , +% \__kernel_msg_info:nnxx , +% \__kernel_msg_info:nnx % } % \begin{syntax} -% \cs{__msg_kernel_info:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \cs{__kernel_msg_info:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} % \end{syntax} % Issues kernel \meta{module} information \meta{message}, passing % \meta{arg one} to \meta{arg four} to the text-creating functions. @@ -649,16 +650,16 @@ % message text and arguments are not expanded, and messages should be % very short. % -% \begin{function}[EXP, added = 2011-11-23] +% \begin{function}[EXP, added = 2017-12-17] % { -% \__msg_kernel_expandable_error:nnnnnn, -% \__msg_kernel_expandable_error:nnnnn, -% \__msg_kernel_expandable_error:nnnn, -% \__msg_kernel_expandable_error:nnn, -% \__msg_kernel_expandable_error:nn +% \__kernel_msg_expandable_error:nnnnnn, +% \__kernel_msg_expandable_error:nnnnn, +% \__kernel_msg_expandable_error:nnnn, +% \__kernel_msg_expandable_error:nnn, +% \__kernel_msg_expandable_error:nn % } % \begin{syntax} -% \cs{__msg_kernel_expandable_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} +% \cs{__kernel_msg_expandable_error:nnnnnn} \Arg{module} \Arg{message} \Arg{arg one} \Arg{arg two} \Arg{arg three} \Arg{arg four} % \end{syntax} % Issues an error, passing \meta{arg one} to \meta{arg four} % to the text-creating functions. The resulting string must @@ -750,13 +751,13 @@ % This auxiliary is similar to \cs{__chk_if_free_cs:N}, and is used when % defining messages with \cs{msg_new:nnnn}. % \begin{macrocode} -\__debug_patch:nnNNpn { } - { \__debug_log:x { Defining~message~ #1 / #2 ~\msg_line_context: } } +\__kernel_patch:nnNNpn { } + { \__kernel_debug_log:x { Defining~message~ #1 / #2 ~\msg_line_context: } } \cs_new_protected:Npn \__chk_if_free_msg:nn #1#2 { \msg_if_exist:nnT {#1} {#2} { - \@@_kernel_error:nnxx { kernel } { message-already-defined } + \__kernel_msg_error:nnxx { kernel } { message-already-defined } {#1} {#2} } } @@ -1378,7 +1379,7 @@ \cs_new:Npn \@@_class_chk_exist:nT #1 { \cs_if_free:cTF { @@_ #1 _code:nnnnnn } - { \@@_kernel_error:nnx { kernel } { message-class-unknown } {#1} } + { \__kernel_msg_error:nnx { kernel } { message-class-unknown } {#1} } } % \end{macrocode} % \end{macro} @@ -1444,7 +1445,7 @@ \@@_use_redirect_name:n { #2 / #3 } } } - { \@@_kernel_error:nnxx { kernel } { message-unknown } {#2} {#3} } + { \__kernel_msg_error:nnxx { kernel } { message-unknown } {#2} {#3} } } \cs_new_protected:Npn \@@_use_code: { } % \end{macrocode} @@ -1592,7 +1593,7 @@ \tl_if_eq:NNTF \l_@@_class_tl \l_@@_current_class_tl { \prop_put:cnn { l_@@_redirect_ #2 _prop } {#3} {#2} - \@@_kernel_warning:nnxxxx + \__kernel_msg_warning:nnxxxx { kernel } { message-redirect-loop } { \seq_item:Nn \l_@@_class_loop_seq { 1 } } { \seq_item:Nn \l_@@_class_loop_seq { 2 } } @@ -1616,19 +1617,19 @@ % % \subsection{Kernel-specific functions} % -% \begin{macro}{\@@_kernel_new:nnnn, \@@_kernel_new:nnn} -% \begin{macro}{\@@_kernel_set:nnnn, \@@_kernel_set:nnn} +% \begin{macro}{\__kernel_msg_new:nnnn, \__kernel_msg_new:nnn} +% \begin{macro}{\__kernel_msg_set:nnnn, \__kernel_msg_set:nnn} % The kernel needs some messages of its own. These are created using % pre-built functions. Two functions are provided: one more general % and one which only has the short text part. % \begin{macrocode} -\cs_new_protected:Npn \@@_kernel_new:nnnn #1#2 +\cs_new_protected:Npn \__kernel_msg_new:nnnn #1#2 { \msg_new:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected:Npn \@@_kernel_new:nnn #1#2 +\cs_new_protected:Npn \__kernel_msg_new:nnn #1#2 { \msg_new:nnn { LaTeX } { #1 / #2 } } -\cs_new_protected:Npn \@@_kernel_set:nnnn #1#2 +\cs_new_protected:Npn \__kernel_msg_set:nnnn #1#2 { \msg_set:nnnn { LaTeX } { #1 / #2 } } -\cs_new_protected:Npn \@@_kernel_set:nnn #1#2 +\cs_new_protected:Npn \__kernel_msg_set:nnn #1#2 { \msg_set:nnn { LaTeX } { #1 / #2 } } % \end{macrocode} % \end{macro} @@ -1644,10 +1645,10 @@ % \begin{macrocode} \group_begin: \cs_set_protected:Npn \@@_kernel_class_new:nN #1 - { \@@_kernel_class_new_aux:nN { kernel_ #1 } } + { \@@_kernel_class_new_aux:nN { __kernel_msg_ #1 } } \cs_set_protected:Npn \@@_kernel_class_new_aux:nN #1#2 { - \cs_new_protected:cpn { @@_ #1 :nnnnnn } ##1##2##3##4##5##6 + \cs_new_protected:cpn { #1 :nnnnnn } ##1##2##3##4##5##6 { \use:x { @@ -1656,29 +1657,29 @@ { \tl_to_str:n {##5} } { \tl_to_str:n {##6} } } } - \cs_new_protected:cpx { @@_ #1 :nnnnn } ##1##2##3##4##5 - { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } } - \cs_new_protected:cpx { @@_ #1 :nnnn } ##1##2##3##4 - { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} {##3} {##4} { } { } } - \cs_new_protected:cpx { @@_ #1 :nnn } ##1##2##3 - { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} {##3} { } { } { } } - \cs_new_protected:cpx { @@_ #1 :nn } ##1##2 - { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} { } { } { } { } } - \cs_new_protected:cpx { @@_ #1 :nnxxxx } ##1##2##3##4##5##6 + \cs_new_protected:cpx { #1 :nnnnn } ##1##2##3##4##5 + { \exp_not:c { #1 :nnnnnn } {##1} {##2} {##3} {##4} {##5} { } } + \cs_new_protected:cpx { #1 :nnnn } ##1##2##3##4 + { \exp_not:c { #1 :nnnnnn } {##1} {##2} {##3} {##4} { } { } } + \cs_new_protected:cpx { #1 :nnn } ##1##2##3 + { \exp_not:c { #1 :nnnnnn } {##1} {##2} {##3} { } { } { } } + \cs_new_protected:cpx { #1 :nn } ##1##2 + { \exp_not:c { #1 :nnnnnn } {##1} {##2} { } { } { } { } } + \cs_new_protected:cpx { #1 :nnxxxx } ##1##2##3##4##5##6 { \use:x { \exp_not:N \exp_not:n - { \exp_not:c { @@_ #1 :nnnnnn } {##1} {##2} } + { \exp_not:c { #1 :nnnnnn } {##1} {##2} } {##3} {##4} {##5} {##6} } } - \cs_new_protected:cpx { @@_ #1 :nnxxx } ##1##2##3##4##5 - { \exp_not:c { @@_ #1 :nnxxxx } {##1} {##2} {##3} {##4} {##5} { } } - \cs_new_protected:cpx { @@_ #1 :nnxx } ##1##2##3##4 - { \exp_not:c { @@_ #1 :nnxxxx } {##1} {##2} {##3} {##4} { } { } } - \cs_new_protected:cpx { @@_ #1 :nnx } ##1##2##3 - { \exp_not:c { @@_ #1 :nnxxxx } {##1} {##2} {##3} { } { } { } } + \cs_new_protected:cpx { #1 :nnxxx } ##1##2##3##4##5 + { \exp_not:c { #1 :nnxxxx } {##1} {##2} {##3} {##4} {##5} { } } + \cs_new_protected:cpx { #1 :nnxx } ##1##2##3##4 + { \exp_not:c { #1 :nnxxxx } {##1} {##2} {##3} {##4} { } { } } + \cs_new_protected:cpx { #1 :nnx } ##1##2##3 + { \exp_not:c { #1 :nnxxxx } {##1} {##2} {##3} { } { } { } } } % \end{macrocode} % \end{macro} @@ -1686,24 +1687,24 @@ % % \begin{macro} % { -% \@@_kernel_fatal:nnnnnn , -% \@@_kernel_fatal:nnnnn , -% \@@_kernel_fatal:nnnn , -% \@@_kernel_fatal:nnn , -% \@@_kernel_fatal:nn , -% \@@_kernel_fatal:nnxxxx , -% \@@_kernel_fatal:nnxxx , -% \@@_kernel_fatal:nnxx , -% \@@_kernel_fatal:nnx , -% \@@_kernel_error:nnnnnn , -% \@@_kernel_error:nnnnn , -% \@@_kernel_error:nnnn , -% \@@_kernel_error:nnn , -% \@@_kernel_error:nn , -% \@@_kernel_error:nnxxxx , -% \@@_kernel_error:nnxxx , -% \@@_kernel_error:nnxx , -% \@@_kernel_error:nnx +% \__kernel_msg_fatal:nnnnnn , +% \__kernel_msg_fatal:nnnnn , +% \__kernel_msg_fatal:nnnn , +% \__kernel_msg_fatal:nnn , +% \__kernel_msg_fatal:nn , +% \__kernel_msg_fatal:nnxxxx , +% \__kernel_msg_fatal:nnxxx , +% \__kernel_msg_fatal:nnxx , +% \__kernel_msg_fatal:nnx , +% \__kernel_msg_error:nnnnnn , +% \__kernel_msg_error:nnnnn , +% \__kernel_msg_error:nnnn , +% \__kernel_msg_error:nnn , +% \__kernel_msg_error:nn , +% \__kernel_msg_error:nnxxxx , +% \__kernel_msg_error:nnxxx , +% \__kernel_msg_error:nnxx , +% \__kernel_msg_error:nnx % } % Neither fatal kernel errors nor kernel errors can be redirected. We % directly use the code for (non-kernel) fatal errors and errors, @@ -1712,33 +1713,33 @@ % errors. % \begin{macrocode} \@@_kernel_class_new:nN { fatal } \@@_fatal_code:nnnnnn - \cs_undefine:N \@@_kernel_error:nnxx - \cs_undefine:N \@@_kernel_error:nnx - \cs_undefine:N \@@_kernel_error:nn + \cs_undefine:N \__kernel_msg_error:nnxx + \cs_undefine:N \__kernel_msg_error:nnx + \cs_undefine:N \__kernel_msg_error:nn \@@_kernel_class_new:nN { error } \@@_error_code:nnnnnn % \end{macrocode} % \end{macro} % % \begin{macro} % { -% \@@_kernel_warning:nnnnnn , -% \@@_kernel_warning:nnnnn , -% \@@_kernel_warning:nnnn , -% \@@_kernel_warning:nnn , -% \@@_kernel_warning:nn , -% \@@_kernel_warning:nnxxxx , -% \@@_kernel_warning:nnxxx , -% \@@_kernel_warning:nnxx , -% \@@_kernel_warning:nnx , -% \@@_kernel_info:nnnnnn , -% \@@_kernel_info:nnnnn , -% \@@_kernel_info:nnnn , -% \@@_kernel_info:nnn , -% \@@_kernel_info:nn , -% \@@_kernel_info:nnxxxx , -% \@@_kernel_info:nnxxx , -% \@@_kernel_info:nnxx , -% \@@_kernel_info:nnx +% \__kernel_msg_warning:nnnnnn , +% \__kernel_msg_warning:nnnnn , +% \__kernel_msg_warning:nnnn , +% \__kernel_msg_warning:nnn , +% \__kernel_msg_warning:nn , +% \__kernel_msg_warning:nnxxxx , +% \__kernel_msg_warning:nnxxx , +% \__kernel_msg_warning:nnxx , +% \__kernel_msg_warning:nnx , +% \__kernel_msg_info:nnnnnn , +% \__kernel_msg_info:nnnnn , +% \__kernel_msg_info:nnnn , +% \__kernel_msg_info:nnn , +% \__kernel_msg_info:nn , +% \__kernel_msg_info:nnxxxx , +% \__kernel_msg_info:nnxxx , +% \__kernel_msg_info:nnxx , +% \__kernel_msg_info:nnx % } % Kernel messages which can be redirected simply use the machinery for % normal messages, with the module name \enquote{\LaTeX{}}. @@ -1756,7 +1757,7 @@ % Error messages needed to actually implement the message system % itself. % \begin{macrocode} -\@@_kernel_new:nnnn { kernel } { message-already-defined } +\__kernel_msg_new:nnnn { kernel } { message-already-defined } { Message~'#2'~for~module~'#1'~already~defined. } { \c_@@_coding_error_text_tl @@ -1764,7 +1765,7 @@ by~the~module~'#1':~this~message~already~exists. \c_@@_return_text_tl } -\@@_kernel_new:nnnn { kernel } { message-unknown } +\__kernel_msg_new:nnnn { kernel } { message-unknown } { Unknown~message~'#2'~for~module~'#1'. } { \c_@@_coding_error_text_tl @@ -1772,14 +1773,14 @@ by~the~module~'#1':~this~message~does~not~exist. \c_@@_return_text_tl } -\@@_kernel_new:nnnn { kernel } { message-class-unknown } +\__kernel_msg_new:nnnn { kernel } { message-class-unknown } { Unknown~message~class~'#1'. } { LaTeX~has~been~asked~to~redirect~messages~to~a~class~'#1':\\ this~was~never~defined. \c_@@_return_text_tl } -\@@_kernel_new:nnnn { kernel } { message-redirect-loop } +\__kernel_msg_new:nnnn { kernel } { message-redirect-loop } { Message~redirection~loop~caused~by~ {#1} ~=>~ {#2} \tl_if_empty:nF {#3} { ~for~module~' \use_none:n #3 ' } . @@ -1794,7 +1795,7 @@ % % Messages for earlier kernel modules. % \begin{macrocode} -\@@_kernel_new:nnnn { kernel } { bad-number-of-arguments } +\__kernel_msg_new:nnnn { kernel } { bad-number-of-arguments } { Function~'#1'~cannot~be~defined~with~#2~arguments. } { \c_@@_coding_error_text_tl @@ -1802,17 +1803,17 @@ #2~arguments.~ TeX~allows~between~0~and~9~arguments~for~a~single~function. } -\@@_kernel_new:nnn { kernel } { char-active } +\__kernel_msg_new:nnn { kernel } { char-active } { Cannot~generate~active~chars. } -\@@_kernel_new:nnn { kernel } { char-invalid-catcode } +\__kernel_msg_new:nnn { kernel } { char-invalid-catcode } { Invalid~catcode~for~char~generation. } -\@@_kernel_new:nnn { kernel } { char-null-space } +\__kernel_msg_new:nnn { kernel } { char-null-space } { Cannot~generate~null~char~as~a~space. } -\@@_kernel_new:nnn { kernel } { char-out-of-range } +\__kernel_msg_new:nnn { kernel } { char-out-of-range } { Charcode~requested~out~of~engine~range. } -\@@_kernel_new:nnn { kernel } { char-space } +\__kernel_msg_new:nnn { kernel } { char-space } { Cannot~generate~space~chars. } -\@@_kernel_new:nnnn { kernel } { command-already-defined } +\__kernel_msg_new:nnnn { kernel } { command-already-defined } { Control~sequence~#1~already~defined. } { \c_@@_coding_error_text_tl @@ -1821,33 +1822,33 @@ The~current~meaning~is:\\ \ \ #2 } -\@@_kernel_new:nnnn { kernel } { command-not-defined } +\__kernel_msg_new:nnnn { kernel } { command-not-defined } { Control~sequence~#1~undefined. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~use~a~control~sequence~'#1':\\ this~has~not~been~defined~yet. } -\@@_kernel_new:nnn { kernel } { deprecated-command } +\__kernel_msg_new:nnn { kernel } { deprecated-command } { The~deprecated~command~'#2'~has~been~or~will~be~removed~on~#1. \tl_if_empty:nF {#3} { ~Use~instead~'#3'. } } -\@@_kernel_new:nnnn { kernel } { empty-search-pattern } +\__kernel_msg_new:nnnn { kernel } { empty-search-pattern } { Empty~search~pattern. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~replace~an~empty~pattern~by~'#1':~that~ would~lead~to~an~infinite~loop! } -\@@_kernel_new:nnnn { kernel } { out-of-registers } +\__kernel_msg_new:nnnn { kernel } { out-of-registers } { No~room~for~a~new~#1. } { TeX~only~supports~\int_use:N \c_max_register_int \ % of~each~type.~All~the~#1~registers~have~been~used.~ This~run~will~be~aborted~now. } -\@@_kernel_new:nnnn { kernel } { non-base-function } +\__kernel_msg_new:nnnn { kernel } { non-base-function } { Function~'#1'~is~not~a~base~function } { \c_@@_coding_error_text_tl @@ -1856,7 +1857,7 @@ To~define~variants~use~\iow_char:N\\cs_generate_variant:Nn~ and~to~define~other~functions~use~\iow_char:N\\cs_new:Npn. } -\@@_kernel_new:nnnn { kernel } { missing-colon } +\__kernel_msg_new:nnnn { kernel } { missing-colon } { Function~'#1'~contains~no~':'. } { \c_@@_coding_error_text_tl @@ -1865,47 +1866,47 @@ needed~when~defining~conditionals~or~variants,~or~when~building~a~ parameter~text~from~the~number~of~arguments~of~the~function. } -\@@_kernel_new:nnnn { kernel } { overflow } +\__kernel_msg_new:nnnn { kernel } { overflow } { Integers~larger~than~2^{30}-1~cannot~be~stored~in~arrays. } { An~attempt~was~made~to~store~#3~at~position~#2~in~the~array~'#1'.~ The~largest~allowed~value~#4~will~be~used~instead. } -\@@_kernel_new:nnnn { kernel } { out-of-bounds } +\__kernel_msg_new:nnnn { kernel } { out-of-bounds } { Access~to~an~entry~beyond~an~array's~bounds. } { An~attempt~was~made~to~access~or~store~data~at~position~#2~of~the~ array~'#1',~but~this~array~has~entries~at~positions~from~1~to~#3. } -\@@_kernel_new:nnnn { kernel } { protected-predicate } +\__kernel_msg_new:nnnn { kernel } { protected-predicate } { Predicate~'#1'~must~be~expandable. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~define~'#1'~as~a~protected~predicate.~ Only~expandable~tests~can~have~a~predicate~version. } -\@@_kernel_new:nnnn { kernel } { conditional-form-unknown } +\__kernel_msg_new:nnnn { kernel } { conditional-form-unknown } { Conditional~form~'#1'~for~function~'#2'~unknown. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~define~the~conditional~form~'#1'~of~ the~function~'#2',~but~only~'TF',~'T',~'F',~and~'p'~forms~exist. } -\@@_kernel_new:nnnn { kernel } { scanmark-already-defined } +\__kernel_msg_new:nnnn { kernel } { scanmark-already-defined } { Scan~mark~#1~already~defined. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~create~a~new~scan~mark~'#1'~ but~this~name~has~already~been~used~for~a~scan~mark. } -\@@_kernel_new:nnnn { kernel } { variable-not-defined } +\__kernel_msg_new:nnnn { kernel } { variable-not-defined } { Variable~#1~undefined. } { \c_@@_coding_error_text_tl LaTeX~has~been~asked~to~show~a~variable~#1,~but~this~has~not~ been~defined~yet. } -\@@_kernel_new:nnnn { kernel } { variant-too-long } +\__kernel_msg_new:nnnn { kernel } { variant-too-long } { Variant~form~'#1'~longer~than~base~signature~of~'#2'. } { \c_@@_coding_error_text_tl @@ -1913,7 +1914,7 @@ with~a~signature~starting~with~'#1',~but~that~is~longer~than~ the~signature~(part~after~the~colon)~of~'#2'. } -\@@_kernel_new:nnnn { kernel } { invalid-variant } +\__kernel_msg_new:nnnn { kernel } { invalid-variant } { Variant~form~'#1'~invalid~for~base~form~'#2'. } { \c_@@_coding_error_text_tl @@ -1921,6 +1922,17 @@ with~a~signature~starting~with~'#1',~but~cannot~change~an~argument~ from~type~'#3'~to~type~'#4'. } +\__kernel_msg_new:nnn { kernel } { deprecated-variant } + { + Variant~form~'#1'~deprecated~for~base~form~'#2'.~ + One~should~not~change~an~argument~from~type~'#3'~to~type~'#4' + \str_case:nnF {#3} + { + { n } { :~use~a~'\token_if_eq_charcode:NNTF #4 c v V'~variant? } + { N } { :~base~form~only~accepts~a~single~token~argument. } + {#4} { :~base~form~is~already~a~variant. } + } { . } + } % \end{macrocode} % % Some errors are only needed in package mode if debugging is enabled by @@ -1931,15 +1943,15 @@ %<*package> \bool_if:NTF \l@expl@enable@debug@bool { - \@@_kernel_new:nnnn { kernel } { debug } + \__kernel_msg_new:nnnn { kernel } { debug } { The~debugging~option~'#1'~does~not~exist~\msg_line_context:. } { The~functions~'\iow_char:N\\debug_on:n'~and~ '\iow_char:N\\debug_off:n'~only~accept~the~arguments~ 'check-declarations',~'deprecation',~'log-functions',~not~'#1'. } - \@@_kernel_new:nnn { kernel } { expr } { '#2'~in~#1 } - \@@_kernel_new:nnnn { kernel } { local-global } + \__kernel_msg_new:nnn { kernel } { expr } { '#2'~in~#1 } + \__kernel_msg_new:nnnn { kernel } { local-global } { Inconsistent~local/global~assignment } { \c_@@_coding_error_text_tl @@ -1948,7 +1960,7 @@ \if:w l #1 local \else: \if:w g #1 global \else: constant \fi: \fi: \ variable~'#3'. } - \@@_kernel_new:nnnn { kernel } { non-declared-variable } + \__kernel_msg_new:nnnn { kernel } { non-declared-variable } { The~variable~#1~has~not~been~declared~\msg_line_context:. } { Checking~is~active,~and~you~have~tried~do~so~something~like: \\ @@ -1960,7 +1972,7 @@ } } { - \@@_kernel_new:nnnn { kernel } { enable-debug } + \__kernel_msg_new:nnnn { kernel } { enable-debug } { To~use~'#1'~load~expl3~with~the~'enable-debug'~option. } { The~function~'#1'~will~be~ignored~because~it~can~only~work~if~ @@ -1972,7 +1984,7 @@ } %</package> %<*initex> -\@@_kernel_new:nnnn { kernel } { enable-debug } +\__kernel_msg_new:nnnn { kernel } { enable-debug } { '#1'~cannot~be~used~in~format~mode. } { The~function~'#1'~will~be~ignored~because~it~can~only~work~if~ @@ -1987,48 +1999,48 @@ % Some errors only appear in expandable settings, % hence don't need a \enquote{more-text} argument. % \begin{macrocode} -\@@_kernel_new:nnn { kernel } { bad-exp-end-f } +\__kernel_msg_new:nnn { kernel } { bad-exp-end-f } { Misused~\exp_end_continue_f:w or~:nw } -\@@_kernel_new:nnn { kernel } { bad-variable } +\__kernel_msg_new:nnn { kernel } { bad-variable } { Erroneous~variable~#1 used! } -\@@_kernel_new:nnn { kernel } { misused-sequence } +\__kernel_msg_new:nnn { kernel } { misused-sequence } { A~sequence~was~misused. } -\@@_kernel_new:nnn { kernel } { misused-prop } +\__kernel_msg_new:nnn { kernel } { misused-prop } { A~property~list~was~misused. } -\@@_kernel_new:nnn { kernel } { negative-replication } +\__kernel_msg_new:nnn { kernel } { negative-replication } { Negative~argument~for~\prg_replicate:nn. } -\@@_kernel_new:nnn { kernel } { prop-keyval } +\__kernel_msg_new:nnn { kernel } { prop-keyval } { Missing/extra~'='~in~'#1'~(in~'..._keyval:Nn') } -\@@_kernel_new:nnn { kernel } { unknown-comparison } +\__kernel_msg_new:nnn { kernel } { unknown-comparison } { Relation~'#1'~unknown:~use~=,~<,~>,~==,~!=,~<=,~>=. } -\@@_kernel_new:nnn { kernel } { zero-step } +\__kernel_msg_new:nnn { kernel } { zero-step } { Zero~step~size~for~step~function~#1. } % \end{macrocode} % % Messages used by the \enquote{\texttt{show}} functions. % \begin{macrocode} -\@@_kernel_new:nnn { kernel } { show-clist } +\__kernel_msg_new:nnn { kernel } { show-clist } { The~comma~list~ \tl_if_empty:nF {#1} { #1 ~ } \tl_if_empty:nTF {#2} { is~empty \\>~ . } { contains~the~items~(without~outer~braces): #2 . } } -\@@_kernel_new:nnn { kernel } { show-prop } +\__kernel_msg_new:nnn { kernel } { show-prop } { The~property~list~#1~ \tl_if_empty:nTF {#2} { is~empty \\>~ . } { contains~the~pairs~(without~outer~braces): #2 . } } -\@@_kernel_new:nnn { kernel } { show-seq } +\__kernel_msg_new:nnn { kernel } { show-seq } { The~sequence~#1~ \tl_if_empty:nTF {#2} { is~empty \\>~ . } { contains~the~items~(without~outer~braces): #2 . } } -\@@_kernel_new:nnn { kernel } { show-streams } +\__kernel_msg_new:nnn { kernel } { show-streams } { \tl_if_empty:nTF {#2} { No~ } { The~following~ } \str_case:nn {#1} @@ -2087,18 +2099,18 @@ % % \begin{macro} % { -% \@@_kernel_expandable_error:nnnnnn, -% \@@_kernel_expandable_error:nnnnn, -% \@@_kernel_expandable_error:nnnn, -% \@@_kernel_expandable_error:nnn, -% \@@_kernel_expandable_error:nn +% \__kernel_msg_expandable_error:nnnnnn, +% \__kernel_msg_expandable_error:nnnnn, +% \__kernel_msg_expandable_error:nnnn, +% \__kernel_msg_expandable_error:nnn, +% \__kernel_msg_expandable_error:nn % } % The command built from the csname % |\c_@@_text_prefix_tl LaTeX / #1 / #2| % takes four arguments and builds the error text, which is fed to % \cs{@@_expandable_error:n}. % \begin{macrocode} -\cs_new:Npn \@@_kernel_expandable_error:nnnnnn #1#2#3#4#5#6 +\cs_new:Npn \__kernel_msg_expandable_error:nnnnnn #1#2#3#4#5#6 { \exp_args:Nf \@@_expandable_error:n { @@ -2107,24 +2119,24 @@ {#3} {#4} {#5} {#6} } } -\cs_new:Npn \@@_kernel_expandable_error:nnnnn #1#2#3#4#5 +\cs_new:Npn \__kernel_msg_expandable_error:nnnnn #1#2#3#4#5 { - \@@_kernel_expandable_error:nnnnnn + \__kernel_msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} {#5} { } } -\cs_new:Npn \@@_kernel_expandable_error:nnnn #1#2#3#4 +\cs_new:Npn \__kernel_msg_expandable_error:nnnn #1#2#3#4 { - \@@_kernel_expandable_error:nnnnnn + \__kernel_msg_expandable_error:nnnnnn {#1} {#2} {#3} {#4} { } { } } -\cs_new:Npn \@@_kernel_expandable_error:nnn #1#2#3 +\cs_new:Npn \__kernel_msg_expandable_error:nnn #1#2#3 { - \@@_kernel_expandable_error:nnnnnn + \__kernel_msg_expandable_error:nnnnnn {#1} {#2} {#3} { } { } { } } -\cs_new:Npn \@@_kernel_expandable_error:nn #1#2 +\cs_new:Npn \__kernel_msg_expandable_error:nn #1#2 { - \@@_kernel_expandable_error:nnnnnn + \__kernel_msg_expandable_error:nnnnnn {#1} {#2} { } { } { } { } } % \end{macrocode} |