[latex3-commits] [l3svn] r6835 - Remove candidates \prop_rand_key:N and \prop_rand_value:N
noreply at latex-project.org
noreply at latex-project.org
Mon Jan 30 22:25:18 CET 2017
Author: bruno
Date: 2017-01-30 22:25:17 +0100 (Mon, 30 Jan 2017)
New Revision: 6835
Modified:
trunk/l3kernel/l3candidates.dtx
trunk/l3kernel/testfiles/m3expl001.luatex.tlg
trunk/l3kernel/testfiles/m3expl001.ptex.tlg
trunk/l3kernel/testfiles/m3expl001.tlg
trunk/l3kernel/testfiles/m3expl001.uptex.tlg
trunk/l3kernel/testfiles/m3expl001.xetex.tlg
trunk/l3kernel/testfiles/m3expl003.luatex.tlg
trunk/l3kernel/testfiles/m3expl003.ptex.tlg
trunk/l3kernel/testfiles/m3expl003.tlg
trunk/l3kernel/testfiles/m3expl003.uptex.tlg
trunk/l3kernel/testfiles/m3expl003.xetex.tlg
trunk/l3kernel/testfiles/m3rand001.lvt
trunk/l3kernel/testfiles/m3rand001.ptex.tlg
trunk/l3kernel/testfiles/m3rand001.tlg
trunk/l3kernel/testfiles/m3rand001.uptex.tlg
trunk/l3kernel/testfiles/m3rand001.xetex.tlg
Log:
Remove candidates \prop_rand_key:N and \prop_rand_value:N
The consensus by email was to only keep \prop_rand_key_value:N
Modified: trunk/l3kernel/l3candidates.dtx
===================================================================
--- trunk/l3kernel/l3candidates.dtx 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/l3candidates.dtx 2017-01-30 21:25:17 UTC (rev 6835)
@@ -686,34 +686,6 @@
% \end{function}
%
% \begin{function}[EXP, added = 2016-12-06]
-% {\prop_rand_key:N, \prop_rand_key:c}
-% \begin{syntax}
-% \cs{prop_rand_key:N} \meta{prop~var}
-% \end{syntax}
-% Selects a pseudo-random key--value pair in the \meta{property list}
-% and returns the \meta{key}. If the \meta{property list} is empty
-% the result is empty. This is only available in \pdfTeX{} and
-% \LuaTeX{}.
-% \end{function}
-%
-% \begin{function}[EXP, added = 2016-12-06]
-% {\prop_rand_value:N, \prop_rand_value:c}
-% \begin{syntax}
-% \cs{prop_rand_value:N} \meta{prop~var}
-% \end{syntax}
-% Selects a pseudo-random key--value pair in the \meta{property list}
-% and returns the \meta{value}. If the \meta{property list} is empty
-% the result is empty. This is only available in \pdfTeX{} and
-% \LuaTeX{}.
-% \begin{texnote}
-% The result is returned within the \tn{unexpanded}
-% primitive (\cs{exp_not:n}), which means that the \meta{value}
-% will not expand further when appearing in an \texttt{x}-type
-% argument expansion.
-% \end{texnote}
-% \end{function}
-%
-% \begin{function}[EXP, added = 2016-12-06]
% {\prop_rand_key_value:N, \prop_rand_key_value:c}
% \begin{syntax}
% \cs{prop_rand_key_value:N} \meta{prop~var}
@@ -2842,11 +2814,7 @@
% \end{macro}
%
% \begin{macro}[EXP]
-% {
-% \prop_rand_key:N, \prop_rand_key:c,
-% \prop_rand_value:N, \prop_rand_value:c,
-% \prop_rand_key_value:N, \prop_rand_key_value:c
-% }
+% {\prop_rand_key_value:N, \prop_rand_key_value:c}
% \begin{macro}[aux, EXP]{\@@_rand:NN, \@@_rand_item:Nw}
% Contrarily to |clist|, |seq| and |tl|, there is no function to get
% an item of a |prop| given an integer between $1$ and the number of
@@ -2855,8 +2823,6 @@
% end, leave either the key |#3| or the value |#4| in the input
% stream.
% \begin{macrocode}
-\cs_new:Npn \prop_rand_key:N { \@@_rand:NN \use_i:nnn }
-\cs_new:Npn \prop_rand_value:N { \@@_rand:NN \use_none:n }
\cs_new:Npn \prop_rand_key_value:N { \@@_rand:NN \@@_rand:nNn }
\cs_new:Npn \@@_rand:nNn #1#2#3 { \exp_not:n { {#1} {#3} } }
\cs_new:Npn \@@_rand:NN #1#2
@@ -2875,8 +2841,6 @@
\exp_after:wN \@@_rand_item:Nw \exp_after:wN #1
\__int_value:w \int_eval:n { #2 - \c_one } \s_@@
}
-\cs_generate_variant:Nn \prop_rand_key:N { c }
-\cs_generate_variant:Nn \prop_rand_value:N { c }
\cs_generate_variant:Nn \prop_rand_key_value:N { c }
% \end{macrocode}
% \end{macro}
Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4672,14 +4672,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4635,14 +4635,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl001.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4660,14 +4660,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4635,14 +4635,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4645,14 +4645,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4673,14 +4673,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4636,14 +4636,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl003.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4661,14 +4661,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4636,14 +4636,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -4646,14 +4646,10 @@
Defining \prop_map_tokens:cn on line ...
Defining \prop_log:N on line ...
Defining \prop_log:c on line ...
-Defining \prop_rand_key:N on line ...
-Defining \prop_rand_value:N on line ...
Defining \prop_rand_key_value:N on line ...
Defining \__prop_rand:nNn on line ...
Defining \__prop_rand:NN on line ...
Defining \__prop_rand_item:Nw on line ...
-Defining \prop_rand_key:c on line ...
-Defining \prop_rand_value:c on line ...
Defining \prop_rand_key_value:c on line ...
Defining \seq_mapthread_function:NNN on line ...
Defining \__seq_mapthread_function:wNN on line ...
Modified: trunk/l3kernel/testfiles/m3rand001.lvt
===================================================================
--- trunk/l3kernel/testfiles/m3rand001.lvt 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3rand001.lvt 2017-01-30 21:25:17 UTC (rev 6835)
@@ -119,11 +119,7 @@
\TIMO
\TESTEXP { Random~prop~key/value }
{
- \test_ii:n { \prop_rand_key:N \c_empty_prop }
- \test_ii:n { \prop_rand_value:N \c_empty_prop }
\test_ii:n { \prop_rand_key_value:N \c_empty_prop }
- \test_ii:n { \prop_rand_key:N \l_tmpa_prop }
- \test_ii:n { \prop_rand_value:N \l_tmpa_prop }
\test_ii:n { \prop_rand_key_value:N \l_tmpa_prop }
}
Modified: trunk/l3kernel/testfiles/m3rand001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3rand001.ptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3rand001.ptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -397,23 +397,5 @@
misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-() () () (\e ) () ({\e }{})
+() ({\e }{})
============================================================
Modified: trunk/l3kernel/testfiles/m3rand001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3rand001.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3rand001.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -234,9 +234,5 @@
TEST 8: Random prop key/value
============================================================
||||||
-||||||
-||||||
-|\a |\e |\b |\b |\a |
-||{\B }|\A |\A |\A |
-|{\e }{}|{\a }{\A }|{\e }{}|{\b }{{\B }}|{\e }{}|
+|{\a }{\A }|{\e }{}|{\b }{{\B }}|{\b }{{\B }}|{\a }{\A }|
============================================================
Modified: trunk/l3kernel/testfiles/m3rand001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3rand001.uptex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3rand001.uptex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -397,23 +397,5 @@
misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-() () () (\e ) () ({\e }{})
+() ({\e }{})
============================================================
Modified: trunk/l3kernel/testfiles/m3rand001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3rand001.xetex.tlg 2017-01-28 20:02:00 UTC (rev 6834)
+++ trunk/l3kernel/testfiles/m3rand001.xetex.tlg 2017-01-30 21:25:17 UTC (rev 6835)
@@ -397,23 +397,5 @@
misspelled it (e.g., `\hobx'), type `I' and the correct
spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-! Undefined control sequence.
-<argument> \LaTeX3 error:
- Random numbers unavailable
-l. ... }
-The control sequence at the end of the top line
-of your error message was never \def'ed. If you have
-misspelled it (e.g., `\hobx'), type `I' and the correct
-spelling (e.g., `I\hbox'). Otherwise just continue,
-and I'll forget about whatever was undefined.
-() () () (\e ) () ({\e }{})
+() ({\e }{})
============================================================
More information about the latex3-commits
mailing list