[latex3-commits] [git/LaTeX3-latex3-latex3] master: Add a test for #672 (36e331250)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Feb 14 08:22:40 CET 2020
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/36e331250a26a806c981c37e22343d9fb5264323
>---------------------------------------------------------------
commit 36e331250a26a806c981c37e22343d9fb5264323
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Feb 14 07:21:06 2020 +0000
Add a test for #672
>---------------------------------------------------------------
36e331250a26a806c981c37e22343d9fb5264323
l3packages/xparse/testfiles/xparse004.luatex.tlg | 28 ++++++++++++++----------
l3packages/xparse/testfiles/xparse004.lvt | 10 ++++++++-
l3packages/xparse/testfiles/xparse004.tlg | 28 ++++++++++++++----------
3 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/l3packages/xparse/testfiles/xparse004.luatex.tlg b/l3packages/xparse/testfiles/xparse004.luatex.tlg
index df6346e5a..c86895084 100644
--- a/l3packages/xparse/testfiles/xparse004.luatex.tlg
+++ b/l3packages/xparse/testfiles/xparse004.luatex.tlg
@@ -718,7 +718,13 @@ TEST 19: Environments and expansion
\A \B \C
============================================================
============================================================
-TEST 20: Expandable e-type argument definitions
+TEST 20: Expandable r type
+============================================================
+|a|b|
+|a|b|
+============================================================
+============================================================
+TEST 21: Expandable e-type argument definitions
============================================================
({-NoValue-}{-NoValue-})(\the re)
({\u p}{-NoValue-})(\he re)
@@ -739,7 +745,7 @@ TEST 20: Expandable e-type argument definitions
({\B }{\A })(\C )(\D )
============================================================
============================================================
-TEST 21: Long status of t-type ignored
+TEST 22: Long status of t-type ignored
============================================================
|\BooleanTrue |\BooleanTrue |\par |\par |
|\BooleanFalse |\BooleanTrue |-NoValue-|\par \A |
@@ -755,7 +761,7 @@ My plan is to forget the whole thing and hope for the best.
|\BooleanFalse |\BooleanTrue |[\A ]|\B |
============================================================
============================================================
-TEST 22: Expandable l/u arguments
+TEST 23: Expandable l/u arguments
============================================================
|{def}ghi|
|abc|{def}
@@ -780,34 +786,34 @@ and I'll forget about whatever was undefined.
|abc||def|
============================================================
============================================================
-TEST 23: Same expandable command with/without defaults
+TEST 24: Same expandable command with/without defaults
============================================================
|a|b|{c}
|b|c|
============================================================
============================================================
-TEST 24: Wrongly undefining an xparse command
+TEST 25: Wrongly undefining an xparse command
============================================================
============================================================
============================================================
-TEST 25: NoValue passed to another command
+TEST 26: NoValue passed to another command
============================================================
|-NoValue-|B|C|
============================================================
============================================================
-TEST 26: Two processors
+TEST 27: Two processors
============================================================
Defining \CountArg on line ...
|2|{5}|
============================================================
============================================================
-TEST 27: Non-character token delimiters
+TEST 28: Non-character token delimiters
============================================================
[abc
something/-NoValue-
============================================================
============================================================
-TEST 28: IfBoolean multi token
+TEST 29: IfBoolean multi token
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
@@ -840,13 +846,13 @@ and I'll forget about whatever was undefined.
FALSE
============================================================
============================================================
-TEST 29: Processor spaces
+TEST 30: Processor spaces
============================================================
|{a}{bcd}|
> \box_wd:N \l_tmpa_box =0.0pt.
============================================================
============================================================
-TEST 30: Processor depending on other argument
+TEST 31: Processor depending on other argument
============================================================
|{a}{bcd;e}|1|
|{a,bcd}{e}|1|
diff --git a/l3packages/xparse/testfiles/xparse004.lvt b/l3packages/xparse/testfiles/xparse004.lvt
index 136560986..4d561ff9c 100644
--- a/l3packages/xparse/testfiles/xparse004.lvt
+++ b/l3packages/xparse/testfiles/xparse004.lvt
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2012,2014,2015,2017-2019 LaTeX3 Project
+% Copyright (C) 2012,2014,2015,2017-2020 LaTeX3 Project
%
\documentclass{minimal}
\input{regression-test}
@@ -363,6 +363,14 @@
\end{foo}
}
+\TEST { Expandable~r~type }
+ {
+ \DeclareExpandableDocumentCommand { \foo } { o R[]{} } { \TYPE{|#1|#2|} }
+ \foo [a][b]
+ \DeclareExpandableDocumentCommand { \foo } { o R''{} } { \TYPE{|#1|#2|} }
+ \foo [a]'b'
+ }
+
\TEST { Expandable~e-type~argument~definitions }
{
\DeclareExpandableDocumentCommand \foo { e { ^ _ } m }
diff --git a/l3packages/xparse/testfiles/xparse004.tlg b/l3packages/xparse/testfiles/xparse004.tlg
index a6d8b5975..7f5f883e9 100644
--- a/l3packages/xparse/testfiles/xparse004.tlg
+++ b/l3packages/xparse/testfiles/xparse004.tlg
@@ -718,7 +718,13 @@ TEST 19: Environments and expansion
\A \B \C
============================================================
============================================================
-TEST 20: Expandable e-type argument definitions
+TEST 20: Expandable r type
+============================================================
+|a|b|
+|a|b|
+============================================================
+============================================================
+TEST 21: Expandable e-type argument definitions
============================================================
({-NoValue-}{-NoValue-})(\the re)
({\u p}{-NoValue-})(\he re)
@@ -739,7 +745,7 @@ TEST 20: Expandable e-type argument definitions
({\B }{\A })(\C )(\D )
============================================================
============================================================
-TEST 21: Long status of t-type ignored
+TEST 22: Long status of t-type ignored
============================================================
|\BooleanTrue |\BooleanTrue |\par |\par |
|\BooleanFalse |\BooleanTrue |-NoValue-|\par \A |
@@ -755,7 +761,7 @@ My plan is to forget the whole thing and hope for the best.
|\BooleanFalse |\BooleanTrue |[\A ]|\B |
============================================================
============================================================
-TEST 22: Expandable l/u arguments
+TEST 23: Expandable l/u arguments
============================================================
|{def}ghi|
|abc|{def}
@@ -780,34 +786,34 @@ and I'll forget about whatever was undefined.
|abc||def|
============================================================
============================================================
-TEST 23: Same expandable command with/without defaults
+TEST 24: Same expandable command with/without defaults
============================================================
|a|b|{c}
|b|c|
============================================================
============================================================
-TEST 24: Wrongly undefining an xparse command
+TEST 25: Wrongly undefining an xparse command
============================================================
============================================================
============================================================
-TEST 25: NoValue passed to another command
+TEST 26: NoValue passed to another command
============================================================
|-NoValue-|B|C|
============================================================
============================================================
-TEST 26: Two processors
+TEST 27: Two processors
============================================================
Defining \CountArg on line ...
|2|{5}|
============================================================
============================================================
-TEST 27: Non-character token delimiters
+TEST 28: Non-character token delimiters
============================================================
[abc
something/-NoValue-
============================================================
============================================================
-TEST 28: IfBoolean multi token
+TEST 29: IfBoolean multi token
============================================================
! Undefined control sequence.
<argument> \LaTeX3 error:
@@ -840,13 +846,13 @@ and I'll forget about whatever was undefined.
FALSE
============================================================
============================================================
-TEST 29: Processor spaces
+TEST 30: Processor spaces
============================================================
|{a}{bcd}|
> \box_wd:N \l_tmpa_box =0.0pt.
============================================================
============================================================
-TEST 30: Processor depending on other argument
+TEST 31: Processor depending on other argument
============================================================
|{a}{bcd;e}|1|
|{a,bcd}{e}|1|
More information about the latex3-commits
mailing list.