[latex3-commits] [l3svn] 02/06: Finalise moving keys data to set of tls
noreply at latex-project.org
noreply at latex-project.org
Tue Nov 22 11:08:03 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 8d9061e09ff813bffb85f1a7649abd490c1f3e86
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Nov 22 08:07:45 2016 +0000
Finalise moving keys data to set of tls
This helps with performance in some areas: as keys are used a lot
this is worthwhile.
There remain a few items to address including what to report back
and whether to store the key values themsevles (easy but does cost
in storage).
---
l3kernel/l3keys.dtx | 91 +++++++++++++------------------
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 +-
l3kernel/testfiles/m3keys004.tlg | 3 +-
12 files changed, 68 insertions(+), 86 deletions(-)
diff --git a/l3kernel/l3keys.dtx b/l3kernel/l3keys.dtx
index 52eeaad..8e9c964 100644
--- a/l3kernel/l3keys.dtx
+++ b/l3kernel/l3keys.dtx
@@ -1115,8 +1115,8 @@
% {
% \c_@@_code_root_tl ,
% \c_@@_default_root_tl ,
-% \c_@@_groups_root_tl,
-% \c_@@_info_root_tl ,
+% \c_@@_groups_root_tl ,
+% \c_@@_type_root_tl ,
% \c_@@_validate_root_tl
% }
% Various storage areas for the different data which make up keys.
@@ -1124,7 +1124,7 @@
\tl_const:Nn \c_@@_code_root_tl { key~code~>~ }
\tl_const:Nn \c_@@_default_root_tl { key~default~>~ }
\tl_const:Nn \c_@@_groups_root_tl { key~groups~>~ }
-\tl_const:Nn \c_@@_info_root_tl { key~info~>~ }
+\tl_const:Nn \c_@@_type_root_tl { key~type~>~ }
\tl_const:Nn \c_@@_validate_root_tl { key~validate~>~ }
% \end{macrocode}
% \end{variable}
@@ -1378,22 +1378,14 @@
%
% \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. We cannot use for example
-% \cs{prop_clear_new:c} here as that would affect the order in which key
-% properties must be set. As key definitions are never global we use
-% |\cs_set_protected:cpn| not |\cs_new_protected:cpn| here. For the
-% same reason, to avoid issues if the key has been undefined in the
-% current scope but exists at a higher level, we do not use \cs{prop_new:c}
-% but rather \cs{prop_set_eq:cN}. 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}).
+% 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
{
- \prop_if_exist:cF { \c_@@_info_root_tl #1 }
- {
- \prop_set_eq:cN { \c_@@_info_root_tl #1 } \c_empty_prop
- }
\cs_if_exist:cF { \c_@@_code_root_tl #1 }
{
\__chk_log:x { Defining~key~#1~ \msg_line_context: }
@@ -1451,13 +1443,12 @@
% \end{macro}
%
% \begin{macro}[int]{\@@_choice_make:, \@@_multichoice_make:}
-% \begin{macro}[int]{\@@_choice_make:N}
+% \begin{macro}[aux]{\@@_choice_make:N}
% \begin{macro}[aux]{\@@_choice_make_aux:N}
-% \begin{macro}[aux]{\@@_parent:n, \@@_parent:o}
-% \begin{macro}[aux]{\@@_parent:wn}
+% \begin{macro}[EXP, aux]{\@@_parent:n, \@@_parent:o}
+% \begin{macro}[EXP, aux]{\@@_parent:w}
% To make a choice from a key, two steps: set the code, and set the
-% unknown key. There is one point to watch here: choice keys cannot be
-% nested! As multichoices and choices are essentially the same bar one
+% unknown key. As multichoices and choices are essentially the same bar one
% function, the code is given together.
% \begin{macrocode}
\cs_new_protected:Npn \@@_choice_make:
@@ -1466,12 +1457,12 @@
{ \@@_choice_make:N \@@_multichoice_find:n }
\cs_new_protected:Npn \@@_choice_make:N #1
{
- \prop_if_exist:cTF
- { \c_@@_info_root_tl \@@_parent:o \l_keys_path_tl }
+ \cs_if_exist:cTF
+ { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl }
{
- \prop_get:cnNTF
- { \c_@@_info_root_tl \@@_parent:o \l_keys_path_tl }
- { choice } \l_keys_value_tl
+ \str_if_eq_x:nnTF
+ { \exp_not:v { \c_@@_type_root_tl \@@_parent:o \l_keys_path_tl } }
+ { choice }
{
\__msg_kernel_error:nnxx { kernel } { nested-choice-key }
{ \l_keys_path_tl } { \@@_parent:o \l_keys_path_tl }
@@ -1482,9 +1473,8 @@
}
\cs_new_protected:Npn \@@_choice_make_aux:N #1
{
+ \cs_set_nopar:cpn { \c_@@_type_root_tl \l_keys_path_tl } { choice }
\@@_cmd_set:nn { \l_keys_path_tl } { #1 {##1} }
- \prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } { choice }
- { true }
\@@_cmd_set:nn { \l_keys_path_tl / unknown }
{
\__msg_kernel_error:nnxx { kernel } { key-choice-unknown }
@@ -1492,14 +1482,14 @@
}
}
\cs_new:Npn \@@_parent:n #1
- { \@@_parent:wn #1 / / \q_stop { } }
+ { \@@_parent:w #1 / / \q_stop { } }
\cs_generate_variant:Nn \@@_parent:n { o }
-\cs_new:Npn \@@_parent:wn #1 / #2 / #3 \q_stop #4
+\cs_new:Npn \@@_parent:w #1 / #2 / #3 \q_stop #4
{
\tl_if_blank:nTF {#2}
{ \use_none:n #4 }
{
- \@@_parent:wn #2 / #3 \q_stop { #4 / #1 }
+ \@@_parent:w #2 / #3 \q_stop { #4 / #1 }
}
}
% \end{macrocode}
@@ -1574,9 +1564,10 @@
% \end{macro}
%
% \begin{macro}[int]{\@@_groups_set:n}
-% Assigning a key to one or more groups uses comma lists. So that the comma
-% list is \enquote{well-behaved} later, the storage is done via a stored
-% list here, which does the normalisation.
+% Assigning a key to one or more groups uses comma lists. As the list of
+% groups only exists if there is anything to do, the setting is done using
+% a scratch list. For the usual grouping reasons we use the low-level
+% approach to undefining a list.
% \begin{macrocode}
\cs_new_protected:Npn \@@_groups_set:n #1
{
@@ -1584,12 +1575,12 @@
\clist_set:Nn \l_@@_groups_clist {#1}
\clist_if_empty:NTF \l_@@_groups_clist
{
- \prop_remove:cn { \c_@@_info_root_tl \l_keys_path_tl }
- { groups }
+ \cs_set_eq:cN { \c_@@_groups_root_tl \l_keys_path_tl }
+ \tex_undefined:D
}
{
- \prop_put:cnV { \c_@@_info_root_tl \l_keys_path_tl }
- { groups } \l_@@_groups_clist
+ \clist_set_eq:cN { \c_@@_groups_root_tl \l_keys_path_tl }
+ \l_@@_groups_clist
}
}
% \end{macrocode}
@@ -1630,7 +1621,7 @@
\cs_new_protected:Npn \@@_undefine:
{
\clist_map_inline:nn
- { code , default , groups , info , validate }
+ { code , default , groups , type , validate }
{
\cs_set_eq:cN
{ \tl_use:c { c_@@_ ##1 _root_tl } \l_keys_path_tl }
@@ -2173,16 +2164,11 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_selective:
{
- \prop_if_exist:cTF { \c_@@_info_root_tl \l_keys_path_tl }
+ \cs_if_exist:cTF { \c_@@_groups_root_tl \l_keys_path_tl }
{
- \prop_get:cnNTF { \c_@@_info_root_tl \l_keys_path_tl }
- { groups } \l_@@_groups_clist
- { \@@_check_groups: }
- {
- \bool_if:NTF \l_@@_filtered_bool
- { \@@_execute: }
- { \@@_store_unused: }
- }
+ \clist_set_eq:Nc \l_@@_groups_clist
+ { \c_@@_groups_root_tl \l_keys_path_tl }
+ \@@_check_groups:
}
{
\bool_if:NTF \l_@@_filtered_bool
@@ -2374,7 +2360,7 @@
% \end{macro}
%
% \begin{macro}{\keys_show:nn}
-% \begin{macro}[aux]{\@@_show:NN}
+% \begin{macro}[aux]{\@@_show:N}
% To show a key, test for its existence to issue the correct message
% (same message, but with a |t| or |f| argument, then build the
% control sequences which contain the code and other information
@@ -2388,9 +2374,8 @@
{
\__msg_show_pre:nnxxxx { LaTeX / kernel } { show-key }
{ \@@_remove_spaces:n { #1 / #2 } } { t } { } { }
- \exp_args:Ncc \@@_show:NN
+ \exp_args:Nc \@@_show:N
{ \c_@@_code_root_tl \@@_remove_spaces:n { #1 / #2 } }
- { \c_@@_info_root_tl \@@_remove_spaces:n { #1 / #2 } }
}
{
\__msg_show_pre:nnxxxx { LaTeX / kernel } { show-key }
@@ -2398,7 +2383,7 @@
\__msg_show_wrap:n { }
}
}
-\cs_new_protected:Npn \@@_show:NN #1#2
+\cs_new_protected:Npn \@@_show:N #1
{
\use:x
{
@@ -2406,8 +2391,6 @@
{
\exp_not:N \__msg_show_item_unbraced:nn { code }
{ \token_get_replacement_spec:N #1 }
- \exp_not:n
- { \prop_map_function:NN #2 \__msg_show_item_unbraced:nn }
}
}
}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 496a6e1..6172941 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3131,7 +3131,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3173,7 +3173,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3312,7 +3312,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index b9f7c52..49ee6d1 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -3122,7 +3122,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3164,7 +3164,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3303,7 +3303,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 92b7758..6e07e1d 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -3122,7 +3122,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3164,7 +3164,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3303,7 +3303,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 49c2635..710dc89 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -3122,7 +3122,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3164,7 +3164,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3303,7 +3303,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 891c5a4..549395d 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3129,7 +3129,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3171,7 +3171,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3310,7 +3310,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 42bd013..8e02f02 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3132,7 +3132,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3174,7 +3174,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3313,7 +3313,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index b130bde..64269b0 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -3123,7 +3123,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3165,7 +3165,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3304,7 +3304,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 19fdc27..cfd4bdf 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -3123,7 +3123,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3165,7 +3165,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3304,7 +3304,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 89fc56f..3db0d31 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -3123,7 +3123,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3165,7 +3165,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3304,7 +3304,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 7523b71..32373a0 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3130,7 +3130,7 @@ Defining message LaTeX/kernel/misplaced-equals-sign on line ...
Defining \c__keys_code_root_tl on line ...
Defining \c__keys_default_root_tl on line ...
Defining \c__keys_groups_root_tl on line ...
-Defining \c__keys_info_root_tl on line ...
+Defining \c__keys_type_root_tl on line ...
Defining \c__keys_validate_root_tl on line ...
Defining \c__keys_props_root_tl on line ...
Defining \l_keys_choice_int on line ...
@@ -3172,7 +3172,7 @@ Defining \__keys_choice_make:N on line ...
Defining \__keys_choice_make_aux:N on line ...
Defining \__keys_parent:n on line ...
Defining \__keys_parent:o on line ...
-Defining \__keys_parent:wn on line ...
+Defining \__keys_parent:w on line ...
Defining \__keys_choices_make:nn on line ...
Defining \__keys_multichoices_make:nn on line ...
Defining \__keys_choices_make:Nnn on line ...
@@ -3311,7 +3311,7 @@ Defining \keys_if_choice_exist:nnnT on line ...
Defining \keys_if_choice_exist:nnnF on line ...
Defining \keys_if_choice_exist:nnnTF on line ...
Defining \keys_show:nn on line ...
-Defining \__keys_show:NN on line ...
+Defining \__keys_show:N on line ...
Defining message LaTeX/kernel/boolean-values-only on line ...
Defining message LaTeX/kernel/key-choice-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
diff --git a/l3kernel/testfiles/m3keys004.tlg b/l3kernel/testfiles/m3keys004.tlg
index c824da5..7aea730 100644
--- a/l3kernel/testfiles/m3keys004.tlg
+++ b/l3kernel/testfiles/m3keys004.tlg
@@ -224,8 +224,7 @@ FALSE
TEST 9: \keys_show:nn
============================================================
The key module/key-one has the properties:
-> code => \TYPE {"#1"}
-> choice => true.
+> code => \TYPE {"#1"}.
<recently read> }
l. ... }
The key module/key-two has the properties:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list