[latex3-commits] [latex3/latex3] e-type: Switch from x- to e-type in l3clist (7bf05da64)
github at latex-project.org
github at latex-project.org
Tue Oct 10 11:58:12 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : e-type
Link : https://github.com/latex3/latex3/commit/7bf05da64b24ad47c292e2db136137e7fb3d8e40
>---------------------------------------------------------------
commit 7bf05da64b24ad47c292e2db136137e7fb3d8e40
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sat Sep 16 08:36:23 2023 +0100
Switch from x- to e-type in l3clist
Includes some tidy up for x-type entirely
unused and matching o-type cases.
>---------------------------------------------------------------
7bf05da64b24ad47c292e2db136137e7fb3d8e40
.../l3benchmark/testfiles/m3benchmark001.lvt | 4 +-
l3experimental/xgalley/l3galley.dtx | 8 +-
l3kernel/l3clist.dtx | 131 ++++++++++-----------
l3kernel/l3doc.dtx | 2 +-
l3kernel/l3keys.dtx | 6 +-
l3kernel/l3unicode.dtx | 4 +-
l3kernel/testfiles/m3clist002.lvt | 28 ++---
l3kernel/testfiles/m3clist002.tlg | 22 +---
l3kernel/testfiles/m3clist003.lvt | 4 +-
l3kernel/testfiles/m3show002.lvt | 2 +-
l3kernel/testfiles/m3show003.lvt | 2 +-
l3kernel/testfiles/m3sort001.lvt | 4 +-
12 files changed, 94 insertions(+), 123 deletions(-)
diff --git a/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt b/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
index 67e1f42ed..07668ab3c 100644
--- a/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
+++ b/l3experimental/l3benchmark/testfiles/m3benchmark001.lvt
@@ -55,9 +55,9 @@
\prg_replicate:nn { 3 }
{
\test_disable_iow:n { \benchmark:n { \test_slow_code: } }
- \clist_put_right:Nx \l_tmpa_clist { \fp_to_tl:N \g_benchmark_time_fp }
+ \clist_put_right:Ne \l_tmpa_clist { \fp_to_tl:N \g_benchmark_time_fp }
\test_disable_iow:n { \benchmark:n { \test_slow_code: \test_slow_code: } }
- \clist_put_right:Nx \l_tmpb_clist { \fp_to_tl:N \g_benchmark_time_fp }
+ \clist_put_right:Ne \l_tmpb_clist { \fp_to_tl:N \g_benchmark_time_fp }
}
\fp_compare:nTF % Check that doing code twice takes between 1.5 and 2.5 times as much
{
diff --git a/l3experimental/xgalley/l3galley.dtx b/l3experimental/xgalley/l3galley.dtx
index a40688f42..2fc73535b 100644
--- a/l3experimental/xgalley/l3galley.dtx
+++ b/l3experimental/xgalley/l3galley.dtx
@@ -2408,11 +2408,11 @@
{ \clist_set_eq:NN #1 \l_galley_line_penalties_clist }
% \end{macrocode}
% These all require appropriate mappings, using the fact that
-% \cs{clist_set:Nx} will tidy up the excess comma.
+% \cs{clist_set:Ne} will tidy up the excess comma.
% \begin{macrocode}
\cs_new_protected:Npn \galley_save_display_club_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_clubpenalties:D 0 - 1 }
\@@_save_display_club_penalties:n
@@ -2422,7 +2422,7 @@
{ \int_value:w \tex_clubpenalties:D \int_eval:n {#1} , }
\cs_new_protected:Npn \galley_save_display_widow_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_displaywidowpenalties:D 0 - 1 }
\@@_save_display_widow_penalties:n
@@ -2435,7 +2435,7 @@
}
\cs_new_protected:Npn \galley_save_widow_penalties:N #1
{
- \clist_set:Nx #1
+ \clist_set:Ne #1
{
\int_step_function:nN { \tex_widowpenalties:D 0 - 1 }
\@@_save_widow_penalties:n
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index 3ce34a01d..64166da3a 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -123,8 +123,9 @@
%
% \begin{function}[added = 2014-07-05]
% {
-% \clist_const:Nn, \clist_const:Nx,
-% \clist_const:cn, \clist_const:cx
+% \clist_const:Nn, \clist_const:Ne,
+% \clist_const:Nx,
+% \clist_const:cn, \clist_const:ce
% }
% \begin{syntax}
% \cs{clist_const:Nn} \meta{clist~var} \Arg{comma list}
@@ -216,14 +217,13 @@
%
% \begin{function}[added = 2011-09-06]
% {
-% \clist_set:Nn, \clist_set:NV,
+% \clist_set:Nn, \clist_set:NV, \clist_set:Ne,
% \clist_set:No, \clist_set:Nx,
-% \clist_set:cn, \clist_set:cV,
+% \clist_set:cn, \clist_set:cV, \clist_set:ce,
% \clist_set:co, \clist_set:cx,
-% \clist_gset:Nn, \clist_gset:NV,
+% \clist_gset:Nn, \clist_gset:NV, \clist_gset:Ne,
% \clist_gset:No, \clist_gset:Nx,
-% \clist_gset:cn, \clist_gset:cV,
-% \clist_gset:co, \clist_gset:cx
+% \clist_gset:cn, \clist_gset:cV, \clist_gset:ce
% }
% \begin{syntax}
% \cs{clist_set:Nn} \meta{clist~var} |{|\meta{item_1},\ldots{},\meta{item_n}|}|
@@ -241,17 +241,14 @@
% \begin{function}[updated = 2011-09-05]
% {
% \clist_put_left:Nn, \clist_put_left:NV,
-% \clist_put_left:Nv,
+% \clist_put_left:Nv, \clist_put_left:Ne,
% \clist_put_left:No, \clist_put_left:Nx,
% \clist_put_left:cn, \clist_put_left:cV,
-% \clist_put_left:cv,
-% \clist_put_left:co, \clist_put_left:cx,
+% \clist_put_left:cv, \clist_put_left:ce,
% \clist_gput_left:Nn, \clist_gput_left:NV,
-% \clist_gput_left:Nv,
-% \clist_gput_left:No, \clist_gput_left:Nx,
+% \clist_gput_left:Nv, \clist_gput_left:Ne,
% \clist_gput_left:cn, \clist_gput_left:cV,
-% \clist_gput_left:cv,
-% \clist_gput_left:co, \clist_gput_left:cx
+% \clist_gput_left:cv, \clist_gput_left:ce
% }
% \begin{syntax}
% \cs{clist_put_left:Nn} \meta{clist~var} |{|\meta{item_1},\ldots{},\meta{item_n}|}|
@@ -268,17 +265,17 @@
% \begin{function}[updated = 2011-09-05]
% {
% \clist_put_right:Nn, \clist_put_right:NV,
-% \clist_put_right:Nv,
+% \clist_put_right:Nv, \clist_put_right:Ne,
% \clist_put_right:No, \clist_put_right:Nx,
% \clist_put_right:cn, \clist_put_right:cV,
-% \clist_put_right:cv,
+% \clist_put_right:cv, \clist_put_right:ce,
% \clist_put_right:co, \clist_put_right:cx,
% \clist_gput_right:Nn, \clist_gput_right:NV,
-% \clist_gput_right:Nv,
+% \clist_gput_right:Nv, \clist_gput_right:Ne,
% \clist_gput_right:No, \clist_gput_right:Nx,
% \clist_gput_right:cn, \clist_gput_right:cV,
-% \clist_gput_right:cv,
-% \clist_gput_right:co, \clist_gput_right:cx
+% \clist_gput_right:cv, \clist_gput_right:ce,
+% \clist_gput_right:cx
% }
% \begin{syntax}
% \cs{clist_put_right:Nn} \meta{clist~var} |{|\meta{item_1},\ldots{},\meta{item_n}|}|
@@ -706,10 +703,10 @@
%
% \begin{function}
% {
-% \clist_push:Nn, \clist_push:NV, \clist_push:No, \clist_push:Nx,
-% \clist_push:cn, \clist_push:cV, \clist_push:co, \clist_push:cx,
-% \clist_gpush:Nn, \clist_gpush:NV, \clist_gpush:No, \clist_gpush:Nx,
-% \clist_gpush:cn, \clist_gpush:cV, \clist_gpush:co, \clist_gpush:cx
+% \clist_push:Nn, \clist_push:NV,
+% \clist_push:cn, \clist_push:cV,
+% \clist_gpush:Nn, \clist_gpush:NV,
+% \clist_gpush:cn, \clist_gpush:cV
% }
% \begin{syntax}
% \cs{clist_push:Nn} \meta{clist~var} \Arg{items}
@@ -984,15 +981,16 @@
%
% \begin{macro}
% {
-% \clist_const:Nn, \clist_const:cn,
-% \clist_const:Nx, \clist_const:cx
+% \clist_const:Nn, \clist_const:Ne, \clist_const:Nx,
+% \clist_const:cn, \clist_const:ce
% }
% Creating and initializing a constant comma list is done by
% sanitizing all items (stripping spaces and braces).
% \begin{macrocode}
\cs_new_protected:Npn \clist_const:Nn #1#2
{ \tl_const:Nx #1 { \@@_sanitize:n {#2} } }
-\cs_generate_variant:Nn \clist_const:Nn { c , Nx , cx }
+\cs_generate_variant:Nn \clist_const:Nn { Ne , c , ce }
+\cs_generate_variant:Nn \clist_const:Nn { Nx }
% \end{macrocode}
% \end{macro}
%
@@ -1140,47 +1138,45 @@
%
% \begin{macro}
% {
-% \clist_set:Nn, \clist_set:NV,
-% \clist_set:No, \clist_set:Nx,
-% \clist_set:cn, \clist_set:cV,
-% \clist_set:co, \clist_set:cx
+% \clist_set:Nn, \clist_set:NV, \clist_set:Ne,
+% \clist_set:No, \clist_set:Nx,
+% \clist_set:cn, \clist_set:cV, \clist_set:ce,
+% \clist_set:co, \clist_set:cx
% }
% \begin{macro}
% {
-% \clist_gset:Nn, \clist_gset:NV,
+% \clist_gset:Nn, \clist_gset:NV, \clist_gset:Ne,
% \clist_gset:No, \clist_gset:Nx,
-% \clist_gset:cn, \clist_gset:cV,
-% \clist_gset:co, \clist_gset:cx
+% \clist_gset:cn, \clist_gset:cV, \clist_gset:ce
% }
% \begin{macrocode}
\cs_new_protected:Npn \clist_set:Nn #1#2
{ \__kernel_tl_set:Nx #1 { \@@_sanitize:n {#2} } }
\cs_new_protected:Npn \clist_gset:Nn #1#2
{ \__kernel_tl_gset:Nx #1 { \@@_sanitize:n {#2} } }
-\cs_generate_variant:Nn \clist_set:Nn { NV , No , Nx , c , cV , co , cx }
-\cs_generate_variant:Nn \clist_gset:Nn { NV , No , Nx , c , cV , co , cx }
+\cs_generate_variant:Nn \clist_set:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \clist_set:Nn { No , Nx , co , cx }
+\cs_generate_variant:Nn \clist_gset:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \clist_gset:Nn { No , Nx }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}
% {
-% \clist_put_left:Nn, \clist_put_left:NV,
-% \clist_put_left:Nv,
-% \clist_put_left:No, \clist_put_left:Nx,
-% \clist_put_left:cn, \clist_put_left:cV,
-% \clist_put_left:cv,
-% \clist_put_left:co, \clist_put_left:cx
+% \clist_put_left:Nn, \clist_put_left:NV,
+% \clist_put_left:Nv, \clist_put_left:Ne,
+% \clist_put_left:No, \clist_put_left:Nx,
+% \clist_put_left:cn, \clist_put_left:cV,
+% \clist_put_left:cv, \clist_put_left:ce
% }
% \UnitTested
% \begin{macro}
% {
% \clist_gput_left:Nn, \clist_gput_left:NV,
-% \clist_gput_left:Nv,
-% \clist_gput_left:No, \clist_gput_left:Nx,
+% \clist_gput_left:Nv, \clist_gput_left:Ne,
% \clist_gput_left:cn, \clist_gput_left:cV,
-% \clist_gput_left:cv,
-% \clist_gput_left:co, \clist_gput_left:cx
+% \clist_gput_left:cv, \clist_gput_left:ce
% }
% \UnitTested
% \begin{macro}{\@@_put_left:NNNn}
@@ -1197,10 +1193,9 @@
#2 \l_@@_internal_clist {#4}
#1 #3 \l_@@_internal_clist #3
}
-\cs_generate_variant:Nn \clist_put_left:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_put_left:Nn { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \clist_gput_left:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_put_left:Nn { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_put_left:Nn { No , Nx }
+\cs_generate_variant:Nn \clist_gput_left:Nn { NV , Nv , Ne , c , cV , cv , ce }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1209,21 +1204,21 @@
% \begin{macro}
% {
% \clist_put_right:Nn, \clist_put_right:NV,
-% \clist_put_right:Nv,
+% \clist_put_right:Nv, \clist_put_right:Ne,
% \clist_put_right:No, \clist_put_right:Nx,
% \clist_put_right:cn, \clist_put_right:cV,
-% \clist_put_right:cv,
+% \clist_put_right:cv, \clist_put_right:ce,
% \clist_put_right:co, \clist_put_right:cx
% }
% \UnitTested
% \begin{macro}
% {
% \clist_gput_right:Nn, \clist_gput_right:NV,
-% \clist_gput_right:Nv,
+% \clist_gput_right:Nv, \clist_gput_right:Ne,
% \clist_gput_right:No, \clist_gput_right:Nx,
% \clist_gput_right:cn, \clist_gput_right:cV,
-% \clist_gput_right:cv,
-% \clist_gput_right:co, \clist_gput_right:cx
+% \clist_gput_right:cv, \clist_gput_right:ce,
+% \clist_gput_right:cx
% }
% \UnitTested
% \begin{macro}{\@@_put_right:NNNn}
@@ -1237,10 +1232,14 @@
#2 \l_@@_internal_clist {#4}
#1 #3 #3 \l_@@_internal_clist
}
-\cs_generate_variant:Nn \clist_put_right:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_put_right:Nn { c , cV , cv , co , cx }
-\cs_generate_variant:Nn \clist_gput_right:Nn { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , cv , co , cx }
+\cs_generate_variant:Nn \clist_put_right:Nn
+ { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_put_right:Nn
+ { No , Nx , co , cx }
+\cs_generate_variant:Nn \clist_gput_right:Nn
+ { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \clist_gput_right:Nn
+ { No , Nx , cx }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1356,33 +1355,25 @@
% \end{macro}
%
% \begin{macro}{
-% \clist_push:Nn, \clist_push:NV, \clist_push:No, \clist_push:Nx,
-% \clist_push:cn, \clist_push:cV, \clist_push:co, \clist_push:cx
+% \clist_push:Nn, \clist_push:NV,
+% \clist_push:cn, \clist_push:cV,
% }
% \UnitTested
% \begin{macro}{
-% \clist_gpush:Nn, \clist_gpush:NV, \clist_gpush:No, \clist_gpush:Nx,
-% \clist_gpush:cn, \clist_gpush:cV, \clist_gpush:co, \clist_gpush:cx
+% \clist_gpush:Nn, \clist_gpush:NV,
+% \clist_gpush:cn, \clist_gpush:cV,
% }
% \UnitTested
% Pushing to a comma list is the same as adding on the left.
% \begin{macrocode}
\cs_new_eq:NN \clist_push:Nn \clist_put_left:Nn
\cs_new_eq:NN \clist_push:NV \clist_put_left:NV
-\cs_new_eq:NN \clist_push:No \clist_put_left:No
-\cs_new_eq:NN \clist_push:Nx \clist_put_left:Nx
\cs_new_eq:NN \clist_push:cn \clist_put_left:cn
\cs_new_eq:NN \clist_push:cV \clist_put_left:cV
-\cs_new_eq:NN \clist_push:co \clist_put_left:co
-\cs_new_eq:NN \clist_push:cx \clist_put_left:cx
\cs_new_eq:NN \clist_gpush:Nn \clist_gput_left:Nn
\cs_new_eq:NN \clist_gpush:NV \clist_gput_left:NV
-\cs_new_eq:NN \clist_gpush:No \clist_gput_left:No
-\cs_new_eq:NN \clist_gpush:Nx \clist_gput_left:Nx
\cs_new_eq:NN \clist_gpush:cn \clist_gput_left:cn
\cs_new_eq:NN \clist_gpush:cV \clist_gput_left:cV
-\cs_new_eq:NN \clist_gpush:co \clist_gput_left:co
-\cs_new_eq:NN \clist_gpush:cx \clist_gput_left:cx
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index a12c847a8..df7c4da82 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -4564,7 +4564,7 @@ and all files in that bundle must be distributed together.
% sorted differently in an index.
% \begin{macrocode}
\clist_new:N \g_@@_non_modules_clist
-\clist_gset:Nx \g_@@_non_modules_clist
+\clist_gset:Ne \g_@@_non_modules_clist
{
\tl_to_str:n
{
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index fd0a8a22c..aaa48b9b1 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -3255,7 +3255,7 @@
{
\@@_quark_if_no_value:NTF \l_@@_relative_tl
{
- \clist_put_right:Nx \l_@@_unused_clist
+ \clist_put_right:Ne \l_@@_unused_clist
{
\l_keys_key_str
\bool_if:NF \l_@@_no_value_bool
@@ -3265,7 +3265,7 @@
{
\tl_if_empty:NTF \l_@@_relative_tl
{
- \clist_put_right:Nx \l_@@_unused_clist
+ \clist_put_right:Ne \l_@@_unused_clist
{
\l_keys_path_str
\bool_if:NF \l_@@_no_value_bool
@@ -3293,7 +3293,7 @@
\l_keys_path_str
\l_@@_relative_tl
}
- \clist_put_right:Nx \l_@@_unused_clist
+ \clist_put_right:Ne \l_@@_unused_clist
{
\exp_not:n {##2}
\bool_if:NF \l_@@_no_value_bool
diff --git a/l3kernel/l3unicode.dtx b/l3kernel/l3unicode.dtx
index f79fc63e5..a39408bf8 100644
--- a/l3kernel/l3unicode.dtx
+++ b/l3kernel/l3unicode.dtx
@@ -689,7 +689,7 @@
}
\prg_replicate:nn
{ \int_mod:nn { #2 - #1 } \c_@@_block_size_int }
- { \clist_put_right:cx { l_@@_ #3 _block_clist } {#4} }
+ { \clist_put_right:ce { l_@@_ #3 _block_clist } {#4} }
}
% \end{macrocode}
% To allow rapid comparison, each completed block is stored locally as a
@@ -994,7 +994,7 @@
{
\str_if_empty:NF \l_@@_tmpb_str
{
- \clist_const:cx { c_@@_grapheme_ \l_@@_tmpb_str _clist }
+ \clist_const:ce { c_@@_grapheme_ \l_@@_tmpb_str _clist }
{ \exp_after:wN \use_none:n \l_@@_tmpa_str }
\cs_set_nopar:Npn \l_@@_tmpa_str { }
}
diff --git a/l3kernel/testfiles/m3clist002.lvt b/l3kernel/testfiles/m3clist002.lvt
index 42a8ba2f7..10b71c336 100644
--- a/l3kernel/testfiles/m3clist002.lvt
+++ b/l3kernel/testfiles/m3clist002.lvt
@@ -162,7 +162,7 @@
\tl_put_right:Nn \l_tmpa_tl { {##} \c_space_tl }
\clist_set:NV \l_tmpa_clist \l_tmpa_tl
\cs_log:N \l_tmpa_clist
- \clist_set:Nx \l_tmpa_clist { \l_tmpa_clist \c_space_tl \l_tmpa_clist }
+ \clist_set:Ne \l_tmpa_clist { \l_tmpa_clist \c_space_tl \l_tmpa_clist }
\cs_log:N \l_tmpa_clist
}
@@ -176,7 +176,7 @@
\tl_put_right:Nn \l_tmpa_tl { {##} \c_space_tl }
\clist_set:cV {l_tmpa_clist} \l_tmpa_tl
\cs_log:N \l_tmpa_clist
- \clist_set:cx {l_tmpa_clist} { \l_tmpa_clist \c_space_tl \l_tmpa_clist }
+ \clist_set:ce {l_tmpa_clist} { \l_tmpa_clist \c_space_tl \l_tmpa_clist }
\cs_log:N \l_tmpa_clist
}
@@ -190,7 +190,7 @@
\tl_put_right:Nn \l_tmpa_tl { {##} \c_space_tl }
{ \clist_gset:NV \g_tmpa_clist \l_tmpa_tl }
\cs_log:N \g_tmpa_clist
- { \clist_gset:Nx \g_tmpa_clist { \g_tmpa_clist \c_space_tl \g_tmpa_clist } }
+ { \clist_gset:Ne \g_tmpa_clist { \g_tmpa_clist \c_space_tl \g_tmpa_clist } }
\cs_log:N \g_tmpa_clist
}
@@ -199,12 +199,12 @@
\cs_log:N \g_tmpa_clist
\clist_log:N \g_tmpa_clist
\tl_set:Nx \l_tmpa_tl { \prg_replicate:nn {3} { ~,a, } }
- { \clist_gset:co {g_tmpa_clist} \l_tmpa_tl }
+ { \clist_gset:cV {g_tmpa_clist} \l_tmpa_tl }
\cs_log:N \g_tmpa_clist
\tl_put_right:Nn \l_tmpa_tl { {##} \c_space_tl }
{ \clist_gset:cV {g_tmpa_clist} \l_tmpa_tl }
\cs_log:N \g_tmpa_clist
- { \clist_gset:cx {g_tmpa_clist} { \g_tmpa_clist \c_space_tl \g_tmpa_clist } }
+ { \clist_gset:ce {g_tmpa_clist} { \g_tmpa_clist \c_space_tl \g_tmpa_clist } }
\cs_log:N \g_tmpa_clist
}
@@ -216,10 +216,8 @@
\tl_set:Nn \l_tmpb_tl { \l_tmpc_tl }
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
\clist_put_left:Nn \l_tmpa_clist { \ERROR A \par }
- \clist_put_left:No \l_tmpa_clist { \l_tmpa_tl \par }
- \clist_put_left:Nx \l_tmpa_clist { \l_tmpa_tl \par }
+ \clist_put_left:Ne \l_tmpa_clist { \l_tmpa_tl \par }
\clist_put_left:cn {l_tmpa_clist} { \ERROR B \par }
- \clist_put_left:co {l_tmpa_clist} { \l_tmpb_tl \par }
\clist_log:N \l_tmpa_clist
}
@@ -229,10 +227,8 @@
\tl_set:Nn \l_tmpb_tl { \l_tmpc_tl }
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
\clist_put_right:Nn \l_tmpa_clist { \ERROR A \par }
- \clist_put_right:No \l_tmpa_clist { \l_tmpa_tl \par }
- \clist_put_right:Nx \l_tmpa_clist { \l_tmpa_tl \par }
+ \clist_put_right:Ne \l_tmpa_clist { \l_tmpa_tl \par }
\clist_put_right:cn {l_tmpa_clist} { \ERROR B \par }
- \clist_put_right:co {l_tmpa_clist} { \l_tmpb_tl \par }
\clist_log:N \l_tmpa_clist
}
@@ -243,10 +239,8 @@
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
{
\clist_gput_left:Nn \g_b_clist { \ERROR A \par }
- \clist_gput_left:No \g_b_clist { \l_tmpa_tl \par }
- \clist_gput_left:Nx \g_b_clist { \l_tmpa_tl \par }
+ \clist_gput_left:Ne \g_b_clist { \l_tmpa_tl \par }
\clist_gput_left:cn {g_b_clist} { \ERROR B \par }
- \clist_gput_left:co {g_b_clist} { \l_tmpb_tl \par }
}
\clist_log:N \g_b_clist
}
@@ -258,10 +252,8 @@
\tl_set:Nn \l_tmpc_tl { FULL~EXPANSION }
{
\clist_gput_right:Nn \g_b_clist { \ERROR A \par }
- \clist_gput_right:No \g_b_clist { \l_tmpa_tl \par }
- \clist_gput_right:Nx \g_b_clist { \l_tmpa_tl \par }
+ \clist_gput_right:Ne \g_b_clist { \l_tmpa_tl \par }
\clist_gput_right:cn {g_b_clist} { \ERROR B \par }
- \clist_gput_right:co {g_b_clist} { \l_tmpb_tl \par }
}
\clist_log:N \g_b_clist
}
@@ -308,7 +300,6 @@
\clist_clear:N \l_tmpa_clist
\tl_set:Nn \l_tmpa_tl { \ERROR B }
\clist_push:Nn \l_tmpa_clist { \ERROR A \par }
- \clist_push:No \l_tmpa_clist { \l_tmpa_tl \par }
\clist_push:cn {l_tmpa_clist} { \ERROR C \par }
\clist_log:N \l_tmpa_clist
}
@@ -318,7 +309,6 @@
\tl_set:Nn \l_tmpa_tl { \ERROR B }
{
\clist_gpush:Nn \g_b_clist { \ERROR A \par }
- \clist_gpush:No \g_b_clist { \l_tmpa_tl \par }
\clist_gpush:cn {g_b_clist} { \ERROR C \par }
}
\clist_log:N \g_b_clist
diff --git a/l3kernel/testfiles/m3clist002.tlg b/l3kernel/testfiles/m3clist002.tlg
index 387d7fd19..e3e466642 100644
--- a/l3kernel/testfiles/m3clist002.tlg
+++ b/l3kernel/testfiles/m3clist002.tlg
@@ -129,7 +129,7 @@ The comma list \l_tmpa_clist contains the items (without outer braces):
> {d \e }.
> \l_tmpa_clist=macro:->a,a,a.
> \l_tmpa_clist=macro:->a,a,a,{####}\c_space_tl .
-> \l_tmpa_clist=macro:->a,a,a,{##} a,a,a,##.
+> \l_tmpa_clist=macro:->a,a,a,{####} a,a,a,####.
============================================================
============================================================
TEST 8: set c
@@ -143,7 +143,7 @@ The comma list \l_tmpa_clist contains the items (without outer braces):
> {d \e }.
> \l_tmpa_clist=macro:->a,a,a.
> \l_tmpa_clist=macro:->a,a,a,{####}\c_space_tl .
-> \l_tmpa_clist=macro:->a,a,a,{##} a,a,a,##.
+> \l_tmpa_clist=macro:->a,a,a,{####} a,a,a,####.
============================================================
============================================================
TEST 9: gset N
@@ -157,7 +157,7 @@ The comma list \g_tmpa_clist contains the items (without outer braces):
> {d \e }.
> \g_tmpa_clist=macro:->a,a,a.
> \g_tmpa_clist=macro:->a,a,a,{####}\c_space_tl .
-> \g_tmpa_clist=macro:->a,a,a,{##} a,a,a,##.
+> \g_tmpa_clist=macro:->a,a,a,{####} a,a,a,####.
============================================================
============================================================
TEST 10: gset c
@@ -171,16 +171,14 @@ The comma list \g_tmpa_clist contains the items (without outer braces):
> {d \e }.
> \g_tmpa_clist=macro:->a,a,a.
> \g_tmpa_clist=macro:->a,a,a,{####}\c_space_tl .
-> \g_tmpa_clist=macro:->a,a,a,{##} a,a,a,##.
+> \g_tmpa_clist=macro:->a,a,a,{####} a,a,a,####.
============================================================
============================================================
TEST 11: put left
============================================================
The comma list \l_tmpa_clist contains the items (without outer braces):
-> {\l_tmpc_tl \par }
> {\ERROR B\par }
> {FULL EXPANSION\par }
-> {\l_tmpb_tl \par }
> {\ERROR A\par }.
============================================================
============================================================
@@ -188,19 +186,15 @@ TEST 12: put right
============================================================
The comma list \l_tmpa_clist contains the items (without outer braces):
> {\ERROR A\par }
-> {\l_tmpb_tl \par }
> {FULL EXPANSION\par }
-> {\ERROR B\par }
-> {\l_tmpc_tl \par }.
+> {\ERROR B\par }.
============================================================
============================================================
TEST 13: gput left
============================================================
The comma list \g_b_clist contains the items (without outer braces):
-> {\l_tmpc_tl \par }
> {\ERROR B\par }
> {FULL EXPANSION\par }
-> {\l_tmpb_tl \par }
> {\ERROR A\par }.
============================================================
============================================================
@@ -208,10 +202,8 @@ TEST 14: gput right
============================================================
The comma list \g_b_clist contains the items (without outer braces):
> {\ERROR A\par }
-> {\l_tmpb_tl \par }
> {FULL EXPANSION\par }
-> {\ERROR B\par }
-> {\l_tmpc_tl \par }.
+> {\ERROR B\par }.
============================================================
============================================================
TEST 15: if_empty (expect Y/Y/N NB. different than seq!!)
@@ -234,7 +226,6 @@ TEST 17: push (same as put_left)
============================================================
The comma list \l_tmpa_clist contains the items (without outer braces):
> {\ERROR C\par }
-> {\ERROR B\par }
> {\ERROR A\par }.
============================================================
============================================================
@@ -242,7 +233,6 @@ TEST 18: gpush (same as gput_left)
============================================================
The comma list \g_b_clist contains the items (without outer braces):
> {\ERROR C\par }
-> {\ERROR B\par }
> {\ERROR A\par }.
============================================================
============================================================
diff --git a/l3kernel/testfiles/m3clist003.lvt b/l3kernel/testfiles/m3clist003.lvt
index 550bb36cd..98339805e 100644
--- a/l3kernel/testfiles/m3clist003.lvt
+++ b/l3kernel/testfiles/m3clist003.lvt
@@ -30,9 +30,9 @@
\clist_log:N \c_a_clist
\clist_const:cn { c_b_clist } { }
\clist_log:N \c_b_clist
- \clist_const:Nx \c_c_clist { \prg_replicate:nn {9} {~} }
+ \clist_const:Ne \c_c_clist { \prg_replicate:nn {9} {~} }
\clist_log:N \c_c_clist
- \clist_const:cx { c_d_clist } { \prg_replicate:nn { 9 } { { } , } }
+ \clist_const:ce { c_d_clist } { \prg_replicate:nn { 9 } { { } , } }
\clist_log:N \c_d_clist
}
diff --git a/l3kernel/testfiles/m3show002.lvt b/l3kernel/testfiles/m3show002.lvt
index 51a91e113..1ffe2f8f4 100644
--- a/l3kernel/testfiles/m3show002.lvt
+++ b/l3kernel/testfiles/m3show002.lvt
@@ -34,7 +34,7 @@
\TEST { CLIST }
{
\clist_new:N \l_my_very_very_very_very_very_very_long_clist
- \clist_set:Nx \l_my_very_very_very_very_very_very_long_clist
+ \clist_set:Ne \l_my_very_very_very_very_very_very_long_clist
{ \prg_replicate:nn { 20 } { abcdefghij ~ } , 2 }
\clist_show:N \l_my_very_very_very_very_very_very_long_clist
}
diff --git a/l3kernel/testfiles/m3show003.lvt b/l3kernel/testfiles/m3show003.lvt
index c69fbfd46..03dbc2237 100644
--- a/l3kernel/testfiles/m3show003.lvt
+++ b/l3kernel/testfiles/m3show003.lvt
@@ -42,7 +42,7 @@
\TEST { clist }
{
\clist_new:N \l_my_very_very_very_very_very_very_long_clist
- \clist_set:Nx \l_my_very_very_very_very_very_very_long_clist
+ \clist_set:Ne \l_my_very_very_very_very_very_very_long_clist
{ item2 , item1 , \prg_replicate:nn { 20 } { abcdefghij ~ } , 2 }
\clist_log:N \l_my_very_very_very_very_very_very_long_clist
\clist_log:c { c_empty_clist }
diff --git a/l3kernel/testfiles/m3sort001.lvt b/l3kernel/testfiles/m3sort001.lvt
index fb53c36a2..ea80a8b4b 100644
--- a/l3kernel/testfiles/m3sort001.lvt
+++ b/l3kernel/testfiles/m3sort001.lvt
@@ -52,7 +52,7 @@
\TYPE { \l_tmpa_clist }
}
\TYPE { \l_tmpa_clist }
- \clist_gset:Nx \g_tmpa_clist
+ \clist_gset:Ne \g_tmpa_clist
{ \prg_replicate:nn { 10 } { 8,23,4,61,02,--3,03,7,3,48, } }
{
\clist_gsort:Nn \g_tmpa_clist
@@ -85,7 +85,7 @@
\OMIT
\tl_set:Nx \l_tmpa_tl
{ \prg_replicate:nn { 1000 } { V W X Y Z } }
-\clist_set:Nx \l_tmpa_clist
+\clist_set:Ne \l_tmpa_clist
{ \prg_replicate:nn { 1000 } { V , W , X , Y , Z , } }
\cs_generate_variant:Nn \seq_set_split:Nnn { Nno }
\seq_set_split:Nno \l_tmpa_seq { } \l_tmpa_tl
More information about the latex3-commits
mailing list.