summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx29
1 files changed, 14 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
index 70259184340..a0e90de31fc 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3luatex.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3luatex.dtx 2545 2011-08-11 13:47:19Z bruno $
{L3 Experimental LuaTeX-specific functions}
%</driver|package>
%<*driver>
@@ -235,12 +235,11 @@
% \begin{macro}{\lua_now:n, \lua_now:x}
% \begin{macro}{\lua_shipout_x:n, \lua_shipout_x:x}
% \begin{macro}{\lua_shipout:n, \lua_shipout:x}
-% \begin{macro}[aux]{\lua_wrong_engine:}
% When \LuaTeX{} is in use, this is all a question of primitives with new
% names. On the other hand, for \pdfTeX{} and \XeTeX{} the argument should
-% be removed from the input stream before issuing an error. This needs
-% to be expandable, so the same idea is used as for \texttt{V}-type
-% expansion, with an appropriately-named but undefined function.
+% be removed from the input stream before issuing an error. This is
+% expandable, using \cs{msg_expandable_error:n} as for \texttt{V}-type
+% expansion.
% \begin{macrocode}
\luatex_if_engine:TF
{
@@ -248,8 +247,16 @@
\cs_new_eq:NN \lua_shipout_x:n \luatex_latelua:D
}
{
- \cs_new:Npn \lua_now:x #1 { \lua_wrong_engine: }
- \cs_new_protected:Npn \lua_shipout_x:n #1 { \lua_wrong_engine: }
+ \cs_new:Npn \lua_now:x #1
+ {
+ \msg_expandable_error:n
+ { LuaTeX~ engine~ not~ in~ use!~ Ignoring~ \lua_now:x. }
+ }
+ \cs_new_protected:Npn \lua_shipout_x:n #1
+ {
+ \msg_expandable_error:n
+ { LuaTeX~ engine~ not~ in~ use!~ Ignoring~ \lua_shipout_x:n. }
+ }
}
\cs_new:Npn \lua_now:n #1
{ \lua_now:x { \exp_not:n {#1} } }
@@ -257,18 +264,10 @@
\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_set_catcode_letter:N\!
-\char_set_catcode_letter:N\ %
-\cs_gset:Npn\lua_wrong_engine:{%
-\LuaTeX engine not in use!%
-}%
-\group_end:%
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \subsection{Category code tables}
%