expl3 1905 (19may10)

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

13 files changed, 275 insertions, 212 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/expl3.sty b/Master/texmf-dist/tex/latex/expl3/expl3.sty
index be01e6750ef..c943d158a23 100644
--- a/Master/texmf-dist/tex/latex/expl3/expl3.sty
+++ b/Master/texmf-dist/tex/latex/expl3/expl3.sty
@@ -49,11 +49,20 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: expl3.dtx 1866 2010-03-23 08:29:27Z joseph $
+\GetIdInfo$Id: expl3.dtx 1905 2010-05-19 07:45:31Z joseph $
        {L3 Experimental code bundle wrapper}%
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
 \RequirePackage{etex}
+\newcommand*\@l@expl@check@declarations@bool{0}
+\newcommand*\@l@expl@log@functions@bool{0}
+\DeclareOption{check-declarations}{
+  \def\@l@expl@check@declarations@bool{1}
+}
+\DeclareOption{log-functions}{
+  \def\@l@expl@log@functions@bool{1}
+}
+\ProcessOptions\relax
 \RequirePackage{
   l3basics,
   l3expan,
@@ -80,12 +89,7 @@
   l3xref,
   l3file
 }
-\bool_new:N \_l_expl_check_declarations_bool
-\DeclareOption{check-declarations}{
-  \bool_set_true:N \_l_expl_check_declarations_bool
-}
-\ProcessOptions \scan_stop:
-\bool_if:NT \_l_expl_check_declarations_bool {
+\bool_if:nT { \@l@expl@check@declarations@bool } {
   \msg_kernel_new:nnnn { check } { non-declared-variable }
     { The~variable~#1~has~not~been~declared~\msg_line_context:. }
     {
@@ -97,118 +101,6 @@
       \\
       LaTeX~will~create~the~variable~and~continue.
     }
-  \cs_set_protected:Npn \_tl_check_exists:N #1
-    {
-      \cs_if_exist:NF #1
-        {
-          \msg_kernel_error:nnx { check } { non-declared-variable }
-            { \token_to_str:N #1 }
-        }
-    }
-  \cs_set_protected:Npn \tl_set:Nn #1#2
-    {
-      \_tl_check_exists:N #1
-      \cs_set_nopar:Npx #1 { \exp_not:n {#2} }
-    }
-  \cs_set_protected:Npn \tl_set:Nx #1#2
-    {
-      \_tl_check_exists:N #1
-      \cs_set_nopar:Npx #1 {#2}
-    }
-  \cs_set_protected:Npn \tl_gset:Nn #1#2
-    {
-      \_tl_check_exists:N #1
-      \cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
-    }
-  \cs_set_protected:Npn \tl_gset:Nx #1#2
-    {
-      \_tl_check_exists:N #1
-      \cs_gset_nopar:Npx #1 {#2}
-    }
-  \cs_set_protected:Npn \tl_set_eq:NN #1#2
-    {
-      \_tl_check_exists:N #1
-      \_tl_check_exists:N #2
-      \cs_set_eq:NN #1 #2
-    }
-  \cs_set_protected:Npn \tl_gset_eq:NN #1#2
-    {
-      \_tl_check_exists:N #1
-      \_tl_check_exists:N #2
-      \cs_gset_eq:NN #1 #2
-    }
-  \cs_set_protected:Npn \tl_put_right:Nn #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
-  }
-  \cs_set_protected:Npn \tl_put_right:NV #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
-  }
-  \cs_set_protected:Npn \tl_put_right:Nv #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
-  }
-  \cs_set_protected:Npn \tl_put_right:No #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} }
-  }
-  \cs_set_protected:Npn \tl_put_right:Nx #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #1 #2 }
-  }
-  \cs_set_protected:Npn \tl_gput_right:Nn #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
-  }
-  \cs_set_protected:Npn \tl_gput_right:NV #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
-  }
-  \cs_set_protected:Npn \tl_gput_right:Nv #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
-  }
-  \cs_set_protected:Npn \tl_gput_right:Nx #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:V #1 #2 }
-  }
-  \cs_set_protected:Npn \tl_put_left:Nn #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_put_left:NV #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_put_left:Nv #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_put_left:No #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_put_left:Nx #1#2 {
-    \_tl_check_exists:N #1
-    \cs_set_nopar:Npx #1 { #2 \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_gput_left:Nn #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_gput_left:NV #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_gput_left:Nv #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
-  }
-  \cs_set_protected:Npn \tl_gput_left:Nx #1#2 {
-    \_tl_check_exists:N #1
-    \cs_gset_nopar:Npx #1 { #2 \exp_not:V #1 }
-  }
 }
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
index 1934eccb2d8..59d1e75cee0 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 1853 2010-03-21 09:11:08Z joseph $
+\GetIdInfo$Id: l3basics.dtx 1905 2010-05-19 07:45:31Z joseph $
        {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -136,7 +136,7 @@
 \cs_set_protected:Npn \use:x #1 {
   \group_begin:
     \cs_set:Npx \cs_tmp: {#1}
-    \exp_args:wN
+    \exp_after:wN
   \group_end:
   \cs_tmp:
 }
@@ -422,6 +422,19 @@
 \cs_set_protected_nopar:Npn \chk_if_free_cs:c {
   \exp_args:Nc \chk_if_free_cs:N
 }
+\tex_ifodd:D \@l@expl@log@functions@bool \else
+  \cs_set_protected_nopar:Npn \chk_if_free_cs:N #1 {
+    \cs_if_free:NF #1
+      {
+        \msg_kernel_bug:x
+          {
+            Command~name~`\token_to_str:N #1'~
+            already~defined!~
+            Current~meaning:~\token_to_meaning:N #1
+          }
+      }
+  }
+\fi
 \cs_set_protected_nopar:Npn \chk_if_exist_cs:N #1 {
   \cs_if_exist:NF #1
   {
@@ -465,22 +478,22 @@
    #2 ##1
  }
 }
-\cs_tmp:w \cs_new_nopar:Npn \cs_set_nopar:Npn
-\cs_tmp:w \cs_new_nopar:Npx\cs_set_nopar:Npx
-\cs_tmp:w \cs_new:Npn \cs_set:Npn
-\cs_tmp:w \cs_new:Npx\cs_set:Npx
-\cs_tmp:w \cs_new_protected_nopar:Npn \cs_set_protected_nopar:Npn
-\cs_tmp:w \cs_new_protected_nopar:Npx\cs_set_protected_nopar:Npx
-\cs_tmp:w \cs_new_protected:Npn \cs_set_protected:Npn
-\cs_tmp:w \cs_new_protected:Npx\cs_set_protected:Npx
-\cs_tmp:w \cs_gnew_nopar:Npn \cs_gset_nopar:Npn
-\cs_tmp:w \cs_gnew_nopar:Npx \cs_gset_nopar:Npx
-\cs_tmp:w \cs_gnew:Npn \cs_gset:Npn
-\cs_tmp:w \cs_gnew:Npx \cs_gset:Npx
-\cs_tmp:w \cs_gnew_protected_nopar:Npn \cs_gset_protected_nopar:Npn
-\cs_tmp:w \cs_gnew_protected_nopar:Npx \cs_gset_protected_nopar:Npx
-\cs_tmp:w \cs_gnew_protected:Npn \cs_gset_protected:Npn
-\cs_tmp:w \cs_gnew_protected:Npx \cs_gset_protected:Npx
+\cs_tmp:w \cs_new_local_nopar:Npn           \cs_set_nopar:Npn
+\cs_tmp:w \cs_new_local_nopar:Npx           \cs_set_nopar:Npx
+\cs_tmp:w \cs_new_local:Npn                 \cs_set:Npn
+\cs_tmp:w \cs_new_local:Npx                 \cs_set:Npx
+\cs_tmp:w \cs_new_local_protected_nopar:Npn \cs_set_protected_nopar:Npn
+\cs_tmp:w \cs_new_local_protected_nopar:Npx \cs_set_protected_nopar:Npx
+\cs_tmp:w \cs_new_local_protected:Npn       \cs_set_protected:Npn
+\cs_tmp:w \cs_new_local_protected:Npx       \cs_set_protected:Npx
+\cs_tmp:w \cs_new_nopar:Npn           \cs_gset_nopar:Npn
+\cs_tmp:w \cs_new_nopar:Npx           \cs_gset_nopar:Npx
+\cs_tmp:w \cs_new:Npn                 \cs_gset:Npn
+\cs_tmp:w \cs_new:Npx                 \cs_gset:Npx
+\cs_tmp:w \cs_new_protected_nopar:Npn \cs_gset_protected_nopar:Npn
+\cs_tmp:w \cs_new_protected_nopar:Npx \cs_gset_protected_nopar:Npx
+\cs_tmp:w \cs_new_protected:Npn       \cs_gset_protected:Npn
+\cs_tmp:w \cs_new_protected:Npx       \cs_gset_protected:Npx
 \cs_set:Npn \cs_tmp:w #1#2{
   \cs_new_nopar:Npn #1 { \exp_args:Nc #2 }
 }
@@ -488,34 +501,50 @@
 \cs_tmp:w \cs_set_nopar:cpx  \cs_set_nopar:Npx
 \cs_tmp:w \cs_gset_nopar:cpn  \cs_gset_nopar:Npn
 \cs_tmp:w \cs_gset_nopar:cpx  \cs_gset_nopar:Npx
-\cs_tmp:w \cs_new_nopar:cpn  \cs_new_nopar:Npn
-\cs_tmp:w \cs_new_nopar:cpx  \cs_new_nopar:Npx
-\cs_tmp:w \cs_gnew_nopar:cpn  \cs_gnew_nopar:Npn
-\cs_tmp:w \cs_gnew_nopar:cpx  \cs_gnew_nopar:Npx
+\cs_tmp:w  \cs_new_local_nopar:cpn  \cs_new_local_nopar:Npn
+\cs_tmp:w  \cs_new_local_nopar:cpx  \cs_new_local_nopar:Npx
+\cs_tmp:w  \cs_new_nopar:cpn        \cs_new_nopar:Npn
+\cs_tmp:w  \cs_new_nopar:cpx        \cs_new_nopar:Npx
 \cs_tmp:w \cs_set:cpn  \cs_set:Npn
 \cs_tmp:w \cs_set:cpx  \cs_set:Npx
 \cs_tmp:w \cs_gset:cpn  \cs_gset:Npn
 \cs_tmp:w \cs_gset:cpx  \cs_gset:Npx
 \cs_tmp:w \cs_new:cpn   \cs_new:Npn
 \cs_tmp:w \cs_new:cpx  \cs_new:Npx
-\cs_tmp:w \cs_gnew:cpn  \cs_gnew:Npn
-\cs_tmp:w \cs_gnew:cpx  \cs_gnew:Npx
+\cs_tmp:w \cs_new_local:cpn  \cs_new_local:Npn
+\cs_tmp:w \cs_new_local:cpx  \cs_new_local:Npx
 \cs_tmp:w \cs_set_protected_nopar:cpn \cs_set_protected_nopar:Npn
 \cs_tmp:w \cs_set_protected_nopar:cpx  \cs_set_protected_nopar:Npx
 \cs_tmp:w \cs_gset_protected_nopar:cpn  \cs_gset_protected_nopar:Npn
 \cs_tmp:w \cs_gset_protected_nopar:cpx  \cs_gset_protected_nopar:Npx
 \cs_tmp:w \cs_new_protected_nopar:cpn   \cs_new_protected_nopar:Npn
 \cs_tmp:w \cs_new_protected_nopar:cpx  \cs_new_protected_nopar:Npx
-\cs_tmp:w \cs_gnew_protected_nopar:cpn  \cs_gnew_protected_nopar:Npn
-\cs_tmp:w \cs_gnew_protected_nopar:cpx  \cs_gnew_protected_nopar:Npx
+\cs_tmp:w \cs_new_local_protected_nopar:cpn  \cs_new_local_protected_nopar:Npn
+\cs_tmp:w \cs_new_local_protected_nopar:cpx  \cs_new_local_protected_nopar:Npx
 \cs_tmp:w \cs_set_protected:cpn \cs_set_protected:Npn
 \cs_tmp:w \cs_set_protected:cpx \cs_set_protected:Npx
 \cs_tmp:w \cs_gset_protected:cpn  \cs_gset_protected:Npn
 \cs_tmp:w \cs_gset_protected:cpx  \cs_gset_protected:Npx
 \cs_tmp:w \cs_new_protected:cpn  \cs_new_protected:Npn
 \cs_tmp:w \cs_new_protected:cpx  \cs_new_protected:Npx
-\cs_tmp:w \cs_gnew_protected:cpn \cs_gnew_protected:Npn
-\cs_tmp:w \cs_gnew_protected:cpx  \cs_gnew_protected:Npx
+\cs_tmp:w \cs_new_local_protected:cpn \cs_new_local_protected:Npn
+\cs_tmp:w \cs_new_local_protected:cpx \cs_new_local_protected:Npx
+\cs_set_eq:NwN           \cs_gnew_nopar:Npn            \cs_new_nopar:Npn
+\cs_set_eq:NwN                 \cs_gnew:Npn                  \cs_new:Npn
+\cs_set_eq:NwN \cs_gnew_protected_nopar:Npn  \cs_new_protected_nopar:Npn
+\cs_set_eq:NwN       \cs_gnew_protected:Npn        \cs_new_protected:Npn
+\cs_set_eq:NwN           \cs_gnew_nopar:Npx            \cs_new_nopar:Npx
+\cs_set_eq:NwN                 \cs_gnew:Npx                  \cs_new:Npx
+\cs_set_eq:NwN \cs_gnew_protected_nopar:Npx  \cs_new_protected_nopar:Npx
+\cs_set_eq:NwN       \cs_gnew_protected:Npx        \cs_new_protected:Npx
+\cs_set_eq:NwN           \cs_gnew_nopar:cpn            \cs_new_nopar:cpn
+\cs_set_eq:NwN                 \cs_gnew:cpn                  \cs_new:cpn
+\cs_set_eq:NwN \cs_gnew_protected_nopar:cpn  \cs_new_protected_nopar:cpn
+\cs_set_eq:NwN       \cs_gnew_protected:cpn        \cs_new_protected:cpn
+\cs_set_eq:NwN           \cs_gnew_nopar:cpx            \cs_new_nopar:cpx
+\cs_set_eq:NwN                 \cs_gnew:cpx                  \cs_new:cpx
+\cs_set_eq:NwN \cs_gnew_protected_nopar:cpx  \cs_new_protected_nopar:cpx
+\cs_set_eq:NwN       \cs_gnew_protected:cpx        \cs_new_protected:cpx
 \cs_set_nopar:cpn{use_0_parameter:}{}
 \cs_set_nopar:cpn{use_1_parameter:}{{##1}}
 \cs_set_nopar:cpn{use_2_parameter:}{{##1}{##2}}
@@ -534,7 +563,7 @@
 \cs_set_protected_nopar:Npn \cs_set_eq:cc { \exp_args:Ncc \cs_set_eq:NN }
 \cs_new_protected:Npn \cs_new_eq:NN #1 {
   \chk_if_free_cs:N #1
-  \cs_set_eq:NN #1
+  \pref_global:D \cs_set_eq:NN #1
 }
 \cs_new_protected_nopar:Npn \cs_new_eq:cN { \exp_args:Nc  \cs_new_eq:NN }
 \cs_new_protected_nopar:Npn \cs_new_eq:Nc { \exp_args:NNc \cs_new_eq:NN }
@@ -543,13 +572,17 @@
 \cs_new_protected_nopar:Npn \cs_gset_eq:Nc { \exp_args:NNc  \cs_gset_eq:NN }
 \cs_new_protected_nopar:Npn \cs_gset_eq:cN { \exp_args:Nc   \cs_gset_eq:NN }
 \cs_new_protected_nopar:Npn \cs_gset_eq:cc { \exp_args:Ncc  \cs_gset_eq:NN }
-\cs_new_protected:Npn \cs_gnew_eq:NN #1 {
+\cs_new_protected:Npn \cs_new_local_eq:NN #1 {
   \chk_if_free_cs:N #1
-  \pref_global:D \cs_set_eq:NN #1
+  \cs_set_eq:NN #1
 }
 \cs_new_protected_nopar:Npn \cs_gnew_eq:cN { \exp_args:Nc  \cs_gnew_eq:NN }
 \cs_new_protected_nopar:Npn \cs_gnew_eq:Nc { \exp_args:NNc \cs_gnew_eq:NN }
 \cs_new_protected_nopar:Npn \cs_gnew_eq:cc { \exp_args:Ncc \cs_gnew_eq:NN }
+\cs_set_eq:NN   \cs_gnew_eq:NN   \cs_new_eq:NN
+\cs_set_eq:NN   \cs_gnew_eq:cN   \cs_new_eq:cN
+\cs_set_eq:NN   \cs_gnew_eq:Nc   \cs_new_eq:Nc
+\cs_set_eq:NN   \cs_gnew_eq:cc   \cs_new_eq:cc
 \cs_new_protected_nopar:Npn \cs_undefine:N  #1 {
   \cs_set_eq:NN #1    \c_undefined:D
 }
@@ -562,6 +595,16 @@
 \cs_new_protected_nopar:Npn \cs_gundefine:c #1 {
   \cs_gset_eq:cN {#1} \c_undefined:D
 }
+\cs_new_nopar:Npn \kernel_register_show:N #1 {
+  \cs_if_exist:NTF #1
+   {
+    \tex_showthe:D #1
+   }
+   {
+    \msg_kernel_bug:x {Register~ `\token_to_str:N #1'~ is~ not~ defined.}
+   }
+}
+\cs_new_nopar:Npn \kernel_register_show:c { \exp_args:Nc \int_show:N }
 \if_cs_exist:N \xetex_version:D
   \cs_new_eq:NN \c_xetex_is_engine_bool \c_true_bool
 \else:
@@ -676,14 +719,14 @@
 \cs_tmp:w {new_protected}{Nx}{Npx}
 \cs_tmp:w {new_protected_nopar}{Nn}{Npn}
 \cs_tmp:w {new_protected_nopar}{Nx}{Npx}
-\cs_tmp:w {gnew}{Nn}{Npn}
-\cs_tmp:w {gnew}{Nx}{Npx}
-\cs_tmp:w {gnew_nopar}{Nn}{Npn}
-\cs_tmp:w {gnew_nopar}{Nx}{Npx}
-\cs_tmp:w {gnew_protected}{Nn}{Npn}
-\cs_tmp:w {gnew_protected}{Nx}{Npx}
-\cs_tmp:w {gnew_protected_nopar}{Nn}{Npn}
-\cs_tmp:w {gnew_protected_nopar}{Nx}{Npx}
+\cs_tmp:w {new_local}{Nn}{Npn}
+\cs_tmp:w {new_local}{Nx}{Npx}
+\cs_tmp:w {new_local_nopar}{Nn}{Npn}
+\cs_tmp:w {new_local_nopar}{Nx}{Npx}
+\cs_tmp:w {new_local_protected}{Nn}{Npn}
+\cs_tmp:w {new_local_protected}{Nx}{Npx}
+\cs_tmp:w {new_local_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {new_local_protected_nopar}{Nx}{Npx}
 \cs_set:Npn \cs_tmp:w #1#2#3{
   \cs_set_protected:cpx {cs_#1:#2}##1##2{
     \exp_not:N\cs_generate_from_arg_count:cNnn {##1}
@@ -715,14 +758,14 @@
 \cs_tmp:w {new_protected}{cx}{Npx}
 \cs_tmp:w {new_protected_nopar}{cn}{Npn}
 \cs_tmp:w {new_protected_nopar}{cx}{Npx}
-\cs_tmp:w {gnew}{cn}{Npn}
-\cs_tmp:w {gnew}{cx}{Npx}
-\cs_tmp:w {gnew_nopar}{cn}{Npn}
-\cs_tmp:w {gnew_nopar}{cx}{Npx}
-\cs_tmp:w {gnew_protected}{cn}{Npn}
-\cs_tmp:w {gnew_protected}{cx}{Npx}
-\cs_tmp:w {gnew_protected_nopar}{cn}{Npn}
-\cs_tmp:w {gnew_protected_nopar}{cx}{Npx}
+\cs_tmp:w {new_local}{cn}{Npn}
+\cs_tmp:w {new_local}{cx}{Npx}
+\cs_tmp:w {new_local_nopar}{cn}{Npn}
+\cs_tmp:w {new_local_nopar}{cx}{Npx}
+\cs_tmp:w {new_local_protected}{cn}{Npn}
+\cs_tmp:w {new_local_protected}{cx}{Npx}
+\cs_tmp:w {new_local_protected_nopar}{cn}{Npn}
+\cs_tmp:w {new_local_protected_nopar}{cx}{Npx}
 \prg_set_conditional:Npnn \cs_if_eq:NN #1#2{p,TF,T,F}{
   \if_meaning:w #1#2
   \prg_return_true: \else: \prg_return_false: \fi:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3box.sty b/Master/texmf-dist/tex/latex/expl3/l3box.sty
index bada61a0001..f703cba4faf 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3box.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3box.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3box.dtx 1867 2010-03-23 13:03:12Z will $
+\GetIdInfo$Id: l3box.dtx 1902 2010-05-13 14:58:53Z mittelba $
           {L3 Experimental Box module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -59,8 +59,8 @@
 }
 \cs_new_protected:Npn \box_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newbox \locbox
   #1
 }
@@ -99,10 +99,10 @@
 \cs_generate_variant:Nn \box_set_to_last:N {c}
 \cs_new_protected_nopar:Npn \box_gset_to_last:N {\pref_global:D \box_set_to_last:N}
 \cs_generate_variant:Nn \box_gset_to_last:N {c}
-\cs_new:Npn \box_move_left:nn #1#2{\tex_moveleft:D\dim_eval:n{#1}{#2}}
-\cs_new:Npn \box_move_right:nn #1#2{\tex_moveright:D\dim_eval:n{#1}{#2}}
-\cs_new:Npn \box_move_up:nn #1#2{\tex_raise:D\dim_eval:n{#1}{#2}}
-\cs_new:Npn \box_move_down:nn #1#2{\tex_lower:D\dim_eval:n{#1}{#2}}
+\cs_new:Npn \box_move_left:nn #1#2{\tex_moveleft:D\dim_eval:n{#1} #2}
+\cs_new:Npn \box_move_right:nn #1#2{\tex_moveright:D\dim_eval:n{#1} #2}
+\cs_new:Npn \box_move_up:nn #1#2{\tex_raise:D\dim_eval:n{#1} #2}
+\cs_new:Npn \box_move_down:nn #1#2{\tex_lower:D\dim_eval:n{#1} #2}
 \cs_new_protected_nopar:Npn \box_clear:N #1{\box_set_eq:NN #1 \c_empty_box }
 \cs_generate_variant:Nn \box_clear:N {c}
 \cs_new_protected_nopar:Npn \box_gclear:N {\pref_global:D\box_clear:N}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
index 0fff4893136..286c61a03a5 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 1786 2010-02-09 12:52:45Z joseph $
+\GetIdInfo$Id: l3doc.dtx 1890 2010-04-11 03:37:15Z will $
           {L3 Experimental documentation class}
 \ProvidesExplClass
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -187,7 +187,7 @@
 }
 \group_begin:
 \char_make_active:N \<
-\cs_gnew_nopar:Npn \function {
+\cs_new_nopar:Npn \function {
   \char_make_active:N \<
   \cs_set_eq:NN < \doc_open_meta:n
   \group_begin:
@@ -282,12 +282,12 @@
 \tl_map_inline:nn {0123456789} { \cs_gset_eq:cN {char_other_#1} #1 }
 \group_begin:
   \tl_map_inline:nn {0123456789} { \char_make_active:N #1 }
-  \cs_gnew:Npn \doc_open_meta:n {
+  \cs_new:Npn \doc_open_meta:n {
     \group_begin:
       \tl_map_function:nN {0123456789} \doc_assign_num:n
       \doc_close_meta:w
   }
-  \cs_gnew:Npn \Arg {
+  \cs_new:Npn \Arg {
     \texttt{ \char`\{ }
     \group_begin:
       \tl_map_function:nN {0123456789} \doc_assign_num:n
diff --git a/Master/texmf-dist/tex/latex/expl3/l3int.sty b/Master/texmf-dist/tex/latex/expl3/l3int.sty
index 0e9c2df8859..61688872989 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 1867 2010-03-23 13:03:12Z will $
+\GetIdInfo$Id: l3int.dtx 1893 2010-04-11 12:54:05Z will $
           {L3 Experimental Integer module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -62,8 +62,8 @@
 }
 \cs_new_protected_nopar:Npn \int_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newcount \loccount
   #1
 }
@@ -116,8 +116,8 @@
 \cs_generate_variant:Nn \int_gsub:Nn {cn}
 \cs_new_eq:NN \int_use:N \tex_the:D
 \cs_new_nopar:Npn \int_use:c #1{\int_use:N \cs:w#1\cs_end:}
-\cs_new_eq:NN  \int_show:N \tex_showthe:D
-\cs_new_nopar:Npn \int_show:c {\exp_args:Nc \int_show:N }
+\cs_new_eq:NN  \int_show:N  \kernel_register_show:N
+\cs_new_eq:NN  \int_show:c  \kernel_register_show:c
 \cs_new_nopar:Npn \int_to_arabic:n #1{ \intexpr_eval:n{#1}}
 \cs_new_protected_nopar:Npn \int_roman_lcuc_mapping:Nnn #1#2#3{
   \cs_set_nopar:cpn {int_to_lc_roman_#1:}{#2}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3io.sty b/Master/texmf-dist/tex/latex/expl3/l3io.sty
index 1bd8c0d627f..5b34cc4cf45 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3io.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3io.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3io.dtx 1853 2010-03-21 09:11:08Z joseph $
+\GetIdInfo$Id: l3io.dtx 1890 2010-04-11 03:37:15Z will $
           {L3 Experimental i/o module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -90,11 +90,11 @@
 \cs_generate_variant:Nn \iow_raw_new:N { c }
 \cs_generate_variant:Nn \ior_raw_new:N { c }
 \cs_new_protected_nopar:Npn \iow_new:N #1 {
-  \cs_gnew_eq:NN #1 \c_iow_log_stream
+  \cs_new_eq:NN #1 \c_iow_log_stream
 }
 \cs_generate_variant:Nn \iow_new:N { c }
 \cs_new_protected_nopar:Npn \ior_new:N #1 {
-  \cs_gnew_eq:NN #1 \c_ior_log_stream
+  \cs_new_eq:NN #1 \c_ior_log_stream
 }
 \cs_generate_variant:Nn \ior_new:N { c }
 \cs_new_protected_nopar:Npn \iow_open:Nn #1#2 {
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index d05909724cb..9b9fb06ee5c 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 1863 2010-03-22 20:15:06Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1894 2010-04-13 07:37:59Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -454,14 +454,14 @@
     Check~that~you~have~spelled~the~key~name~correctly.
   }
 \msg_kernel_new:nnnn { keys } { property-requires-value }
-  { The property '#1' requires a value. }
+  { 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. }
+  { The~key~property~'#1'~is~unknown. }
   {
     \l_msg_coding_error_text_tl
     LaTeX~has~been~asked~to~set~the~property~'#1'~for~key~'#2':\\
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keyval.sty b/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
index 782b899dd87..ad42ce146ee 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3keyval.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3keyval.dtx 1872 2010-03-24 07:53:45Z mittelba $
+\GetIdInfo$Id: l3keyval.dtx 1890 2010-04-11 03:37:15Z will $
        {L3 Experimental keyval processing}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -103,14 +103,14 @@
 }
 \group_begin:
 \char_set_catcode:nn{`\Q}{3}
-\cs_gnew:Npn\KV_remove_surrounding_spaces:nw#1#2\q_nil{
+\cs_new:Npn\KV_remove_surrounding_spaces:nw#1#2\q_nil{
   #1{\KV_remove_surrounding_spaces_auxi:w \exp_not:N#2Q~Q}
 }
-\cs_gnew:Npn\KV_remove_surrounding_spaces_auxi:w#1~Q{
+\cs_new:Npn\KV_remove_surrounding_spaces_auxi:w#1~Q{
   \KV_remove_surrounding_spaces_auxii:w #1 Q
 }
-\cs_gnew:Npn\KV_remove_surrounding_spaces_auxii:w#1Q#2{#1}
-\cs_gnew_protected:Npn\KV_add_value_element:w\q_stop#1\q_nil{
+\cs_new:Npn\KV_remove_surrounding_spaces_auxii:w#1Q#2{#1}
+\cs_new_protected:Npn\KV_add_value_element:w\q_stop#1\q_nil{
   \tl_set:Nf\l_KV_currval_tl {
     \KV_remove_surrounding_spaces_auxi:w \exp_not:N#1Q~Q
   }
@@ -118,7 +118,7 @@
     \exp_after:wN { \l_KV_currval_tl }
   }
 }
-\cs_gnew_protected:Npn\KV_set_key_element:w#1\q_nil{
+\cs_new_protected:Npn\KV_set_key_element:w#1\q_nil{
   \tl_set:Nf\l_KV_currkey_tl
   {
     \exp_last_unbraced:NNo \KV_remove_surrounding_spaces_auxi:w
diff --git a/Master/texmf-dist/tex/latex/expl3/l3seq.sty b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
index 8f6b8c95e01..2ccbaf7c977 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3seq.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3seq.dtx 1857 2010-03-21 21:32:09Z joseph $
+\GetIdInfo$Id: l3seq.dtx 1879 2010-03-29 17:48:38Z mittelba $
           {L3 Experimental sequences and stacks}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -73,6 +73,10 @@
 \cs_new_eq:NN \seq_gset_eq:cN \cs_gset_eq:cN
 \cs_new_eq:NN \seq_gset_eq:Nc \cs_gset_eq:Nc
 \cs_new_eq:NN \seq_gset_eq:cc \cs_gset_eq:cc
+\cs_new_protected_nopar:Npn \seq_concat:NNN #1#2#3 {
+  \tl_set:Nx #1 { \exp_not:V #2 \exp_not:V #3 }
+}
+\cs_generate_variant:Nn \seq_concat:NNN {ccc}
 \cs_new_protected_nopar:Npn \seq_gconcat:NNN #1#2#3 {
   \tl_gset:Nx #1 { \exp_not:V #2 \exp_not:V #3 }
 }
@@ -150,7 +154,6 @@
 }
 \cs_generate_variant:Nn \seq_gput_left:Nn {NV,No,Nx,c,cV,co}
 \cs_generate_variant:Nn \seq_gput_right:Nn {NV,No,Nx,c,cV,co}
-\cs_generate_variant:Nn \seq_gput_right:Nn {Nc}
 \cs_new_protected:Npn \seq_map_variable_aux:Nnw #1#2 \seq_elt:w #3 \seq_elt_end: {
   \tl_set:Nn #1 {#3}
   \quark_if_nil:NT #1 \seq_map_break:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3skip.sty b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
index 210d9e0c86b..edf9e627ada 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3skip.sty
@@ -15,7 +15,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% 
-%% File: l3skip.dtx Copyright (C) 2005-2008 Frank Mittelbach, LaTeX3 project
+%% File: l3skip.dtx Copyright (C) 2005-2010 Frank Mittelbach, 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,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 1867 2010-03-23 13:03:12Z will $
+\GetIdInfo$Id: l3skip.dtx 1892 2010-04-11 08:59:45Z will $
        {L3 Experimental skip registers}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -59,8 +59,8 @@
 }
 \cs_new_protected_nopar:Npn \skip_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newskip \locskip
   #1
 }
@@ -144,8 +144,8 @@
 }
 \cs_new_protected_nopar:Npn \dim_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newdimen \locdimen
   #1
 }
