expl3 update (9jun10)

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

1 files changed, 69 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/l3basics.sty b/Master/texmf-dist/tex/latex/expl3/l3basics.sty
index 06aec13b63e..b0535e6833a 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 1921 2010-05-22 08:28:54Z joseph $
+\GetIdInfo$Id: l3basics.dtx 1942 2010-06-07 17:06:11Z will $
        {L3 Experimental basic definitions}
 \ProvidesExplPackage
   {\filename}{\filedate}{\fileversion}{\filedescription}
@@ -583,20 +583,16 @@
    }
 }
 \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:
-  \cs_new_eq:NN \c_xetex_is_engine_bool \c_false_bool
-\fi:
+\cs_if_exist:NTF \xetex_version:D
+  { \cs_new_eq:NN \c_xetex_is_engine_bool \c_true_bool  }
+  { \cs_new_eq:NN \c_xetex_is_engine_bool \c_false_bool }
 \prg_new_conditional:Npnn \xetex_if_engine: {TF,T,F} {
   \if_bool:N \c_xetex_is_engine_bool
     \prg_return_true: \else: \prg_return_false: \fi:
 }
-\if_cs_exist:N \luatex_directlua:D
-  \cs_new_eq:NN \c_luatex_is_engine_bool \c_true_bool
-\else:
-  \cs_new_eq:NN \c_luatex_is_engine_bool \c_false_bool
-\fi:
+\cs_if_exist:NTF \luatex_directlua:D
+  { \cs_new_eq:NN \c_luatex_is_engine_bool \c_true_bool  }
+  { \cs_new_eq:NN \c_luatex_is_engine_bool \c_false_bool }
 \prg_set_conditional:Npnn \xetex_if_engine: {TF,T,F}{
   \if_bool:N \c_xetex_is_engine_bool \prg_return_true:
   \else: \prg_return_false: \fi:
@@ -666,6 +662,68 @@
     I~ can~ probably~ not~ help~ you~ here
   }
 }
+\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:NNnn ##1
+    \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end:
+      {\exp_not:N\cs_get_arg_count_from_signature:N ##1}{##2}
+  }
+}
+\cs_tmp:w {set}{Nn}{Npn}
+\cs_tmp:w {set}{Nx}{Npx}
+\cs_tmp:w {set_nopar}{Nn}{Npn}
+\cs_tmp:w {set_nopar}{Nx}{Npx}
+\cs_tmp:w {set_protected}{Nn}{Npn}
+\cs_tmp:w {set_protected}{Nx}{Npx}
+\cs_tmp:w {set_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {set_protected_nopar}{Nx}{Npx}
+\cs_tmp:w {gset}{Nn}{Npn}
+\cs_tmp:w {gset}{Nx}{Npx}
+\cs_tmp:w {gset_nopar}{Nn}{Npn}
+\cs_tmp:w {gset_nopar}{Nx}{Npx}
+\cs_tmp:w {gset_protected}{Nn}{Npn}
+\cs_tmp:w {gset_protected}{Nx}{Npx}
+\cs_tmp:w {gset_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {gset_protected_nopar}{Nx}{Npx}
+\cs_tmp:w {new}{Nn}{Npn}
+\cs_tmp:w {new}{Nx}{Npx}
+\cs_tmp:w {new_nopar}{Nn}{Npn}
+\cs_tmp:w {new_nopar}{Nx}{Npx}
+\cs_tmp:w {new_protected}{Nn}{Npn}
+\cs_tmp:w {new_protected}{Nx}{Npx}
+\cs_tmp:w {new_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {new_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}
+    \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end:
+      {\exp_not:N\cs_get_arg_count_from_signature:c {##1}}{##2}
+  }
+}
+\cs_tmp:w {set}{cn}{Npn}
+\cs_tmp:w {set}{cx}{Npx}
+\cs_tmp:w {set_nopar}{cn}{Npn}
+\cs_tmp:w {set_nopar}{cx}{Npx}
+\cs_tmp:w {set_protected}{cn}{Npn}
+\cs_tmp:w {set_protected}{cx}{Npx}
+\cs_tmp:w {set_protected_nopar}{cn}{Npn}
+\cs_tmp:w {set_protected_nopar}{cx}{Npx}
+\cs_tmp:w {gset}{cn}{Npn}
+\cs_tmp:w {gset}{cx}{Npx}
+\cs_tmp:w {gset_nopar}{cn}{Npn}
+\cs_tmp:w {gset_nopar}{cx}{Npx}
+\cs_tmp:w {gset_protected}{cn}{Npn}
+\cs_tmp:w {gset_protected}{cx}{Npx}
+\cs_tmp:w {gset_protected_nopar}{cn}{Npn}
+\cs_tmp:w {gset_protected_nopar}{cx}{Npx}
+\cs_tmp:w {new}{cn}{Npn}
+\cs_tmp:w {new}{cx}{Npx}
+\cs_tmp:w {new_nopar}{cn}{Npn}
+\cs_tmp:w {new_nopar}{cx}{Npx}
+\cs_tmp:w {new_protected}{cn}{Npn}
+\cs_tmp:w {new_protected}{cx}{Npx}
+\cs_tmp:w {new_protected_nopar}{cn}{Npn}
+\cs_tmp:w {new_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: