[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-kernel-msgs: prefixes (925ee4ab)

Frank Mittelbach frank.mittelbach at latex-project.org
Sun Jun 6 17:01:19 CEST 2021


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

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

commit 925ee4ab22d34ce46cb4b73decdc3cf170bce349
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Jun 6 17:01:19 2021 +0200

    prefixes


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

925ee4ab22d34ce46cb4b73decdc3cf170bce349
 base/ltcmd.dtx                           |  48 ++++++------
 base/testfiles-ltcmd/ltcmd001.tlg        |  17 ++---
 base/testfiles-ltcmd/ltcmd004.luatex.tlg |  43 ++++++-----
 base/testfiles-ltcmd/ltcmd004.tlg        |  43 ++++++-----
 base/testfiles-ltcmd/ltcmd005.luatex.tlg | 126 ++++++++++++++-----------------
 base/testfiles-ltcmd/ltcmd005.tlg        | 126 ++++++++++++++-----------------
 6 files changed, 191 insertions(+), 212 deletions(-)

diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index 67901489..8386c097 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -3506,17 +3506,17 @@
 % Some messages intended as errors when defining commands/environments.
 %    \begin{macrocode}
 \msg_new:nnnn { cmd } { arg-after-body }
-  { In~the~definition~of~#1,~b~(body)~argument~must~be~last. }
+  { Invalid~argument~type~'#2'~in~#1. }
   {
-    The~'body'~argument~type~is~followed~by~'#2'~in~the~argument~
-    specification~of~the~#1.~This~is~not~allowed.
+    The~'b'~argument~type~must~come~last~but~it~is~followed~
+    by~'#2'~in~the~argument~specification.~This~is~not~allowed.
     \c_@@_ignore_def_tl
   }
 \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.
+    The~argument~specification~provided~is~not~valid:~
+    one~or~more~mandatory~parts~are~missing.
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { command-already-defined }
@@ -3548,20 +3548,19 @@
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { expandable-ending-optional }
-  {
-    Argument~specification~'#2'~for~expandable~command~'#1'~
-    ends~with~optional~argument.
-  }
+  { Bad~argument~specification~'#2'~for~#1. }
   {
     Expandable~commands~must~have~a~final~mandatory~argument~
     (or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
     argument~with~expandable~commands.
   }
 \msg_new:nnnn { cmd } { inconsistent-long }
-  { Inconsistent~long~arguments~for~expandable~command~'#1'. }
+%  { Inconsistent~long~arguments~for~expandable~command~'#1'. }
+  { Invalid~argument~prefix~'+'~in~command~'#1'. }
   {
     The~arguments~for~an~expandable~command~must~not~involve~short~
-    arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types.
+    arguments~after~long~arguments.~You~have~tried~to~mix~the~two~types~
+    when~defining~'#1'.
   }
 \msg_new:nnnn { cmd } { invalid-command-arg }
   { Invalid~argument~type~'#2'~in~#1. }
@@ -3579,6 +3578,7 @@
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { invalid-after-optional-expandably }
+%  { Invalid~argument~type~'#2'~in~#1. }
   {
     Argument~type~'#2'~not~available~after~optional~argument~
     for~expandable~command~'#1'.
@@ -3589,9 +3589,11 @@
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { non-trailing-obey-spaces }
-  { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. }
+%  { Prefix~'!'~used~before~mandatory~argument~'#2'~of~#1. }
+  { Invalid~argument~prefix~'!'~in~#1. }
   {
-    The~prefix~'!'~can~only~apply~to~trailing~optional~arguments.
+    The~prefix~'!'~is~only~allowed~for~trailing~optional~arguments.~
+    You~tried~to~apply~it~to~'#2'.
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { not-definable }
@@ -3627,24 +3629,26 @@
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { processor-in-expandable }
-  { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. }
+%  { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. }
+  { Invalid~argument~prefix~'>'~in~command~'#1'. }
   {
-    The~argument~specification~for~#1~contains~a~processor~function:~
-    this~is~only~supported~for~standard~robust~commands.
+    The~argument~specification~for~'#1'~contains~the~processor~function~'>{#2}'.~
+    This~is~only~supported~for~robust~commands,~but~not~for~expandable~ones.
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { too-many-arguments }
-  { Too~many~arguments~in~argument~specification~'#2'~of~#1. }
+  { Too~many~arguments~for~#1. }
   {
-    The~argument~specification~provided~has~more~than~9~arguments.~
+    The~argument~specification~'#2'~asks~for~more~than~9~arguments.~
     This~cannot~be~implemented.
     \c_@@_ignore_def_tl
   }
 \msg_new:nnnn { cmd } { two-markers }
-  { Two~'#2'~apply~to~the~same~argument~in~argument~specification~of~#1. }
+  { Invalid~argument~prefix~'#2'~in~#1. }
+%  { 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.
+    The~argument~specification~provided~for~#1~has~two~'#2'~markers~applied~
+    to~the~same~argument;~one~is~redundant.
   }
 \msg_new:nnnn { cmd } { unknown-argument-type }
   { Invalid~argument~type~'#2'~in~#1. }
@@ -3669,7 +3673,7 @@
 \msg_new:nnn { cmd } { if-boolean }
   { Invalid~use~\iow_char:N\\IfBooleanTF~{#1} }
 \msg_new:nnnn { cmd } { loop-in-defaults }
-  { Defaults~of~#1~have~circular~dependency. }
+  { Circular~dependency~in~defaults~of~#1. }
   {
     The~default~values~of~two~or~more~arguments~of~the~#1~
     depend~on~each~other~in~a~way~that~cannot~be~resolved.
diff --git a/base/testfiles-ltcmd/ltcmd001.tlg b/base/testfiles-ltcmd/ltcmd001.tlg
index 8d9b4ee7..7486e105 100644
--- a/base/testfiles-ltcmd/ltcmd001.tlg
+++ b/base/testfiles-ltcmd/ltcmd001.tlg
@@ -114,13 +114,12 @@ l. ...}
 ============================================================
 TEST 3: Command with too many arguments
 ============================================================
-! LaTeX cmd Error: Too many arguments in argument specification 'mmmmmmmmmm'
-(cmd)              of command '\foo'.
+! LaTeX cmd Error: Too many arguments for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...}
-The argument specification provided has more than 9 arguments. This cannot be
-implemented.
+The argument specification 'mmmmmmmmmm' asks for more than 9 arguments. This
+cannot be implemented.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 <recently read> }
@@ -405,8 +404,7 @@ l. ...}
 ============================================================
 TEST 9: Not valid as expandable functions
 ============================================================
-! LaTeX cmd Error: Argument specification 'mo' for expandable command '\foo'
-(cmd)              ends with optional argument.
+! LaTeX cmd Error: Bad argument specification 'mo' for \foo.
 For immediate help type H <return>.
  ...                                              
 l. ...}
@@ -418,12 +416,12 @@ l. ...}
 > \foo code=undefined.
 <recently read> }
 l. ...}
-! LaTeX cmd Error: Inconsistent long arguments for expandable command '\foo'.
+! LaTeX cmd Error: Invalid argument prefix '+' in command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...}
 The arguments for an expandable command must not involve short arguments after
-long arguments. You have tried to mix the two types.
+long arguments. You have tried to mix the two types when defining '\foo'.
 > \foo=undefined.
 <recently read> }
 l. ...}
@@ -440,8 +438,7 @@ l. ...}
 LaTeX cmd Warning: The command '\foo' was undefined but not the associated
 (cmd)              commands '\foo code' and/or '\foo defaults'. Maybe you
 (cmd)              tried using \let. This may lead to an infinite loop.
-! LaTeX cmd Error: Argument specification 'r()o' for expandable command '\foo'
-(cmd)              ends with optional argument.
+! LaTeX cmd Error: Bad argument specification 'r()o' for \foo.
 For immediate help type H <return>.
  ...                                              
 l. ...}
diff --git a/base/testfiles-ltcmd/ltcmd004.luatex.tlg b/base/testfiles-ltcmd/ltcmd004.luatex.tlg
index aefa9700..2747ee73 100644
--- a/base/testfiles-ltcmd/ltcmd004.luatex.tlg
+++ b/base/testfiles-ltcmd/ltcmd004.luatex.tlg
@@ -132,16 +132,16 @@ TEST 7: Bad arg specs
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification 't' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Argument delimiter 'oh' invalid in command '\foo'.
@@ -173,16 +173,16 @@ LaTeX will ignore this entire definition.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification 'e{__}' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification '+>{\ReverseBoolean }' for
@@ -190,8 +190,8 @@ LaTeX will ignore this entire definition.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ============================================================
@@ -552,7 +552,7 @@ TEST 14: Refer to other args (expandable)
 ============================================================
 ! Undefined control sequence.
 <argument> \::error 
-         ! cmd: Defaults of \foobar have circular dependency.
+         ! cmd: Circular dependency in defaults of \foobar.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -561,7 +561,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \::error 
-         ! cmd: Defaults of \foobar have circular dependency.
+         ! cmd: Circular dependency in defaults of \foobar.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -598,33 +598,32 @@ undefined
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
 ! LaTeX cmd Error: Bad argument specification 'D' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
 ! LaTeX cmd Error: Bad argument specification 'O' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
-! LaTeX cmd Error: Argument processor '>{\abc }' cannot be used for the
-(cmd)              expandable command '\foo'.
+! LaTeX cmd Error: Invalid argument prefix '>' in command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification for \foo contains a processor function: this is
-only supported for standard robust commands.
+The argument specification for '\foo' contains the processor function '>{\abc
+}'. This is only supported for robust commands, but not for expandable ones.
 LaTeX will ignore this entire definition.
 undefined
 ============================================================
diff --git a/base/testfiles-ltcmd/ltcmd004.tlg b/base/testfiles-ltcmd/ltcmd004.tlg
index e2eefb59..189130cc 100644
--- a/base/testfiles-ltcmd/ltcmd004.tlg
+++ b/base/testfiles-ltcmd/ltcmd004.tlg
@@ -132,16 +132,16 @@ TEST 7: Bad arg specs
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification 't' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Argument delimiter 'oh' invalid in command '\foo'.
@@ -173,16 +173,16 @@ LaTeX will ignore this entire definition.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification 'e{__}' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ! LaTeX cmd Error: Bad argument specification '+>{\ReverseBoolean }' for
@@ -190,8 +190,8 @@ LaTeX will ignore this entire definition.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 > \foo=undefined.
 ============================================================
@@ -552,7 +552,7 @@ TEST 14: Refer to other args (expandable)
 ============================================================
 ! Undefined control sequence.
 <argument> \::error 
-                    ! cmd: Defaults of \foobar have circular dependency.
+                    ! cmd: Circular dependency in defaults of \foobar.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -561,7 +561,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
 and I'll forget about whatever was undefined.
 ! Undefined control sequence.
 <argument> \::error 
-                    ! cmd: Defaults of \foobar have circular dependency.
+                    ! cmd: Circular dependency in defaults of \foobar.
 l. ...  }
 The control sequence at the end of the top line
 of your error message was never \def'ed. If you have
@@ -598,33 +598,32 @@ undefined
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
 ! LaTeX cmd Error: Bad argument specification 'D' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
 ! LaTeX cmd Error: Bad argument specification 'O' for command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 undefined
-! LaTeX cmd Error: Argument processor '>{\abc }' cannot be used for the
-(cmd)              expandable command '\foo'.
+! LaTeX cmd Error: Invalid argument prefix '>' in command '\foo'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification for \foo contains a processor function: this is
-only supported for standard robust commands.
+The argument specification for '\foo' contains the processor function '>{\abc
+}'. This is only supported for robust commands, but not for expandable ones.
 LaTeX will ignore this entire definition.
 undefined
 ============================================================
diff --git a/base/testfiles-ltcmd/ltcmd005.luatex.tlg b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
index 3ab655a7..a3d82643 100644
--- a/base/testfiles-ltcmd/ltcmd005.luatex.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
@@ -4,68 +4,65 @@ Author: Bruno Le Floch
 ============================================================
 TEST 1: Invalid '!'
 ============================================================
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'R(){-NoValue-}'
-(cmd)              of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'R(){-NoValue-}'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
+The argument specification provided for command '\testA' has two '!' markers
+applied to the same argument; one is redundant.
 ! LaTeX cmd Error: Bad argument specification '!+!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '+!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '+' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '+' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '+' applying to the same
-argument; these are redundant.
-! LaTeX cmd Error: Argument specification '!o' for expandable command '\testA'
-(cmd)              ends with optional argument.
+The argument specification provided for command '\testA' has two '+' markers
+applied to the same argument; one is redundant.
+! LaTeX cmd Error: Bad argument specification '!o' for \testA.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 Expandable commands must have a final mandatory argument (or no arguments at
 all). You cannot have a terminal optional argument with expandable commands.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -142,13 +139,12 @@ 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: In the definition of environment 'env3', b (body) argument
-(cmd)              must be last.
+! LaTeX cmd Error: Invalid argument type 'm' in environment 'env3'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The 'body' argument type is followed by 'm' in the argument specification of
-the environment 'env3'. This is not allowed.
+The 'b' argument type must come last but it is followed by 'm' in the argument
+specification. This is not allowed.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -158,68 +154,64 @@ TEST 6: Invalid signatures
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification 'D[]' for environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '!+>{\TrimSpaces }' for
 (cmd)              environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of
-(cmd)              environment 'testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Too many arguments in argument specification 'mmmmmmmmmmmm'
-(cmd)              of command '\testA'.
+! LaTeX cmd Error: Too many arguments for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has more than 9 arguments. This cannot be
-implemented.
+The argument specification 'mmmmmmmmmmmm' asks for more than 9 arguments. This
+cannot be implemented.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Too many arguments in argument specification 'mmmmmmmmmmmm'
-(cmd)              of environment 'testA'.
+! LaTeX cmd Error: Too many arguments for environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has more than 9 arguments. This cannot be
-implemented.
+The argument specification 'mmmmmmmmmmmm' asks for more than 9 arguments. This
+cannot be implemented.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of environment 'testA'.
+The argument specification provided for command '\testA' has two '!' markers
+applied to the same argument; one is redundant.
+! LaTeX cmd Error: Invalid argument prefix '!' in environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
+The argument specification provided for environment 'testA' has two '!'
+markers applied to the same argument; one is redundant.
 ! LaTeX cmd Error: Invalid argument type 'X' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
@@ -325,20 +317,18 @@ FALSE
 ============================================================
 TEST 9: Invalid signatures for expandable commands
 ============================================================
-! LaTeX cmd Error: Argument specification 'mo' for expandable command '\testA'
-(cmd)              ends with optional argument.
+! LaTeX cmd Error: Bad argument specification 'mo' for \testA.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 Expandable commands must have a final mandatory argument (or no arguments at
 all). You cannot have a terminal optional argument with expandable commands.
-! LaTeX cmd Error: Inconsistent long arguments for expandable command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '+' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 The arguments for an expandable command must not involve short arguments after
-long arguments. You have tried to mix the two types.
+long arguments. You have tried to mix the two types when defining '\testA'.
 ! LaTeX cmd Error: Invalid argument type 'v' in \testA.
 For immediate help type H <return>.
  ...                                              
@@ -346,13 +336,13 @@ l. ...  }
 The letter 'v' specifies an argument type which cannot be used in an
 expandable command.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Argument processor '>{\TrimSpaces }' cannot be used for the
-(cmd)              expandable command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '>' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification for \testA contains a processor function: this is
-only supported for standard robust commands.
+The argument specification for '\testA' contains the processor function
+'>{\TrimSpaces }'. This is only supported for robust commands, but not for
+expandable ones.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -388,14 +378,14 @@ but it is not defined.
 ============================================================
 TEST 11: Run-time errors
 ============================================================
-! LaTeX cmd Error: Defaults of command '\testA' have circular dependency.
+! LaTeX cmd Error: Circular dependency in defaults of command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 The default values of two or more arguments of the command '\testA' depend on
 each other in a way that cannot be resolved.
 \C \E \C \E \C \E \C \E -NoValue-|\C \E \C \E \C \E \C \E -NoValue--NoValue-|\C |\C \E |\E 
-! LaTeX cmd Error: Defaults of environment 'testB' have circular dependency.
+! LaTeX cmd Error: Circular dependency in defaults of environment 'testB'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
diff --git a/base/testfiles-ltcmd/ltcmd005.tlg b/base/testfiles-ltcmd/ltcmd005.tlg
index c9fc2198..2c8a36c9 100644
--- a/base/testfiles-ltcmd/ltcmd005.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.tlg
@@ -4,68 +4,65 @@ Author: Bruno Le Floch
 ============================================================
 TEST 1: Invalid '!'
 ============================================================
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'R(){-NoValue-}'
-(cmd)              of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'R(){-NoValue-}'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
+The argument specification provided for command '\testA' has two '!' markers
+applied to the same argument; one is redundant.
 ! LaTeX cmd Error: Bad argument specification '!+!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '+!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '!' for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '+' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '+' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '+' applying to the same
-argument; these are redundant.
-! LaTeX cmd Error: Argument specification '!o' for expandable command '\testA'
-(cmd)              ends with optional argument.
+The argument specification provided for command '\testA' has two '+' markers
+applied to the same argument; one is redundant.
+! LaTeX cmd Error: Bad argument specification '!o' for \testA.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 Expandable commands must have a final mandatory argument (or no arguments at
 all). You cannot have a terminal optional argument with expandable commands.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -142,13 +139,12 @@ 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: In the definition of environment 'env3', b (body) argument
-(cmd)              must be last.
+! LaTeX cmd Error: Invalid argument type 'm' in environment 'env3'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The 'body' argument type is followed by 'm' in the argument specification of
-the environment 'env3'. This is not allowed.
+The 'b' argument type must come last but it is followed by 'm' in the argument
+specification. This is not allowed.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -158,68 +154,64 @@ TEST 6: Invalid signatures
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification 'D[]' for environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
 ! LaTeX cmd Error: Bad argument specification '!+>{\TrimSpaces }' for
 (cmd)              environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided was not valid: one or more mandatory
-pieces of information were missing.
+The argument specification provided is not valid: one or more mandatory parts
+are missing.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Prefix '!' used before mandatory argument 'm' of
-(cmd)              environment 'testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The prefix '!' can only apply to trailing optional arguments.
+The prefix '!' is only allowed for trailing optional arguments. You tried to
+apply it to 'm'.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Too many arguments in argument specification 'mmmmmmmmmmmm'
-(cmd)              of command '\testA'.
+! LaTeX cmd Error: Too many arguments for command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has more than 9 arguments. This cannot be
-implemented.
+The argument specification 'mmmmmmmmmmmm' asks for more than 9 arguments. This
+cannot be implemented.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Too many arguments in argument specification 'mmmmmmmmmmmm'
-(cmd)              of environment 'testA'.
+! LaTeX cmd Error: Too many arguments for environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has more than 9 arguments. This cannot be
-implemented.
+The argument specification 'mmmmmmmmmmmm' asks for more than 9 arguments. This
+cannot be implemented.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '!' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
-! LaTeX cmd Error: Two '!' apply to the same argument in argument
-(cmd)              specification of environment 'testA'.
+The argument specification provided for command '\testA' has two '!' markers
+applied to the same argument; one is redundant.
+! LaTeX cmd Error: Invalid argument prefix '!' in environment 'testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification provided has two markers '!' applying to the same
-argument; these are redundant.
+The argument specification provided for environment 'testA' has two '!'
+markers applied to the same argument; one is redundant.
 ! LaTeX cmd Error: Invalid argument type 'X' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
@@ -325,20 +317,18 @@ FALSE
 ============================================================
 TEST 9: Invalid signatures for expandable commands
 ============================================================
-! LaTeX cmd Error: Argument specification 'mo' for expandable command '\testA'
-(cmd)              ends with optional argument.
+! LaTeX cmd Error: Bad argument specification 'mo' for \testA.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 Expandable commands must have a final mandatory argument (or no arguments at
 all). You cannot have a terminal optional argument with expandable commands.
-! LaTeX cmd Error: Inconsistent long arguments for expandable command
-(cmd)              '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '+' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 The arguments for an expandable command must not involve short arguments after
-long arguments. You have tried to mix the two types.
+long arguments. You have tried to mix the two types when defining '\testA'.
 ! LaTeX cmd Error: Invalid argument type 'v' in \testA.
 For immediate help type H <return>.
  ...                                              
@@ -346,13 +336,13 @@ l. ...  }
 The letter 'v' specifies an argument type which cannot be used in an
 expandable command.
 LaTeX will ignore this entire definition.
-! LaTeX cmd Error: Argument processor '>{\TrimSpaces }' cannot be used for the
-(cmd)              expandable command '\testA'.
+! LaTeX cmd Error: Invalid argument prefix '>' in command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
-The argument specification for \testA contains a processor function: this is
-only supported for standard robust commands.
+The argument specification for '\testA' contains the processor function
+'>{\TrimSpaces }'. This is only supported for robust commands, but not for
+expandable ones.
 LaTeX will ignore this entire definition.
 ============================================================
 ============================================================
@@ -388,14 +378,14 @@ but it is not defined.
 ============================================================
 TEST 11: Run-time errors
 ============================================================
-! LaTeX cmd Error: Defaults of command '\testA' have circular dependency.
+! LaTeX cmd Error: Circular dependency in defaults of command '\testA'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }
 The default values of two or more arguments of the command '\testA' depend on
 each other in a way that cannot be resolved.
 \C \E \C \E \C \E \C \E -NoValue-|\C \E \C \E \C \E \C \E -NoValue--NoValue-|\C |\C \E |\E 
-! LaTeX cmd Error: Defaults of environment 'testB' have circular dependency.
+! LaTeX cmd Error: Circular dependency in defaults of environment 'testB'.
 For immediate help type H <return>.
  ...                                              
 l. ...  }





More information about the latex3-commits mailing list.