@@ -205,8 +205,8 @@
 }
 \cs_new_protected_nopar:Npn \muskip_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newmuskip \locmuskip
   #1
 }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
index 00dcc85798c..121cdb68c7f 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 1873 2010-03-24 08:32:54Z joseph $
+\GetIdInfo$Id: l3tl.dtx 1905 2010-05-19 07:45:31Z joseph $
           {L3 Experimental Token Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -64,6 +64,17 @@
 }
 \cs_new_protected_nopar:Npn \tl_new:N #1{\tl_new:Nn #1{}}
 \cs_new_protected_nopar:Npn \tl_new:c #1{\tl_new:cn {#1}{}}
+\cs_new_protected:Npn \tl_new_local:Nn #1#2{
+  \chk_if_free_cs:N #1
+  \cs_set_nopar:Npn #1{#2}
+}
+\cs_generate_variant:Nn \tl_new_local:Nn {cn}
+\cs_new_protected:Npn \tl_new_local:Nx #1#2{
+  \chk_if_free_cs:N #1
+  \cs_set_nopar:Npx #1{#2}
+}
+\cs_new_protected_nopar:Npn \tl_new_local:N #1{\tl_new_local:Nn #1{}}
+\cs_new_protected_nopar:Npn \tl_new_local:c #1{\tl_new_local:cn {#1}{}}
 \cs_new_protected:Npn \tl_const:Nn #1#2 {
   \tl_new:N   #1
   \tl_gset:Nn #1 {#2}
