[latex3-commits] [latex3/latex3] main: Standardise variants for \prop_(g)put:Nnn (see #1257) (d9c60e263)

[github at latex-project.org]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/d9c60e263380fa990041d16213760ee1a5d64bea

>---------------------------------------------------------------

commit d9c60e263380fa990041d16213760ee1a5d64bea
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Sep 8 18:11:49 2023 +0100

    Standardise variants for \prop_(g)put:Nnn (see #1257)
    
    This completes the set for N/c (#1), n/V/v/x (#2, #3). Additional variants (containing o/e) are provided only as far as they appear in TL'23 at present. This means a few unused variants are removed: they can be re-added if required.
    
    We have never provided f-type variants here,
    so none are added.


>---------------------------------------------------------------

d9c60e263380fa990041d16213760ee1a5d64bea
 l3kernel/CHANGELOG.md |  3 ++
 l3kernel/l3prop.dtx   | 85 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 43e0dce33..6ffae7761 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Standardise variants for `\prop_(g)put:Nnn`
+
 ## [2023-08-29]
 
 ### Added
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index 2d5fc3edc..aac5b0ce2 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -165,18 +165,25 @@
 %
 % \begin{function}[updated = 2012-07-09]
 %   {
-%     \prop_put:Nnn,  \prop_put:NnV,  \prop_put:Nno,  \prop_put:Nne, \prop_put:Nnx,
-%     \prop_put:NVn,  \prop_put:NVV,  \prop_put:NVx,  \prop_put:Nvx,
-%     \prop_put:Non,  \prop_put:Nxn,  \prop_put:NxV,  \prop_put:Noo, \prop_put:Nxx,
-%     \prop_put:cnn,  \prop_put:cnV,  \prop_put:cno,  \prop_put:cne, \prop_put:cnx,
-%     \prop_put:cVn,  \prop_put:cVV,  \prop_put:cVx,  \prop_put:cvx,
-%     \prop_put:con,  \prop_put:cxn,  \prop_put:cxV,  \prop_put:coo,  \prop_put:cxx,
-%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx,
-%     \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVx, \prop_gput:Nvx,
-%     \prop_gput:Non, \prop_gput:Nxn, \prop_gput:NxV, \prop_gput:Noo, \prop_gput:Nxx,
-%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx,
-%     \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx,
-%     \prop_gput:con, \prop_gput:cxn, \prop_gput:cxV, \prop_gput:coo, \prop_gput:cxx
+%     \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,
 %   }
 %   \begin{syntax}
 %     \cs{prop_put:Nnn} \meta{property list} \Arg{key} \Arg{value}
@@ -1163,21 +1170,28 @@
 %
 % \begin{macro}[tested = m3prop002]
 %   {
-%     \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nne, \prop_put:Nnx,
-%     \prop_put:NVn, \prop_put:NVV, \prop_put:NVx, \prop_put:Nvx,
-%     \prop_put:Non, \prop_put:Nxn, \prop_put:NxV, \prop_put:Noo, \prop_put:Nxx,
-%     \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cne, \prop_put:cnx,
-%     \prop_put:cVn, \prop_put:cVV, \prop_put:cVx, \prop_put:cvx,
-%     \prop_put:con, \prop_put:cxn, \prop_put:cxV, \prop_put:coo, \prop_put:cxx
+%     \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,
 %   }
 % \begin{macro}[tested = m3prop002]
 %   {
-%     \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx,
-%     \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVx, \prop_hput:Nvx,
-%     \prop_gput:Non, \prop_gput:Nxn, \prop_pgut:NxV, \prop_gput:Noo, \prop_gput:Nxx,
-%     \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx,
-%     \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx,
-%     \prop_gput:con, \prop_gput:cxn, \prop_gput:cxV, \prop_gput:coo, \prop_gput: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
 %   }
 % \begin{macro}{\@@_put:NNnn}
 %   Since the branches of \cs{@@_split:NnTF} are used as the replacement
@@ -1207,13 +1221,28 @@
       { #1 #2 { \exp_not:o {#2} \l_@@_internal_tl } }
   }
 \cs_generate_variant:Nn \prop_put:Nnn
-  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Nx , NxV , Noo , Nxx }
+  {
+         NnV , Nnv , Nnx , NV , NVV , NVv , NVx ,
+    Nv , NvV , Nvv , Nvx , Nx , NxV , Nxv , Nxx
+  }
+\cs_generate_variant:Nn \prop_put:Nnn { Nno , Nne , No , Noo }
 \cs_generate_variant:Nn \prop_put:Nnn
-  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , cx , cxV , coo , cxx }
+  {
+    c  , cnV , cnv , cnx , cV , cVV , cVv , cVx ,
+    cv , cvV , cvv , cvx , cx , cxV , cxv , cxx
+  }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  {     NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Nx , NxV , Noo , Nxx }
+  {
+         NnV , Nnv , Nnx , NV , NVV , NVv , NVx ,
+    Nv , NvV , Nvv , Nvx , Nx , NxV , Nxv , Nxx
+  }
+\cs_generate_variant:Nn \prop_gput:Nnn { Nno , Nne , No, Noo }
 \cs_generate_variant:Nn \prop_gput:Nnn
-  { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , cx , cxV , coo , cxx }
+  {
+    c  , cnV , cnv , cnx , cV , cVV , cVv , cVx ,
+    cv , cvV , cvv , cvx , cx , cxV , cxv , cxx
+  }
+\cs_generate_variant:Nn \prop_gput:Nnn { cno , co }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}