[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename expandable \lua_<thing>_x:n to \lua_<thing>:e (1a62d58)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Jun 18 17:58:05 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/1a62d58aa1b45a95cee392f7d5c60cfcad96de8e
>---------------------------------------------------------------
commit 1a62d58aa1b45a95cee392f7d5c60cfcad96de8e
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 18 16:58:05 2018 +0100
Rename expandable \lua_<thing>_x:n to \lua_<thing>:e
The non-expandable \lua_shipout_x:n still to do: need to check on exact details!
>---------------------------------------------------------------
1a62d58aa1b45a95cee392f7d5c60cfcad96de8e
l3kernel/CHANGELOG.md | 6 ++++
l3kernel/l3bootstrap.dtx | 2 +-
l3kernel/l3candidates.dtx | 8 ++---
l3kernel/l3final.dtx | 2 +-
l3kernel/l3luatex.dtx | 54 +++++++++++++++++--------------
l3kernel/l3obsolete.txt | 2 ++
l3kernel/l3str.dtx | 16 ++++-----
l3kernel/l3token.dtx | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 12 ++++---
l3kernel/testfiles/m3expl001.ptex.tlg | 10 +++---
l3kernel/testfiles/m3expl001.tlg | 10 +++---
l3kernel/testfiles/m3expl001.uptex.tlg | 10 +++---
l3kernel/testfiles/m3expl001.xetex.tlg | 10 +++---
l3kernel/testfiles/m3expl003.luatex.tlg | 12 ++++---
l3kernel/testfiles/m3expl003.ptex.tlg | 10 +++---
l3kernel/testfiles/m3expl003.tlg | 10 +++---
l3kernel/testfiles/m3expl003.uptex.tlg | 10 +++---
l3kernel/testfiles/m3expl003.xetex.tlg | 10 +++---
l3trial/l3bigint/l3bigint.dtx | 6 ++--
19 files changed, 117 insertions(+), 85 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 8d56929..460b79f 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## Added
+- `\lua_now:e` and `\lua_escape:e`
+
+## Deprecated
+- `\lua_now_x:n` and `\lua_escape_x:n`
+
## [2018-06-14]
### Added
diff --git a/l3kernel/l3bootstrap.dtx b/l3kernel/l3bootstrap.dtx
index 0d69acb..21a4103 100644
--- a/l3kernel/l3bootstrap.dtx
+++ b/l3kernel/l3bootstrap.dtx
@@ -340,7 +340,7 @@
}>0 %
\everyjob\expandafter{%
\the\expandafter\everyjob
- \csname\detokenize{lua_now_x:n}\endcsname{require("expl3")}%
+ \csname\detokenize{lua_now:n}\endcsname{require("expl3")}%
}%
\fi
\fi
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 5757cea..fda27e6 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2151,10 +2151,10 @@
\file_get_full_name:nN {#1} \l_@@_full_name_str
\str_set:Nx #3
{
- \lua_now_x:n
+ \lua_now:e
{
l3kernel.file#2
- ( " \lua_escape_x:n { \l_@@_full_name_str } " )
+ ( " \lua_escape:e { \l_@@_full_name_str } " )
}
}
}
@@ -2896,8 +2896,8 @@
{
\cs_new_protected:Npn \sys_shell_now:n #1
{
- \lua_now_x:n
- { os.execute(" \lua_escape_x:n { \tl_to_str:n {#1} } ") }
+ \lua_now:e
+ { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") }
}
}
{
diff --git a/l3kernel/l3final.dtx b/l3kernel/l3final.dtx
index b8dd58c..2a2c742 100644
--- a/l3kernel/l3final.dtx
+++ b/l3kernel/l3final.dtx
@@ -255,7 +255,7 @@
\tex_everyjob:D \exp_after:wN
{
\tex_the:D \tex_everyjob:D
- \lua_now_x:n { require("l3format.lua") }
+ \lua_now:n { require("l3format.lua") }
}
}
\use:x
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index 2a65cb5..afcf3f6 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -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,12 +67,8 @@
% 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}
@@ -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}
@@ -200,11 +192,11 @@
%<@@=luatex>
% \end{macrocode}
%
-% \begin{macro}[EXP]{\@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n}
+% \begin{macro}[EXP]{\@@_escape:n, \@@_now:n, \@@_shipout_x: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 \@@_escape:n \tex_luaescapestring:D
+\cs_new_eq:NN \@@_now:n \tex_directlua:D
\cs_new_eq:NN \@@_shipout_x:n \tex_latelua:D
% \end{macrocode}
% \end{macro}
@@ -212,30 +204,30 @@
% 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}[EXP]{\lua_now:n, \lua_now:e}
% \begin{macro}{\lua_shipout_x:n, \lua_shipout:n}
-% \begin{macro}[EXP]{\lua_escape_x:n, \lua_escape: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: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_x:n #1 { \@@_shiphout_x: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} } }
+\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
{
- \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
@@ -270,6 +262,18 @@
}
% \end{macrocode}
%
+% \subsection{Deprecated functions}
+%
+% \begin{macro}[deprecated = 2019-12-31]{\lua_now_x:n, \lua_escape_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} }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</tex>
% \end{macrocode}
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index 5c1989b..45dfd69 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -53,6 +53,8 @@ Function Expires end
\ior_log_streams: 2018
\iow_list_streams: 2018
\iow_log_streams: 2018
+\lua_escape_x:n 2019
+\lua_now_x:n 2019
\luatex_...:D 2019
\pdftex_...:D 2019
\ptex_...:D 2019
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 6376b0d..0c66841 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1030,7 +1030,7 @@
% \end{macro}
%
% \begin{macro}[EXP]{\@@_if_eq_x:nn}
-% \begin{macro}[EXP]{\@@_escape_x:n}
+% \begin{macro}[EXP]{\@@_escape:n}
% String comparisons rely on the primitive \cs[index=pdfstrcmp]{(pdf)strcmp} if available:
% \LuaTeX{} does not have it, so emulation is required. As the net result
% is that we do not \emph{always} use the primitive, the correct approach
@@ -1046,22 +1046,22 @@
\cs_new:Npn \@@_if_eq_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
\cs_if_exist:NT \tex_luatexversion:D
{
- \cs_set_eq:NN \lua_escape_x:n \tex_luaescapestring:D
- \cs_set_eq:NN \lua_now_x:n \tex_directlua:D
+ \cs_set_eq:NN \lua_escape:e \tex_luaescapestring:D
+ \cs_set_eq:NN \lua_now:e \tex_directlua:D
\cs_set:Npn \@@_if_eq_x:nn #1#2
{
- \lua_now_x:n
+ \lua_now:e
{
l3kernel.strcmp
(
- " \@@_escape_x:n {#1} " ,
- " \@@_escape_x:n {#2} "
+ " \@@_escape:n {#1} " ,
+ " \@@_escape:n {#2} "
)
}
}
- \cs_new:Npn \@@_escape_x:n #1
+ \cs_new:Npn \@@_escape:n #1
{
- \lua_escape_x:n
+ \lua_escape:e
{ \__kernel_tl_to_str:w \use:e { {#1} } }
}
}
diff --git a/l3kernel/l3token.dtx b/l3kernel/l3token.dtx
index 7fe05c7..9da2ac6 100644
--- a/l3kernel/l3token.dtx
+++ b/l3kernel/l3token.dtx
@@ -1436,7 +1436,7 @@
{
#3
\exp_after:wN \exp_after:wN \exp_after:wN \exp_end:
- \lua_now_x:n { l3kernel.charcat(#1, #2) }
+ \lua_now:e { l3kernel.charcat(#1, #2) }
}
}
{
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index b85d1c9..232c9c9 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -727,7 +727,7 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_escape_x:n on line ...
+Defining \__str_escape:n on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -5318,16 +5318,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
\g__file_internal_ior=\read...
Defining \c__char_mixed_case_DŽ_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 5d89db8..e2604df 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5614,16 +5614,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 93736ae..430d1fd 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5614,16 +5614,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 7f28214..d519527 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5611,16 +5611,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index eb3fe64..a590bae 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5329,16 +5329,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
\g__file_internal_ior=\read...
Defining \c__char_mixed_case_DŽ_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index b85d1c9..232c9c9 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -727,7 +727,7 @@ Defining \str_if_empty:cT on line ...
Defining \str_if_empty:cF on line ...
Defining \str_if_empty:cTF on line ...
Defining \__str_if_eq_x:nn on line ...
-Defining \__str_escape_x:n on line ...
+Defining \__str_escape:n on line ...
Defining \str_if_eq_p:nn on line ...
Defining \str_if_eq:nnT on line ...
Defining \str_if_eq:nnF on line ...
@@ -5318,16 +5318,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
\g__file_internal_ior=\read...
Defining \c__char_mixed_case_DŽ_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 5d89db8..e2604df 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5614,16 +5614,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 93736ae..430d1fd 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5614,16 +5614,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 7f28214..d519527 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5611,16 +5611,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
Defining \c__char_upper_case_a_tl on line ...
Defining \c__char_lower_case_A_tl on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index eb3fe64..a590bae 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5329,16 +5329,18 @@ Defining message LaTeX/kernel/no-pole-intersection on line ...
Defining message LaTeX/kernel/unknown-coffin on line ...
Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
-Defining \__luatex_escape_x:n on line ...
-Defining \__luatex_now_x:n on line ...
+Defining \__luatex_escape:n on line ...
+Defining \__luatex_now:n on line ...
Defining \__luatex_shipout_x:n on line ...
-Defining \lua_now_x:n on line ...
+Defining \lua_now:e on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_escape_x:n on line ...
+Defining \lua_escape:e on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
+Defining \lua_now_x:n on line ...
+Defining \lua_escape_x:n on line ...
Defining \g__char_data_ior on line ...
\g__file_internal_ior=\read...
Defining \c__char_mixed_case_DŽ_tl on line ...
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 516f5ee..e9b1a58 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -631,12 +631,12 @@
{
\cs_set:Npn \@@_str_cmp_x:nn #1#2
{
- \lua_now_x:n
+ \lua_now:e
{
l3kernel.strcmp
(
- " \lua_escape_x:n {#1}",
- " \lua_escape_x:n {#2}"
+ " \lua_escape:e {#1}",
+ " \lua_escape:e {#2}"
)
}
}
More information about the latex3-commits
mailing list