diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-26 17:33:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-26 17:33:09 +0000 |
commit | 6c4cd2ab2f8d1ebe3a051d700c3005d73eefe04c (patch) | |
tree | 16833d474c6532347c42dee6b34fa77aed22eca6 /Master/texmf-dist/source/latex/l3kernel/l3keys.dtx | |
parent | 097e7dc0afa442be238a967b292237470680626e (diff) |
l3 (26aug14)
git-svn-id: svn://tug.org/texlive/trunk@35045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3keys.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3keys.dtx | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx index 648508d7777..49b443977de 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} %</driver> %<*driver|package> -\GetIdInfo$Id: l3keys.dtx 5121 2014-06-12 17:37:56Z joseph $ +\GetIdInfo$Id: l3keys.dtx 5354 2014-08-23 01:35:39Z bruno $ {L3 Key-value interfaces} %</driver|package> %<*driver> @@ -939,7 +939,11 @@ \tl_put_right:Nx \l_@@_parse_tl { \exp_not:c - { @@_key_no_value_elt_ \int_use:N \g_@@_level_int :n } + { + @@_key_no_value_elt_ + \int_use:N \g_@@_level_int + :n + } { \exp_not:o \l_@@_key_tl } } } @@ -1326,11 +1330,13 @@ { \@@_choice_make:N \@@_choice_find:n } \cs_new_protected_nopar:Npn \@@_multichoice_make: { \@@_choice_make:N \@@_multichoice_find:n } -\cs_new_protected_nopar:Npn \@@_choice_make:N #1 - { - \prop_if_exist:cTF { \c_@@_info_root_tl \@@_parent:o \l_keys_path_tl } +\cs_new_protected_nopar:Npn \@@_choice_make:N #1 + { + \prop_if_exist:cTF + { \c_@@_info_root_tl \@@_parent:o \l_keys_path_tl } { - \prop_get:cnNTF { \c_@@_info_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 { \__msg_kernel_error:nnxx { kernel } { nested-choice-key } @@ -1418,7 +1424,10 @@ \cs_new_protected:Npn \@@_default_set:n #1 { \prop_if_exist:cT { \c_@@_info_root_tl \l_keys_path_tl } - { \prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } { default } {#1} } + { + \prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } + { default } {#1} + } } % \end{macrocode} % \end{macro} @@ -1461,7 +1470,10 @@ \cs_new_protected:Npn \@@_meta_make:n #1 { \@@_cmd_set:Vo \l_keys_path_tl - { \exp_after:wN \keys_set:nn \exp_after:wN { \l_@@_module_tl } {#1} } + { + \exp_after:wN \keys_set:nn + \exp_after:wN { \l_@@_module_tl } {#1} + } } \cs_new_protected:Npn \@@_meta_make:nn #1#2 { \@@_cmd_set:Vn \l_keys_path_tl { \keys_set:nn {#1} {#2} } } @@ -1477,9 +1489,12 @@ { \prop_if_exist:cT { \c_@@_info_root_tl \l_keys_path_tl } { - \prop_remove:cn { \c_@@_info_root_tl \l_keys_path_tl } { required } - \prop_remove:cn { \c_@@_info_root_tl \l_keys_path_tl } { forbidden } - \prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } {#1} { true } + \prop_remove:cn { \c_@@_info_root_tl \l_keys_path_tl } + { required } + \prop_remove:cn { \c_@@_info_root_tl \l_keys_path_tl } + { forbidden } + \prop_put:cnn { \c_@@_info_root_tl \l_keys_path_tl } + {#1} { true } } } % \end{macrocode} @@ -1493,7 +1508,11 @@ { \use:c { #2_if_exist:NF } #1 { \use:c { #2 _new:N } #1 } \@@_cmd_set:nx { \l_keys_path_tl } - { \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 \exp_not:n { {##1} } } + { + \exp_not:c { #2 _ #3 set:N #4 } + \exp_not:N #1 + \exp_not:n { {##1} } + } } \cs_generate_variant:Nn \@@_variable_set:NnnN { c } % \end{macrocode} @@ -2118,7 +2137,8 @@ % \begin{macro}[EXP,pTF]{\keys_if_choice_exist:nnn} % Just an alternative view on \cs{keys_if_exist:nn(TF)}. % \begin{macrocode} -\prg_new_conditional:Npnn \keys_if_choice_exist:nnn #1#2#3 { p , T , F , TF } +\prg_new_conditional:Npnn \keys_if_choice_exist:nnn #1#2#3 + { p , T , F , TF } { \cs_if_exist:cTF { \c_@@_code_root_tl #1 / #2 / #3 } { \prg_return_true: } @@ -2151,7 +2171,8 @@ \__msg_kernel_new:nnnn { kernel } { key-choice-unknown } { Key~'#1'~accepts~only~a~fixed~set~of~choices. } { - The~key~'#1'~only~accepts~predefined~values,~and~'#2'~is~not~one~of~these. + The~key~'#1'~only~accepts~predefined~values,~ + and~'#2'~is~not~one~of~these. } \__msg_kernel_new:nnnn { kernel } { key-no-property } { No~property~given~in~definition~of~key~'#1'. } |