summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3keys.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keys.sty29
1 files changed, 15 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index aab64765fa0..a0ae5751eb3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 3086 2011-12-22 17:55:46Z bruno $
+\GetIdInfo$Id: l3keys.dtx 3487 2012-03-03 19:36:51Z bruno $
{L3 Experimental key-value interfaces}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -191,15 +191,16 @@
\bool_set_false:N \l_keys_no_value_bool
\keys_define_elt_aux:nn {#1} {#2}
}
-\cs_new_protected:Npn \keys_define_elt_aux:nn #1#2 {
- \keys_property_find:n {#1}
- \cs_if_exist:cTF { \c_keys_props_root_tl \l_keys_property_tl }
- { \keys_define_key:n {#2} }
- {
- \msg_kernel_error:nnxx { keys } { property-unknown }
- { \l_keys_property_tl } { \l_keys_path_tl }
- }
-}
+\cs_new_protected:Npn \keys_define_elt_aux:nn #1#2
+ {
+ \keys_property_find:n {#1}
+ \cs_if_exist:cTF { \c_keys_props_root_tl \l_keys_property_tl }
+ { \keys_define_key:n {#2} }
+ {
+ \msg_kernel_error:nnxx { keys } { property-unknown }
+ { \l_keys_property_tl } { \l_keys_path_tl }
+ }
+ }
\cs_new_protected:Npn \keys_property_find:n #1
{
\tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / }
@@ -236,7 +237,7 @@
{ \tl_if_empty:nTF {#2} }
\cs_new:Npn \keys_bool_set:NN #1#2
{
- \cs_if_exist:NF #1 { \bool_new:N #1 }
+ \bool_if_exist:NF #1 { \bool_new:N #1 }
\keys_choice_make:
\keys_cmd_set:nx { \l_keys_path_tl / true }
{ \exp_not:c { bool_ #2 set_true:N } \exp_not:N #1 }
@@ -251,7 +252,7 @@
}
\cs_new:Npn \keys_bool_set_inverse:NN #1#2
{
- \cs_if_exist:NF #1 { \bool_new:N #1 }
+ \bool_if_exist:NF #1 { \bool_new:N #1 }
\keys_choice_make:
\keys_cmd_set:nx { \l_keys_path_tl / true }
{ \exp_not:c { bool_ #2 set_false:N } \exp_not:N #1 }
@@ -392,7 +393,7 @@
}
\cs_new_protected:Npn \keys_variable_set:NnNN #1#2#3#4
{
- \cs_if_exist:NF #1 { \use:c { #2 _new:N } #1 }
+ \use:c { #2_if_exist:NF } #1 { \use:c { #2 _new:N } #1 }
\keys_cmd_set:nx { \l_keys_path_tl }
{ \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 {##1} }
}
@@ -601,7 +602,7 @@
{
\cs_if_exist:cTF { \c_keys_code_root_tl #1 }
{
- \exp_args:Nno \use:c { \c_keys_code_root_tl #1 }
+ \exp_args:Nc \exp_args:No { \c_keys_code_root_tl #1 }
\l_keys_value_tl
}
{#2}