expl3 1766 (12jan10)

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

2 files changed, 34 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
index a1ff6c00b0f..f2d6d9a6919 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
@@ -53,7 +53,7 @@
 \let        \filedateOld        \filedate
 \let     \fileversionOld     \fileversion
 \let \filedescriptionOld \filedescription
-\GetIdInfo$Id: l3doc.dtx 1755 2009-12-23 07:07:48Z joseph $
+\GetIdInfo$Id: l3doc.dtx 1762 2010-01-09 10:05:37Z joseph $
           {L3 Experimental documentation class}
 \ProvidesExplClass
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -331,7 +331,7 @@
 \cs_set_nopar:Npn \doc_macro_opt_aux: { \bool_set_true:N \l_doc_macro_aux_bool }
 \cs_set_nopar:Npn \doc_macro_opt_TF:  { \bool_set_true:N \l_doc_macro_TF_bool }
 \cs_set_nopar:Npn \doc_macro_single #1 {
-
+  \tl_set:Nx \saved@macroname { \token_to_str:N #1 }
   \topsep\MacroTopsep
   \trivlist
   \cs_set_nopar:Npn \makelabel ##1 { \llap{##1} }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index d1a19278a5c..03090e32afe 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 1748 2009-11-18 08:48:04Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1766 2010-01-12 08:59:24Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -336,6 +336,7 @@
     \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 {##1}
   }
 }
+\cs_generate_variant:Nn \keys_variable_set:NnNN { c }
 \keys_property_new_arg:nn { .bool_set:N } {
   \keys_bool_set:NN #1 { }
 }
@@ -366,18 +367,30 @@
 \keys_property_new_arg:nn { .dim_set:N } {
   \keys_variable_set:NnNN #1 { dim } { } n
 }
+\keys_property_new_arg:nn { .dim_set:c } {
+  \keys_variable_set:cnNN {#1} { dim } { } n
+}
 \keys_property_new_arg:nn { .dim_gset:N } {
   \keys_variable_set:NnNN #1 { dim } g n
 }
+\keys_property_new_arg:nn { .dim_gset:c } {
+  \keys_variable_set:cnNN {#1} { dim } g n
+}
 \keys_property_new_arg:nn { .generate_choices:n } {
   \keys_choices_generate:n {#1}
 }
 \keys_property_new_arg:nn { .int_set:N } {
   \keys_variable_set:NnNN #1 { int } { } n
 }
+\keys_property_new_arg:nn { .int_set:c } {
+  \keys_variable_set:cnNN {#1} { int } { } n
+}
 \keys_property_new_arg:nn { .int_gset:N } {
   \keys_variable_set:NnNN #1 { int } g n
 }
+\keys_property_new_arg:nn { .int_gset:c } {
+  \keys_variable_set:cnNN {#1} { int } g n
+}
 \keys_property_new_arg:nn { .meta:n } {
   \keys_meta_make:n {#1}
 }
@@ -387,21 +400,39 @@
 \keys_property_new_arg:nn { .skip_set:N } {
   \keys_variable_set:NnNN #1 { skip } { } n
 }
+\keys_property_new_arg:nn { .skip_set:c } {
+  \keys_variable_set:cnNN {#1} { skip } { } n
+}
 \keys_property_new_arg:nn { .skip_gset:N } {
   \keys_variable_set:NnNN #1 { skip } g n
 }
+\keys_property_new_arg:nn { .skip_gset:c } {
+  \keys_variable_set:cnNN {#1} { skip } g n
+}
 \keys_property_new_arg:nn { .tl_set:N } {
   \keys_variable_set:NnNN #1 { tl } { } n
 }
+\keys_property_new_arg:nn { .tl_set:c } {
+  \keys_variable_set:cnNN {#1} { tl } { } n
+}
 \keys_property_new_arg:nn { .tl_set_x:N } {
   \keys_variable_set:NnNN #1 { tl } { } x
 }
+\keys_property_new_arg:nn { .tl_set_x:c } {
+  \keys_variable_set:cnNN {#1} { tl } { } x
+}
 \keys_property_new_arg:nn { .tl_gset:N } {
   \keys_variable_set:NnNN #1 { tl } g n
 }
+\keys_property_new_arg:nn { .tl_gset:c } {
+  \keys_variable_set:cnNN {#1} { tl } g n
+}
 \keys_property_new_arg:nn { .tl_gset_x:N } {
   \keys_variable_set:NnNN #1 { tl } g x
 }
+\keys_property_new_arg:nn { .tl_gset_x:c } {
+  \keys_variable_set:cnNN {#1} { tl } g x
+}
 \keys_property_new:nn { .value_forbidden: } {
   \keys_value_requirement:n { forbidden }
 }