summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-09 23:40:45 +0000
committerKarl Berry <karl@freefriends.org>2011-01-09 23:40:45 +0000
commit2423c76378e279e9150d0b2794fc310b6b82098c (patch)
tree1ff7711f5eac982d3593ad3748cc3781b110e809 /Master/texmf-dist/tex/latex/expl3
parent5e2fa289125cb5d0a8c0a14544aee379aeef47e7 (diff)
expl3 (<8jan11)
git-svn-id: svn://tug.org/texlive/trunk@20998 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3luatex.sty16
1 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3luatex.sty b/Master/texmf-dist/tex/latex/expl3/l3luatex.sty
index 49f232528f4..d32d740cee0 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3luatex.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3luatex.sty
@@ -15,7 +15,7 @@
%% Do not distribute a modified version of this file.
%%
%%
-%% File: l3fp.dtx Copyright (C) 2010 LaTeX3 project
+%% File: l3luatex.dtx Copyright (C) 2010,2011 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
@@ -55,13 +55,21 @@
\package_check_loaded_expl:
\luatex_if_engine:TF
{
- \cs_new_eq:NN \lua_now:x \luatex_directlua:D
- \cs_new_eq:NN \lua_shipout:x \luatex_latelua:D
+ \cs_new_eq:NN \lua_now:x \luatex_directlua:D
+ \cs_new_eq:NN \lua_shipout_x:n \luatex_latelua:D
}
{
\cs_new:Npn \lua_now:x #1 { \lua_wrong_engine: }
- \cs_new:Npn \lua_shipout:x #1 { \lua_wrong_engine: }
+ \cs_new_protected:Npn \lua_shipout_x:n #1 { \lua_wrong_engine: }
}
+\cs_new:Npn \lua_now:n #1 {
+ \lua_now:x { \exp_not:n {#1} }
+}
+\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} }
+}
+\cs_generate_variant:Nn \lua_shipout:n { x }
\group_begin:
\char_make_letter:N\!
\char_make_letter:N\ %