[latex3-commits] [latex3/latex3] main: Switch from x- to e-type in l3prop (89bb74012)
github at latex-project.org
github at latex-project.org
Tue Oct 10 12:59:28 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/89bb7401241ace9e09d38b3ce5578c069a572bc2
>---------------------------------------------------------------
commit 89bb7401241ace9e09d38b3ce5578c069a572bc2
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Sep 14 12:57:13 2023 +0100
Switch from x- to e-type in l3prop
This retains all x-type variants in use in TL outside of kernel code.
>---------------------------------------------------------------
89bb7401241ace9e09d38b3ce5578c069a572bc2
l3backend/l3backend-color.dtx | 4 +-
l3kernel/l3coffins.dtx | 44 ++++----
l3kernel/l3color.dtx | 14 +--
l3kernel/l3doc.dtx | 6 -
l3kernel/l3prop.dtx | 204 ++++++++++++++++++++--------------
l3kernel/testfiles/m3show002.lvt | 4 +-
l3packages/l3doc/examples/testing.dtx | 6 -
l3trial/l3auxdata/l3auxdata.dtx | 2 +-
8 files changed, 152 insertions(+), 132 deletions(-)
diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 5049aae5f..40699ce15 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -412,7 +412,7 @@
{ \exp_not:N \int_use:N \g_@@_model_int }
{#1} {#2} {#3} {#4} {#5}
}
- \prop_gput:Nxx \exp_not:N \g_@@_backend_colorant_prop
+ \prop_gput:Nee \exp_not:N \g_@@_backend_colorant_prop
{ / \exp_not:N \str_convert_pdfname:n {#1} }
{
<< ~
@@ -779,7 +779,7 @@
\pdf_object_write:nnn { color \int_use:N \g_@@_model_int } { array }
{ /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
}
- \prop_gput:Nnx \g_@@_backend_colorant_prop { /#1 }
+ \prop_gput:Nne \g_@@_backend_colorant_prop { /#1 }
{ \pdf_object_ref_last: }
}
% \end{macrocode}
diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index 2269c6c68..17361a77e 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -996,10 +996,10 @@
% three-argument version is used internally to do a direct setting.
% \begin{macrocode}
\cs_new_protected:Npn \coffin_set_horizontal_pole:Nnn #1#2#3
- { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+ { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_put:cne }
\cs_generate_variant:Nn \coffin_set_horizontal_pole:Nnn { c }
\cs_new_protected:Npn \coffin_gset_horizontal_pole:Nnn #1#2#3
- { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+ { \@@_set_horizontal_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
\cs_generate_variant:Nn \coffin_gset_horizontal_pole:Nnn { c }
\cs_new_protected:Npn \@@_set_horizontal_pole:NnnN #1#2#3#4
{
@@ -1014,10 +1014,10 @@
}
}
\cs_new_protected:Npn \coffin_set_vertical_pole:Nnn #1#2#3
- { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cnx }
+ { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_put:cne }
\cs_generate_variant:Nn \coffin_set_vertical_pole:Nnn { c }
\cs_new_protected:Npn \coffin_gset_vertical_pole:Nnn #1#2#3
- { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cnx }
+ { \@@_set_vertical_pole:NnnN #1 {#2} {#3} \prop_gput:cne }
\cs_generate_variant:Nn \coffin_gset_vertical_pole:Nnn { c }
\cs_new_protected:Npn \@@_set_vertical_pole:NnnN #1#2#3#4
{
@@ -1070,9 +1070,9 @@
% of the underlying \TeX{} box.
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_corners:N #1
- { \@@_update_corners:NN #1 \prop_put:Nnx }
+ { \@@_update_corners:NN #1 \prop_put:Nne }
\cs_new_protected:Npn \@@_gupdate_corners:N #1
- { \@@_update_corners:NN #1 \prop_gput:Nnx }
+ { \@@_update_corners:NN #1 \prop_gput:Nne }
\cs_new_protected:Npn \@@_update_corners:NN #1#2
{
\exp_args:Nc \@@_update_corners:NNN
@@ -1115,9 +1115,9 @@
% coffins.
% \begin{macrocode}
\cs_new_protected:Npn \@@_update_poles:N #1
- { \@@_update_poles:NN #1 \prop_put:Nnx }
+ { \@@_update_poles:NN #1 \prop_put:Nne }
\cs_new_protected:Npn \@@_gupdate_poles:N #1
- { \@@_update_poles:NN #1 \prop_gput:Nnx }
+ { \@@_update_poles:NN #1 \prop_gput:Nne }
\cs_new_protected:Npn \@@_update_poles:NN #1#2
{
\exp_args:Nc \@@_update_poles:NNN
@@ -1494,17 +1494,17 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_bounding:N #1
{
- \prop_put:Nnx \l_@@_bounding_prop { tl }
+ \prop_put:Nne \l_@@_bounding_prop { tl }
{ { 0pt } { \dim_eval:n { \box_ht:N #1 } } }
- \prop_put:Nnx \l_@@_bounding_prop { tr }
+ \prop_put:Nne \l_@@_bounding_prop { tr }
{
{ \dim_eval:n { \box_wd:N #1 } }
{ \dim_eval:n { \box_ht:N #1 } }
}
\dim_set:Nn \l_@@_internal_dim { -\box_dp:N #1 }
- \prop_put:Nnx \l_@@_bounding_prop { bl }
+ \prop_put:Nne \l_@@_bounding_prop { bl }
{ { 0pt } { \dim_use:N \l_@@_internal_dim } }
- \prop_put:Nnx \l_@@_bounding_prop { br }
+ \prop_put:Nne \l_@@_bounding_prop { br }
{
{ \dim_eval:n { \box_wd:N #1 } }
{ \dim_use:N \l_@@_internal_dim }
@@ -1523,13 +1523,13 @@
\cs_new_protected:Npn \@@_rotate_bounding:nnn #1#2#3
{
\@@_rotate_vector:nnNN {#2} {#3} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_bounding_prop {#1}
+ \prop_put:Nne \l_@@_bounding_prop {#1}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
\cs_new_protected:Npn \@@_rotate_corner:Nnnn #1#2#3#4
{
\@@_rotate_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
% \end{macrocode}
@@ -1546,7 +1546,7 @@
\@@_rotate_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
\@@_rotate_vector:nnNN {#5} {#6}
\l_@@_x_prime_dim \l_@@_y_prime_dim
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim }
{ \dim_use:N \l_@@_x_prime_dim }
@@ -1647,7 +1647,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1655,7 +1655,7 @@
}
\cs_new_protected:Npn \@@_shift_pole:Nnnnnn #1#2#3#4#5#6
{
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_eval:n { #3 - \l_@@_left_corner_dim } }
{ \dim_eval:n { #4 - \l_@@_bottom_corner_dim } }
@@ -1821,13 +1821,13 @@
\cs_new_protected:Npn \@@_scale_corner:Nnnn #1#2#3#4
{
\@@_scale_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{ { \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim } }
}
\cs_new_protected:Npn \@@_scale_pole:Nnnnnn #1#2#3#4#5#6
{
\@@_scale_vector:nnNN {#3} {#4} \l_@@_x_dim \l_@@_y_dim
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_use:N \l_@@_x_dim } { \dim_use:N \l_@@_y_dim }
{#5} {#6}
@@ -1844,14 +1844,14 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_x_shift_corner:Nnnn #1#2#3#4
{
- \prop_put:Nnx \l_@@_corners_prop {#2}
+ \prop_put:Nne \l_@@_corners_prop {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
}
}
\cs_new_protected:Npn \@@_x_shift_pole:Nnnnnn #1#2#3#4#5#6
{
- \prop_put:Nnx \l_@@_poles_prop {#2}
+ \prop_put:Nne \l_@@_poles_prop {#2}
{
{ \dim_eval:n { #3 + \box_wd:N #1 } } {#4}
{#5} {#6}
@@ -2092,7 +2092,7 @@
}
\cs_new_protected:Npn \@@_offset_corner:Nnnnn #1#2#3#4#5#6
{
- \prop_put:cnx
+ \prop_put:cne
{
coffin ~ \@@_to_value:N \l_@@_aligned_coffin
\c_space_tl corners
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index 1453001a2..b1c37870d 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -854,7 +854,7 @@
{
\tl_set:Nx \exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_model:N \exp_not:N \l_@@_current_tl }
- \prop_put:NVx \exp_not:c { l_@@_named_ . _prop }
+ \prop_put:NVe \exp_not:c { l_@@_named_ . _prop }
\exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_values:N \exp_not:N \l_@@_current_tl }
\exp_not:N \exp_args:Ne \exp_not:N \@@_parse_aux:nN
@@ -1424,7 +1424,7 @@
\tl_set:Nx \exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_model:N \exp_not:N \l_@@_current_tl }
\prop_clear:N \exp_not:c { l_@@_named_ . _prop }
- \prop_put:NVx \exp_not:c { l_@@_named_ . _prop }
+ \prop_put:NVe \exp_not:c { l_@@_named_ . _prop }
\exp_not:c { l_@@_named_ . _tl }
{ \exp_not:N \@@_values:N \exp_not:N \l_@@_current_tl }
}
@@ -1784,7 +1784,7 @@
\tl_set:cx { l_@@_named_ #1 _tl }
{ \@@_model:N \l_@@_named_tl }
\prop_clear_new:c { l_@@_named_ #1 _prop }
- \prop_put:cvx { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
+ \prop_put:cve { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
{ \@@_values:N \l_@@_named_tl }
\@@_set:nnw {#1} {#2} #2 ! \s_@@_stop
}
@@ -1811,7 +1811,7 @@
\@@_parse:nN {#2} \l_@@_internal_tl
\exp_args:NNNV \group_end:
\tl_set:Nn \l_@@_internal_tl \l_@@_internal_tl
- \prop_put:cxx { l_@@_named_ #1 _prop }
+ \prop_put:cee { l_@@_named_ #1 _prop }
{ \@@_model:N \l_@@_internal_tl }
{ \@@_values:N \l_@@_internal_tl }
}
@@ -1854,7 +1854,7 @@
\tl_set:Nx \l_@@_internal_tl { \@@_model:N \l_@@_named_tl }
\tl_if_empty:cT { l_@@_named_ #1 _tl }
{ \tl_set_eq:cN { l_@@_named_ #1 _tl } \l_@@_internal_tl }
- \prop_put:cVx { l_@@_named_ #1 _prop } \l_@@_internal_tl
+ \prop_put:cVe { l_@@_named_ #1 _prop } \l_@@_internal_tl
{ \@@_values:N \l_@@_named_tl }
\@@_set_loop:nw {#1} #3 \s_@@_mark #5 \s_@@_stop
}
@@ -1869,7 +1869,7 @@
{
\tl_set:cx { l_@@_named_ #1 _tl }
{ \@@_model:N \l_@@_current_tl }
- \prop_put:cvx { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
+ \prop_put:cve { l_@@_named_ #1 _prop } { l_@@_named_ #1 _tl }
{ \@@_values:N \l_@@_current_tl }
}
{
@@ -2309,7 +2309,7 @@
\use:c { @@_model_separation_ #8 :nnnnnn }
{#6} {#7} {#1} {#2} {#3} {#4}
\prop_gput:Nnn \g_@@_alternative_model_prop {#6} {#8}
- \prop_gput:Nnx \g_@@_colorants_prop {#6}
+ \prop_gput:Nne \g_@@_colorants_prop {#6}
{ \str_convert_pdfname:n {#7} }
}
\cs_new_protected:Npn \@@_model_separation_cmyk:nnnnnn #1#2#3#4#5#6
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index fa266883e..a12c847a8 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -976,9 +976,6 @@ and all files in that bundle must be distributed together.
% \tl_replace_once:Noo,
% \tl_to_str:f,
% \tl_to_str:o,
-% \prop_get:NxNTF,
-% \prop_put:Nxn,
-% \prop_gput:NVx,
% }
% A few missing variants.
% \begin{macrocode}
@@ -1001,9 +998,6 @@ and all files in that bundle must be distributed together.
\cs_generate_variant:Nn \tl_replace_once:Nnn { Noo }
\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
\cs_generate_variant:Nn \tl_to_str:n { f , o }
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
-\cs_generate_variant:Nn \prop_put:Nnn { Nx }
-\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 9c3243b9c..2c51a960a 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -165,25 +165,28 @@
%
% \begin{function}[updated = 2012-07-09]
% {
-% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nnv, \prop_put:Nnx,
-% \prop_put:NVn, \prop_put:NVV, \prop_put:NVv, \prop_put:NVx,
-% \prop_put:Nvn, \prop_put:NvV, \prop_put:Nvv, \prop_put:Nvx,
-% \prop_put:Nxn, \prop_put:NxV, \prop_put:Nxv, \prop_put:Nxx,
-% \prop_put:Nno, \prop_put:Nne, \prop_put:Non, \prop_put:Noo,
-% \prop_put:cnn, \prop_put:cnV, \prop_put:cnv, \prop_put:cnx,
-% \prop_put:cVn, \prop_put:cVV, \prop_put:cVv, \prop_put:cVx,
-% \prop_put:cvn, \prop_put:cvV, \prop_put:cvv, \prop_put:cvx,
-% \prop_put:cxn, \prop_put:cxV, \prop_put:cxv, \prop_put:cxx,
-% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nnv, \prop_gput:Nnx,
-% \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVv, \prop_gput:NVx,
-% \prop_gput:Nvn, \prop_gput:NvV, \prop_gput:Nvv, \prop_gput:Nvx,
-% \prop_gput:Nxn, \prop_gput:NxV, \prop_gput:Nxv, \prop_gput:Nxx,
-% \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Non, \prop_gput:Noo,
-% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cnv, \prop_gput:cnx,
-% \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVv, \prop_gput:cVx,
-% \prop_gput:cvn, \prop_gput:cvV, \prop_gput:cvv, \prop_gput:cvx,
-% \prop_gput:cxn, \prop_gput:cxV, \prop_gput:cxv, \prop_gput:cxx,
-% \prop_gput:cno, \prop_gput:con,
+% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nnv, \prop_put:Nne,
+% \prop_put:NVn, \prop_put:NVV, \prop_put:NVv, \prop_put:NVe,
+% \prop_put:Nvn, \prop_put:NvV, \prop_put:Nvv, \prop_put:Nve,
+% \prop_put:Nen, \prop_put:NeV, \prop_put:Nev, \prop_put:Nee,
+% \prop_put:Nno, \prop_put:Nnx, \prop_put:NVx,
+% \prop_put:Non, \prop_put:Noo, \prop_put:NxV, \prop_put:Nxx,
+% \prop_put:cnn, \prop_put:cnV, \prop_put:cnv, \prop_put:cne,
+% \prop_put:cVn, \prop_put:cVV, \prop_put:cVv, \prop_put:cVe,
+% \prop_put:cvn, \prop_put:cvV, \prop_put:cvv, \prop_put:cve,
+% \prop_put:cen, \prop_put:ceV, \prop_put:cev, \prop_put:cee,
+% \prop_put:cnx, \prop_put:cxV,
+% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nnv, \prop_gput:Nne,
+% \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVv, \prop_gput:NVe,
+% \prop_gput:Nvn, \prop_gput:NvV, \prop_gput:Nvv, \prop_gput:Nve,
+% \prop_gput:Nen, \prop_gput:NeV, \prop_gput:Nev, \prop_gput:Nee,
+% \prop_gput:Nno, \prop_gput:Non, \prop_gput:Noo,
+% \prop_gput:Nnx, \prop_gput:NVx, \prop_gput:Nxn, \prop_gput:Nxx,
+% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cnv, \prop_gput:cne,
+% \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVv, \prop_gput:cVe,
+% \prop_gput:cvn, \prop_gput:cvV, \prop_gput:cvv, \prop_gput:cve,
+% \prop_gput:cen, \prop_gput:ceV, \prop_gput:cev, \prop_gput:cee,
+% \prop_gput:cno, \prop_gput:con, \prop_gput:cxn, \prop_gput:cxx
% }
% \begin{syntax}
% \cs{prop_put:Nnn} \meta{property list} \Arg{key} \Arg{value}
@@ -199,12 +202,13 @@
%
% \begin{function}
% {
-% \prop_put_if_new:Nnn, \prop_put_if_new:NnV, \prop_put_if_new:Nnx,
-% \prop_put_if_new:NVn, \prop_put_if_new:NVV, \prop_put_if_new:NVx,
-% \prop_put_if_new:Nxn, \prop_put_if_new:NxV, \prop_put_if_new:Nxx,
-% \prop_gput_if_new:Nnn, \prop_gput_if_new:NnV, \prop_gput_if_new:Nnx,
-% \prop_gput_if_new:NVn, \prop_gput_if_new:NVV, \prop_gput_if_new:NVx,
-% \prop_gput_if_new:Nxn, \prop_gput_if_new:NxV, \prop_gput_if_new:Nxx,
+% \prop_put_if_new:Nnn, \prop_put_if_new:NnV, \prop_put_if_new:Nne,
+% \prop_put_if_new:NVn, \prop_put_if_new:NVV, \prop_put_if_new:NVe,
+% \prop_put_if_new:Nen, \prop_put_if_new:NeV, \prop_put_if_new:Nee,
+% \prop_gput_if_new:Nnn, \prop_gput_if_new:NnV, \prop_gput_if_new:Nne,
+% \prop_gput_if_new:NVn, \prop_gput_if_new:NVV, \prop_gput_if_new:NVe,
+% \prop_gput_if_new:Nen, \prop_gput_if_new:NeV, \prop_gput_if_new:Nee,
+% \prop_gput_if_new:Nnx, \prop_gput_if_new:Nxn, \prop_gput_if_new:Nxx
% }
% \begin{syntax}
% \cs{prop_put_if_new:Nnn} \meta{property list} \Arg{key} \Arg{value}
@@ -261,8 +265,10 @@
%
% \begin{function}[updated = 2011-08-28]
% {
-% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NxN, \prop_get:NoN,
-% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:cxN, \prop_get:coN,
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NeN,
+% \prop_get:NoN, \prop_get:NxN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:ceN,
+% \prop_get:coN, \prop_get:cxN,
% \prop_get:cnc
% }
% \begin{syntax}
@@ -361,10 +367,12 @@
%
% \begin{function}[added = 2012-05-12]
% {
-% \prop_remove:Nn, \prop_remove:NV, \prop_remove:Nx,
-% \prop_remove:cn, \prop_remove:cV, \prop_remove:cx,
-% \prop_gremove:Nn, \prop_gremove:NV, \prop_gremove:Nx,
-% \prop_gremove:cn, \prop_gremove:cV, \prop_gremove:cx
+% \prop_remove:Nn, \prop_remove:NV, \prop_remove:Ne,
+% \prop_remove:cn, \prop_remove:cV, \prop_remove:ce,
+% \prop_remove:cx,
+% \prop_gremove:Nn, \prop_gremove:NV, \prop_gremove:Ne,
+% \prop_gremove:Nx,
+% \prop_gremove:cn, \prop_gremove:cV, \prop_gremove:ce,
% }
% \begin{syntax}
% \cs{prop_remove:Nn} \meta{property list} \Arg{key}
@@ -424,8 +432,10 @@
%
% \begin{function}[updated = 2012-05-19, TF]
% {
-% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NoN, \prop_get:NxN,
-% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:coN, \prop_get:cxN,
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NeN,
+% \prop_get:NoN, \prop_get:NxN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:ceN,
+% \prop_get:coN, \prop_get:cxN,
% \prop_get:cnc
% }
% \begin{syntax}
@@ -987,13 +997,15 @@
%
% \begin{macro}[tested = m3prop002]
% {
-% \prop_remove:Nn, \prop_remove:NV, \prop_remove:Nx,
-% \prop_remove:cn, \prop_remove:cV, \prop_remove:cx
+% \prop_remove:Nn, \prop_remove:NV, \prop_remove:Ne,
+% \prop_remove:cn, \prop_remove:cV, \prop_remove:ce,
+% \prop_remove:cx
% }
% \begin{macro}[tested = m3prop002]
% {
-% \prop_gremove:Nn, \prop_gremove:NV, \prop_gremove:Nx,
-% \prop_gremove:cn, \prop_gremove:cV, \prop_gremove:cx
+% \prop_gremove:Nn, \prop_gremove:NV, \prop_gremove:Ne,
+% \prop_gremove:Nx,
+% \prop_gremove:cn, \prop_gremove:cV, \prop_gremove:ce
% }
% Deleting from a property starts by splitting the list.
% If the key is present in the property list, the returned value is ignored.
@@ -1011,18 +1023,20 @@
{ \tl_gset:Nn #1 { ##1 ##3 } }
{ }
}
-\cs_generate_variant:Nn \prop_remove:Nn { NV , Nx }
-\cs_generate_variant:Nn \prop_remove:Nn { c , cV , cx }
-\cs_generate_variant:Nn \prop_gremove:Nn { NV , Nx }
-\cs_generate_variant:Nn \prop_gremove:Nn { c , cV , cx }
+\cs_generate_variant:Nn \prop_remove:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \prop_remove:Nn { cx }
+\cs_generate_variant:Nn \prop_gremove:Nn { NV , Ne , c , cV , ce }
+\cs_generate_variant:Nn \prop_gremove:Nn { Nx }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}[tested = m3prop002]
% {
-% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NoN, \prop_get:NxN,
-% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:coN, \prop_get:cxN,
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NeN,
+% \prop_get:NoN, \prop_get:NxN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:ceN,
+% \prop_get:coN, \prop_get:cxN,
% \prop_get:cnc
% }
% Getting an item from a list is very easy: after splitting,
@@ -1035,8 +1049,9 @@
{ \tl_set:Nn #3 {##2} }
{ \tl_set:Nn #3 { \q_no_value } }
}
-\cs_generate_variant:Nn \prop_get:NnN { NV , Nv , No , Nx }
-\cs_generate_variant:Nn \prop_get:NnN { c , cV , cv , co , cx , cnc }
+\cs_generate_variant:Nn \prop_get:NnN { NV , Nv , Ne , c , cV , cv , ce }
+\cs_generate_variant:Nn \prop_get:NnN { No , Nx , co , cx }
+\cs_generate_variant:Nn \prop_get:NnN { cnc }
% \end{macrocode}
% \end{macro}
%
@@ -1210,28 +1225,31 @@
%
% \begin{macro}[tested = m3prop002]
% {
-% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nnv, \prop_put:Nnx,
-% \prop_put:NVn, \prop_put:NVV, \prop_put:NVv, \prop_put:NVx,
-% \prop_put:Nvn, \prop_put:NvV, \prop_put:Nvv, \prop_put:Nvx,
-% \prop_put:Nxn, \prop_put:NxV, \prop_put:Nxv, \prop_put:Nxx,
-% \prop_put:Nno, \prop_put:Nne, \prop_put:Non, \prop_put:Noo,
-% \prop_put:cnn, \prop_put:cnV, \prop_put:cnv, \prop_put:cnx,
-% \prop_put:cVn, \prop_put:cVV, \prop_put:cVv, \prop_put:cVx,
-% \prop_put:cvn, \prop_put:cvV, \prop_put:cvv, \prop_put:cvx,
-% \prop_put:cxn, \prop_put:cxV, \prop_put:cxv, \prop_put:cxx,
+% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nnv, \prop_put:Nne,
+% \prop_put:NVn, \prop_put:NVV, \prop_put:NVv, \prop_put:NVe,
+% \prop_put:Nvn, \prop_put:NvV, \prop_put:Nvv, \prop_put:Nve,
+% \prop_put:Nen, \prop_put:NeV, \prop_put:Nev, \prop_put:Nee,
+% \prop_put:Nno, \prop_put:Nnx, \prop_put:NVx,
+% \prop_put:Non, \prop_put:Noo, \prop_put:NxV, \prop_put:Nxx,
+% \prop_put:cnn, \prop_put:cnV, \prop_put:cnv, \prop_put:cne,
+% \prop_put:cVn, \prop_put:cVV, \prop_put:cVv, \prop_put:cVe,
+% \prop_put:cvn, \prop_put:cvV, \prop_put:cvv, \prop_put:cve,
+% \prop_put:cen, \prop_put:ceV, \prop_put:cev, \prop_put:cee,
+% \prop_put:cnx, \prop_put:cxV
% }
% \begin{macro}[tested = m3prop002]
% {
-% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nnv, \prop_gput:Nnx,
-% \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVv, \prop_gput:NVx,
-% \prop_gput:Nvn, \prop_gput:NvV, \prop_gput:Nvv, \prop_gput:Nvx,
-% \prop_gput:Nxn, \prop_gput:NxV, \prop_gput:Nxv, \prop_gput:Nxx,
-% \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Non, \prop_gput:Noo,
-% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cnv, \prop_gput:cnx,
-% \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVv, \prop_gput:cVx,
-% \prop_gput:cvn, \prop_gput:cvV, \prop_gput:cvv, \prop_gput:cvx,
-% \prop_gput:cxn, \prop_gput:cxV, \prop_gput:cxv, \prop_gput:cxx,
-% \prop_gput:cno, \prop_gput:con
+% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nnv, \prop_gput:Nne,
+% \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVv, \prop_gput:NVe,
+% \prop_gput:Nvn, \prop_gput:NvV, \prop_gput:Nvv, \prop_gput:Nve,
+% \prop_gput:Nen, \prop_gput:NeV, \prop_gput:Nev, \prop_gput:Nee,
+% \prop_gput:Nno, \prop_gput:Non, \prop_gput:Noo,
+% \prop_gput:Nnx, \prop_gput:NVx, \prop_gput:Nxn, \prop_gput:Nxx,
+% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cnv, \prop_gput:cne,
+% \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVv, \prop_gput:cVe,
+% \prop_gput:cvn, \prop_gput:cvV, \prop_gput:cvv, \prop_gput:cve,
+% \prop_gput:cen, \prop_gput:ceV, \prop_gput:cev, \prop_gput:cee,
+% \prop_gput:cno, \prop_gput:con, \prop_gput:cxn, \prop_gput:cxx
% }
% \begin{macro}{\@@_put:NNnn}
% Since the branches of \cs{@@_split:NnTF} are used as the replacement
@@ -1262,27 +1280,30 @@
}
\cs_generate_variant:Nn \prop_put:Nnn
{
- NnV , Nnv , Nnx , NV , NVV , NVv , NVx ,
- Nv , NvV , Nvv , Nvx , Nx , NxV , Nxv , Nxx
+ NnV , Nnv , Nne , NV , NVV , NVv , NVe ,
+ Nv , NvV , Nvv , Nve , Ne , NeV , Nev , Nee
}
-\cs_generate_variant:Nn \prop_put:Nnn { Nno , Nne , No , Noo }
+\cs_generate_variant:Nn \prop_put:Nnn
+ { Nno , No , Noo , Nnx , NVx , NxV , Nxx }
\cs_generate_variant:Nn \prop_put:Nnn
{
- c , cnV , cnv , cnx , cV , cVV , cVv , cVx ,
- cv , cvV , cvv , cvx , cx , cxV , cxv , cxx
+ c , cnV , cnv , cne , cV , cVV , cVv , cVe ,
+ cv , cvV , cvv , cve , ce , ceV , cev , cee
}
+\cs_generate_variant:Nn \prop_put:Nnn
+ { cx , cxV , cxx }
\cs_generate_variant:Nn \prop_gput:Nnn
{
- NnV , Nnv , Nnx , NV , NVV , NVv , NVx ,
- Nv , NvV , Nvv , Nvx , Nx , NxV , Nxv , Nxx
+ NnV , Nnv , Nne , NV , NVV , NVv , NVe ,
+ Nv , NvV , Nvv , Nve , Ne , NeV , Nev , Nee
}
-\cs_generate_variant:Nn \prop_gput:Nnn { Nno , Nne , No, Noo }
+\cs_generate_variant:Nn \prop_gput:Nnn { Nno , No, Noo , NVx , Nx , Nxx }
\cs_generate_variant:Nn \prop_gput:Nnn
{
- c , cnV , cnv , cnx , cV , cVV , cVv , cVx ,
- cv , cvV , cvv , cvx , cx , cxV , cxv , cxx
+ c , cnV , cnv , cne , cV , cVV , cVv , cVe ,
+ cv , cvV , cvv , cve , ce , ceV , cev , cee
}
-\cs_generate_variant:Nn \prop_gput:Nnn { cno , co }
+\cs_generate_variant:Nn \prop_gput:Nnn { cno , co , cx }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1290,15 +1311,16 @@
%
% \begin{macro}[tested = m3prop002]
% {
-% \prop_put_if_new:Nnn, \prop_put_if_new:NnV, \prop_put_if_new:Nnx,
-% \prop_put_if_new:NVn, \prop_put_if_new:NVV, \prop_put_if_new:NVx,
-% \prop_put_if_new:Nxn, \prop_put_if_new:NxV, \prop_put_if_new:Nxx
+% \prop_put_if_new:Nnn, \prop_put_if_new:NnV, \prop_put_if_new:Nne,
+% \prop_put_if_new:NVn, \prop_put_if_new:NVV, \prop_put_if_new:NVe,
+% \prop_put_if_new:Nen, \prop_put_if_new:NeV, \prop_put_if_new:Nee
% }
% \begin{macro}[tested = m3prop002]
% {
-% \prop_gput_if_new:Nnn, \prop_gput_if_new:NnV, \prop_gput_if_new:Nnx,
-% \prop_gput_if_new:NVn, \prop_gput_if_new:NVV, \prop_gput_if_new:NVx,
-% \prop_gput_if_new:Nxn, \prop_gput_if_new:NxV, \prop_gput_if_new:Nxx
+% \prop_gput_if_new:Nnn, \prop_gput_if_new:NnV, \prop_gput_if_new:Nne,
+% \prop_gput_if_new:NVn, \prop_gput_if_new:NVV, \prop_gput_if_new:NVe,
+% \prop_gput_if_new:Nen, \prop_gput_if_new:NeV, \prop_gput_if_new:Nee,
+% \prop_gput_if_new:Nxn, \prop_gput_if_new:Nnx, \prop_gput_if_new:Nxx
% }
% \begin{macro}{\@@_put_if_new:NNnn}
% Adding conditionally also splits. If the key is already present,
@@ -1321,8 +1343,12 @@
{ }
{ #1 #2 { \exp_not:o {#2} \l_@@_internal_tl } }
}
-\cs_generate_variant:Nn \prop_put_if_new:Nnn { NnV , Nnx , NVn , NVV , NVx , Nx , NxV , Nxx }
-\cs_generate_variant:Nn \prop_gput_if_new:Nnn { NnV , Nnx , NVn , NVV , NVx , Nx , NxV , Nxx }
+\cs_generate_variant:Nn \prop_put_if_new:Nnn
+ { NnV , Nne , NVn , NVV , NVe , Ne , NeV , Nee }
+\cs_generate_variant:Nn \prop_gput_if_new:Nnn
+ { NnV , Nne , NVn , NVV , NVe , Ne , NeV , Nee }
+\cs_generate_variant:Nn \prop_gput_if_new:Nnn
+ { Nnx , Nx , Nxx }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1395,8 +1421,10 @@
%
% \begin{macro}[TF, tested = m3prop004]
% {
-% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NoN, \prop_get:NxN,
-% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:coN, \prop_get:cxN,
+% \prop_get:NnN, \prop_get:NVN, \prop_get:NvN, \prop_get:NeN,
+% \prop_get:NoN, \prop_get:NxN,
+% \prop_get:cnN, \prop_get:cVN, \prop_get:cvN, \prop_get:ceN,
+% \prop_get:coN, \prop_get:cxN,
% \prop_get:cnc
% }
% Getting the value corresponding to a key, keeping track of whether
@@ -1413,7 +1441,11 @@
{ \prg_return_false: }
}
\prg_generate_conditional_variant:Nnn \prop_get:NnN
- { NV , Nv , No , Nx , c , cV , cv , co , cx , cnc } { T , F , TF }
+ { NV , Nv , Ne , c , cV , cv , ce } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \prop_get:NnN
+ { No , Nx , co , cx } { T , F , TF }
+\prg_generate_conditional_variant:Nnn \prop_get:NnN
+ { cnc } { T , F , TF }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/testfiles/m3show002.lvt b/l3kernel/testfiles/m3show002.lvt
index ab0413388..51a91e113 100644
--- a/l3kernel/testfiles/m3show002.lvt
+++ b/l3kernel/testfiles/m3show002.lvt
@@ -46,9 +46,9 @@
\TEST { PROP }
{
- \prop_put:Nxn \l_tmpa_prop
+ \prop_put:Nen \l_tmpa_prop
{ \prg_replicate:nn { 40 } { the ~ key1 ~ } } { val1 }
- \prop_put:Nnx \l_tmpa_prop
+ \prop_put:Nne \l_tmpa_prop
{ key2 } { \prg_replicate:nn { 40 } { the ~ val2 ~ } }
\prop_show:N \l_tmpa_prop
}
diff --git a/l3packages/l3doc/examples/testing.dtx b/l3packages/l3doc/examples/testing.dtx
index ceadbfb99..406013559 100644
--- a/l3packages/l3doc/examples/testing.dtx
+++ b/l3packages/l3doc/examples/testing.dtx
@@ -728,9 +728,6 @@
% \tl_replace_once:Noo,
% \tl_to_str:f,
% \tl_to_str:o,
-% \prop_get:NxNTF,
-% \prop_put:Nxn,
-% \prop_gput:NVx,
% }
% A few missing variants.
% \begin{macrocode}
@@ -750,9 +747,6 @@
\cs_generate_variant:Nn \tl_replace_all:Nnn { Nx , Nnx, No , Nno }
\cs_generate_variant:Nn \tl_replace_once:Nnn { Noo }
\cs_generate_variant:Nn \tl_to_str:n { f , o }
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
-\cs_generate_variant:Nn \prop_put:Nnn { Nx }
-\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3trial/l3auxdata/l3auxdata.dtx b/l3trial/l3auxdata/l3auxdata.dtx
index c9300ee9d..d23d1ff76 100644
--- a/l3trial/l3auxdata/l3auxdata.dtx
+++ b/l3trial/l3auxdata/l3auxdata.dtx
@@ -729,7 +729,7 @@ Don't~ look~ here:~ check~ your~ console~ output!
{
\cs_set_protected:Npn \char_set_catcode:nn ##1 ##2
{
- \prop_put:Nxx \l_@@_catcodes_prop
+ \prop_put:Nee \l_@@_catcodes_prop
{ \int_eval:n {##1} }
{ \tex_the:D \tex_catcode:D \int_eval:n {##1} }
\tex_catcode:D \int_eval:n {##1} = \int_eval:n {##2} \exp_stop_f:
More information about the latex3-commits
mailing list.