expl3 1766 (12jan10)

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

6 files changed, 105 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/expl3/expl3.pdf b/Master/texmf-dist/doc/latex/expl3/expl3.pdf
index 33bb7807ee9..63ab9d388d5 100644
--- a/Master/texmf-dist/doc/latex/expl3/expl3.pdf
+++ b/Master/texmf-dist/doc/latex/expl3/expl3.pdf
diff --git a/Master/texmf-dist/doc/latex/expl3/source3.pdf b/Master/texmf-dist/doc/latex/expl3/source3.pdf
index 7aaf91e1c6e..7c17beb4c36 100644
--- a/Master/texmf-dist/doc/latex/expl3/source3.pdf
+++ b/Master/texmf-dist/doc/latex/expl3/source3.pdf
diff --git a/Master/texmf-dist/source/latex/expl3/l3doc.dtx b/Master/texmf-dist/source/latex/expl3/l3doc.dtx
index 6360be85f54..c78b348da4a 100644
--- a/Master/texmf-dist/source/latex/expl3/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3doc.dtx
@@ -77,7 +77,7 @@ Do not distribute a modified version of this file.
 %    \end{macrocode}
 %
 %<*driver|class>
-\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}
 %</driver|class>
 %
@@ -926,7 +926,7 @@ Do not distribute a modified version of this file.
 % \end{arguments}
 %    \begin{macrocode}
 \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/source/latex/expl3/l3keys.dtx b/Master/texmf-dist/source/latex/expl3/l3keys.dtx
index a33a1ff1c28..e67d54223de 100644
--- a/Master/texmf-dist/source/latex/expl3/l3keys.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3keys.dtx
@@ -35,7 +35,7 @@
 \RequirePackage{l3names}
 %</driver|package>
 %\fi
-\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}
 %\iffalse
 %<*driver>
@@ -238,7 +238,9 @@
 %
 %\begin{function}{
 %  .dim_set:N  |
+%  .dim_set:c  |
 %  .dim_gset:N |
+%  .dim_gset:c |
 %}
 %  \begin{syntax}
 %    <key> .dim_set:N  = <dimension>
@@ -259,7 +261,9 @@
 %
 %\begin{function}{
 %  .int_set:N  |
+%  .int_set:c  |
 %  .int_gset:N |
+%  .int_gset:c |
 %}
 %  \begin{syntax}
 %    <key> .int_set:N  = <integer>
@@ -282,7 +286,9 @@
 %
 %\begin{function}{
 %  .skip_set:N  |
+%  .skip_set:c  |
 %  .skip_gset:N |
+%  .skip_gset:c |
 %}
 %  \begin{syntax}
 %    <key> .skip_set:N  = <skip>
@@ -293,9 +299,13 @@
 %
 %\begin{function}{
 %  .tl_set:N    |
+%  .tl_set:c    |
 %  .tl_set_x:N  |
+%  .tl_set_x:c  |
 %  .tl_gset:N   |
+%  .tl_gset:c   |
 %  .tl_gset_x:N |
+%  .tl_gset_x:c |
 %}
 %  \begin{syntax}
 %    <key> .tl_set:N  = <token list variable>
@@ -621,9 +631,12 @@
 %   Sets <key> to have <requirement> concerning <value>.
 %\end{function}
 %
-%\begin{function}{\keys_variable_set:NnNN}
+%\begin{function}{
+%  \keys_variable_set:NnNN |
+%  \keys_variable_set:cnNN |
+%}
 %   \begin{syntax}
-%     "\keys_variable_set:NN" <var> <type> <scope> <expansion>
+%     "\keys_variable_set:NnNN" <var> <type> <scope> <expansion>
 %   \end{syntax}
 %   Sets <key> to assign <value> to <variable>. The <scope> (blank
 %   for local, \texttt{g} for global) and <type> (\texttt{tl},
@@ -1242,6 +1255,7 @@
 %\end{macro}
 %
 %\begin{macro}{\keys_variable_set:NnNN}
+%\begin{macro}{\keys_variable_set:cnNN}
 % Setting a variable takes the type and scope separately so that 
 % it is easy to make a new variable if needed.
 %    \begin{macrocode}
@@ -1253,8 +1267,10 @@
     \exp_not:c { #2 _ #3 set:N #4 } \exp_not:N #1 {##1}
   }
 }
+\cs_generate_variant:Nn \keys_variable_set:NnNN { c }
 %    \end{macrocode}
 %\end{macro}
+%\end{macro}
 %
 %\subsubsection{Properties}
 %
@@ -1327,18 +1343,28 @@
 %\end{macro}
 %
 %\begin{macro}{.dim_set:N}
+%\begin{macro}{.dim_set:c}
 %\begin{macro}{.dim_gset:N}
+%\begin{macro}{.dim_gset:c}
 % Setting a variable is very easy: just pass the data along.
 %    \begin{macrocode}
 \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
+}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
+%\end{macro}
+%\end{macro}
 %
 %\begin{macro}{.generate_choices:n}
 % Making choices is easy.
@@ -1350,18 +1376,28 @@
 %\end{macro}
 %
 %\begin{macro}{.int_set:N}
+%\begin{macro}{.int_set:c}
 %\begin{macro}{.int_gset:N}
+%\begin{macro}{.int_gset:c}
 % Setting a variable is very easy: just pass the data along.
 %    \begin{macrocode}
 \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
+}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
+%\end{macro}
+%\end{macro}
 %
 %\begin{macro}{.meta:n}
 %\begin{macro}{.meta:x}
@@ -1378,42 +1414,72 @@
 %\end{macro}
 %
 %\begin{macro}{.skip_set:N}
+%\begin{macro}{.skip_set:c}
 %\begin{macro}{.skip_gset:N}
+%\begin{macro}{.skip_gset:c}
 % Setting a variable is very easy: just pass the data along.
 %    \begin{macrocode}
 \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
+}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
+%\end{macro}
+%\end{macro}
 %
 %\begin{macro}{.tl_set:N}
+%\begin{macro}{.tl_set:c}
 %\begin{macro}{.tl_set_x:N}
+%\begin{macro}{.tl_set_x:c}
 %\begin{macro}{.tl_gset:N}
+%\begin{macro}{.tl_gset:c}
 %\begin{macro}{.tl_gset_x:N}
+%\begin{macro}{.tl_gset_x:c}
 % Setting a variable is very easy: just pass the data along.
 %    \begin{macrocode}
 \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
+}
 %    \end{macrocode}
 %\end{macro}
 %\end{macro}
 %\end{macro}
 %\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
 %
 %\begin{macro}{.value_forbidden:}
 %\begin{macro}{.value_required:}
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 }
 }