[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-kernel-msgs: change msg text (fdfbe4f2)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Jun 7 16:07:42 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : TL21-2-kernel-msgs
Link : https://github.com/latex3/latex2e/commit/fdfbe4f2f2c5bb8b2554193308cb1c009ff50149
>---------------------------------------------------------------
commit fdfbe4f2f2c5bb8b2554193308cb1c009ff50149
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Jun 7 16:07:42 2021 +0200
change msg text
>---------------------------------------------------------------
fdfbe4f2f2c5bb8b2554193308cb1c009ff50149
base/ltcmd.dtx | 2 +-
base/testfiles-ltcmd/ltcmd005.luatex.tlg | 4 ++--
base/testfiles-ltcmd/ltcmd005.tlg | 4 ++--
base/testfiles-ltcmd/ltcmd007.lvt | 22 ++++++++++++++++++++++
base/testfiles-ltcmd/ltcmd007.tlg | 16 +++++++++++++++-
5 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index e10f85c0..907cad35 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -3694,7 +3694,7 @@
}
\msg_new:nnnn { cmd } { split-excess-tokens }
% { Too~many~'#1'~tokens~when~trying~to~split~argument. }
- { Too~many~'#1'~tokens~in~argument. }
+ { Too~many~'#1'~separators~in~argument. }
{
LaTeX~was~asked~to~split~the~input~'#3'~
at~each~occurrence~of~the~token~'#1'~into~#2~parts.~
diff --git a/base/testfiles-ltcmd/ltcmd005.luatex.tlg b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
index 2da3456d..c8dc8f61 100644
--- a/base/testfiles-ltcmd/ltcmd005.luatex.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.luatex.tlg
@@ -392,13 +392,13 @@ 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 in argument.
+! LaTeX cmd Error: Too many ',' separators in argument.
For immediate help type H <return>.
...
l. ... }
LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token
',' into 3 parts. There were too many ',' tokens.
-! LaTeX cmd Error: Too many ',' tokens in argument.
+! LaTeX cmd Error: Too many ',' separators in argument.
For immediate help type H <return>.
...
l. ... }
diff --git a/base/testfiles-ltcmd/ltcmd005.tlg b/base/testfiles-ltcmd/ltcmd005.tlg
index dfba325f..a5b7e663 100644
--- a/base/testfiles-ltcmd/ltcmd005.tlg
+++ b/base/testfiles-ltcmd/ltcmd005.tlg
@@ -392,13 +392,13 @@ 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 in argument.
+! LaTeX cmd Error: Too many ',' separators in argument.
For immediate help type H <return>.
...
l. ... }
LaTeX was asked to split the input 'a,b,c,d' at each occurrence of the token
',' into 3 parts. There were too many ',' tokens.
-! LaTeX cmd Error: Too many ',' tokens in argument.
+! LaTeX cmd Error: Too many ',' separators in argument.
For immediate help type H <return>.
...
l. ... }
diff --git a/base/testfiles-ltcmd/ltcmd007.lvt b/base/testfiles-ltcmd/ltcmd007.lvt
index ff18ff68..8c7dee8d 100644
--- a/base/testfiles-ltcmd/ltcmd007.lvt
+++ b/base/testfiles-ltcmd/ltcmd007.lvt
@@ -32,6 +32,28 @@
}
+\ExplSyntaxOff % want spaces in the test
+
+
+\TEST { Splitting arguments }
+ {
+ \NewDocumentCommand \foo
+ {>{\SplitArgument { 2 } { ;; } } m } {\typeout{==>\space #1}}
+ \foo{a;;b;;c}
+% but ...
+ \RenewDocumentCommand \foo
+ {>{\SplitArgument { 2 } {;;} } m } {\typeout{==>\space #1}}
+ \foo{a;;b;;c}
+ \foo{a;;b;;c;;d}
+ \RenewDocumentCommand \foo
+ {>{\SplitArgument { 4 } { ; } } m } {\typeout{==>\space #1}}
+ \foo{a;;b;;c}
+}
+
+\ExplSyntaxOn
+
+
+
\OMIT
\RequirePackage{xparse}
\TIMO
diff --git a/base/testfiles-ltcmd/ltcmd007.tlg b/base/testfiles-ltcmd/ltcmd007.tlg
index 69ad09da..5b07e347 100644
--- a/base/testfiles-ltcmd/ltcmd007.tlg
+++ b/base/testfiles-ltcmd/ltcmd007.tlg
@@ -51,7 +51,21 @@ not find this argument and will insert a default value for further processing.
|E|\BooleanTrue |G|
============================================================
============================================================
-TEST 3: deprecated stuff
+TEST 3: Splitting arguments
+============================================================
+==> {a;;b;;c}{-NoValue-}{-NoValue-}
+==> {a}{b}{c}
+! LaTeX cmd Error: Too many ';;' separators in argument.
+For immediate help type H <return>.
+ ...
+l. ...}
+LaTeX was asked to split the input 'a;;b;;c;;d' at each occurrence of the
+token ';;' into 3 parts. There were too many ';;' tokens.
+==> {a}{b}{c}
+==> {a}{}{b}{}{c}
+============================================================
+============================================================
+TEST 4: deprecated stuff
============================================================
LaTeX cmd Warning: Optional and mandatory argument with same delimiter '{'.
(cmd)
More information about the latex3-commits
mailing list.