diff options
author | Karl Berry <karl@freefriends.org> | 2018-08-24 22:18:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-08-24 22:18:02 +0000 |
commit | 9067afb3f8bce172638d12a6f926ab82547590e6 (patch) | |
tree | fa13c48c4ed98564fbcee7220e7c1b76b4fbfefe /Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx | |
parent | 8d113437aa8a3fae9dc8603507fa4aa9f64c5517 (diff) |
l3 (24aug18)
git-svn-id: svn://tug.org/texlive/trunk@48476 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx | 79 |
1 files changed, 43 insertions, 36 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx index 87a535ce163..ca9935e58cc 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2018-06-14} +% \date{Released 2018-08-23} % % \maketitle % @@ -56,7 +56,7 @@ % % \section{Breaking out to \Lua{}} % -% \begin{function}[EXP, added = 2015-06-29]{\lua_now_x:n, \lua_now:n} +% \begin{function}[EXP, added = 2018-06-18]{\lua_now:n, \lua_now:e} % \begin{syntax} % \cs{lua_now:n} \Arg{token list} % \end{syntax} @@ -67,18 +67,14 @@ % Each \cs{lua_now:n} block is treated by \Lua{} as a separate chunk. % The \Lua{} interpreter executes the \meta{\Lua{} input} immediately, % and in an expandable manner. -% -% In the case of the \cs{lua_now_x:n} version the input is fully expanded -% by \TeX{} in an \texttt{x}-type manner \emph{but} the function remains -% fully expandable. % \begin{texnote} -% \cs{lua_now_x:n} is a macro wrapper around \tn{directlua}: when +% \cs{lua_now:e} is a macro wrapper around \tn{directlua}: when % \LuaTeX{} is in use two expansions are required to yield the % result of the \Lua{} code. % \end{texnote} % \end{function} % -% \begin{function}[added = 2015-06-30]{\lua_shipout_x:n, \lua_shipout:n} +% \begin{function}[added = 2018-06-18]{\lua_shipout_e:n, \lua_shipout:n} % \begin{syntax} % \cs{lua_shipout:n} \Arg{token list} % \end{syntax} @@ -92,8 +88,8 @@ % page-building routine: no \TeX{} expansion of the \meta{\Lua{} input} % will occur at this stage. % -% In the case of the \cs{lua_shipout_x:n} version the input is fully -% expanded by \TeX{} in an \texttt{x}-type manner during the shipout +% In the case of the \cs{lua_shipout_e:n} version the input is fully +% expanded by \TeX{} in an \texttt{e}-type manner during the shipout % operation. % \begin{texnote} % At a \TeX{} level, the \meta{\Lua{} input} is stored as a @@ -101,7 +97,7 @@ % \end{texnote} % \end{function} % -% \begin{function}[EXP, added = 2015-06-29]{\lua_escape_x:n, \lua_escape:n} +% \begin{function}[EXP, added = 2015-06-29]{\lua_escape:n, \lua_escape:e} % \begin{syntax} % \cs{lua_escape:n} \Arg{token list} % \end{syntax} @@ -110,12 +106,8 @@ % and carriage returns are escaped. This is done by prepending an extra % token consisting of a backslash with category code~$12$, and for the line % endings, converting them to |\n| and |\r|, respectively. -% -% In the case of the \cs{lua_escape_x:n} version the input is fully expanded -% by \TeX{} in an \texttt{x}-type manner \emph{but} the function remains -% fully expandable. % \begin{texnote} -% \cs{lua_escape_x:n} is a macro wrapper around \tn{luaescapestring}: +% \cs{lua_escape:e} is a macro wrapper around \tn{luaescapestring}: % when \LuaTeX{} is in use two expansions are required to yield the % result of the \Lua{} code. % \end{texnote} @@ -197,46 +189,45 @@ % \end{macrocode} % % \begin{macrocode} -%<@@=luatex> +%<@@=lua> % \end{macrocode} % -% \begin{macro}[EXP]{\@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n} +% \begin{macro}[EXP]{\@@_escape:n, \@@_now:n, \@@_shipout:n} % Copies of primitives. % \begin{macrocode} -\cs_new_eq:NN \@@_escape_x:n \tex_luaescapestring:D -\cs_new_eq:NN \@@_now_x:n \tex_directlua:D -\cs_new_eq:NN \@@_shipout_x:n \tex_latelua:D +\cs_new_eq:NN \@@_escape:n \tex_luaescapestring:D +\cs_new_eq:NN \@@_now:n \tex_directlua:D +\cs_new_eq:NN \@@_shipout:n \tex_latelua:D % \end{macrocode} % \end{macro} % % These functions are set up in \pkg{l3str} for bootstrapping: we want to % replace them with a \enquote{proper} version at this stage, so clean up. % \begin{macrocode} -\cs_undefine:N \lua_escape_x:n -\cs_undefine:N \lua_now_x:n +\cs_undefine:N \lua_escape:e +\cs_undefine:N \lua_now:e % \end{macrocode} % -% \begin{macro}[EXP]{\lua_now_x:n, \lua_now:n} -% \begin{macro}{\lua_shipout_x:n, \lua_shipout:n} -% \begin{macro}[EXP]{\lua_escape_x:n, \lua_escape:n} +% \begin{macro}[EXP]{\lua_now:n, \lua_now:e} +% \begin{macro}{\lua_shipout_e:n, \lua_shipout:n} +% \begin{macro}[EXP]{\lua_escape:n, \lua_escape:e} % Wrappers around the primitives. As with engines other than \LuaTeX{} % these have to be macros, we give them the same status in all cases. % When \LuaTeX{} is not in use, simply give an error message/ % \begin{macrocode} -\cs_new:Npn \lua_now_x:n #1 { \@@_now_x:n {#1} } -\cs_new:Npn \lua_now:n #1 { \lua_now_x:n { \exp_not:n {#1} } } -\cs_new_protected:Npn \lua_shipout_x:n #1 { \@@_shiphout_x:n {#1} } +\cs_new:Npn \lua_now:e #1 { \@@_now:n {#1} } +\cs_new:Npn \lua_now:n #1 { \lua_now:e { \exp_not:n {#1} } } +\cs_new_protected:Npn \lua_shipout_e:n #1 { \@@_shiphout:n {#1} } \cs_new_protected:Npn \lua_shipout:n #1 - { \lua_shipout_x:n { \exp_not:n {#1} } } -\cs_new:Npn \lua_escape_x:n #1 { \@@_escape_x:n {#1} } -\cs_new:Npn \lua_escape:n #1 { \lua_escape_x:n { \exp_not:n {#1} } } + { \lua_shipout_e:n { \exp_not:n {#1} } } +\cs_new:Npn \lua_escape:e #1 { \@@_escape:n {#1} } +\cs_new:Npn \lua_escape:n #1 { \lua_escape:e { \exp_not:n {#1} } } \sys_if_engine_luatex:F { \clist_map_inline:nn { - \use_x:n , - \lua_escape_x:n , \lua_escape:n , - \lua_now_x:n , \lua_now:n + \lua_escape:n , \lua_escape:e , + \lua_now:n , \lua_now:e } { \cs_set:Npn #1 ##1 @@ -246,7 +237,7 @@ } } \clist_map_inline:nn - { \lua_shipout_x:n , \lua_shipout:n } + { \lua_shipout_e:n , \lua_shipout:n } { \cs_set_protected:Npn #1 ##1 { @@ -271,6 +262,22 @@ } % \end{macrocode} % +% \subsection{Deprecated functions} +% +% \begin{macro}[EXP, deprecated = 2019-12-31]{\lua_now_x:n, \lua_escape_x:n} +% \begin{macro}[deprecated = 2019-12-31]{\lua_shipout_x:n} +% For removal after 2019-12-31. +% \begin{macrocode} +\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \lua_now:e } +\cs_new:Npn \lua_now_x:n #1 { \@@_now:n {#1} } +\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \lua_escape:e } +\cs_new:Npn \lua_escape_x:n #1 { \@@_escape:n {#1} } +\__kernel_patch_deprecation:nnNNpn { 2019-12-31 } { \lua_shipout_e:n } +\cs_new_protected:Npn \lua_shipout_x:n #1 { \@@_shipout:n {#1} } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macrocode} %</tex> % \end{macrocode} |