expl3 1881 (30mar10)

git-svn-id: svn://tug.org/texlive/trunk@17631 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 94 insertions, 117 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index 03090e32afe..d05909724cb 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
@@ -15,7 +15,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% 
-%% File: l3keys.dtx Copyright (C) 2009 LaTeX3 project
+%% File: l3keys.dtx Copyright (C) 2009-2010 LaTeX3 project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -48,15 +48,15 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 1766 2010-01-12 08:59:24Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1863 2010-03-22 20:15:06Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
 \package_check_loaded_expl:
-\tl_new:Nn \c_keys_root_tl { keys~>~ }
-\tl_new:Nn \c_keys_properties_root_tl { keys_properties }
-\tl_new:Nn \c_keys_value_forbidden_tl { forbidden }
-\tl_new:Nn \c_keys_value_required_tl { required }
+\tl_const:Nn \c_keys_root_tl { keys~>~ }
+\tl_const:Nn \c_keys_properties_root_tl { keys_properties }
+\tl_const:Nn \c_keys_value_forbidden_tl { forbidden }
+\tl_const:Nn \c_keys_value_required_tl { required }
 \int_new:N \l_keys_choice_int
 \tl_new:N \l_keys_choice_tl
 \tl_new:N \l_keys_choice_code_tl
@@ -64,11 +64,9 @@
 \tl_new:N \l_keys_path_tl
 \tl_new:N \l_keys_property_tl
 \tl_new:N \l_keys_module_tl
-\seq_new:N \l_keys_nesting_seq
-\tl_new:Nn \l_keys_nesting_tl { none }
 \bool_new:N \l_keys_no_value_bool
-\toks_new:N \l_keys_value_toks
-\cs_new_nopar:Npn \keys_bool_set:NN #1#2 {
+\tl_new:N \l_keys_value_tl
+\cs_new_protected_nopar:Npn \keys_bool_set:NN #1#2 {
   \keys_cmd_set:nx { \l_keys_path_tl / true } {
     \exp_not:c { bool_ #2 set_true:N }
       \exp_not:N #1
@@ -84,15 +82,15 @@
   }
   \keys_default_set:n { true }
 }
-\cs_new:Npn \keys_choice_code_store:x #1 {
+\cs_new_protected:Npn \keys_choice_code_store:x #1 {
   \tl_set:cx { \c_keys_root_tl \l_keys_path_tl .choice_code_tl } {#1}
 }
-\cs_new_nopar:Npn \keys_choice_find:n #1 {
+\cs_new_protected_nopar:Npn \keys_choice_find:n #1 {
   \keys_execute_aux:nn { \l_keys_path_tl / #1 } {
     \keys_execute_aux:nn { \l_keys_path_tl / unknown } { }
   }
 }
