[latex3-commits] [l3svn] r6868 - Make error messages more informative
noreply at latex-project.org
noreply at latex-project.org
Thu Feb 9 23:10:54 CET 2017
Author: bruno
Date: 2017-02-09 23:10:53 +0100 (Thu, 09 Feb 2017)
New Revision: 6868
Modified:
trunk/l3packages/xparse/testfiles/xparse001.ptex.tlg
trunk/l3packages/xparse/testfiles/xparse001.tlg
trunk/l3packages/xparse/testfiles/xparse001.uptex.tlg
trunk/l3packages/xparse/testfiles/xparse004.luatex.tlg
trunk/l3packages/xparse/testfiles/xparse004.tlg
trunk/l3packages/xparse/xparse.dtx
Log:
Make error messages more informative
Include function name in most error messages given by xparse.
Modified: trunk/l3packages/xparse/testfiles/xparse001.ptex.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse001.ptex.tlg 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/testfiles/xparse001.ptex.tlg 2017-02-09 22:10:53 UTC (rev 6868)
@@ -169,7 +169,7 @@
!
! LaTeX error: "xparse/too-many-arguments"
!
-! Too many arguments in argument specification 'mmmmmmmmmm'.
+! Too many arguments in argument specification 'mmmmmmmmmm' of command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -609,7 +609,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'n' replaced by 'm'.
+! Unknown argument type 'n' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -637,7 +637,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'a' replaced by 'm'.
+! Unknown argument type 'a' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -762,7 +762,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'mo' for expandable command '\foo' ends with optional
+! argument.
!
! See the LaTeX3 documentation for further information.
!
@@ -790,7 +791,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -818,7 +819,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -846,7 +847,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'r()o' for expandable command '\foo' ends with
+! optional argument.
!
! See the LaTeX3 documentation for further information.
!
Modified: trunk/l3packages/xparse/testfiles/xparse001.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse001.tlg 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/testfiles/xparse001.tlg 2017-02-09 22:10:53 UTC (rev 6868)
@@ -169,7 +169,7 @@
!
! LaTeX error: "xparse/too-many-arguments"
!
-! Too many arguments in argument specification 'mmmmmmmmmm'.
+! Too many arguments in argument specification 'mmmmmmmmmm' of command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -609,7 +609,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'n' replaced by 'm'.
+! Unknown argument type 'n' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -637,7 +637,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'a' replaced by 'm'.
+! Unknown argument type 'a' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -762,7 +762,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'mo' for expandable command '\foo' ends with optional
+! argument.
!
! See the LaTeX3 documentation for further information.
!
@@ -790,7 +791,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -818,7 +819,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -846,7 +847,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'r()o' for expandable command '\foo' ends with
+! optional argument.
!
! See the LaTeX3 documentation for further information.
!
Modified: trunk/l3packages/xparse/testfiles/xparse001.uptex.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse001.uptex.tlg 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/testfiles/xparse001.uptex.tlg 2017-02-09 22:10:53 UTC (rev 6868)
@@ -169,7 +169,7 @@
!
! LaTeX error: "xparse/too-many-arguments"
!
-! Too many arguments in argument specification 'mmmmmmmmmm'.
+! Too many arguments in argument specification 'mmmmmmmmmm' of command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -609,7 +609,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'n' replaced by 'm'.
+! Unknown argument type 'n' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -637,7 +637,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'a' replaced by 'm'.
+! Unknown argument type 'a' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -762,7 +762,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'mo' for expandable command '\foo' ends with optional
+! argument.
!
! See the LaTeX3 documentation for further information.
!
@@ -790,7 +791,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -818,7 +819,7 @@
!
! LaTeX error: "xparse/inconsistent-long"
!
-! Inconsistent long arguments for expandable command.
+! Inconsistent long arguments for expandable command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -846,7 +847,8 @@
!
! LaTeX error: "xparse/expandable-ending-optional"
!
-! Argument specification for expandable command ends with optional argument.
+! Argument specification 'r()o' for expandable command '\foo' ends with
+! optional argument.
!
! See the LaTeX3 documentation for further information.
!
Modified: trunk/l3packages/xparse/testfiles/xparse004.luatex.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse004.luatex.tlg 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/testfiles/xparse004.luatex.tlg 2017-02-09 22:10:53 UTC (rev 6868)
@@ -63,7 +63,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -71,15 +71,15 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(-NoValue-)(there)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -87,8 +87,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(nothing)(-NoValue-)(there)
.................................................
@@ -100,7 +100,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '['.
+! Failed to find required argument starting with '[' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -108,8 +108,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '['. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '['. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(stuff)(is)(-NoValue-)
.................................................
@@ -121,7 +121,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -129,14 +129,14 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -144,8 +144,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(-NoValue-)
============================================================
@@ -161,7 +161,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -169,15 +169,15 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(drat)(there)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -185,8 +185,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(nothing)(drat)(there)
.................................................
@@ -198,7 +198,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '['.
+! Failed to find required argument starting with '[' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -206,8 +206,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '['. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '['. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(stuff)(is)(drat)
.................................................
@@ -219,7 +219,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -227,14 +227,14 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -242,8 +242,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(drat)(drat)
============================================================
@@ -312,7 +312,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'dm'.
+! Bad argument specification 'dm' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -337,7 +337,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 't'.
+! Bad argument specification 't' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -362,7 +362,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'oh'.
+! Argument delimiter 'oh' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -387,7 +387,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: ''.
+! Argument delimiter '' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -412,7 +412,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: '{Y}'.
+! Argument delimiter '{Y}' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -437,7 +437,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification '+>{\ReverseBoolean }'.
+! Bad argument specification '+>{\ReverseBoolean }' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -462,7 +462,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification '+>{\ReverseBoolean }'.
+! Bad argument specification '+>{\ReverseBoolean }' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1000,7 +1000,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1008,8 +1008,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
1|##|\BooleanFalse |{1##}{2##}|...|A|##|C|D
##|1|\BooleanFalse |{1##}{2##}|...|A|B|C|D
@@ -1027,7 +1027,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1035,8 +1035,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
1|##|\BooleanFalse |{1##}{2##}|...|A|##|C|D
##|1|\BooleanFalse |{1##}{2##}|...|A|B|C|D
@@ -1084,7 +1084,7 @@
!
! LaTeX error: "xparse/loop-in-defaults"
!
-! Unresolved circular dependency in default values for '\foo '.
+! Circular dependency in defaults of '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1128,7 +1128,7 @@
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
- Failed to find required argument starting with '('.
+ Failed to find required argument starting with '(' for command
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -1157,7 +1157,7 @@
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
- Unresolved circular dependency in default values for '\foobar
+ 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
@@ -1166,7 +1166,7 @@
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
- Unresolved circular dependency in default values for '\foobar
+ 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
@@ -1192,7 +1192,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'abc' replaced by 'm'.
+! Unknown argument type 'abc' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1215,7 +1215,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'abc'.
+! Argument delimiter 'abc' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -1240,7 +1240,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'abc'.
+! Argument delimiter 'abc' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -1265,7 +1265,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'D'.
+! Bad argument specification 'D' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1290,7 +1290,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'O'.
+! Bad argument specification 'O' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1315,7 +1315,8 @@
!
! LaTeX error: "xparse/processor-in-expandable"
!
-! Argument processors cannot be used with expandable functions.
+! Argument processor '>{\abc }' cannot be used for the expandable command
+! '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1326,7 +1327,7 @@
| This is a coding error.
|
| The argument specification for \foo contains a processor function: this is
-| only supported for standard robust functions.
+| only supported for standard robust commands.
|
| LaTeX will ignore this entire definition.
|...............................................
Modified: trunk/l3packages/xparse/testfiles/xparse004.tlg
===================================================================
--- trunk/l3packages/xparse/testfiles/xparse004.tlg 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/testfiles/xparse004.tlg 2017-02-09 22:10:53 UTC (rev 6868)
@@ -63,7 +63,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -71,15 +71,15 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(-NoValue-)(there)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -87,8 +87,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(nothing)(-NoValue-)(there)
.................................................
@@ -100,7 +100,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '['.
+! Failed to find required argument starting with '[' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -108,8 +108,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '['. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '['. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(stuff)(is)(-NoValue-)
.................................................
@@ -121,7 +121,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -129,14 +129,14 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -144,8 +144,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(-NoValue-)
============================================================
@@ -161,7 +161,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -169,15 +169,15 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(-NoValue-)(drat)(there)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -185,8 +185,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(nothing)(drat)(there)
.................................................
@@ -198,7 +198,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '['.
+! Failed to find required argument starting with '[' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -206,8 +206,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '['. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '['. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(stuff)(is)(drat)
.................................................
@@ -219,7 +219,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -227,14 +227,14 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -242,8 +242,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
(drat)(drat)
============================================================
@@ -312,7 +312,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'dm'.
+! Bad argument specification 'dm' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -337,7 +337,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 't'.
+! Bad argument specification 't' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -362,7 +362,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'oh'.
+! Argument delimiter 'oh' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -387,7 +387,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: ''.
+! Argument delimiter '' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -412,7 +412,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: '{Y}'.
+! Argument delimiter '{Y}' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -437,7 +437,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification '+>{\ReverseBoolean }'.
+! Bad argument specification '+>{\ReverseBoolean }' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -462,7 +462,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification '+>{\ReverseBoolean }'.
+! Bad argument specification '+>{\ReverseBoolean }' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1000,7 +1000,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1008,8 +1008,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
1|##|\BooleanFalse |{1##}{2##}|...|A|##|C|D
##|1|\BooleanFalse |{1##}{2##}|...|A|B|C|D
@@ -1027,7 +1027,7 @@
!
! LaTeX error: "xparse/missing-required"
!
-! Failed to find required argument starting with '('.
+! Failed to find required argument starting with '(' for command '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1035,8 +1035,8 @@
!...............................................
l. ... }
|'''''''''''''''''''''''''''''''''''''''''''''''
-| There is supposed to be an argument to the current function starting with
-| '('. LaTeX did not find it, and will insert a default value to be processed.
+| The current command '\foo ' expects an argument starting with '('. LaTeX did
+| not find it, and will insert a default value to be processed.
|...............................................
1|##|\BooleanFalse |{1##}{2##}|...|A|##|C|D
##|1|\BooleanFalse |{1##}{2##}|...|A|B|C|D
@@ -1084,7 +1084,7 @@
!
! LaTeX error: "xparse/loop-in-defaults"
!
-! Unresolved circular dependency in default values for '\foo '.
+! Circular dependency in defaults of '\foo '.
!
! See the LaTeX3 documentation for further information.
!
@@ -1128,7 +1128,7 @@
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
- Failed to find required argument starting with '('.
+ Failed to find required argument starting with '(...
l. ... }
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
@@ -1157,7 +1157,7 @@
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
- Unresolved circular dependency in default values ...
+ 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
@@ -1166,7 +1166,7 @@
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> \LaTeX3 error:
- Unresolved circular dependency in default values ...
+ 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
@@ -1192,7 +1192,7 @@
!
! LaTeX error: "xparse/unknown-argument-type"
!
-! Unknown argument type 'abc' replaced by 'm'.
+! Unknown argument type 'abc' for the command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1215,7 +1215,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'abc'.
+! Argument delimiter 'abc' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -1240,7 +1240,7 @@
!
! LaTeX error: "xparse/not-single-token"
!
-! Argument delimiter should be a single token: 'abc'.
+! Argument delimiter 'abc' for the command '\foo' should be a single token.
!
! See the LaTeX3 documentation for further information.
!
@@ -1265,7 +1265,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'D'.
+! Bad argument specification 'D' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1290,7 +1290,7 @@
!
! LaTeX error: "xparse/bad-arg-spec"
!
-! Bad argument specification 'O'.
+! Bad argument specification 'O' for command '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1315,7 +1315,8 @@
!
! LaTeX error: "xparse/processor-in-expandable"
!
-! Argument processors cannot be used with expandable functions.
+! Argument processor '>{\abc }' cannot be used for the expandable command
+! '\foo'.
!
! See the LaTeX3 documentation for further information.
!
@@ -1326,7 +1327,7 @@
| This is a coding error.
|
| The argument specification for \foo contains a processor function: this is
-| only supported for standard robust functions.
+| only supported for standard robust commands.
|
| LaTeX will ignore this entire definition.
|...............................................
Modified: trunk/l3packages/xparse/xparse.dtx
===================================================================
--- trunk/l3packages/xparse/xparse.dtx 2017-02-09 21:43:31 UTC (rev 6867)
+++ trunk/l3packages/xparse/xparse.dtx 2017-02-09 22:10:53 UTC (rev 6868)
@@ -1462,15 +1462,16 @@
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
\int_compare:nNnT \l_@@_current_arg_int > 9
{
- \__msg_kernel_error:nnx { xparse } { too-many-arguments }
- { \tl_to_str:n {#1} }
+ \__msg_kernel_error:nnxx { xparse } { too-many-arguments }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
\bool_if:NT \l_@@_expandable_bool
{
\tl_if_empty:NF \l_@@_last_delimiters_tl
{
- \__msg_kernel_error:nn { xparse } { expandable-ending-optional }
+ \__msg_kernel_error:nnxx { xparse } { expandable-ending-optional }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
}
@@ -1481,8 +1482,8 @@
\int_incr:N \l_@@_current_arg_int
\cs_if_exist_use:cF { @@_normalize_type_ \tl_to_str:n {#1} :w }
{
- \__msg_kernel_error:nnx { xparse } { unknown-argument-type }
- { \tl_to_str:n {#1} }
+ \__msg_kernel_error:nnxx { xparse } { unknown-argument-type }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
}
@@ -1554,8 +1555,8 @@
\quark_if_recursion_tail_stop_do:nn {#2} { \@@_bad_arg_spec:wn }
\bool_if:NT \l_@@_expandable_bool
{
- \__msg_kernel_error:nnx { xparse } { processor-in-expandable }
- { \iow_char:N\\ \l_@@_function_tl }
+ \__msg_kernel_error:nnxx { xparse } { processor-in-expandable }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
\tl_put_right:Nn \l_@@_arg_spec_tl { > {#1} }
@@ -1701,8 +1702,8 @@
{
\exp_args:Nx \tl_if_single_token:nF { \tl_trim_spaces:n {#1} }
{
- \__msg_kernel_error:nnx { xparse } { not-single-token }
- { \tl_to_str:n {#1} }
+ \__msg_kernel_error:nnxx { xparse } { not-single-token }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
}
@@ -1716,8 +1717,9 @@
{
\bool_if:NT \l_@@_expandable_bool
{
- \__msg_kernel_error:nnx
- { xparse } { invalid-expandable-argument-type } {#1}
+ \__msg_kernel_error:nnxx
+ { xparse } { invalid-expandable-argument-type }
+ { \iow_char:N \\ \l_@@_function_tl } { \tl_to_str:n {#1} }
\@@_bad_def:wn
}
}
@@ -1749,7 +1751,10 @@
% definition process.
% \begin{macrocode}
\cs_new_protected:Npn \@@_bad_arg_spec:wn #1 \@@_break_point:n #2
- { \__msg_kernel_error:nnx { xparse } { bad-arg-spec } { \tl_to_str:n {#2} } }
+ {
+ \__msg_kernel_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 { }
% \end{macrocode}
% \end{macro}
@@ -2227,7 +2232,8 @@
\bool_if:nT
{ \bool_xor_p:nn { \l_@@_all_long_bool } { \l_@@_long_bool } }
{
- \__msg_kernel_error:nn { xparse } { inconsistent-long }
+ \__msg_kernel_error:nnx { xparse } { inconsistent-long }
+ { \iow_char:N \\ \l_@@_function_tl }
\@@_bad_def:wn
}
\bool_set_false:N \l_@@_long_bool
@@ -2682,7 +2688,8 @@
\peek_meaning_remove_ignore_spaces:NTF #1
{ \@@_grab_D_call:Nw #1 }
{
- \__msg_kernel_error:nnx { xparse } { missing-required }
+ \__msg_kernel_error:nnxx { xparse } { missing-required }
+ { \exp_after:wN \token_to_str:N \l_@@_fn_tl }
{ \token_to_str:N #1 }
\@@_add_arg:o \c_@@_no_value_tl
}
@@ -3230,8 +3237,8 @@
\q_nil { } ##2 \ERROR \q_@@ \ERROR
}
{
- \__msg_kernel_expandable_error:nnn
- { xparse } { missing-required } {##2}
+ \__msg_kernel_expandable_error:nnnn
+ { xparse } { missing-required } {##5} {##2}
##4 {#1} \q_@@ ##5 {##6}
}
}
@@ -3262,8 +3269,8 @@
##5 \ERROR
}
{
- \__msg_kernel_expandable_error:nnn
- { xparse } { missing-required } {##2}
+ \__msg_kernel_expandable_error:nnnn
+ { xparse } { missing-required } {##4} {##2}
##3 {#1} \q_@@ ##4 {##5}
}
}
@@ -3673,7 +3680,7 @@
% Some messages intended as errors.
% \begin{macrocode}
\__msg_kernel_new:nnnn { xparse } { bad-arg-spec }
- { Bad~argument~specification~'#1'. }
+ { Bad~argument~specification~'#2'~for~command~'#1'. }
{
\c__msg_coding_error_text_tl
The~argument~specification~provided~was~not~valid:~
@@ -3710,7 +3717,8 @@
}
\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
{
- Argument~specification~for~expandable~command~ends~with~optional~argument.
+ Argument~specification~'#2'~for~expandable~command~'#1'~
+ ends~with~optional~argument.
}
{
\c__msg_coding_error_text_tl
@@ -3719,34 +3727,33 @@
argument~with~expandable~commands.
}
\__msg_kernel_new:nnnn { xparse } { inconsistent-long }
- { Inconsistent~long~arguments~for~expandable~command. }
+ { Inconsistent~long~arguments~for~expandable~command~'#1'. }
{
\c__msg_coding_error_text_tl
The~arguments~for~an~expandable~command~must~either~all~be~
short~or~all~be~long.~You~have~tried~to~mix~the~two~types.
}
\__msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
- { Argument~type~'#1'~not~available~for~an~expandable~function. }
+ { Argument~type~'#2'~not~available~for~expandable~command~'#1'. }
{
\c__msg_coding_error_text_tl
- The~letter~'#1'~does~not~specify~an~argument~type~which~can~be~used~
- in~an~expandable~function.
+ The~letter~'#2'~does~not~specify~an~argument~type~which~can~be~used~
+ in~an~expandable~command.
\\ \\
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { loop-in-defaults }
- { Unresolved~circular~dependency~in~default~values~for~'#1'. }
+ { 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 }
- { Failed~to~find~required~argument~starting~with~'#1'. }
+ { Failed~to~find~required~argument~starting~with~'#2'~for~command~'#1'. }
{
- There~is~supposed~to~be~an~argument~to~the~current~function~starting~with~
- '#1'.~LaTeX~did~not~find~it,~and~will~insert~a~default~value~to~be~
- processed.
+ 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 }
{ Command~'#1'~not~defined~using~xparse. }
@@ -3781,19 +3788,19 @@
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { not-single-token }
- { Argument~delimiter~should~be~a~single~token:~'#1'. }
+ { Argument~delimiter~'#2'~for~the~command~'#1'~should~be~a~single~token. }
{
\c__msg_coding_error_text_tl
The~argument~specification~provided~was~not~valid:~
- in~a~place~where~a~single~token~is~required,~LaTeX~found~'#1'. \\ \\
+ in~a~place~where~a~single~token~is~required,~LaTeX~found~'#2'. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { processor-in-expandable }
- { Argument~processors~cannot~be~used~with~expandable~functions. }
+ { Argument~processor~'>{#2}'~cannot~be~used~for~the~expandable~command~'#1'. }
{
\c__msg_coding_error_text_tl
The~argument~specification~for~#1~contains~a~processor~function:~
- this~is~only~supported~for~standard~robust~functions. \\ \\
+ this~is~only~supported~for~standard~robust~commands. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { split-excess-tokens }
@@ -3804,7 +3811,7 @@
There~were~too~many~'#1'~tokens.
}
\__msg_kernel_new:nnnn { xparse } { too-many-arguments }
- { Too~many~arguments~in~argument~specification~'#1'. }
+ { Too~many~arguments~in~argument~specification~'#2'~of~command~'#1'. }
{
\c__msg_coding_error_text_tl
The~argument~specification~provided~has~more~than~9~arguments.~
@@ -3812,10 +3819,10 @@
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { unknown-argument-type }
- { Unknown~argument~type~'#1'~replaced~by~'m'. }
+ { Unknown~argument~type~'#2'~for~the~command~'#1'. }
{
\c__msg_coding_error_text_tl
- The~letter~'#1'~does~not~specify~a~known~argument~type.~
+ The~letter~'#2'~does~not~specify~a~known~argument~type.~
LaTeX~will~ignore~this~entire~definition.
}
\__msg_kernel_new:nnnn { xparse } { unknown-command }
More information about the latex3-commits
mailing list