@@ -690,6 +701,120 @@
       \tl_head:w #1 \q_nil \exp_not:N #2
     \prg_return_true: \else: \prg_return_false: \fi:
 }
+\tex_ifodd:D \@l@expl@check@declarations@bool \scan_stop:
+  \cs_set_protected:Npn \_tl_check_exists:N #1
+    {
+      \cs_if_exist:NF #1
+        {
+          \msg_kernel_error:nnx { check } { non-declared-variable }
+            { \token_to_str:N #1 }
+        }
+    }
+  \cs_set_protected:Npn \tl_set:Nn #1#2
+    {
+      \_tl_check_exists:N #1
+      \cs_set_nopar:Npx #1 { \exp_not:n {#2} }
+    }
+  \cs_set_protected:Npn \tl_set:Nx #1#2
+    {
+      \_tl_check_exists:N #1
+      \cs_set_nopar:Npx #1 {#2}
+    }
+  \cs_set_protected:Npn \tl_gset:Nn #1#2
+    {
+      \_tl_check_exists:N #1
+      \cs_gset_nopar:Npx #1 { \exp_not:n {#2} }
+    }
+  \cs_set_protected:Npn \tl_gset:Nx #1#2
+    {
+      \_tl_check_exists:N #1
+      \cs_gset_nopar:Npx #1 {#2}
+    }
+  \cs_set_protected:Npn \tl_set_eq:NN #1#2
+    {
+      \_tl_check_exists:N #1
+      \_tl_check_exists:N #2
+      \cs_set_eq:NN #1 #2
+    }
+  \cs_set_protected:Npn \tl_gset_eq:NN #1#2
+    {
+      \_tl_check_exists:N #1
+      \_tl_check_exists:N #2
+      \cs_gset_eq:NN #1 #2
+    }
+  \cs_set_protected:Npn \tl_put_right:Nn #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
+  }
+  \cs_set_protected:Npn \tl_put_right:NV #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
+  }
+  \cs_set_protected:Npn \tl_put_right:Nv #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
+  }
+  \cs_set_protected:Npn \tl_put_right:No #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} }
+  }
+  \cs_set_protected:Npn \tl_put_right:Nx #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #1 #2 }
+  }
+  \cs_set_protected:Npn \tl_gput_right:Nn #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} }
+  }
+  \cs_set_protected:Npn \tl_gput_right:NV #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 }
+  }
+  \cs_set_protected:Npn \tl_gput_right:Nv #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} }
+  }
+  \cs_set_protected:Npn \tl_gput_right:Nx #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:V #1 #2 }
+  }
+  \cs_set_protected:Npn \tl_put_left:Nn #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_put_left:NV #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_put_left:Nv #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_put_left:No #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_put_left:Nx #1#2 {
+    \_tl_check_exists:N #1
+    \cs_set_nopar:Npx #1 { #2 \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_gput_left:Nn #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_gput_left:NV #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_gput_left:Nv #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 }
+  }
+  \cs_set_protected:Npn \tl_gput_left:Nx #1#2 {
+    \_tl_check_exists:N #1
+    \cs_gset_nopar:Npx #1 { #2 \exp_not:V #1 }
+  }
+\tex_fi:D
 %% 
 %%
 %% End of file `l3tl.sty'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3token.sty b/Master/texmf-dist/tex/latex/expl3/l3token.sty
index 46de3e83a57..4feba030a6b 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3token.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3token.sty
@@ -15,7 +15,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% 
-%% File: l3token.dtx Copyright (C) 2005-2009 LaTeX3 project
+%% File: l3token.dtx Copyright (C) 2005-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,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 1857 2010-03-21 21:32:09Z joseph $
+\GetIdInfo$Id: l3token.dtx 1890 2010-04-11 03:37:15Z will $
        {L3 Experimental token investigation and manipulation}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -147,7 +147,7 @@
 \cs_new_nopar:Npn \char_show_value_sfcode:n #1 {
   \char_show_value_sfcode:w \intexpr_eval:w #1\intexpr_eval_end:
 }
-\cs_new_protected_nopar:Npn \token_new:Nn #1#2 {\cs_gnew_eq:NN #1#2}
+\cs_new_protected_nopar:Npn \token_new:Nn #1#2 {\cs_new_eq:NN #1#2}
 \cs_new_eq:NN \c_group_begin_token {
 \cs_new_eq:NN \c_group_end_token }
 \group_begin:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3toks.sty b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
index afe5ff158a9..534859a8c83 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3toks.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3toks.sty
@@ -15,7 +15,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% 
-%% File: l3toks.dtx Copyright (C) 1990-2009 LaTeX3 project
+%% File: l3toks.dtx Copyright (C) 1990-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,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3toks.dtx 1867 2010-03-23 13:03:12Z will $
+\GetIdInfo$Id: l3toks.dtx 1892 2010-04-11 08:59:45Z will $
           {L3 Experimental Token Registers}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -59,8 +59,8 @@
 }
 \cs_new_protected_nopar:Npn \toks_new_local:N #1 {
   \chk_if_free_cs:N #1
-  \int_compare:nNnTF
-    \tex_currentgrouplevel:D = 0
+  \intexpr_compare:nNnTF
+    \etex_currentgrouplevel:D = 0
     \newtoks \loctoks
   #1
 }