expl3 1509 (5sep09)

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

14 files changed, 84 insertions, 210 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/expl3.sty b/Master/texmf-dist/tex/latex/expl3/expl3.sty
index cd5739205f3..8b493deed0d 100644
--- a/Master/texmf-dist/tex/latex/expl3/expl3.sty
+++ b/Master/texmf-dist/tex/latex/expl3/expl3.sty
@@ -49,7 +49,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: expl3.dtx 1439 2009-08-05 19:05:55Z joseph $
+\GetIdInfo$Id: expl3.dtx 1458 2009-08-12 03:35:07Z will $
        {L3 Experimental code bundle wrapper}%
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
index 08ce70bc2ee..ba4a2431289 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 1414 2009-06-16 07:34:57Z joseph $
+\GetIdInfo$Id: l3basics.dtx 1453 2009-08-08 14:38:49Z joseph $
        {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -219,6 +219,12 @@
     \cs_new_protected:Npn {count}
   }{\cs_get_arg_count_from_signature:N #1}
 }
+\cs_set:Npn \prg_set_eq_conditional:NNn #1#2#3 {
+  \prg_set_eq_conditional_aux:NNNn \cs_set_eq:cc #1#2 {#3}
+}
+\cs_set:Npn \prg_new_eq_conditional:NNn #1#2#3 {
+  \prg_set_eq_conditional_aux:NNNn \cs_new_eq:cc #1#2 {#3}
+}
 \cs_set:Npn \prg_get_count_aux:nn #1#2 {#1{#2}}
 \cs_set:Npn \prg_get_parm_aux:nw #1#2#{#1{#2}}
 \cs_set:Npn \prg_generate_conditional_aux:nnNNnnnn #1#2#3#4#5#6#7#8{
@@ -273,6 +279,24 @@
     \exp_after:wN\use_none:nn\fi:\use:n
   }
 }
