expl3 update (26may10)

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

10 files changed, 42 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/latex/expl3/expl3.pdf b/Master/texmf-dist/doc/latex/expl3/expl3.pdf
index c9a5b600ea9..3f89d5d2b6a 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 178b3203300..56338147168 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/l3int.dtx b/Master/texmf-dist/source/latex/expl3/l3int.dtx
index ac4819295e6..ae9c1cae3bc 100644
--- a/Master/texmf-dist/source/latex/expl3/l3int.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3int.dtx
@@ -36,7 +36,7 @@
 \RequirePackage{l3names}
 %</driver|package>
 %\fi
-\GetIdInfo$Id: l3int.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3int.dtx 1933 2010-05-25 00:26:38Z will $
           {L3 Experimental Integer module}
 %\iffalse
 %<*driver>
@@ -198,7 +198,7 @@
 % primitive "\tex_showthe:D" which is also responsible to produce the values for
 % other internal quantities.  We have chosen to use individual functions
 % for counters, dimensions etc.\ to allow checks and to make the code
-% more self-explaining.
+% more self-explanatory.
 % \end{texnote}
 % \end{function}
 %
diff --git a/Master/texmf-dist/source/latex/expl3/l3keys.dtx b/Master/texmf-dist/source/latex/expl3/l3keys.dtx
index 6fdeb8b7cae..188a2ac8547 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 1894 2010-04-13 07:37:59Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1931 2010-05-24 21:06:50Z joseph $
   {L3 Experimental key-value support}
 %\iffalse
 %<*driver>
@@ -872,7 +872,7 @@
 % when a choice is first made. So there is no need for any escape code.
 %    \begin{macrocode}
 \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 / \tl_to_str:n {#1} } {
     \keys_execute_aux:nn { \l_keys_path_tl / unknown } { }
   }
 }
diff --git a/Master/texmf-dist/source/latex/expl3/l3skip.dtx b/Master/texmf-dist/source/latex/expl3/l3skip.dtx
index 47ffe1c7535..572c4e919a1 100644
--- a/Master/texmf-dist/source/latex/expl3/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3skip.dtx
@@ -36,7 +36,7 @@
 \RequirePackage{l3names}
 %</driver|package>
 %\fi
-\GetIdInfo$Id: l3skip.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3skip.dtx 1933 2010-05-25 00:26:38Z will $
        {L3 Experimental skip registers}
 %\iffalse
 %<*driver>
@@ -166,7 +166,7 @@
 % primitive "\tex_showthe:D" which is also responsible to produce the values for
 % other internal quantities.  We have chosen to use individual functions
 % for counters, dimensions etc.\ to allow checks and to make the code
-% more self-explaining.
+% more self-explanatory.
 % \end{texnote}
 % \end{function}
 %
@@ -365,16 +365,16 @@
 % \begin{function}{ \dim_show:N |
 %                   \dim_show:c }
 % \begin{syntax}
-%   "\dim_show:N" <skip>
+%   "\dim_show:N" <dim>
 % \end{syntax}
-% This function pauses the compilation and displays the length value kept 
+% This function pauses the compilation and displays the length value kept
 % in <skip> in the console output and log file.
 % \begin{texnote}
 % The function "\dim_show:N" could be implemented directly as the \TeX{}
 % primitive "\tex_showthe:D" which is also responsible to produce the values for
 % other internal quantities.  We have chosen to use individual functions
 % for counters, dimensions etc.\ to allow checks and to make the code
-% more self-explaining.
+% more self-explanatory.
 % \end{texnote}
 % \end{function}
 %
@@ -529,6 +529,14 @@
 % \end{texnote}
 % \end{function}
 %
+% \begin{function}{ \muskip_show:N }
+% \begin{syntax}
+%   "\muskip_show:N" <muskip>
+% \end{syntax}
+% This function pauses the compilation and displays the length value kept
+% in <muskip> in the console output and log file.
+% \end{function}
+%
 % \end{documentation}
 %
 % \begin{implementation}
@@ -727,8 +735,8 @@
 % \begin{macro}{\skip_show:c}
 %    Diagnostics.
 %    \begin{macrocode}
-\cs_new_eq:NN  \skip_show:N \tex_showthe:D
-\cs_new_nopar:Npn \skip_show:c #1 { \skip_show:N \cs:w #1 \cs_end: }
+\cs_new_eq:NN  \skip_show:N \kernel_register_show:N
+\cs_generate_variant:Nn \skip_show:N {c}
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
@@ -947,8 +955,8 @@
 % \begin{macro}{\dim_show:c}
 %    Diagnostics.
 %    \begin{macrocode}
-\cs_new_eq:NN  \dim_show:N \tex_showthe:D
-\cs_new_nopar:Npn \dim_show:c #1 { \dim_show:N \cs:w #1 \cs_end: }
+\cs_new_eq:NN  \dim_show:N \kernel_register_show:N
+\cs_generate_variant:Nn \dim_show:N {c}
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
@@ -1083,6 +1091,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
+% \begin{macro}{\muskip_show:N}
+%    \begin{macrocode}
+\cs_new_eq:NN \muskip_show:N \kernel_register_show:N
+%    \end{macrocode}
+% \end{macro}
+%
+%
 %    \begin{macrocode}
 %</initex|package>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/expl3/l3toks.dtx b/Master/texmf-dist/source/latex/expl3/l3toks.dtx
