[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-kernel-msgs: xparse -> xmd; some first line rename (8a387cce)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : TL21-2-kernel-msgs
Link       : https://github.com/latex3/latex2e/commit/8a387ccef9f2bca9fd70f8425f14921b63c5701c

>---------------------------------------------------------------

commit 8a387ccef9f2bca9fd70f8425f14921b63c5701c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Jun 8 17:49:33 2021 +0200

    xparse -> xmd; some  first  line rename


>---------------------------------------------------------------

8a387ccef9f2bca9fd70f8425f14921b63c5701c
 base/ltcmd.dtx                           | 8 +++++---
 base/testfiles-ltcmd/ltcmd005.luatex.tlg | 2 +-
 base/testfiles-ltcmd/ltcmd005.tlg        | 2 +-
 base/testfiles-ltcmd/ltcmd007.tlg        | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index f35d18a1..1c7b59a5 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -1273,7 +1273,7 @@
       {
         \tl_if_empty:NF \l_@@_last_delimiters_tl
           {
-            \msg_error:nnxx { xparse } { invalid-after-optional-expandably }
+            \msg_error:nnxx { cmd } { invalid-after-optional-expandably }
               { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
             \@@_bad_def:wn
           }
@@ -3506,7 +3506,9 @@
 % Some messages intended as errors when defining commands/environments.
 %    \begin{macrocode}
 \msg_new:nnnn { cmd } { arg-after-body }
-  { Invalid~argument~type~'#2'~in~#1. }
+%  { Invalid~argument~type~'#2'~in~#1. }
+%  { Argument~'#2'~invalid'~after~'b'~in~#1. }
+  { Argument~type~'b'~must~be~last~in~#1. }
   {
     The~'b'~argument~type~must~come~last~but~it~is~followed~
     by~'#2'~in~the~argument~specification.~This~is~not~allowed.
@@ -3577,7 +3579,7 @@
     in~an~expandable~command.
     \c_@@_ignore_def_tl
   }
-\msg_new:nnnn { xparse } { invalid-after-optional-expandably }
+\msg_new:nnnn { cmd } { invalid-after-optional-expandably }
 %  { Invalid~argument~type~'#2'~in~#1. }
   {
     Argument~type~'#2'~not~available~after~optional~argument~
diff --git a/base/testfiles-ltcmd/ltcmd005.luatex.tlg b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
index 8d6d29fc..1ad5d44b 100644
--- a/base/testfiles-ltcmd/ltcmd005.luatex.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
@@ -139,7 +139,7 @@ l. ...  }
 The letter 'b' can only be used in environment argument specifications, but
 not for commands.
 LaTeX will ignore the entire definition.
-! LaTeX cmd Error: Invalid argument type 'm' in environment 'env3'.
+! LaTeX cmd Error: Argument type 'b' must be last in environment 'env3'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
diff --git a/base/testfiles-ltcmd/ltcmd005.tlg b/base/testfiles-ltcmd/ltcmd005.tlg
index d4303bc3..5b800b9b 100644
--- a/base/testfiles-ltcmd/ltcmd005.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.tlg
@@ -139,7 +139,7 @@ l. ...  }
 The letter 'b' can only be used in environment argument specifications, but
 not for commands.
 LaTeX will ignore the entire definition.
-! LaTeX cmd Error: Invalid argument type 'm' in environment 'env3'.
+! LaTeX cmd Error: Argument type 'b' must be last in environment 'env3'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
diff --git a/base/testfiles-ltcmd/ltcmd007.tlg b/base/testfiles-ltcmd/ltcmd007.tlg
index a13bd3dd..c322d68f 100644
--- a/base/testfiles-ltcmd/ltcmd007.tlg
+++ b/base/testfiles-ltcmd/ltcmd007.tlg
@@ -83,8 +83,8 @@ LaTeX cmd Warning: Optional and mandatory argument with same delimiter '{'.
 (cmd)              arguments when calling this command.
 (cmd)              
 (cmd)              This may be intentional, but then it might be a mistake.
-! Package xparse Error: Argument type 'l' not available after optional
-(xparse)                argument for expandable command '\dummy'.
+! LaTeX cmd Error: Argument type 'l' not available after optional argument for
+(cmd)              expandable command '\dummy'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }