[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move \prop_count:N to stable (531eac5)

[Bruno Le Floch]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/531eac575dbcf0522217bd021f3dfc1c3fdd2e74

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

commit 531eac575dbcf0522217bd021f3dfc1c3fdd2e74
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Feb 26 22:57:15 2019 +0000

    Move \prop_count:N to stable


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

531eac575dbcf0522217bd021f3dfc1c3fdd2e74
 l3kernel/CHANGELOG.md                   |    1 +
 l3kernel/l3candidates.dtx               |   29 -----------------------------
 l3kernel/l3prop.dtx                     |   29 +++++++++++++++++++++++++++++
 l3kernel/testfiles/m3expl001.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl001.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl001.tlg        |    6 +++---
 l3kernel/testfiles/m3expl001.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl001.xetex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.luatex.tlg |    6 +++---
 l3kernel/testfiles/m3expl003.ptex.tlg   |    6 +++---
 l3kernel/testfiles/m3expl003.tlg        |    6 +++---
 l3kernel/testfiles/m3expl003.uptex.tlg  |    6 +++---
 l3kernel/testfiles/m3expl003.xetex.tlg  |    6 +++---
 13 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 02f09f1..bcc8bfa 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -18,6 +18,7 @@ this project uses date-based 'snapshot' version identifiers.
 - Return values from `\file_get:nnN`, `\file_get_...:nN`, `\ior_get:NN`,
   `\sys_shell_get:nnN`
 - Moved coffin affine transformations to stable
+- Moved `\prop_count:N` to stable
 - Moved `\tl_count_tokens:n` to stable
 - Completed emulation of e-type argument when `\expanded` is unavailable
 - Renamed `\token_get_prefix_spec:N`, `\token_get_arg_spec:N`,
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index c32fac8..72e00fc 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -599,14 +599,6 @@
 %
 % \section{Additions to \pkg{l3prop}}
 %
-% \begin{function}[EXP]{\prop_count:N, \prop_count:c}
-%   \begin{syntax}
-%     \cs{prop_count:N} \meta{property list}
-%   \end{syntax}
-%   Leaves the number of key--value pairs in the \meta{property list} in
-%   the input stream as an \meta{integer denotation}.
-% \end{function}
-%
 % \begin{function}[rEXP]
 %   {\prop_map_tokens:Nn, \prop_map_tokens:cn}
 %   \begin{syntax}
@@ -1931,27 +1923,6 @@
 %<@@=prop>
 %    \end{macrocode}
 %
-% \begin{macro}[EXP]{\prop_count:N, \prop_count:c}
-% \begin{macro}[EXP]{\@@_count:nn}
-%   Counting the key--value pairs in a property list is done using the
-%   same approach as for other count functions: turn each entry into a
-%   \texttt{+1} then use integer evaluation to actually do the
-%   mathematics.
-%    \begin{macrocode}
-\cs_new:Npn \prop_count:N #1
-  {
-    \int_eval:n
-      {
-        0
-        \prop_map_function:NN #1 \@@_count:nn
-      }
-  }
-\cs_new:Npn \@@_count:nn #1#2 { + 1 }
-\cs_generate_variant:Nn \prop_count:N { c }
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
 % \begin{macro}[rEXP]{\prop_map_tokens:Nn, \prop_map_tokens:cn}
 % \begin{macro}{\@@_map_tokens:nwwn}
 %   The mapping is very similar to \cs{prop_map_function:NN}.  The
diff --git a/l3kernel/l3prop.dtx b/l3kernel/l3prop.dtx
index b3f7077..835e1ea 100644
--- a/l3kernel/l3prop.dtx
+++ b/l3kernel/l3prop.dtx
@@ -216,6 +216,14 @@
 %   \end{texnote}
 % \end{function}
 %
+% \begin{function}[EXP]{\prop_count:N, \prop_count:c}
+%   \begin{syntax}
+%     \cs{prop_count:N} \meta{property list}
+%   \end{syntax}
+%   Leaves the number of key--value pairs in the \meta{property list} in
+%   the input stream as an \meta{integer denotation}.
+% \end{function}
+%
 % \section{Modifying property lists}
 %
 % \begin{function}[added = 2012-05-12]
@@ -872,6 +880,27 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}[EXP]{\prop_count:N, \prop_count:c}
+% \begin{macro}[EXP]{\@@_count:nn}
+%   Counting the key--value pairs in a property list is done using the
+%   same approach as for other count functions: turn each entry into a
+%   \texttt{+1} then use integer evaluation to actually do the
+%   mathematics.
+%    \begin{macrocode}
+\cs_new:Npn \prop_count:N #1
+  {
+    \int_eval:n
+      {
+        0
+        \prop_map_function:NN #1 \@@_count:nn
+      }
+  }
+\cs_new:Npn \@@_count:nn #1#2 { + 1 }
+\cs_generate_variant:Nn \prop_count:N { c }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}[TF, tested = m3prop004]
 %   {\prop_pop:NnN, \prop_pop:cnN, \prop_gpop:NnN, \prop_gpop:cnN}
 %   Popping an item from a property list, keeping track of whether
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 0100c59..b50ae57 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -2322,6 +2322,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5939,9 +5942,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 04911ae..f6dd5b7 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5976,9 +5979,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 3ad4f85..951c22f 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5976,9 +5979,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index fa374d0..5915156 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5973,9 +5976,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index fe650c2..9a9b3d9 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -2363,6 +2363,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5954,9 +5957,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 0100c59..b50ae57 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -2322,6 +2322,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5939,9 +5942,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 04911ae..f6dd5b7 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5976,9 +5979,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 3ad4f85..951c22f 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5976,9 +5979,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index fa374d0..5915156 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2618,6 +2618,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5973,9 +5976,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index fe650c2..9a9b3d9 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -2363,6 +2363,9 @@ Defining \prop_gpop:coN on line ...
 Defining \prop_item:Nn on line ...
 Defining \__prop_item_Nn:nwwn on line ...
 Defining \prop_item:cn on line ...
+Defining \prop_count:N on line ...
+Defining \__prop_count:nn on line ...
+Defining \prop_count:c on line ...
 Defining \prop_pop:NnNT on line ...
 Defining \prop_pop:NnNF on line ...
 Defining \prop_pop:NnNTF on line ...
@@ -5954,9 +5957,6 @@ Defining \bool_set_inverse:N on line ...
 Defining \bool_set_inverse:c on line ...
 Defining \bool_gset_inverse:N on line ...
 Defining \bool_gset_inverse:c on line ...
-Defining \prop_count:N on line ...
-Defining \__prop_count:nn on line ...
-Defining \prop_count:c on line ...
 Defining \prop_map_tokens:Nn on line ...
 Defining \__prop_map_tokens:nwwn on line ...
 Defining \prop_map_tokens:cn on line ...