[latex3-commits] [l3svn] branch master updated: Some minor naming cleanup
noreply at latex-project.org
noreply at latex-project.org
Mon Sep 19 23:17:18 CEST 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new 44f7685 Some minor naming cleanup
44f7685 is described below
commit 44f76854bbab9bc8e4cfec5184e5406847ee1550
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Sep 19 22:17:03 2016 +0100
Some minor naming cleanup
---
l3kernel/l3keys.dtx | 38 +++++++++++++++----------------
l3kernel/testfiles/m3expl001.luatex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl001.ptex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl001.tlg | 12 +++++-----
l3kernel/testfiles/m3expl001.uptex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl001.xetex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl003.luatex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl003.ptex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl003.tlg | 12 +++++-----
l3kernel/testfiles/m3expl003.uptex.tlg | 12 +++++-----
l3kernel/testfiles/m3expl003.xetex.tlg | 12 +++++-----
11 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 0648b3b..5fb19cc 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1967,7 +1967,7 @@
\cs_new_protected:Npn \@@_set:nnn #1#2#3
{
\tl_set:Nx \l_@@_module_tl { \@@_remove_spaces:n {#2} }
- \keyval_parse:NNn \@@_set_elt:n \@@_set_elt:nn {#3}
+ \keyval_parse:NNn \@@_set:n \@@_set:nn {#3}
\tl_set:Nn \l_@@_module_tl {#1}
}
\cs_generate_variant:Nn \keys_set:nn { nV , nv , no }
@@ -2071,24 +2071,24 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[int]{\@@_set_elt:n, \@@_set_elt:nn}
-% \begin{macro}[aux]{\@@_set_elt_aux:nnn, \@@_set_elt_aux:onn}
+% \begin{macro}[int]{\@@_set:n, \@@_set:nn}
+% \begin{macro}[aux]{\@@_set_aux:nnn, \@@_set_aux:onn}
% \begin{macro}[aux]{\@@_find_key_module:w}
-% \begin{macro}[aux]{\@@_set_elt_aux:, \@@_set_elt_selective:}
+% \begin{macro}[aux]{\@@_set_aux:, \@@_set_selective:}
% A shared system once again. First, set the current path and add a
% default if needed. There are then checks to see if the a value is
% required or forbidden. If everything passes, move on to execute the
% code.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_elt:n #1
+\cs_new_protected:Npn \@@_set:n #1
{
\bool_set_true:N \l_@@_no_value_bool
- \@@_set_elt_aux:onn \l_@@_module_tl {#1} { }
+ \@@_set_aux:onn \l_@@_module_tl {#1} { }
}
-\cs_new_protected:Npn \@@_set_elt:nn #1#2
+\cs_new_protected:Npn \@@_set:nn #1#2
{
\bool_set_false:N \l_@@_no_value_bool
- \@@_set_elt_aux:onn \l_@@_module_tl {#1} {#2}
+ \@@_set_aux:onn \l_@@_module_tl {#1} {#2}
}
% \end{macrocode}
% The key path here can be fully defined, after which there is a search
@@ -2097,18 +2097,18 @@
% that happens on a per-key basis, we use the stack approach to restore
% the module name without a group.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_elt_aux:nnn #1#2#3
+\cs_new_protected:Npn \@@_set_aux:nnn #1#2#3
{
\tl_set:Nx \l_keys_path_tl { #1 / \@@_remove_spaces:n {#2} }
\tl_clear:N \l_@@_module_tl
\exp_after:wN \@@_find_key_module:w \l_keys_path_tl / \q_stop
\@@_value_or_default:n {#3}
\bool_if:NTF \l_@@_selective_bool
- { \@@_set_elt_selective: }
- { \@@_set_elt_aux: }
+ { \@@_set_selective: }
+ { \@@_set_aux: }
\tl_set:Nn \l_@@_module_tl {#1}
}
-\cs_generate_variant:Nn \@@_set_elt_aux:nnn { o }
+\cs_generate_variant:Nn \@@_set_aux:nnn { o }
\cs_new_protected:Npn \@@_find_key_module:w #1 / #2 \q_stop
{
\tl_if_blank:nTF {#2}
@@ -2122,7 +2122,7 @@
\@@_find_key_module:w #2 \q_stop
}
}
-\cs_new_protected:Npn \@@_set_elt_aux:
+\cs_new_protected:Npn \@@_set_aux:
{
\bool_if:nTF
{
@@ -2152,7 +2152,7 @@
% have any groups assigned. There is then the question of whether the
% selection is opt-in or opt-out.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_elt_selective:
+\cs_new_protected:Npn \@@_set_selective:
{
\prop_if_exist:cTF { \c_@@_info_root_tl \l_keys_path_tl }
{
@@ -2161,13 +2161,13 @@
{ \@@_check_groups: }
{
\bool_if:NTF \l_@@_filtered_bool
- { \@@_set_elt_aux: }
+ { \@@_set_aux: }
{ \@@_store_unused: }
}
}
{
\bool_if:NTF \l_@@_filtered_bool
- { \@@_set_elt_aux: }
+ { \@@_set_aux: }
{ \@@_store_unused: }
}
}
@@ -2195,11 +2195,11 @@
{
\bool_if:NTF \l_@@_filtered_bool
{ \@@_store_unused: }
- { \@@_set_elt_aux: }
+ { \@@_set_aux: }
}
{
\bool_if:NTF \l_@@_filtered_bool
- { \@@_set_elt_aux: }
+ { \@@_set_aux: }
{ \@@_store_unused: }
}
}
@@ -2230,7 +2230,7 @@
% To test if a value is required or forbidden. A simple check for
% the existence of the appropriate marker.
% \begin{macrocode}
-\prg_new_conditional:Npnn \@@_if_value:n #1 { p }
+\prg_new_conditional:Npnn \@@_if_value:n #1 { p , T, TF, F }
{
\prop_if_exist:cTF { \c_@@_info_root_tl \l_keys_path_tl }
{
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 2bb5a2a..d7c0723 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3282,13 +3282,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 2f2e11e..cbbaffb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3273,13 +3273,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 05d3491..c244850 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3273,13 +3273,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index b84a8bd..aaafd8b 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3273,13 +3273,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 8031340..965776b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3280,13 +3280,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 9511560..51fcf95 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3283,13 +3283,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index ead35e2..71c2f75 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3274,13 +3274,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 1c5830b..faba447 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3274,13 +3274,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 6460b6b..ea79062 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3274,13 +3274,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 3cc05d5..7be8a51 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3281,13 +3281,13 @@ Defining \keys_set_groups:nnn on line ...
Defining \keys_set_groups:nnV on line ...
Defining \keys_set_groups:nnv on line ...
Defining \keys_set_groups:nno on line ...
-Defining \__keys_set_elt:n on line ...
-Defining \__keys_set_elt:nn on line ...
-Defining \__keys_set_elt_aux:nnn on line ...
-Defining \__keys_set_elt_aux:onn on line ...
+Defining \__keys_set:n on line ...
+Defining \__keys_set:nn on line ...
+Defining \__keys_set_aux:nnn on line ...
+Defining \__keys_set_aux:onn on line ...
Defining \__keys_find_key_module:w on line ...
-Defining \__keys_set_elt_aux: on line ...
-Defining \__keys_set_elt_selective: on line ...
+Defining \__keys_set_aux: on line ...
+Defining \__keys_set_selective: on line ...
Defining \__keys_check_groups: on line ...
Defining \__keys_value_or_default:n on line ...
Defining \__keys_if_value_p:n on line ...
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list