From 6a2af1dccd9dde80db1f961a909461273c348ef9 Mon Sep 17 00:00:00 2001 From: Frank Mittelbach Date: Mon, 7 Jun 2021 09:19:34 +0200 Subject: [PATCH] typo --- base/changes.txt | 13 +- base/ltcmd.dtx | 5 +- base/testfiles-ltcmd/ltcmd004.luatex.tlg | 182 ++++++++++++++--------- base/testfiles-ltcmd/ltcmd004.tlg | 182 ++++++++++++++--------- base/testfiles-ltcmd/ltcmd005.luatex.tlg | 8 +- base/testfiles-ltcmd/ltcmd005.tlg | 8 +- 6 files changed, 238 insertions(+), 160 deletions(-) diff --git a/base/changes.txt b/base/changes.txt index 335b41476..3ac954530 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -1,11 +1,3 @@ -2021-06-05 Frank Mittelbach - - * ltcmd.dtx, - * ltdefns.dtx, - * ltmiscen.dtx, - Normalize message texts - - ================================================================================ This file lists changes to the LaTeX2e files in reverse chronological order of publication (therefore the dates might be out of sequence if there are hotfixes). @@ -14,6 +6,11 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2021-06-05 Frank Mittelbach + + * ltcmd.dtx, ltdefns.dtx, ltmiscen.dtx: + Normalize message texts + ================================================================================ All changes above are only part of the development branch for the next release. ================================================================================ diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx index 4f3203c22..81a359a51 100644 --- a/base/ltcmd.dtx +++ b/base/ltcmd.dtx @@ -3693,10 +3693,11 @@ but~this~was~not~defined~using~xparse. } \msg_new:nnnn { cmd } { split-excess-tokens } - { Too~many~'#1'~tokens~when~trying~to~split~argument. } +% { Too~many~'#1'~tokens~when~trying~to~split~argument. } + { Too~many~'#1'~tokens~in~argument. } { LaTeX~was~asked~to~split~the~input~'#3'~ - at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~ + at~each~occurrence~of~the~token~'#1'~into~#2~parts.~ There~were~too~many~'#1'~tokens. } \msg_new:nnnn { cmd } { unknown } diff --git a/base/testfiles-ltcmd/ltcmd004.luatex.tlg b/base/testfiles-ltcmd/ltcmd004.luatex.tlg index 3f15978b2..25ffa5993 100644 --- a/base/testfiles-ltcmd/ltcmd004.luatex.tlg +++ b/base/testfiles-ltcmd/ltcmd004.luatex.tlg @@ -24,77 +24,77 @@ TEST 2: Basic definitions R-type arguments ============================================================ TEST 3: r-type argument errors ============================================================ -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(-NoValue-)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (nothing)(-NoValue-)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '['. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '['. LaTeX did +not find this argument and will insert a default value for further processing. (stuff)(is)(-NoValue-) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. -! LaTeX cmd Error: XMissing required argument for command '\foo'. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(-NoValue-) ============================================================ ============================================================ TEST 4: R-type argument errors ============================================================ -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(drat)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (nothing)(drat)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '['. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '['. LaTeX did +not find this argument and will insert a default value for further processing. (stuff)(is)(drat) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. -! LaTeX cmd Error: XMissing required argument for command '\foo'. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (drat)(drat) ============================================================ ============================================================ @@ -535,7 +535,7 @@ TEST 13: Test ## in expandable argument specification ============================================================ ! Undefined control sequence. \::error - ! cmd: XMissing required argument for \foobar. + ! cmd: Required argument missing for \foobar. l. ... } The control sequence at the end of the top line of your error message was never \def'ed. If you have @@ -630,45 +630,77 @@ undefined ============================================================ TEST 16: Optional+mandatory with same delimiter ============================================================ -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) ':' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter ':'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter ':' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a:b,c|d| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) ':' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter ':'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter ':' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a:b,c|d| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |-NoValue-|\BooleanTrue |a| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '*' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '*'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '*' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |\BooleanTrue |a| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '(' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '('. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '(' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |\BooleanTrue |a(b)c|\BooleanTrue | -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '_' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '_'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '_' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |{_}{a}|\BooleanFalse || |{a}{-NoValue-}|\BooleanFalse |abc| |{-NoValue-}{-NoValue-}|\BooleanTrue |a| @@ -707,10 +739,14 @@ TEST 18: Environments and expansion ============================================================ TEST 19: Expandable r type ============================================================ -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| |a|b| ============================================================ @@ -780,10 +816,14 @@ TEST 26: Non-character token delimiters ============================================================ abc def -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '\(' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '\('. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '\(' as an earlier optional argument. It +(cmd) will therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. abc/def abc/def abc/-NoValue- diff --git a/base/testfiles-ltcmd/ltcmd004.tlg b/base/testfiles-ltcmd/ltcmd004.tlg index 05b8f372a..62753a3da 100644 --- a/base/testfiles-ltcmd/ltcmd004.tlg +++ b/base/testfiles-ltcmd/ltcmd004.tlg @@ -24,77 +24,77 @@ TEST 2: Basic definitions R-type arguments ============================================================ TEST 3: r-type argument errors ============================================================ -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(-NoValue-)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (nothing)(-NoValue-)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '['. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '['. LaTeX did +not find this argument and will insert a default value for further processing. (stuff)(is)(-NoValue-) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. -! LaTeX cmd Error: XMissing required argument for command '\foo'. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(-NoValue-) ============================================================ ============================================================ TEST 4: R-type argument errors ============================================================ -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (-NoValue-)(drat)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (nothing)(drat)(there) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '['. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '['. LaTeX did +not find this argument and will insert a default value for further processing. (stuff)(is)(drat) -! LaTeX cmd Error: XMissing required argument for command '\foo'. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. -! LaTeX cmd Error: XMissing required argument for command '\foo'. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. +! LaTeX cmd Error: Required argument missing for command '\foo'. For immediate help type H . ... l. ... } -The current command '\foo' expects an argument starting with '('. LaTeX did -not find it and will insert a default value to be processed. +The command '\foo' expects one of its arguments to start with '('. LaTeX did +not find this argument and will insert a default value for further processing. (drat)(drat) ============================================================ ============================================================ @@ -535,7 +535,7 @@ TEST 13: Test ## in expandable argument specification ============================================================ ! Undefined control sequence. \::error - ! cmd: XMissing required argument for \foobar. + ! cmd: Required argument missing for \foobar. l. ... } The control sequence at the end of the top line of your error message was never \def'ed. If you have @@ -630,45 +630,77 @@ undefined ============================================================ TEST 16: Optional+mandatory with same delimiter ============================================================ -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) ':' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter ':'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter ':' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a:b,c|d| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) ':' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter ':'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter ':' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a:b,c|d| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |-NoValue-|\BooleanTrue |a| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '*' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '*'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '*' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |\BooleanTrue |a| -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '(' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '('. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '(' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |\BooleanTrue |a(b)c|\BooleanTrue | -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '_' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '_'. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '_' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |{_}{a}|\BooleanFalse || |{a}{-NoValue-}|\BooleanFalse |abc| |{-NoValue-}{-NoValue-}|\BooleanTrue |a| @@ -707,10 +739,14 @@ TEST 18: Environments and expansion ============================================================ TEST 19: Expandable r type ============================================================ -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '[' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '['. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '[' as an earlier optional argument. It will +(cmd) therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. |a|b| |a|b| ============================================================ @@ -780,10 +816,14 @@ TEST 26: Non-character token delimiters ============================================================ abc def -LaTeX cmd Warning: Since the mandatory argument 'R/r' has the same delimiter -(cmd) '\(' as a previous optional argument, it will not be -(cmd) possible to omit all optional arguments when calling this -(cmd) command. +LaTeX cmd Warning: Optional and mandatory argument with same delimiter '\('. +(cmd) +(cmd) The mandatory argument specified with 'r' or 'R' has the +(cmd) same delimiter '\(' as an earlier optional argument. It +(cmd) will therefore not be possible to omit all the optional +(cmd) arguments when calling this command. +(cmd) +(cmd) This may be intentional, but then it my be a mistake. abc/def abc/def abc/-NoValue- diff --git a/base/testfiles-ltcmd/ltcmd005.luatex.tlg b/base/testfiles-ltcmd/ltcmd005.luatex.tlg index a3d826432..2da3456d2 100644 --- a/base/testfiles-ltcmd/ltcmd005.luatex.tlg +++ b/base/testfiles-ltcmd/ltcmd005.luatex.tlg @@ -392,18 +392,18 @@ l. ... } The default values of two or more arguments of the environment 'testB' 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: Too many ',' tokens when trying to split argument. +! LaTeX cmd Error: Too many ',' tokens in argument. For immediate help type H . ... l. ... } LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token -',', up to a maximum of 3 parts. There were too many ',' tokens. -! LaTeX cmd Error: Too many ',' tokens when trying to split argument. +',' into 3 parts. There were too many ',' tokens. +! LaTeX cmd Error: Too many ',' tokens in argument. For immediate help type H . ... l. ... } LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token -',', up to a maximum of 3 parts. There were too many ',' tokens. +',' into 3 parts. There were too many ',' tokens. ! LaTeX cmd Error: Verbatim-like command '\testE' illegal in argument. For immediate help type H . ... diff --git a/base/testfiles-ltcmd/ltcmd005.tlg b/base/testfiles-ltcmd/ltcmd005.tlg index 2c8a36c95..dfba325fd 100644 --- a/base/testfiles-ltcmd/ltcmd005.tlg +++ b/base/testfiles-ltcmd/ltcmd005.tlg @@ -392,18 +392,18 @@ l. ... } The default values of two or more arguments of the environment 'testB' 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: Too many ',' tokens when trying to split argument. +! LaTeX cmd Error: Too many ',' tokens in argument. For immediate help type H . ... l. ... } LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token -',', up to a maximum of 3 parts. There were too many ',' tokens. -! LaTeX cmd Error: Too many ',' tokens when trying to split argument. +',' into 3 parts. There were too many ',' tokens. +! LaTeX cmd Error: Too many ',' tokens in argument. For immediate help type H . ... l. ... } LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token -',', up to a maximum of 3 parts. There were too many ',' tokens. +',' into 3 parts. There were too many ',' tokens. ! LaTeX cmd Error: Verbatim-like command '\testE' illegal in argument. For immediate help type H . ...