-\cs_new_nopar:Npn \keys_choice_make: {
+\cs_new_protected_nopar:Npn \keys_choice_make: {
   \keys_cmd_set:nn { \l_keys_path_tl } {
     \keys_choice_find:n {##1}
   }
@@ -101,7 +99,7 @@
       { \l_keys_path_tl } {##1}
   }
 }
-\cs_new:Npn \keys_choices_generate:n #1 {
+\cs_new_protected:Npn \keys_choices_generate:n #1 {
   \keys_choice_make:
   \int_zero:N \l_keys_choice_int
   \cs_if_exist:cTF {
@@ -116,7 +114,7 @@
   }
   \clist_map_function:nN {#1} \keys_choices_generate_aux:n
 }
-\cs_new_nopar:Npn \keys_choices_generate_aux:n #1 {
+\cs_new_protected_nopar:Npn \keys_choices_generate_aux:n #1 {
   \keys_cmd_set:nx { \l_keys_path_tl / #1 } {
     \exp_not:n { \tl_set:Nn \l_keys_choice_tl } {#1}
     \exp_not:n { \int_set:Nn \l_keys_choice_int }
@@ -125,46 +123,42 @@
   }
   \int_incr:N \l_keys_choice_int
 }
-\cs_new:Npn \keys_cmd_set:nn #1#2 {
+\cs_new_protected:Npn \keys_cmd_set:nn #1#2 {
   \keys_cmd_set_aux:n {#1}
   \cs_generate_from_arg_count:cNnn { \c_keys_root_tl #1 .cmd:n }
     \cs_set:Npn 1 {#2}
 }
-\cs_new:Npn \keys_cmd_set:nx #1#2 {
+\cs_new_protected:Npn \keys_cmd_set:nx #1#2 {
   \keys_cmd_set_aux:n {#1}
   \cs_generate_from_arg_count:cNnn { \c_keys_root_tl #1 .cmd:n }
     \cs_set:Npx 1 {#2}
 }
-\cs_new_nopar:Npn \keys_cmd_set_aux:n #1 {
+\cs_new_protected_nopar:Npn \keys_cmd_set_aux:n #1 {
   \keys_property_undefine:n { #1 .default_tl }
-  \tl_set:cn { \c_keys_root_tl #1 .req_tl } { }
+  \cs_if_free:cT { \c_keys_root_tl #1 .req_tl }
+    { \tl_new:c { \c_keys_root_tl #1 .req_tl } }
+  \tl_clear:c { \c_keys_root_tl #1 .req_tl }
 }
-\cs_new:Npn \keys_default_set:n #1 {
+\cs_new_protected:Npn \keys_default_set:n #1 {
+  \cs_if_free:cT { \c_keys_root_tl \l_keys_path_tl .default_tl }
+    { \tl_new:c { \c_keys_root_tl \l_keys_path_tl .default_tl } }
   \tl_set:cn { \c_keys_root_tl \l_keys_path_tl .default_tl } {#1}
 }
 \cs_generate_variant:Nn \keys_default_set:n { V }
-\cs_new:Npn \keys_define:nn #1#2 {
+\cs_new_protected:Npn \keys_define:nn #1#2 {
   \tl_set:Nn \l_keys_module_tl {#1}
-  \cs_set_eq:NN \KV_key_no_value_elt:n \keys_define_elt:n
-  \cs_set_eq:NN \KV_key_value_elt:nn \keys_define_elt:nn
-  \seq_push:NV \l_keys_nesting_seq \l_keys_nesting_tl
-  \tl_set:Nn \l_keys_nesting_tl { define }
-  \KV_parse_no_space_removal_no_sanitize:n {#2}
-  \seq_pop:NN \l_keys_nesting_seq \l_keys_nesting_tl
-  \cs_set_eq:Nc \KV_key_no_value_elt:n
-    { keys_ \l_keys_nesting_tl _elt:n }
-  \cs_set_eq:Nc \KV_key_value_elt:nn
-    { keys_ \l_keys_nesting_tl _elt:nn }
-}
-\cs_new_nopar:Npn \keys_define_elt:n #1 {
+  \KV_process_no_space_removal_no_sanitize:NNn
+    \keys_define_elt:n \keys_define_elt:nn {#2}
+}
+\cs_new_protected_nopar:Npn \keys_define_elt:n #1 {
   \bool_set_true:N \l_keys_no_value_bool
   \keys_define_elt_aux:nn {#1} { }
 }
-\cs_new:Npn \keys_define_elt:nn #1#2 {
+\cs_new_protected:Npn \keys_define_elt:nn #1#2 {
   \bool_set_false:N \l_keys_no_value_bool
   \keys_define_elt_aux:nn {#1} {#2}
 }
-\cs_new:Npn \keys_define_elt_aux:nn #1#2 {
+\cs_new_protected:Npn \keys_define_elt_aux:nn #1#2 {
   \keys_property_find:n {#1}
   \cs_set_eq:Nc \keys_tmp:w
     { \c_keys_properties_root_tl \l_keys_property_tl }
@@ -175,7 +169,7 @@
       { \l_keys_property_tl } { \l_keys_path_tl }
   }
 }
-\cs_new:Npn \keys_define_key:n #1 {
+\cs_new_protected:Npn \keys_define_key:n #1 {
   \bool_if:NTF \l_keys_no_value_bool {
     \intexpr_compare:nTF {
       \exp_args:Nc \cs_get_arg_count_from_signature:N
@@ -190,21 +184,21 @@
     \keys_tmp:w {#1}
   }
 }
-\cs_new_nopar:Npn \keys_execute: {
+\cs_new_protected_nopar:Npn \keys_execute: {
   \keys_execute_aux:nn { \l_keys_path_tl } {
     \keys_execute_unknown:
   }
 }
-\cs_new_nopar:Npn \keys_execute_unknown: {
+\cs_new_protected_nopar:Npn \keys_execute_unknown: {
   \keys_execute_aux:nn { \l_keys_module_tl / unknown } {
     \msg_kernel_error:nnxx { keys } { key-unknown } { \l_keys_path_tl }
       { \l_keys_module_tl }
   }
 }
-\cs_new_nopar:Npn \keys_execute_aux:nn #1#2 {
+\cs_new_protected_nopar:Npn \keys_execute_aux:nn #1#2 {
   \cs_set_eq:Nc \keys_tmp:w { \c_keys_root_tl #1 .cmd:n }
   \cs_if_exist:NTF \keys_tmp:w {
-    \exp_args:NV \keys_tmp:w \l_keys_value_toks
+    \exp_args:NV \keys_tmp:w \l_keys_value_tl
   }{
     #2
   }
@@ -221,16 +215,16 @@
     \c_keys_root_tl \l_keys_path_tl .req_tl
   }
 }
-\cs_new_nopar:Npn \keys_meta_make:n #1 {
+\cs_new_protected_nopar:Npn \keys_meta_make:n #1 {
   \exp_last_unbraced:NNo \keys_cmd_set:nn \l_keys_path_tl
     \exp_after:wN { \exp_after:wN \keys_set:nn  \exp_after:wN { \l_keys_module_tl } {#1} }
 }
-\cs_new_nopar:Npn \keys_meta_make:x #1 {
+\cs_new_protected_nopar: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_property_find:n #1 {
+\cs_new_protected_nopar: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:n {#1}
@@ -238,10 +232,10 @@
     \msg_kernel_error:nnx { keys } { key-no-property } {#1}
   }
 }
-\cs_new_nopar:Npn \keys_property_find_aux:n #1 {
+\cs_new_protected_nopar:Npn \keys_property_find_aux:n #1 {
   \keys_property_find_aux:w #1 \q_stop
 }
-\cs_new_nopar:Npn \keys_property_find_aux:w #1 . #2 \q_stop {
+\cs_new_protected_nopar:Npn \keys_property_find_aux:w #1 . #2 \q_stop {
   \tl_if_in:nnTF {#2} { . } {
     \tl_set:Nx \l_keys_path_tl {
       \l_keys_path_tl \tl_to_str:n {#1} .
@@ -255,35 +249,27 @@
 \cs_new_nopar:Npn \keys_property_new:nn #1#2 {
   \cs_new:cpn { \c_keys_properties_root_tl #1 } {#2}
 }
-\cs_new_nopar:Npn \keys_property_new_arg:nn #1#2 {
+\cs_new_protected_nopar:Npn \keys_property_new_arg:nn #1#2 {
   \cs_new:cpn { \c_keys_properties_root_tl #1 } ##1 {#2}
 }
-\cs_new_nopar:Npn \keys_property_undefine:n #1 {
+\cs_new_protected_nopar:Npn \keys_property_undefine:n #1 {
   \cs_set_eq:cN { \c_keys_root_tl #1 } \c_undefined
 }
-\cs_new:Npn \keys_set:nn #1#2 {
+\cs_new_protected:Npn \keys_set:nn #1#2 {
   \tl_set:Nn \l_keys_module_tl {#1}
-  \cs_set_eq:NN \KV_key_no_value_elt:n \keys_set_elt:n
-  \cs_set_eq:NN \KV_key_value_elt:nn \keys_set_elt:nn
-  \seq_push:NV \l_keys_nesting_seq \l_keys_nesting_tl
-  \tl_set:Nn \l_keys_nesting_tl { set }
-  \KV_parse_space_removal_sanitize:n {#2}
-  \seq_pop:NN \l_keys_nesting_seq \l_keys_nesting_tl
-  \cs_set_eq:Nc \KV_key_no_value_elt:n
-    { keys_ \l_keys_nesting_tl _elt:n }
-  \cs_set_eq:Nc \KV_key_value_elt:nn
-    { keys_ \l_keys_nesting_tl _elt:nn }
+  \KV_process_space_removal_sanitize:NNn
+    \keys_set_elt:n \keys_set_elt:nn {#2}
 }
 \cs_generate_variant:Nn \keys_set:nn { nV, nv }
-\cs_new_nopar:Npn \keys_set_elt:n #1 {
+\cs_new_protected_nopar:Npn \keys_set_elt:n #1 {
   \bool_set_true:N \l_keys_no_value_bool
   \keys_set_elt_aux:nn {#1} { }
 }
-\cs_new:Npn \keys_set_elt:nn #1#2 {
+\cs_new_protected:Npn \keys_set_elt:nn #1#2 {
   \bool_set_false:N \l_keys_no_value_bool
   \keys_set_elt_aux:nn {#1} {#2}
 }
-\cs_new:Npn \keys_set_elt_aux:nn #1#2 {
+\cs_new_protected:Npn \keys_set_elt_aux:nn #1#2 {
   \tl_set:Nx \l_keys_key_tl { \tl_to_str:n {#1} }
   \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / \l_keys_key_tl }
   \keys_value_or_default:n {#2}
@@ -298,13 +284,13 @@
     \keys_set_elt_aux:
   }
 }
-\cs_new_nopar:Npn \keys_set_elt_aux: {
+\cs_new_protected_nopar:Npn \keys_set_elt_aux: {
   \keys_if_value_requirement:nTF { forbidden } {
     \bool_if:NTF \l_keys_no_value_bool {
       \keys_execute:
     }{
       \msg_kernel_error:nnxx { keys } { value-forbidden }
-        { \l_keys_path_tl } { \toks_use:N \l_keys_value_toks }
+        { \l_keys_path_tl } { \tl_use:N \l_keys_value_tl }
     }
   }{
     \keys_execute:
@@ -314,21 +300,21 @@
   \cs_show:c { \c_keys_root_tl #1 / \tl_to_str:n {#2} .cmd:n }
 }
 \cs_new:Npn \keys_tmp:w {}
-\cs_new:Npn \keys_value_or_default:n #1 {
-  \toks_set:Nn \l_keys_value_toks  {#1}
+\cs_new_protected:Npn \keys_value_or_default:n #1 {
+  \tl_set:Nn \l_keys_value_tl  {#1}
   \bool_if:NT \l_keys_no_value_bool {
     \cs_if_exist:cT { \c_keys_root_tl \l_keys_path_tl .default_tl } {
-      \toks_set:Nv \l_keys_value_toks  {
+      \tl_set:Nv \l_keys_value_tl  {
         \c_keys_root_tl \l_keys_path_tl .default_tl
       }
     }
   }
 }
-\cs_new_nopar:Npn \keys_value_requirement:n #1 {
+\cs_new_protected_nopar:Npn \keys_value_requirement:n #1 {
   \tl_set_eq:cc { \c_keys_root_tl \l_keys_path_tl .req_tl }
     { c_keys_value_ #1 _tl }
 }
-\cs_new_nopar:Npn \keys_variable_set:NnNN #1#2#3#4 {
+\cs_new_protected_nopar:Npn \keys_variable_set:NnNN #1#2#3#4 {
   \cs_if_exist:NF #1 {
     \use:c { #2 _new:N } #1
   }
@@ -440,67 +426,58 @@
   \keys_value_requirement:n { required }
 }
 \msg_kernel_new:nnnn { keys } { choice-unknown }
-  {%
-    Choice `#2' unknown for key `#1':\\%
-    the key is being ignored.%
-  }
-  {%
-    The key `#1' takes a limited number of values.\\%
-    The input you gave, `#2', was not on the list accepted.\\%
-    Perhaps this is a typing error?%
+  { Choice~'#2'~unknown~for~key~'#1'. }
+  {
+    The~key~'#1'~takes~a~limited~number~of~values.\\
+    The~input~given,~'#2',~is~not~on~the~list~accepted.
   }
 \msg_kernel_new:nnnn { keys } { generate-choices-before-code }
-  {%
-    Cannot create choices for key `#1':\\%
-    no code has been defined.%
-  }
-  {%
-    Code for use by .generate_choices:n should first be defined\\%
-    using .choice_code:n or .choice_code:x.%
+  { No~code~available~to~generate~choices~for~key~'#1'. }
+  {
+    \l_msg_coding_error_text_tl
+    Before~using~.generate_choices:n~the~code~should~be~defined\\%
+    with~.choice_code:n~or~.choice_code:x.
   }
 \msg_kernel_new:nnnn { keys } { key-no-property }
-  {No property given in definition of key `#1'.}
-  {%
-   Inside \token_to_str:N \keys_define:nn \msg_space: each key name
-   needs a property:\\%
-   \msg_two_spaces: #1 .<property>:\\%
-   I did not find a ``.'' to indicate the start of a property.%
+  { No~property~given~in~definition~of~key~'#1'. }
+  {
+    \c_msg_coding_error_text_tl
+    Inside~\token_to_str:N \keys_define:nn \c_space_tl each~key~name
+    needs~a~property:  \\
+    ~ ~ #1 .<property> \\
+    LaTeX~did~not~find~a~'.'~to~indicate~the~start~of~a~property.
   }
 \msg_kernel_new:nnnn { keys } { key-unknown }
-  {The key `#1' is unknown and is being ignored.}
-  {%
-    The module `#2' does not seem to implement a key called `#1'.\\%
-    I also checked for code to handle a unknown key, and did not
-    find any.%
-    Check that you have spelled the key name correctly.%
-  }
-\msg_kernel_new:nnnn { keys } { property-unknown }
-  {The key property `#1' is unknown.}
-  {%
-    You have asked for key `#2' to have the property `#1'.\\%
-    However, I don't know the property `#1': this line will be ignored.%
+  { The~key~'#1'~is~unknown~and~is~being~ignored. }
+  {
+    The~module~'#2'~does~not~have~a~key~called~#1'.\\
+    Check~that~you~have~spelled~the~key~name~correctly.
   }
 \msg_kernel_new:nnnn { keys } { property-requires-value }
-  {The property `#1' requires a value.}
-  {%
-  You have tried to set the property `#2' for key `#1'.\\%
-  However, you did not give a value for this property, and one is
-  needed.\\%
-  The entire line will be ignored.%
+  { The property '#1' requires a value. }
+  {
+    \l_msg_coding_error_text_tl
+    LaTeX~was~asked~to~set~property~'#2'~for~key~'#1'.\\
+    No~value~was~given~for~the~property,~and~one~is~required.
+  }
+\msg_kernel_new:nnnn { keys } { property-unknown }
+  { The key property '#1' is unknown. }
+  {
+    \l_msg_coding_error_text_tl
+    LaTeX~has~been~asked~to~set~the~property~'#1'~for~key~'#2':\\
+    this~property~is~not~defined.
   }
 \msg_kernel_new:nnnn { keys } { value-forbidden }
-  {The key `#1' does not taken a value.}
-  {%
-    The key `#1' should be given without a value.\\%
-    You gave `#1 = #2'; I will ignore `#2' and carry out whatever\\%
-    key `#1' is supposed to do.%
+  { The~key~'#1'~does~not~taken~a~value. }
+  {
+    The~key~'#1'~should~be~given~without~a~value.\\
+    LaTeX~will~ignore~the~given~value~'#2'.
   }
 \msg_kernel_new:nnnn { keys } { value-required }
-  {The key `#1' requires a value.}
-  {%
-    The key `#1' should be given with a value.\\%
-    You gave `#1', but should have given `#1 = <value>'.\\%
-    I will ignore the key entirely.\\%
+  { The~key~'#1'~requires~a~value. }
+  {
+    The~key~'#1'~must~have~a~value.\\
+    No~value~was~present:~the~key~will~be~ignored.
   }
 %% 
 %%