[latex3-commits] [l3svn] 03/06: No longer need \__keys_ensure_exists:N
noreply at latex-project.org
noreply at latex-project.org
Tue Nov 22 11:08:04 CET 2016
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit 7e866132e7918eec03009fee9bab048118734942
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Nov 22 08:18:41 2016 +0000
No longer need \__keys_ensure_exists:N
Avoiding property lists means this approach can be dropped.
---
l3kernel/l3keys.dtx | 27 +++++----------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 2 --
l3kernel/testfiles/m3expl001.ptex.tlg | 2 --
l3kernel/testfiles/m3expl001.tlg | 2 --
l3kernel/testfiles/m3expl001.uptex.tlg | 2 --
l3kernel/testfiles/m3expl001.xetex.tlg | 2 --
l3kernel/testfiles/m3expl003.luatex.tlg | 2 --
l3kernel/testfiles/m3expl003.ptex.tlg | 2 --
l3kernel/testfiles/m3expl003.tlg | 2 --
l3kernel/testfiles/m3expl003.uptex.tlg | 2 --
l3kernel/testfiles/m3expl003.xetex.tlg | 2 --
11 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 8e9c964..07b0306 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1376,26 +1376,6 @@
%
% \subsection{Turning properties into actions}
%
-% \begin{macro}[int]{\@@_ensure_exist:n, \@@_ensure_exist:V}
-% Used to make sure that a key implementation and the related property
-% list will exist whenever this is required. As key definitions are never
-% global we use |\cs_set_protected:cpn| not |\cs_new_protected:cpn| here.
-% The function \cs{__chk_log:x} only writes to the log file if logging all
-% new functions is active: without it keys would not show up (as we are not
-% using \cs[no-index]{..._new}).
-% \begin{macrocode}
-\cs_new_protected:Npn \@@_ensure_exist:n #1
- {
- \cs_if_exist:cF { \c_@@_code_root_tl #1 }
- {
- \__chk_log:x { Defining~key~#1~ \msg_line_context: }
- \cs_set_protected:cpn { \c_@@_code_root_tl #1 } ##1 { }
- }
- }
-\cs_generate_variant:Nn \@@_ensure_exist:n { V }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}[int]{\@@_bool_set:Nn, \@@_bool_set:cn}
% Boolean keys are really just choices, but all done by hand. The
% second argument here is the scope: either empty or \texttt{ g } for
@@ -1535,7 +1515,11 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_cmd_set:nn #1#2
{
- \@@_ensure_exist:V \l_keys_path_tl
+ \cs_if_exist:cF { \c_@@_code_root_tl \l_keys_path_tl }
+ {
+ \__chk_log:x
+ { Defining~key~\l_keys_path_tl \c_space_tl \msg_line_context: }
+ }
\cs_set_protected:cpn { \c_@@_code_root_tl #1 } ##1 {#2}
}
\cs_generate_variant:Nn \@@_cmd_set:nn { nx , Vn , Vo }
@@ -1571,7 +1555,6 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_groups_set:n #1
{
- \@@_ensure_exist:V \l_keys_path_tl
\clist_set:Nn \l_@@_groups_clist {#1}
\clist_if_empty:NTF \l_@@_groups_clist
{
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 6172941..e62c72f 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3161,8 +3161,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 49ee6d1..7e9a218 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3152,8 +3152,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 6e07e1d..403f3b2 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3152,8 +3152,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 710dc89..eb90172 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3152,8 +3152,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 549395d..1f68f6e 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3159,8 +3159,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 8e02f02..ee70d5d 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3162,8 +3162,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 64269b0..300ae0c 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3153,8 +3153,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index cfd4bdf..f834cca 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3153,8 +3153,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3db0d31..6f3fa85 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3153,8 +3153,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 32373a0..dd735e1 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3160,8 +3160,6 @@ Defining \__keys_property_find:w on line ...
Defining \__keys_property_search:w on line ...
Defining \__keys_define_code:n on line ...
Defining \__keys_define_code:w on line ...
-Defining \__keys_ensure_exist:n on line ...
-Defining \__keys_ensure_exist:V on line ...
Defining \__keys_bool_set:Nn on line ...
Defining \__keys_bool_set:cn on line ...
Defining \__keys_bool_set_inverse:Nn 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