finish l3 update

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

1 files changed, 8 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
index c6050b44f98..9673e80ab1c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
@@ -45,22 +45,22 @@
 %%   prior consultation with the LaTeX3 Project.
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3luatex.dtx 3986 2012-07-15 19:23:51Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3luatex.dtx 4049 2012-08-03 14:01:40Z bruno $
   {L3 Experimental LuaTeX-specific functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
 \__expl_package_check:
 \luatex_if_engine:TF
   {
-    \cs_new_eq:NN \lua_now:x       \luatex_directlua:D
+    \cs_new_eq:NN \lua_now_x:n     \luatex_directlua:D
     \cs_new_eq:NN \lua_shipout_x:n \luatex_latelua:D
   }
   {
-    \cs_new:Npn \lua_now:x #1
+    \cs_new:Npn \lua_now_x:n #1
       {
         \__msg_kernel_expandable_error:nnn
-          { kernel } { bad-engine } { \lua_now:x }
+          { kernel } { bad-engine } { \lua_now_x:n }
       }
     \cs_new_protected:Npn \lua_shipout_x:n #1
       {
@@ -68,8 +68,10 @@
           { kernel } { bad-engine } { \lua_shipout_x:n }
       }
   }
+\cs_generate_variant:Nn \lua_now_x:n { x }
 \cs_new:Npn \lua_now:n #1
-  { \lua_now:x { \exp_not:n {#1} } }
+  { \lua_now_x:n { \exp_not:n {#1} } }
+\cs_generate_variant:Nn \lua_now:n { x }
 \cs_generate_variant:Nn \lua_shipout_x:n { x }
 \cs_new_protected:Npn \lua_shipout:n #1
   { \lua_shipout_x:n { \exp_not:n {#1} } }