+\cs_set:Npn \prg_set_eq_conditional_aux:NNNn #1#2#3#4 {
+  \prg_set_eq_conditional_aux:NNNw #1#2#3#4,?,\q_recursion_stop
+}
+\cs_set:Npn \prg_set_eq_conditional_aux:NNNw #1#2#3#4, {
+  \if:w ? #4 \scan_stop:
+    \exp_after:wN \use_none_delimit_by_q_recursion_stop:w
+  \fi:
+  #1 {
+    \exp_args:NNc \cs_split_function:NN #2 {prg_conditional_form_#4:nnn}
+  }{
+    \exp_args:NNc \cs_split_function:NN #3 {prg_conditional_form_#4:nnn}
+  }
+  \prg_set_eq_conditional_aux:NNNw #1{#2}{#3}
+}
+\cs_set:Npn \prg_conditional_form_p:nnn  #1#2#3 {#1_p:#2}
+\cs_set:Npn \prg_conditional_form_TF:nnn #1#2#3 {#1:#2TF}
+\cs_set:Npn \prg_conditional_form_T:nnn  #1#2#3 {#1:#2T}
+\cs_set:Npn \prg_conditional_form_F:nnn  #1#2#3 {#1:#2F}
 \tex_chardef:D \c_true_bool = 1~
 \tex_chardef:D \c_false_bool = 0~
 \cs_set_nopar:Npn \cs_to_str:N {
@@ -695,31 +719,6 @@
 \cs_new_nopar:Npn \cs_if_eq:ccTF {\exp_args:Ncc \cs_if_eq:NNTF}
 \cs_new_nopar:Npn \cs_if_eq:ccT  {\exp_args:Ncc \cs_if_eq:NNT}
 \cs_new_nopar:Npn \cs_if_eq:ccF  {\exp_args:Ncc \cs_if_eq:NNF}
-\cs_new_nopar:Npn\file_not_found:nTF #1#2#3{\IfFileExists{#1}{#3}{#2}}
-\cs_set:Npn \prg_set_eq_conditional:NNn #1#2#3 {
-  \prg_set_eq_conditional_aux:NNNn \cs_set_eq:cc #1#2 {#3}
-}
-\cs_set:Npn \prg_new_eq_conditional:NNn #1#2#3 {
-  \prg_set_eq_conditional_aux:NNNn \cs_new_eq:cc #1#2 {#3}
-}
-\cs_set:Npn \prg_set_eq_conditional_aux:NNNn #1#2#3#4 {
-  \prg_set_eq_conditional_aux:NNNw #1#2#3#4,?,\q_recursion_stop
-}
-\cs_set:Npn \prg_set_eq_conditional_aux:NNNw #1#2#3#4, {
-  \if:w ? #4 \scan_stop:
-    \exp_after:wN \use_none_delimit_by_q_recursion_stop:w
-  \fi:
-  #1 {
-    \exp_args:NNc \cs_split_function:NN #2 {prg_conditional_form_#4:nnn}
-  }{
-    \exp_args:NNc \cs_split_function:NN #3 {prg_conditional_form_#4:nnn}
-  }
-  \prg_set_eq_conditional_aux:NNNw #1{#2}{#3}
-}
-\cs_set:Npn \prg_conditional_form_p:nnn  #1#2#3 {#1_p:#2}
-\cs_set:Npn \prg_conditional_form_TF:nnn #1#2#3 {#1:#2TF}
-\cs_set:Npn \prg_conditional_form_T:nnn  #1#2#3 {#1:#2T}
-\cs_set:Npn \prg_conditional_form_F:nnn  #1#2#3 {#1:#2F}
 %% 
 %%
 %% End of file `l3basics.sty'.
diff --git a/Master/texmf-dist/tex/latex/expl3/l3doc.cls b/Master/texmf-dist/tex/latex/expl3/l3doc.cls
index 09d6928412f..691afa415e9 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 1398 2009-06-08 15:53:26Z joseph $
+\GetIdInfo$Id: l3doc.dtx 1451 2009-08-08 06:33:34Z joseph $
           {L3 Experimental documentation class}
 \ProvidesExplClass
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -179,7 +179,6 @@
   \group_begin:
     \MakePrivateLetters
     \char_make_other:N \|
-    \char_make_other:N \^
     \char_make_other:N \\
     \char_make_space:N \~
     \char_make_ignore:N \ % space
diff --git a/Master/texmf-dist/tex/latex/expl3/l3expan.sty b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
index 7cb632f1fd9..8a3c64a26ab 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3expan.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 1418 2009-07-04 08:24:17Z joseph $
+\GetIdInfo$Id: l3expan.dtx 1464 2009-08-16 11:02:19Z joseph $
        {L3 Experimental Argument Expansion module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -157,6 +157,7 @@
 \cs_set_nopar:Npn \exp_args:Ncf {\::c\::f\:::}
 \cs_set_nopar:Npn \exp_args:Nnf {\::n\::f\:::}
 \cs_set_nopar:Npn \exp_args:Nno {\::n\::o\:::}
+\cs_set_nopar:Npn \exp_args:NnV {\::n\::V\:::}
 \cs_set_nopar:Npn \exp_args:Nnx {\::n\::x\:::}
 
 \cs_set_nopar:Npn \exp_args:Noc {\::o\::c\:::}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3intexpr.sty b/Master/texmf-dist/tex/latex/expl3/l3intexpr.sty
index 91d7d2daeb0..311fdc6dddc 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3intexpr.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3intexpr.sty
@@ -97,15 +97,16 @@
   \prg_return_true: \else: \prg_return_false: \fi:
 }
 \cs_set:cpn {intexpr_compare_<=:w} #1<=#2\q_nil{
-  \if_intexpr_compare:w #1<\intexpr_eval:w #2 +\c_one \intexpr_eval_end:
-  \prg_return_true: \else: \prg_return_false: \fi:
+  \if_intexpr_compare:w #1>\intexpr_eval:w #2 \intexpr_eval_end:
+  \prg_return_false: \else: \prg_return_true: \fi:
 }
 \cs_set:cpn {intexpr_compare_>=:w} #1>=#2\q_nil{
-  \if_intexpr_compare:w #1>\intexpr_eval:w #2 - \c_one \intexpr_eval_end:
-  \prg_return_true: \else: \prg_return_false: \fi:
+  \if_intexpr_compare:w #1<\intexpr_eval:w #2 \intexpr_eval_end:
+  \prg_return_false: \else: \prg_return_true: \fi:
 }
 \prg_set_conditional:Npnn \intexpr_compare:nNn #1#2#3{p,TF,T,F}{
-  \if_intexpr_compare:w \intexpr_eval:w #1 #2 \intexpr_eval:w #3 \intexpr_eval_end:
+  \if_intexpr_compare:w \intexpr_eval:w #1 #2 \intexpr_eval:w #3
+  \intexpr_eval_end:
   \prg_return_true: \else: \prg_return_false: \fi:
 }
 \cs_set:Npn \intexpr_abs:n #1{
diff --git a/Master/texmf-dist/tex/latex/expl3/l3keys.sty b/Master/texmf-dist/tex/latex/expl3/l3keys.sty
index 7af3a864b83..0029aedf9b4 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 1441 2009-08-05 19:23:23Z joseph $
+\GetIdInfo$Id: l3keys.dtx 1504 2009-09-03 20:29:00Z joseph $
   {L3 Experimental key-value support}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -226,6 +226,13 @@
     #2
   }
 }
+\prg_set_conditional:Nnn \keys_if_exist:nn {TF,T,F} {
+  \cs_if_exist:cTF { \c_keys_root_tl #1 / #2 .cmd:w } {
+    \prg_return_true:
+  }{
+    \prg_return_false:
+  }
+}
 \cs_new_nopar:Npn \keys_if_value_requirement:nTF #1 {
   \tl_if_eq:ccTF { c_keys_value_ #1 _tl } {
     \c_keys_root_tl \l_keys_path_tl .req_tl
@@ -244,6 +251,7 @@
     \exp_not:N \keys_set:nn { \l_keys_module_tl } {#1}
   }
 }
+\cs_generate_variant:Nn \keys_meta_make:n { x }
 \cs_new_nopar:Nn \keys_property_find:n {
   \tl_set:Nx \l_keys_path_tl { \l_keys_module_tl / }
   \tl_if_in:nnTF {#1} {.} {
@@ -301,7 +309,7 @@
   \keys_value_or_default:n {#2}
   \keys_if_value_requirement:nTF { required } {
     \bool_if:NTF \l_keys_no_value_bool {
-      \msg_kernel_error:nx  { key~value~required } { \l_keys_path_tl }
+      \msg_kernel_error:nx  { key-value-required } { \l_keys_path_tl }
     }{
       \keys_set_elt_aux:
     }
@@ -438,6 +446,9 @@
 \keys_property_new:nn { .meta:n } {
   \keys_meta_make:n {#1}
 }
+\keys_property_new:nn { .meta:x } {
+  \keys_meta_make:x {#1}
+}
 \keys_property_new:nn { .set:N } {
   \keys_variable_set:NN n #1
 }
@@ -465,7 +476,7 @@
   The key `#1' cannot taken a value:\\%
   the given input `#2' is being ignored.%
 }
-\msg_kernel_new:nn { key~value~required } {%
+\msg_kernel_new:nn { key-value-required } {%
   The key `#1' requires a value\\%
   and is being ignored.%
 }
diff --git a/Master/texmf-dist/tex/latex/expl3/l3msg.sty b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
index 7f5cc5344f0..757394ff669 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3msg.sty
@@ -49,7 +49,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 1423 2009-07-12 20:23:53Z joseph $
+\GetIdInfo$Id: l3msg.dtx 1502 2009-09-01 16:23:32Z joseph $
   {L3 Experimental LaTeX Messages module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -93,9 +93,9 @@
 {}%
 }%
 \tl_new:Nn \c_msg_on_line_tl { on~line }
-\tl_new:Nn \c_msg_text_prefix_tl      { msg_text // }
-\tl_new:Nn \c_msg_more_text_prefix_tl { msg_text_more // }
-\tl_new:Nn \c_msg_code_prefix_tl      { msg_code // }
+\tl_new:Nn \c_msg_text_prefix_tl      { msg_text ~>~ }
+\tl_new:Nn \c_msg_more_text_prefix_tl { msg_text_more ~>~ }
+\tl_new:Nn \c_msg_code_prefix_tl      { msg_code ~>~ }
 \tl_new:N \l_msg_class_tl
 \tl_new:N \l_msg_current_class_tl
 \clist_new:N \l_msg_names_clist
diff --git a/Master/texmf-dist/tex/latex/expl3/l3names.sty b/Master/texmf-dist/tex/latex/expl3/l3names.sty
index 28f36638615..dccba570136 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3names.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3names.sty
@@ -52,10 +52,10 @@
   \begingroup
     \def\GetIdInfoString{#1}%
     \def\IdInfoStringUnexp{Id}%
-    \ifx \GetIdInfoString \IdInfoStringUnexp
-      \def\next{\endgroup\GetIdInfoMissing}
+    \ifx\GetIdInfoString\IdInfoStringUnexp
+      \def\next{\endgroup\GetIdInfoMissing}%
     \else
-      \def\next{\endgroup\GetIdInfoFull$#1$}
+      \def\next{\endgroup\GetIdInfoFull$#1$}%
     \fi
     \next
 }
@@ -87,7 +87,7 @@
   \gdef\filedescription{#1}%
   \ProvidesPackage{[unknown package]}[0000/00/00 v0.0 #1]
 }
-\GetIdInfo$Id: l3names.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3names.dtx 1452 2009-08-08 14:09:32Z joseph $
      {L3 Experimental Naming Scheme for TeX Primitives}
 \endgroup
 \begingroup
@@ -124,7 +124,7 @@
 \endlinechar=32\relax % endline is space
 \catcode95=11\relax   % underscore letter
 \catcode58=11\relax   % colon letter
-\let\tex_let:D\let
+\let \tex_let:D \let
 \DeclareOption{removeoldnames}{
   \long\def\name_undefine:N#1{
     \tex_let:D#1\c_undefined}}
@@ -132,10 +132,10 @@
   \long\def\name_undefine:N#1{}}
 \ExecuteOptions{keepoldnames}
 \ProcessOptions
-\long\def\name_primitive:NN#1#2{
+\long \def \name_primitive:NN #1#2 {
   \tex_let:D #2 #1
   \name_undefine:N #1
-      }
+}
 \name_primitive:NN \                      \tex_space:D
 \name_primitive:NN \/                     \tex_italiccor:D
 \name_primitive:NN \-                     \tex_hyphen:D
@@ -635,10 +635,10 @@
     \name_primitive:NN \strcmp \pdf_strcmp:D
   \tex_fi:D
 \tex_fi:D
-\tex_def:D\ExplSyntaxOn{
+\tex_def:D \ExplSyntaxOn {
   \tex_ifodd:D \ExplSyntaxStatus \tex_relax:D
   \tex_else:D
-    \tex_edef:D\ExplSyntaxOff{
+    \tex_edef:D \ExplSyntaxOff {
       \etex_unexpanded:D{
         \tex_ifodd:D \ExplSyntaxStatus \tex_relax:D
           \tex_def:D \ExplSyntaxStatus{0}
@@ -651,7 +651,7 @@
       \tex_catcode:D  58=\tex_the:D \tex_catcode:D 58 \tex_relax:D
       \tex_noexpand:D \tex_fi:D
     }
-    \tex_def:D\ExplSyntaxStatus{1}
+    \tex_def:D \ExplSyntaxStatus { 1 }
     \tex_catcode:D  126=10 \tex_relax:D % tilde is a space char.
     \tex_catcode:D   32=9  \tex_relax:D % space is ignored
     \tex_catcode:D    9=9  \tex_relax:D % tab also ignored
@@ -660,16 +660,16 @@
     \tex_catcode:D   58=11 \tex_relax:D % colon letter
   \tex_fi:D
 }
-\tex_def:D\ExplSyntaxStatus{1}
-\tex_def:D \ExplSyntaxNamesOn{
+\tex_def:D \ExplSyntaxStatus { 1 }
+\tex_def:D \ExplSyntaxNamesOn {
   \tex_catcode:D `\_=11\tex_relax:D
   \tex_catcode:D `\:=11\tex_relax:D
 }
-\tex_def:D \ExplSyntaxNamesOff{
+\tex_def:D \ExplSyntaxNamesOff {
   \tex_catcode:D `\_=8\tex_relax:D
   \tex_catcode:D `\:=12\tex_relax:D
 }
-\tex_def:D\GetIdInfo{
+\tex_def:D \GetIdInfo {
   \tex_begingroup:D
   \tex_catcode:D   32=10 \tex_relax:D % needed? Probably for now.
   \GetIdInfoMaybeMissing:w
diff --git a/Master/texmf-dist/tex/latex/expl3/l3num.sty b/Master/texmf-dist/tex/latex/expl3/l3num.sty
index f2a12228b84..884658dc5c1 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3num.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3num.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3num.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3num.dtx 1451 2009-08-08 06:33:34Z joseph $
        {L3 Experimental token numbers}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3precom.sty b/Master/texmf-dist/tex/latex/expl3/l3precom.sty
index c8a07a52680..7beb5d43c72 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3precom.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3precom.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3precom.dtx 1362 2009-05-28 20:19:21Z joseph $
+\GetIdInfo$Id: l3precom.dtx 1453 2009-08-08 14:38:49Z joseph $
   {L3 Experimental precompilation module}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -91,12 +91,15 @@
 \iow_close:N\c_cs_dump_stream
 \tex_message:D{~finished}
 }
-\cs_new_nopar:Npn\cs_load_dump:n#1{
-\file_not_found:nTF{#1.cmp}
-{\tl_gset:Nn\g_cs_dump_name_tl{#1.cmp}}
-{\input{#1.cmp}
-\cs_set_eq:NN\cs_dump:\fi:
-\if_false:}}
+\cs_new_nopar:Npn \cs_load_dump:n #1 {
+  \file_if_exist:nTF { #1 .cmp } {
+    \file_input:n { #1 .cmp }
+    \cs_set_eq:NN \cs_dump: \fi:
+    \if_false:
+  }{
+    \tl_gset:Nn \g_cs_dump_name_tl { #1 .cmp }
+  }
+}
 \num_new:N\g_gen_sym_num \num_gset:Nn\g_gen_sym_num{0}
 \num_new:N\g_ggen_sym_num \num_gset:Nn\g_ggen_sym_num{0}
 \cs_new_nopar:Npn\cs_gen_sym:N#1{
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prg.sty b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
index d696e412e06..de730887e82 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prg.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 1365 2009-05-31 17:26:17Z mittelba $
+\GetIdInfo$Id: l3prg.dtx 1451 2009-08-08 06:33:34Z joseph $
        {L3 Experimental control structures}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prop.sty b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
index a7a24f6b530..f66173c17bf 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3prop.sty
@@ -48,7 +48,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 1420 2009-07-08 19:07:14Z joseph $
+\GetIdInfo$Id: l3prop.dtx 1506 2009-09-04 21:52:12Z joseph $
           {L3 Experimental Property Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -130,7 +130,7 @@
     \prop_tmp:w #5
   }
 }
-\cs_generate_variant:Nn \prop_put:Nnn { NnV, cnn }
+\cs_generate_variant:Nn \prop_put:Nnn { NnV, NVn, NVV, cnn }
 \cs_generate_variant:Nn \prop_gput:Nnn {NnV,Nno,Nnx,Nox,cnn,ccx}
 \cs_new:Npn \prop_del:Nn #1#2{
   \prop_split_aux:Nnn #1{#2}{\prop_del_aux:w {\toks_set:Nn #1}{#2}}}
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty
index ef0a0ac8af4..e6906d8952c 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 1421 2009-07-10 21:10:59Z joseph $
+\GetIdInfo$Id: l3tl.dtx 1505 2009-09-03 20:29:19Z joseph $
           {L3 Experimental Token Lists}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -577,6 +577,8 @@
 \cs_new_eq:NN \tl_head_i:w \tl_head:w
 \cs_new:Npn \tl_tail:w #1#2\q_nil{#2}
 \cs_new:Npn \tl_head_iii:w #1#2#3#4\q_nil{#1#2#3}
+\cs_generate_variant:Nn \tl_head:n { V }
+\cs_generate_variant:Nn \tl_tail:n { V }
 \prg_new_conditional:Npnn \tl_if_head_eq_meaning:nN #1#2 {p,TF,T,F} {
   \exp_after:wN \if_meaning:w \tl_head:w #1 \q_nil #2
     \prg_return_true: \else: \prg_return_false: \fi:
diff --git a/Master/texmf-dist/tex/latex/expl3/l3vers.dtx b/Master/texmf-dist/tex/latex/expl3/l3vers.dtx
deleted file mode 100644
index c61d07ce94c..00000000000
--- a/Master/texmf-dist/tex/latex/expl3/l3vers.dtx
+++ /dev/null
@@ -1,142 +0,0 @@
-% \iffalse
-%% File: l3vers.dtx Copyright (C) 1990-2009 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
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the ``expl3 bundle'' (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%<*driver|package>
-\RequirePackage{l3names}
-%</driver|package>
-%\fi
-\GetIdInfo$Id: l3vers.dtx 1378 2009-06-01 19:15:56Z joseph $
-       {L3 Experimental LaTeX format version}
-%\iffalse
-%<*driver>
-%\fi
-\ProvidesFile{\filename.\filenameext}
-  [\filedate\space v\fileversion\space\filedescription]
-%\iffalse
-\documentclass[full]{l3doc}
-\begin{document}
-\DocInput{\filename.\filenameext}
-\end{document}
-%</driver>
-% \fi
-%
-% \begin{documentation}
-%
-% \section{Version Identification}
-% Here we identify the date and version number of this release of
-% \LaTeX3, and set |\tex_everyjob:D| so that it is printed at the start of
-% every \LaTeX3 run.
-%
-% \begin{variable}{\c_format_name|\c_format_date}
-% Name and date.
-% \end{variable}
-%
-% \begin{variable}{\c_fmt_too_old}
-% Age in months past "\c_format_date" after which an error is called 
-% during format generation.
-% \end{variable}
-%
-% \begin{function}{\chk_format_age:w}
-% Function that calculates the age of the format and calls an error if it
-% is too old.
-% \end{function}
-%
-% \end{documentation}
-%
-% \begin{implementation}
-%
-% \begin{macro}{\c_format_name}
-% \begin{macro}{\c_format_date}
-%    \begin{macrocode}
-%<*initex>
-\cs_set_nopar:Npn\c_format_name{Experimental~ LaTeX3}
-\cs_set_nopar:Npn\c_format_date{2009/06/01}
-%^^A\cs_set_nopar:Npx\c_format_version{--release--date--goes--here--}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\c_fmt_too_old}
-% \begin{macro}{\chk_format_age:w}
-% Check that the format being made is not too old. While in development
-% it should be a rather small number.
-%    \begin{macrocode}
-\int_const:Nn \c_fmt_too_old{12}
-\cs_set_nopar:Npn\chk_format_age:w #1/#2/#3\q_stop{
-%    \end{macrocode}
-%  We just calculate the age of this file in months and give a warning
-%  if deemed too old.
-%    \begin{macrocode}
-  \intexpr_compare:nNnT{(\tex_year:D-#1)*12+\tex_month:D-#2}>\c_fmt_too_old
-  {\iow_term:x{^^J
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J
-  !~~You~are~attempting~to~make~an~experimental~LaTeX3~format~from^^J
-  !~~source~files~that~are~more~than~
-     \intexpr_eval:n{\c_fmt_too_old}~months~old.^^J
-  !^^J
-  !~~If~you~enter~<return>~to~scroll~past~this~message~then~the~format^^J
-  !~~will~be~built,~but~please~consider~obtaining~newer~source~files^^J
-  !~~before~continuing~to~build~an~experimental~LaTeX3~format.^^J
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!^^J
-  }
-  \tex_errhelp:D{
-    To~avoid~this~error~message,~obtain~new~Experimental~LaTeX3~sources.}
-  \tex_errmessage:D{
-    Experimental~LaTeX3~source~files~are~more~than~
-    \intexpr_eval:n{\c_fmt_too_old}~months~old!}
-  }
-}
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
-% Then we execute it.
-%    \begin{macrocode}
-\exp_after:wN\chk_format_age:w\c_format_date\q_stop
-%    \end{macrocode}
-% And since it's no longer needed we remove it again.
-%    \begin{macrocode}
-\cs_gundefine:N \chk_format_age:w
-%    \end{macrocode}
-%
-% This startup banner may be further modified by the code in
-% |ltfinal.dtx| if a patch file is present.
-%    \begin{macrocode}
-\tex_everyjob:D{\iow_term:x{\c_format_name,~<\c_format_date>}}
-\iow_term:x{\c_format_name,~<\c_format_date>}
-%</initex>
-%    \end{macrocode}
-%
-% \end{implementation}
-% \PrintIndex
-%
-% \endinput