l3 (22feb18)

git-svn-id: svn://tug.org/texlive/trunk@46712 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 72 insertions, 72 deletions

diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index 1cf07be68d5..045d969b6ba 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -27,8 +27,8 @@
 %<*driver|package>
 % The version of expl3 required is tested as early as possible, as
 % some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2017/12/16]
-%<package>\@ifpackagelater{expl3}{2017/12/16}
+\RequirePackage{expl3}[2018/02/21]
+%<package>\@ifpackagelater{expl3}{2018/02/21}
 %<package>  {}
 %<package>  {%
 %<package>    \PackageError{xparse}{Support package l3kernel too old}
@@ -67,7 +67,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2017/12/16}
+% \date{Released 2018/02/21}
 %
 % \maketitle
 %
@@ -776,7 +776,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xparse}{2017/12/16}{}
+\ProvidesExplPackage{xparse}{2018/02/21}{}
   {L3 Experimental document command parser}
 %    \end{macrocode}
 %
@@ -1032,7 +1032,7 @@
   {
     \cs_if_exist:NTF #1
       {
-        \__msg_kernel_info:nnxx { xparse } { redefine-command }
+        \__kernel_msg_info:nnxx { xparse } { redefine-command }
           { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
       {
@@ -1040,10 +1040,10 @@
           { \cs_if_exist_p:c { \cs_to_str:N #1 ~ code } }
           { \cs_if_exist_p:c { \cs_to_str:N #1 ~ defaults } }
           {
-            \__msg_kernel_warning:nnx { xparse } { unsupported-let }
+            \__kernel_msg_warning:nnx { xparse } { unsupported-let }
               { \token_to_str:N #1 }
           }
-        \__msg_kernel_info:nnxx { xparse } { define-command }
+        \__kernel_msg_info:nnxx { xparse } { define-command }
           { \token_to_str:N #1 } { \tl_to_str:n {#2} }
       }
     \bool_set_false:N \l_@@_environment_bool
@@ -1194,11 +1194,11 @@
     \cs_if_exist:cTF {#1}
 %</package>
       {
-        \__msg_kernel_info:nnxx { xparse } { redefine-environment }
+        \__kernel_msg_info:nnxx { xparse } { redefine-environment }
           {#1} { \tl_to_str:n {#2} }
       }
       {
-        \__msg_kernel_info:nnxx { xparse } { define-environment }
+        \__kernel_msg_info:nnxx { xparse } { define-environment }
           {#1} { \tl_to_str:n {#2} }
       }
     \bool_set_false:N \l_@@_expandable_bool
@@ -1314,7 +1314,7 @@
   }
 \cs_new_protected:Npn \@@_defaults_error:w \q_recursion_stop
   {
-    \__msg_kernel_error:nnx { xparse } { loop-in-defaults }
+    \__kernel_msg_error:nnx { xparse } { loop-in-defaults }
       { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
   }
 %    \end{macrocode}
@@ -1431,7 +1431,7 @@
     \@@_end_expandable_defaults:nnnNNn {#1} { } {#1} #2#3
       { } { } { } { } { } { } { } { } { } { }
       {
-        \__msg_kernel_expandable_error:nnn
+        \__kernel_msg_expandable_error:nnn
           { xparse } { loop-in-defaults } {#4}
         \use_iv:nnnn
       }
@@ -1531,7 +1531,7 @@
       \q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
     \int_compare:nNnT \l_@@_current_arg_int > 9
       {
-        \__msg_kernel_error:nnxx { xparse } { too-many-arguments }
+        \__kernel_msg_error:nnxx { xparse } { too-many-arguments }
           { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
         \@@_bad_def:wn
       }
@@ -1539,7 +1539,7 @@
       {
         \tl_if_empty:NF \l_@@_last_delimiters_tl
           {
-            \__msg_kernel_error:nnxx { xparse } { expandable-ending-optional }
+            \__kernel_msg_error:nnxx { xparse } { expandable-ending-optional }
               { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
             \@@_bad_def:wn
           }
@@ -1555,7 +1555,7 @@
     \int_incr:N \l_@@_current_arg_int
     \cs_if_exist_use:cF { @@_normalize_type_ \tl_to_str:n {#1} :w }
       {
-        \__msg_kernel_error:nnxx { xparse } { unknown-argument-type }
+        \__kernel_msg_error:nnxx { xparse } { unknown-argument-type }
           { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
         \@@_bad_def:wn
       }
@@ -1628,7 +1628,7 @@
     \quark_if_recursion_tail_stop_do:nn {#2} { \@@_bad_arg_spec:wn }
     \bool_if:NT \l_@@_expandable_bool
       {
-        \__msg_kernel_error:nnxx { xparse } { processor-in-expandable }
+        \__kernel_msg_error:nnxx { xparse } { processor-in-expandable }
           { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
         \@@_bad_def:wn
       }
@@ -1800,13 +1800,13 @@
         \exp_args:Nx \tl_if_single_token:nF
           { \exp_args:No \tl_to_str:n { \use:nn #1 { } } }
           {
-            \__msg_kernel_warning:nnxx { xparse } { not-single-char }
+            \__kernel_msg_warning:nnxx { xparse } { not-single-char }
               { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
           }
         \group_end:
       }
       {
-        \__msg_kernel_error:nnxx { xparse } { not-single-char }
+        \__kernel_msg_error:nnxx { xparse } { not-single-char }
           { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
         \@@_bad_def:wn
       }
@@ -1822,7 +1822,7 @@
   {
     \bool_if:NT \l_@@_expandable_bool
       {
-        \__msg_kernel_error:nnxx
+        \__kernel_msg_error:nnxx
           { xparse } { invalid-expandable-argument-type }
           { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
         \@@_bad_def:wn
@@ -1835,7 +1835,7 @@
       {
         \tl_if_empty:NF \l_@@_last_delimiters_tl
           {
-            \__msg_kernel_error:nnxx
+            \__kernel_msg_error:nnxx
               { xparse } { invalid-after-optional-expandably }
               { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
             \@@_bad_def:wn
@@ -1857,7 +1857,7 @@
       {
         \tl_if_eq:nnT {##1} {#1}
           {
-            \__msg_kernel_warning:nnxx { xparse } { optional-mandatory }
+            \__kernel_msg_warning:nnxx { xparse } { optional-mandatory }
               {#2} {#3}
           }
       }
@@ -1871,7 +1871,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_bad_arg_spec:wn #1 \@@_break_point:n #2
   {
-    \__msg_kernel_error:nnxx { xparse } { bad-arg-spec }
+    \__kernel_msg_error:nnxx { xparse } { bad-arg-spec }
       { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#2} }
   }
 \cs_new_protected:Npn \@@_bad_def:wn #1 \@@_break_point:n #2 { }
@@ -1894,7 +1894,7 @@
       {
         \bool_if:NT \l_@@_expandable_bool
           {
-            \__msg_kernel_error:nnx { xparse } { inconsistent-long }
+            \__kernel_msg_error:nnx { xparse } { inconsistent-long }
               { \iow_char:N \\ \l_@@_function_tl }
             \@@_bad_def:wn
           }
@@ -2926,7 +2926,7 @@
     \peek_meaning_remove_ignore_spaces:NTF #1
       { \@@_grab_D_call:Nw #1 }
       {
-        \__msg_kernel_error:nnxx { xparse } { missing-required }
+        \__kernel_msg_error:nnxx { xparse } { missing-required }
           { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
           { \token_to_str:N #1 }
         \@@_add_arg:o \c_novalue_tl
@@ -3208,14 +3208,14 @@
     \exp_after:wN \exp_after:wN \exp_after:wN
       \peek_meaning_remove:NTF \char_generate:nn { \tex_endlinechar:D } { 6 }
       {
-        \__msg_kernel_error:nnxxx { xparse } { verbatim-newline }
+        \__kernel_msg_error:nnxxx { xparse } { verbatim-newline }
           { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
           { \tl_to_str:N \l_@@_v_arg_tl }
           { \tl_to_str:n {#1} }
         \@@_add_arg:o \c_novalue_tl
       }
       {
-        \__msg_kernel_error:nnxxx { xparse } { verbatim-tokenized }
+        \__kernel_msg_error:nnxxx { xparse } { verbatim-tokenized }
           { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
           { \tl_to_str:N \l_@@_v_arg_tl }
           { \tl_to_str:n {#1} }
@@ -3566,7 +3566,7 @@
               \q_nil { } ##2 \ERROR \q_@@ \ERROR
           }
           {
-            \__msg_kernel_expandable_error:nnnn
+            \__kernel_msg_expandable_error:nnnn
               { xparse } { missing-required } {##5} {##2}
             ##4 {#1} \q_@@ ##5 ##6 {##7}
           }
@@ -3602,7 +3602,7 @@
               ##6 \ERROR
           }
           {
-            \__msg_kernel_expandable_error:nnnn
+            \__kernel_msg_expandable_error:nnnn
               { xparse } { missing-required } {##4} {##2}
             ##3 {#1} \q_@@ ##4 ##5 {##6}
           }
@@ -3742,7 +3742,7 @@
                   \ProcessedArgument
                   \q_stop
               }
-            \__msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
+            \__kernel_msg_error:nnxxx { xparse } { split-excess-tokens }
               { \tl_to_str:n {#3} } { \int_eval:n { #2 + 1 } }
               { \tl_to_str:n {#4} }
           }
@@ -3791,11 +3791,11 @@
   {
     \cs_if_exist:NTF #1
       {
-        \__msg_kernel_error:nnx { xparse } { non-xparse-command }
+        \__kernel_msg_error:nnx { xparse } { non-xparse-command }
           { \token_to_str:N #1 }
       }
       {
-        \__msg_kernel_error:nnx { xparse } { unknown-command }
+        \__kernel_msg_error:nnx { xparse } { unknown-command }
           { \token_to_str:N #1 }
       }
   }
@@ -3803,11 +3803,11 @@
   {
     \cs_if_exist:cTF {#1}
       {
-        \__msg_kernel_error:nnx { xparse } { non-xparse-environment }
+        \__kernel_msg_error:nnx { xparse } { non-xparse-environment }
           { \tl_to_str:n {#1} }
       }
       {
-        \__msg_kernel_error:nnx { xparse } { unknown-environment }
+        \__kernel_msg_error:nnx { xparse } { unknown-environment }
           { \tl_to_str:n {#1} }
       }
   }
@@ -3917,11 +3917,11 @@
         }
         { \group_end: \use_ii:nnn }
       {
-        \__msg_kernel_error:nnxx { xparse } { not-definable }
+        \__kernel_msg_error:nnxx { xparse } { not-definable }
           { \tl_to_str:n {#1} } { \token_to_str:N #2 }
       }
       {
-        \__msg_kernel_error:nnxx { xparse } { not-one-token }
+        \__kernel_msg_error:nnxx { xparse } { not-one-token }
           { \tl_to_str:n {#1} } { \token_to_str:N #2 }
       }
     }
@@ -3995,7 +3995,7 @@
 %
 % Some messages intended as errors.
 %    \begin{macrocode}
-\__msg_kernel_new:nnnn { xparse } { bad-arg-spec }
+\__kernel_msg_new:nnnn { xparse } { bad-arg-spec }
   { Bad~argument~specification~'#2'~for~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
@@ -4003,35 +4003,35 @@
     one~or~more~mandatory~pieces~of~information~were~missing. \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { command-already-defined }
+\__kernel_msg_new:nnnn { xparse } { 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.
   }
-\__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
+\__kernel_msg_new:nnnn { xparse } { command-not-yet-defined }
   { Command ~'#1'~not~yet~defined! }
   {
     You~have~used~#2~
     with~a~command~that~was~never~defined. \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { environment-already-defined }
+\__kernel_msg_new:nnnn { xparse } { 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~be~overwritten.
   }
-\__msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
+\__kernel_msg_new:nnnn { xparse } { environment-not-yet-defined }
   { Environment~'#1'~not~yet~defined! }
   {
     You~have~used~\RenewDocumentEnvironment
     with~an~environment~that~was~never~defined. \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
+\__kernel_msg_new:nnnn { xparse } { expandable-ending-optional }
   {
     Argument~specification~'#2'~for~expandable~command~'#1'~
     ends~with~optional~argument.
@@ -4042,21 +4042,21 @@
     (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
     argument~with~expandable~commands.
   }
-\__msg_kernel_new:nnnn { xparse } { if-boolean }
+\__kernel_msg_new:nnnn { xparse } { if-boolean }
   { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} }
   {
     \c__msg_coding_error_text_tl
     The~first~argument~of~\iow_char:N\\IfBoolean(TF/T/F)~must~be~
     a~boolean~argument~obtained~from~parsing~'s'~or~'t'~arguments.
   }
-\__msg_kernel_new:nnnn { xparse } { inconsistent-long }
+\__kernel_msg_new:nnnn { xparse } { inconsistent-long }
   { Inconsistent~long~arguments~for~expandable~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
     The~arguments~for~an~expandable~command~must~not~involve~short~
     arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types.
   }
-\__msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
+\__kernel_msg_new:nnnn { xparse } { invalid-expandable-argument-type }
   { Argument~type~'#2'~not~available~for~expandable~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
@@ -4065,7 +4065,7 @@
     \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { invalid-after-optional-expandably }
+\__kernel_msg_new:nnnn { xparse } { invalid-after-optional-expandably }
   {
     Argument~type~'#2'~not~available~after~optional~argument~
     for~expandable~command~'#1'.
@@ -4077,32 +4077,32 @@
     \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { loop-in-defaults }
+\__kernel_msg_new:nnnn { xparse } { loop-in-defaults }
   { Circular~dependency~in~defaults~of~'#1'. }
   {
     \c__msg_coding_error_text_tl
     The~default~values~of~two~or~more~arguments~of~'#1'~depend~on~each~
     other~in~a~way~that~cannot~be~resolved.
   }
-\__msg_kernel_new:nnnn { xparse } { missing-required }
+\__kernel_msg_new:nnnn { xparse } { missing-required }
   { Failed~to~find~required~argument~starting~with~'#2'~for~command~'#1'. }
   {
     The~current~command~'#1'~expects~an~argument~starting~with~'#2'.~
     LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~processed.
   }
-\__msg_kernel_new:nnnn { xparse } { non-xparse-command }
+\__kernel_msg_new:nnnn { xparse } { non-xparse-command }
   { Command~'#1'~not~defined~using~xparse. }
   {
     You~have~asked~for~the~argument~specification~for~a~command~'#1',~
     but~this~is~not~a~command~defined~using~xparse.
   }
-\__msg_kernel_new:nnnn { xparse } { non-xparse-environment }
+\__kernel_msg_new:nnnn { xparse } { non-xparse-environment }
   { Environment~'#1'~not~defined~using~xparse. }
   {
     You~have~asked~for~the~argument~specification~for~an~environment~'#1',~
     but~this~is~not~an~environment~defined~using~xparse.
   }
-\__msg_kernel_new:nnnn { xparse } { not-definable }
+\__kernel_msg_new:nnnn { xparse } { not-definable }
   { First~argument~of~'#2'~must~be~a~command. }
   {
     \c__msg_coding_error_text_tl
@@ -4112,7 +4112,7 @@
     \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { not-one-token }
+\__kernel_msg_new:nnnn { xparse } { not-one-token }
   { First~argument~of~'#2'~must~be~a~command. }
   {
     \c__msg_coding_error_text_tl
@@ -4122,7 +4122,7 @@
     \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { not-single-char }
+\__kernel_msg_new:nnnn { xparse } { not-single-char }
   {
     Argument~delimiter~'#2'~for~the~command~'#1'~should~be~
     a~single~character.
@@ -4133,7 +4133,7 @@
     where~a~single~character~is~required,~LaTeX~found~'#2'. \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { processor-in-expandable }
+\__kernel_msg_new:nnnn { xparse } { processor-in-expandable }
   { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
@@ -4141,14 +4141,14 @@
     this~is~only~supported~for~standard~robust~commands. \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { split-excess-tokens }
+\__kernel_msg_new:nnnn { xparse } { 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.
   }
-\__msg_kernel_new:nnnn { xparse } { too-many-arguments }
+\__kernel_msg_new:nnnn { xparse } { too-many-arguments }
   { Too~many~arguments~in~argument~specification~'#2'~of~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
@@ -4156,26 +4156,26 @@
     This~cannot~be~implemented. \\ \\
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { unknown-argument-type }
+\__kernel_msg_new:nnnn { xparse } { unknown-argument-type }
   { Unknown~argument~type~'#2'~for~the~command~'#1'. }
   {
     \c__msg_coding_error_text_tl
     The~letter~'#2'~does~not~specify~a~known~argument~type.~
     LaTeX~will~ignore~this~entire~definition.
   }
-\__msg_kernel_new:nnnn { xparse } { unknown-command }
+\__kernel_msg_new:nnnn { xparse } { unknown-command }
   { Unknown~document~command~'#1'. }
   {
     You~have~asked~for~the~argument~specification~for~a~command~'#1',~
     but~it~is~not~defined.
   }
-\__msg_kernel_new:nnnn { xparse } { unknown-environment }
+\__kernel_msg_new:nnnn { xparse } { unknown-environment }
   { Unknown~document~environment~'#1'. }
   {
     You~have~asked~for~the~argument~specification~for~an~environment~'#1',~
     but~it~is~not~defined.
   }
-\__msg_kernel_new:nnnn { xparse } { verbatim-newline }
+\__kernel_msg_new:nnnn { xparse } { verbatim-newline }
   { Verbatim~argument~of~'#1'~ended~by~end~of~line. }
   {
     The~verbatim~argument~of~'#1'~cannot~contain~more~than~one~line,~
@@ -4185,7 +4185,7 @@
     \\ \\
     LaTeX~will~ignore~'#2'.
   }
-\__msg_kernel_new:nnnn { xparse } { verbatim-tokenized }
+\__kernel_msg_new:nnnn { xparse } { verbatim-tokenized }
   {
     The~verbatim~command~'#1'~cannot~be~used~inside~an~argument.~
   }
@@ -4200,33 +4200,33 @@
 %
 % Intended more for information.
 %    \begin{macrocode}
-\__msg_kernel_new:nnn { xparse } { define-command }
+\__kernel_msg_new:nnn { xparse } { define-command }
   {
     Defining~command~#1~
     with~sig.~'#2'~\msg_line_context:.
   }
-\__msg_kernel_new:nnn { xparse } { define-environment }
+\__kernel_msg_new:nnn { xparse } { define-environment }
   {
     Defining~environment~'#1'~
     with~sig.~'#2'~\msg_line_context:.
   }
-\__msg_kernel_new:nnn { xparse } { redefine-command }
+\__kernel_msg_new:nnn { xparse } { redefine-command }
   {
     Redefining~command~#1~
     with~sig.~'#2'~\msg_line_context:.
   }
-\__msg_kernel_new:nnn { xparse } { redefine-environment }
+\__kernel_msg_new:nnn { xparse } { redefine-environment }
   {
     Redefining~environment~'#1'~
     with~sig.~'#2'~\msg_line_context:.
   }
-\__msg_kernel_new:nnn { xparse } { optional-mandatory }
+\__kernel_msg_new:nnn { xparse } { 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.
   }
-\__msg_kernel_new:nnn { xparse } { unsupported-let }
+\__kernel_msg_new:nnn { xparse } { unsupported-let }
   {
     The~command~'#1'~was~undefined~but~not~the~associated~commands~
     '#1~code'~and/or~'#1~defaults'.~Maybe~you~tried~using~
@@ -4264,7 +4264,7 @@
       {
         \cs_if_exist:NTF #1
           {
-            \__msg_kernel_error:nnxx { xparse } { command-already-defined }
+            \__kernel_msg_error:nnxx { xparse } { command-already-defined }
               { \use:nnn \token_to_str:N #1 { } }
               { \token_to_str:N \NewDocumentCommand }
           }
@@ -4278,7 +4278,7 @@
         \cs_if_exist:NTF #1
           { \@@_declare_cmd:Nnn #1 {#2} {#3} }
           {
-            \__msg_kernel_error:nnxx { xparse } { command-not-yet-defined }
+            \__kernel_msg_error:nnxx { xparse } { command-not-yet-defined }
               { \use:nnn \token_to_str:N #1 { } }
               { \token_to_str:N \RenewDocumentCommand }
           }
@@ -4309,14 +4309,14 @@
 \cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4
   {
     \cs_if_exist:cTF {#1}
-      { \__msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
+      { \__kernel_msg_error:nnx { xparse } { environment-already-defined } {#1} }
       { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
 }
 \cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4
   {
     \cs_if_exist:cTF {#1}
       { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
-      { \__msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
+      { \__kernel_msg_error:nnx { xparse } { environment-not-yet-defined } {#1} }
   }
 \cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4
   { \cs_if_exist:cF {#1} { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} } }
@@ -4340,7 +4340,7 @@
       {
         \cs_if_exist:NTF #1
           {
-            \__msg_kernel_error:nnxx { xparse } { command-already-defined }
+            \__kernel_msg_error:nnxx { xparse } { command-already-defined }
               { \use:nnn \token_to_str:N #1 { } }
               { \token_to_str:N \NewExpandableDocumentCommand }
           }
@@ -4354,7 +4354,7 @@
         \cs_if_exist:NTF #1
           { \@@_declare_expandable_cmd:Nnn #1 {#2} {#3} }
           {
-            \__msg_kernel_error:nnxx { xparse } { command-not-yet-defined }
+            \__kernel_msg_error:nnxx { xparse } { command-not-yet-defined }
               { \use:nnn \token_to_str:N #1 { } }
               { \token_to_str:N \RenewExpandableDocumentCommand }
           }
@@ -4391,7 +4391,7 @@
       { \tl_if_single_token_p:n #1 }
       { \bool_if:NTF #1 }
       {
-        \__msg_kernel_error:nnn { xparse } { if-boolean } {#1}
+        \__kernel_msg_error:nnn { xparse } { if-boolean } {#1}
         \use_ii:nn
       }
   }