[latex3-commits] [git/LaTeX3-latex3-latex3] master: Avoid some unneeded variants (bfe0c8d)

Joseph Wright joseph.wright at morningstar2.co.uk
Mon Jan 28 23:03:00 CET 2019 

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

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

commit bfe0c8def15fcd8ee856ab9ed215f3f52be6b89f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Jan 28 21:51:31 2019 +0000

    Avoid some unneeded variants
    
    These are only used the once.


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

bfe0c8def15fcd8ee856ab9ed215f3f52be6b89f
 l3kernel/l3keys.dtx                     |   15 ++++++---------
 l3kernel/testfiles/m3expl001.luatex.tlg |    3 ---
 l3kernel/testfiles/m3expl001.ptex.tlg   |    3 ---
 l3kernel/testfiles/m3expl001.tlg        |    3 ---
 l3kernel/testfiles/m3expl001.uptex.tlg  |    3 ---
 l3kernel/testfiles/m3expl001.xetex.tlg  |    3 ---
 l3kernel/testfiles/m3expl003.luatex.tlg |    3 ---
 l3kernel/testfiles/m3expl003.ptex.tlg   |    3 ---
 l3kernel/testfiles/m3expl003.tlg        |    3 ---
 l3kernel/testfiles/m3expl003.uptex.tlg  |    3 ---
 l3kernel/testfiles/m3expl003.xetex.tlg  |    3 ---
 11 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index ca4d801..28e0a6d 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -2053,7 +2053,7 @@
 %     \keys_set_known:nnN, \keys_set_known:nVN,
 %     \keys_set_known:nvN, \keys_set_known:noN
 %   }
-% \begin{macro}{\@@_set_known:nnnN, \@@_set_known:onnN}
+% \begin{macro}{\@@_set_known:nnnN}
 % \begin{macro}
 %   {
 %     \keys_set_known:nn, \keys_set_known:nV,
@@ -2066,7 +2066,7 @@
 %   operation to set the \texttt{clist} here!
 %    \begin{macrocode}
 \cs_new_protected:Npn \keys_set_known:nnN
-  { \@@_set_known:onnN \l_@@_unused_clist }
+  { \exp_args:No \@@_set_known:nnnN \l_@@_unused_clist }
 \cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , no }
 \cs_new_protected:Npn \@@_set_known:nnnN #1#2#3#4
   {
@@ -2075,7 +2075,6 @@
     \tl_set:Nx #4 { \exp_not:o { \l_@@_unused_clist } }
     \tl_set:Nn \l_@@_unused_clist {#1}
   }
-\cs_generate_variant:Nn \@@_set_known:nnnN { o }
 \cs_new_protected:Npn \keys_set_known:nn #1#2
   {
     \use:x
@@ -2103,7 +2102,7 @@
 %     \keys_set_filter:nnnN, \keys_set_filter:nnVN, \keys_set_filter:nnvN,
 %       \keys_set_filter:nnoN
 %   }
-% \begin{macro}{\@@_set_filter:nnnnN, \@@_set_filter:onnnN}
+% \begin{macro}{\@@_set_filter:nnnnN}
 % \begin{macro}
 %   {
 %     \keys_set_filter:nnn, \keys_set_filter:nnV, \keys_set_filter:nnv,
@@ -2115,14 +2114,14 @@
 %       \keys_set_groups:nno
 %   }
 %  \begin{macro}{\@@_set_selective:nnn}
-%  \begin{macro}{\@@_set_selective:nnnn, \@@_set_selective:onnn}
+%  \begin{macro}{\@@_set_selective:nnnn}
 %   The idea of setting keys in a selective manner again uses flags
 %   wrapped around the basic code. The comments on \cs{keys_set_known:nnN}
 %   also apply here. We have a bit more shuffling to do to keep everything
 %   nestable.
 %    \begin{macrocode}
 \cs_new_protected:Npn \keys_set_filter:nnnN
-  {  \@@_set_filter:onnnN \l_@@_unused_clist }
+  { \exp_args:No \@@_set_filter:nnnnN \l_@@_unused_clist }
 \cs_generate_variant:Nn \keys_set_filter:nnnN { nnV , nnv , nno }
 \cs_new_protected:Npn \@@_set_filter:nnnnN #1#2#3#4#5
   {
@@ -2131,7 +2130,6 @@
     \tl_set:Nx #5 { \exp_not:o { \l_@@_unused_clist } }
     \tl_set:Nn \l_@@_unused_clist {#1}
   }
-\cs_generate_variant:Nn \@@_set_filter:nnnnN { o }
 \cs_new_protected:Npn \keys_set_filter:nnn #1#2#3
   {
     \use:x
@@ -2167,14 +2165,13 @@
   }
 \cs_generate_variant:Nn \keys_set_groups:nnn { nnV , nnv , nno }
 \cs_new_protected:Npn \@@_set_selective:nnn
-  { \@@_set_selective:onnn \l_@@_selective_seq }
+  { \exp_args:No \@@_set_selective:nnnn \l_@@_selective_seq }
 \cs_new_protected:Npn \@@_set_selective:nnnn #1#2#3#4
   {
     \seq_set_from_clist:Nn \l_@@_selective_seq {#3}
     \@@_set:nn {#2} {#4}
     \tl_set:Nn \l_@@_selective_seq {#1}
   }
-\cs_generate_variant:Nn \@@_set_selective:nnnn { o }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 0adcea9..3adc9c8 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3343,7 +3343,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3355,7 +3354,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3366,7 +3364,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 7fbc00f..7527c19 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 07e78d4..135e912 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 8c53d89..2459807 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index f62b3d8..7270ffb 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3381,7 +3381,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3393,7 +3392,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3404,7 +3402,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 0adcea9..3adc9c8 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3343,7 +3343,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3355,7 +3354,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3366,7 +3364,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 7fbc00f..7527c19 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 07e78d4..135e912 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 8c53d89..2459807 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3636,7 +3636,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3648,7 +3647,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3659,7 +3657,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index f62b3d8..7270ffb 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3381,7 +3381,6 @@ Defining \keys_set_known:nVN on line ...
 Defining \keys_set_known:nvN on line ...
 Defining \keys_set_known:noN on line ...
 Defining \__keys_set_known:nnnN on line ...
-Defining \__keys_set_known:onnN on line ...
 Defining \keys_set_known:nn on line ...
 Defining \keys_set_known:nV on line ...
 Defining \keys_set_known:nv on line ...
@@ -3393,7 +3392,6 @@ Defining \exp_args:Nnnv on line ...
 Defining \keys_set_filter:nnvN on line ...
 Defining \keys_set_filter:nnoN on line ...
 Defining \__keys_set_filter:nnnnN on line ...
-Defining \__keys_set_filter:onnnN on line ...
 Defining \keys_set_filter:nnn on line ...
 Defining \keys_set_filter:nnV on line ...
 Defining \keys_set_filter:nnv on line ...
@@ -3404,7 +3402,6 @@ Defining \keys_set_groups:nnv on line ...
 Defining \keys_set_groups:nno on line ...
 Defining \__keys_set_selective:nnn on line ...
 Defining \__keys_set_selective:nnnn on line ...
-Defining \__keys_set_selective:onnn on line ...
 Defining \__keys_set_keyval:n on line ...
 Defining \__keys_set_keyval:nn on line ...
 Defining \__keys_set_keyval:nnn on line ...

More information about the latex3-commits mailing list