index 5d89fbdfb27..8faade60b58 100644
--- a/Master/texmf-dist/source/latex/expl3/l3toks.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3toks.dtx
@@ -36,7 +36,7 @@
 \RequirePackage{l3names}
 %</driver|package>
 %\fi
-\GetIdInfo$Id: l3toks.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3toks.dtx 1933 2010-05-25 00:26:38Z will $
           {L3 Experimental Token Registers}
 %\iffalse
 %<*driver>
@@ -560,9 +560,8 @@
 % \begin{macro}{\toks_show:N}
 % \begin{macro}{\toks_show:c}
 %    This function shows the contents of a token register on the terminal.
-% TODO: this is not pretty when the argument is a control sequence that doesn't exist!
 %    \begin{macrocode}
-\cs_new_eq:NN           \toks_show:N \tex_showthe:D
+\cs_new_eq:NN           \toks_show:N \kernel_register_show:N
 \cs_generate_variant:Nn \toks_show:N {c}
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty
index 7ece9f20bc8..6909f182286 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3int.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3int.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3int.dtx 1933 2010-05-25 00:26:38Z will $
           {L3 Experimental Integer module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index 9b9fb06ee5c..c2ef0cf8954 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 1894 2010-04-13 07:37:59Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1931 2010-05-24 21:06:50Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -86,7 +86,7 @@
   \tl_set:cx { \c_keys_root_tl \l_keys_path_tl .choice_code_tl } {#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 / \tl_to_str:n {#1} } {
     \keys_execute_aux:nn { \l_keys_path_tl / unknown } { }
   }
 }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index a809531c62f..86bf7cf1d43 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3skip.dtx 1933 2010-05-25 00:26:38Z will $
        {L3 Experimental skip registers}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -100,8 +100,8 @@
 \cs_new_nopar:Npn \skip_vertical:n #1 { \skip_vertical:N \skip_eval:n{#1} }
 \cs_new_eq:NN \skip_use:N \tex_the:D
 \cs_generate_variant:Nn \skip_use:N {c}
-\cs_new_eq:NN  \skip_show:N \tex_showthe:D
-\cs_new_nopar:Npn \skip_show:c #1 { \skip_show:N \cs:w #1 \cs_end: }
+\cs_new_eq:NN  \skip_show:N \kernel_register_show:N
+\cs_generate_variant:Nn \skip_show:N {c}
 \cs_new_protected_nopar:Npn \skip_eval:n #1 { \etex_glueexpr:D #1 \scan_stop: }
 %%\chk_if_free_cs:N \l_tmpa_skip
 %%\tex_skipdef:D\l_tmpa_skip 255  %currently taken up by \skip@
@@ -155,8 +155,8 @@
 \cs_generate_variant:Nn \dim_gsub:Nn {cn}
 \cs_new_eq:NN \dim_use:N \tex_the:D
 \cs_generate_variant:Nn \dim_use:N {c}
-\cs_new_eq:NN  \dim_show:N \tex_showthe:D
-\cs_new_nopar:Npn \dim_show:c #1 { \dim_show:N \cs:w #1 \cs_end: }
+\cs_new_eq:NN  \dim_show:N \kernel_register_show:N
+\cs_generate_variant:Nn \dim_show:N {c}
 \dim_new:N \l_tmpa_dim
 \dim_new:N \l_tmpb_dim
 \dim_new:N \l_tmpc_dim
@@ -194,6 +194,7 @@
 \cs_new_protected_nopar:Npn \muskip_sub:Nn#1#2{\tex_advance:D#1-\etex_muexpr:D#2\scan_stop:}
 \cs_new_protected_nopar:Npn \muskip_gsub:Nn{\pref_global:D\muskip_sub:Nn}
 \cs_new_eq:NN \muskip_use:N \tex_the:D
+\cs_new_eq:NN \muskip_show:N \kernel_register_show:N
 %% 
 %%
 %% End of file `l3skip.sty'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3toks.sty b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
index b8f1e17568c..ce2a909f3db 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3toks.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3toks.dtx 1919 2010-05-22 05:56:38Z will $
+\GetIdInfo$Id: l3toks.dtx 1933 2010-05-25 00:26:38Z will $
           {L3 Experimental Token Registers}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -96,7 +96,7 @@
 }
 \cs_generate_variant:Nn \toks_use_clear:N  {c}
 \cs_generate_variant:Nn \toks_use_gclear:N {c}
-\cs_new_eq:NN           \toks_show:N \tex_showthe:D
+\cs_new_eq:NN           \toks_show:N \kernel_register_show:N
 \cs_generate_variant:Nn \toks_show:N {c}
 \cs_new_protected_nopar:Npn \toks_put_left:Nn #1 {
   \exp_after:wN \toks_put_left_aux:w \exp_after:wN \q_mark