diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx index 5fbaea8cbd6..5ae55447bf0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx @@ -34,8 +34,8 @@ %% ----------------------------------------------------------------------- % %<*driver|package> -\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} %</driver|package> %<*driver> @@ -76,30 +76,43 @@ % error: use \cs{luatex_if_engine:T} to avoid this. Details of coding % the \LuaTeX{} engine are detailed in the \LuaTeX{} manual. % -% \begin{function}[EXP]{\lua_now:n, \lua_now:x} +% \begin{function}[EXP, updated = 2012-08-02]{\lua_now:n, \lua_now:x} % \begin{syntax} % \cs{lua_now:n} \Arg{token list} % \end{syntax} % The \meta{token list} is first tokenized by \TeX{}, which will include % converting line ends to spaces in the usual \TeX{} manner and which -% respects currently-applicable \TeX\ category codes. The resulting +% respects currently-applicable \TeX{} category codes. The resulting % \meta{\Lua{} input} is passed to the \Lua{} interpreter for processing. % Each \cs{lua_now:n} block is treated by \Lua{} as a separate chunk. % The \Lua{} interpreter will execute the \meta{\Lua{} input} immediately, % and in an expandable manner. +% \end{function} +% +% \begin{function}[EXP, added = 2012-08-02]{\lua_now_x:n, \lua_now_x:x} +% \begin{syntax} +% \cs{lua_now_x:n} \Arg{token list} +% \end{syntax} +% The \meta{token list} is first tokenized and expanded by \TeX{}, which +% will include converting line ends to spaces in the usual \TeX{} manner and +% which respects currently-applicable \TeX{} category codes. The resulting +% \meta{\Lua{} input} is passed to the \Lua{} interpreter for processing. +% Each \cs{lua_now_x:n} block is treated by \Lua{} as a separate chunk. +% The \Lua{} interpreter will execute the \meta{\Lua{} input} immediately, +% and in an expandable manner. % \begin{texnote} -% \cs{lua_now:x} is the \LuaTeX{} primitive \tn{directlua} renamed. +% \cs{lua_now_x:n} is the \LuaTeX{} primitive \tn{directlua} renamed. % \end{texnote} % \end{function} % % \begin{function}{\lua_shipout:n, \lua_shipout:x} % \begin{syntax} -% \cs{lua_shipout:x} \Arg{token list} +% \cs{lua_shipout:n} \Arg{token list} % \end{syntax} % The \meta{token list} is first tokenized by \TeX{}, which will include % converting line ends to spaces in the usual \TeX{} manner and which % respects currently-applicable \TeX{} category codes. The resulting -% \meta{\Lua{} input} is passed to the \Lua\ interpreter when the +% \meta{\Lua{} input} is passed to the \Lua{} interpreter when the % current page is finalised (\emph{i.e.}~at shipout). Each % \cs{lua_shipout:n} block is treated by \Lua{} as a separate chunk. % The \Lua{} interpreter will execute the \meta{\Lua{} input} during the @@ -230,6 +243,7 @@ %</package> % \end{macrocode} % +% \begin{macro}{\lua_now_x:n, \lua_now_x:x} % \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} @@ -241,14 +255,14 @@ % \begin{macrocode} \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 { @@ -256,8 +270,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} } } @@ -266,6 +282,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \subsection{Category code tables} % @@ -465,9 +482,9 @@ % \end{variable} % \end{variable} % \end{variable} -% +% % \subsection{Messages} -% +% % \begin{macrocode} \__msg_kernel_new:nnnn { kernel } { bad-engine } { LuaTeX~engine~not~in~use!~Ignoring~#1. } |