diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3keys.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3keys.sty | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty index 721a7ecc09d..aab64765fa0 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 2800 2011-09-10 16:54:36Z will $ +\GetIdInfo$Id: l3keys.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental key-value interfaces} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -181,7 +181,7 @@ \tl_set:Nn \l_keys_module_tl {#1} } \cs_generate_variant:Nn \keys_define_aux:nnn { o } -\cs_new_protected_nopar:Npn \keys_define_elt:n #1 +\cs_new_protected:Npn \keys_define_elt:n #1 { \bool_set_true:N \l_keys_no_value_bool \keys_define_elt_aux:nn {#1} { } @@ -200,14 +200,14 @@ { \l_keys_property_tl } { \l_keys_path_tl } } } -\cs_new_protected_nopar:Npn \keys_property_find:n #1 +\cs_new_protected:Npn \keys_property_find:n #1 { \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / } \tl_if_in:nnTF {#1} { . } { \keys_property_find_aux:w #1 \q_stop } { \msg_kernel_error:nnx { keys } { key-no-property } {#1} } } -\cs_new_protected_nopar:Npn \keys_property_find_aux:w #1 . #2 \q_stop +\cs_new_protected:Npn \keys_property_find_aux:w #1 . #2 \q_stop { \tl_set:Nx \l_keys_path_tl { \l_keys_path_tl \tl_to_str:n {#1} } \tl_if_in:nnTF {#2} { . } @@ -234,7 +234,7 @@ } \cs_new_protected:Npn \keys_define_key_aux:w #1 : #2 \q_stop { \tl_if_empty:nTF {#2} } -\cs_new_nopar:Npn \keys_bool_set:NN #1#2 +\cs_new:Npn \keys_bool_set:NN #1#2 { \cs_if_exist:NF #1 { \bool_new:N #1 } \keys_choice_make: @@ -249,7 +249,7 @@ } \keys_default_set:n { true } } -\cs_new_nopar:Npn \keys_bool_set_inverse:NN #1#2 +\cs_new:Npn \keys_bool_set_inverse:NN #1#2 { \cs_if_exist:NF #1 { \bool_new:N #1 } \keys_choice_make: @@ -304,7 +304,7 @@ { generate-choices-before-code } { \l_keys_path_tl } } } -\cs_new_protected_nopar:Npn \keys_choices_generate_aux:n #1 +\cs_new_protected:Npn \keys_choices_generate_aux:n #1 { \keys_cmd_set:nx { \l_keys_path_tl / #1 } { @@ -337,7 +337,7 @@ \keys_cmd_set_aux:n {#1} \cs_set:cpx { \c_keys_code_root_tl #1 } ##1 {#2} } -\cs_new_protected_nopar:Npn \keys_cmd_set_aux:n #1 +\cs_new_protected:Npn \keys_cmd_set_aux:n #1 { \tl_clear_new:c { \c_keys_vars_root_tl #1 .default } \tl_set:cn { \c_keys_vars_root_tl #1 .default } { \q_no_value } @@ -346,17 +346,17 @@ \cs_new_protected:Npn \keys_default_set:n #1 { \tl_set:cn { \c_keys_vars_root_tl \l_keys_path_tl .default } {#1} } \cs_generate_variant:Nn \keys_default_set:n { V } -\cs_new_protected_nopar:Npn \keys_meta_make:n #1 +\cs_new_protected:Npn \keys_meta_make:n #1 { \exp_args:NNo \keys_cmd_set:nn \l_keys_path_tl { \exp_after:wN \keys_set:nn \exp_after:wN { \l_keys_module_tl } {#1} } } -\cs_new_protected_nopar:Npn \keys_meta_make:x #1 +\cs_new_protected:Npn \keys_meta_make:x #1 { \keys_cmd_set:nx { \l_keys_path_tl } { \exp_not:N \keys_set:nn { \l_keys_module_tl } {#1} } } -\cs_new_nopar:Npn \keys_multichoice_find:n #1 +\cs_new:Npn \keys_multichoice_find:n #1 { \clist_map_function:nN {#1} \keys_choice_find:n } \cs_new_protected_nopar:Npn \keys_multichoice_make: { @@ -384,29 +384,29 @@ \int_incr:N \l_keys_choice_int } } -\cs_new_protected_nopar:Npn \keys_value_requirement:n #1 +\cs_new_protected:Npn \keys_value_requirement:n #1 { \tl_set_eq:cc { \c_keys_vars_root_tl \l_keys_path_tl .req } { c_keys_value_ #1 _tl } } -\cs_new_protected_nopar:Npn \keys_variable_set:NnNN #1#2#3#4 +\cs_new_protected:Npn \keys_variable_set:NnNN #1#2#3#4 { \cs_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} } } -\cs_new_protected_nopar:Npn \keys_variable_set:NnN #1#2#3 +\cs_new_protected:Npn \keys_variable_set:NnN #1#2#3 { \keys_variable_set:NnNN #1 {#2} { } #3 } \cs_generate_variant:Nn \keys_variable_set:NnNN { c } \cs_generate_variant:Nn \keys_variable_set:NnN { c } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_set:N } #1 { \keys_bool_set:NN #1 { } } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_gset:N } #1 { \keys_bool_set:NN #1 g } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_set_inverse:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_set_inverse:N } #1 { \keys_bool_set_inverse:NN #1 { } } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .bool_gset_inverse:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .bool_gset_inverse:N } #1 { \keys_bool_set_inverse:NN #1 g } \cs_new_protected_nopar:cpn { \c_keys_props_root_tl .choice: } { \keys_choice_make: } @@ -420,43 +420,43 @@ { \keys_choice_code_store:x { \exp_not:n {#1} } } \cs_new_protected:cpn { \c_keys_props_root_tl .choice_code:x } #1 { \keys_choice_code_store:x {#1} } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_set:N } #1 { \keys_variable_set:NnN #1 { clist } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_set:c } #1 { \keys_variable_set:cnN {#1} { clist } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_gset:N } #1 { \keys_variable_set:NnNN #1 { clist } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .clist_gset:c } #1 { \keys_variable_set:cnNN {#1} { clist } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .default:n } #1 { \keys_default_set:n {#1} } \cs_new_protected:cpn { \c_keys_props_root_tl .default:V } #1 { \keys_default_set:V #1 } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_set:N } #1 { \keys_variable_set:NnN #1 { dim } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_set:c } #1 { \keys_variable_set:cnN {#1} { dim } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_gset:N } #1 { \keys_variable_set:NnNN #1 { dim } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .dim_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .dim_gset:c } #1 { \keys_variable_set:cnNN {#1} { dim } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_set:N } #1 { \keys_variable_set:NnN #1 { fp } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_set:c } #1 { \keys_variable_set:cnN {#1} { fp } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_gset:N } #1 { \keys_variable_set:NnNN #1 { fp } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .fp_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .fp_gset:c } #1 { \keys_variable_set:cnNN {#1} { fp } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .generate_choices:n } #1 { \keys_choices_generate:n {#1} } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_set:N } #1 { \keys_variable_set:NnN #1 { int } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_set:c } #1 { \keys_variable_set:cnN {#1} { int } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_gset:N } #1 { \keys_variable_set:NnNN #1 { int } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .int_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .int_gset:c } #1 { \keys_variable_set:cnNN {#1} { int } g n } \cs_new_protected:cpn { \c_keys_props_root_tl .meta:n } #1 { \keys_meta_make:n {#1} } @@ -466,29 +466,29 @@ { \keys_multichoice_make: } \cs_new_protected:cpn { \c_keys_props_root_tl .multichoices:nn } #1 { \keys_multichoices_make:nn #1 } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_set:N } #1 { \keys_variable_set:NnN #1 { skip } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_set:c } #1 { \keys_variable_set:cnN {#1} { skip } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_gset:N } #1 { \keys_variable_set:NnNN #1 { skip } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .skip_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .skip_gset:c } #1 { \keys_variable_set:cnNN {#1} { skip } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set:N } #1 { \keys_variable_set:NnN #1 { tl } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set:c } #1 { \keys_variable_set:cnN {#1} { tl } n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set_x:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set_x:N } #1 { \keys_variable_set:NnN #1 { tl } x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_set_x:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_set_x:c } #1 { \keys_variable_set:cnN {#1} { tl } x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset:N } #1 { \keys_variable_set:NnNN #1 { tl } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset:c } #1 { \keys_variable_set:cnNN {#1} { tl } g n } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset_x:N } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset_x:N } #1 { \keys_variable_set:NnNN #1 { tl } g x } -\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .tl_gset_x:c } #1 +\cs_new_protected:cpn { \c_keys_props_root_tl .tl_gset_x:c } #1 { \keys_variable_set:cnNN {#1} { tl } g x } \cs_new_protected_nopar:cpn { \c_keys_props_root_tl .value_forbidden: } { \keys_value_requirement:n { forbidden } } @@ -518,7 +518,7 @@ } \cs_generate_variant:Nn \keys_set_known:nnN { nV , nv , no } \cs_generate_variant:Nn \keys_set_known_aux:nnnN { o } -\cs_new_protected_nopar:Npn \keys_set_elt:n #1 +\cs_new_protected:Npn \keys_set_elt:n #1 { \bool_set_true:N \l_keys_no_value_bool \keys_set_elt_aux:nn {#1} { } @@ -597,7 +597,7 @@ { = { \exp_not:o \l_keys_value_tl } } } } -\cs_new_nopar:Npn \keys_execute:nn #1#2 +\cs_new:Npn \keys_execute:nn #1#2 { \cs_if_exist:cTF { \c_keys_code_root_tl #1 } { @@ -606,7 +606,7 @@ } {#2} } -\cs_new_nopar:Npn \keys_choice_find:n #1 +\cs_new:Npn \keys_choice_find:n #1 { \keys_execute:nn { \l_keys_path_tl / \tl_to_str:n {#1} } { \keys_execute:nn { \l_keys_path_tl / unknown } { } } @@ -623,7 +623,7 @@ { \prg_return_true: } { \prg_return_false: } } -\cs_new_nopar:Npn \keys_show:nn #1#2 +\cs_new:Npn \keys_show:nn #1#2 { \cs_show:c { \c_keys_code_root_tl #1 / \tl_to_str:n {#2} } } \msg_kernel_new:nnnn { keys } { boolean-values-only } { Key~'#1'~accepts~boolean~values~only. } |