[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename a candidate to \lua_use_x:n (cf0fb62)
Bruno Le Floch
bruno at le-floch.fr
Fri Apr 13 21:24:48 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/cf0fb62418e796fea0c5fd9e9b0c586e0310b9e0
>---------------------------------------------------------------
commit cf0fb62418e796fea0c5fd9e9b0c586e0310b9e0
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Fri Apr 13 15:24:48 2018 -0400
Rename a candidate to \lua_use_x:n
>---------------------------------------------------------------
cf0fb62418e796fea0c5fd9e9b0c586e0310b9e0
l3kernel/l3candidates.dtx | 16 ++++++++++++++++
l3kernel/l3luatex.dtx | 25 ++++++-------------------
l3kernel/l3str.dtx | 4 ++--
l3kernel/testfiles/m3expl001.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.tlg | 4 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.luatex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.tlg | 4 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 4 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 4 ++--
13 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index a12f08f..941c3e4 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -358,6 +358,22 @@
% locally.
% \end{function}
%
+% \section{Additions to \pkg{l3luatex}}
+%
+% \begin{function}[EXP, added = 2018-04-13]{\lua_use_x:n}
+% \begin{syntax}
+% \cs{lua_use_x:n} \Arg{token list}
+% \end{syntax}
+% Fully expands the \meta{token list} in an \texttt{x}-type manner,
+% \emph{but} the function remains fully expandable, and parameter
+% character (usually~|#|) need not be doubled.
+% \begin{texnote}
+% \cs{lua_use_x:n} is a macro wrapper around \tn{expanded}:
+% when \LuaTeX{} is in use two expansions are required to yield the
+% result.
+% \end{texnote}
+% \end{function}
+%
% \section{Additions to \pkg{l3msg}}
%
% In very rare cases it may be necessary to produce errors in an
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index a32a2df..e6ae303 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -103,19 +103,6 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}[EXP, added = 2018-04-13]{\lua_exp_x:n}
-% \begin{syntax}
-% \cs{lua_exp_x:n} \Arg{token list}
-% \end{syntax}
-% Fully expands the \meta{token list} an \texttt{x}-type manner \emph{but} the
-% function remains fully expandable.
-% \begin{texnote}
-% \cs{lua_exp_x:n} is a macro wrapper around \tn{expanded}:
-% when \LuaTeX{} is in use two expansions are required to yield the
-% result.
-% \end{texnote}
-% \end{function}
-%
% \begin{function}[EXP, added = 2015-06-29]{\lua_escape_x:n, \lua_escape:n}
% \begin{syntax}
% \cs{lua_escape:n} \Arg{token list}
@@ -206,10 +193,10 @@
%<@@=luatex>
% \end{macrocode}
%
-% \begin{macro}[EXP]{\@@_exp_x:n, \@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n}
+% \begin{macro}[EXP]{\@@_use_x:n, \@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n}
% Copies of primitives.
% \begin{macrocode}
-\cs_new_eq:NN \@@_exp_x:n \luatex_expanded:D
+\cs_new_eq:NN \@@_use_x:n \luatex_expanded:D
\cs_new_eq:NN \@@_escape_x:n \luatex_luaescapestring:D
\cs_new_eq:NN \@@_now_x:n \luatex_directlua:D
\cs_new_eq:NN \@@_shipout_x:n \luatex_latelua:D
@@ -219,14 +206,14 @@
% 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_exp_x:n
+\cs_undefine:N \lua_use_x:n
\cs_undefine:N \lua_escape_x:n
\cs_undefine:N \lua_now_x:n
% \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_exp_x:n}
+% \begin{macro}[EXP]{\lua_use_x:n}
% \begin{macro}[EXP]{\lua_escape_x:n, \lua_escape:n}
% Wrappers around the primitives. As with engines other than \LuaTeX{}
% these have to be macros, we give them the same status in all cases.
@@ -237,14 +224,14 @@
\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_exp_x:n #1 { \@@_exp_x:n {#1} }
+\cs_new:Npn \lua_use_x:n #1 { \@@_use_x: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} } }
\sys_if_engine_luatex:F
{
\clist_map_inline:nn
{
- \lua_exp_x:n ,
+ \lua_use_x:n ,
\lua_escape_x:n , \lua_escape:n ,
\lua_now_x:n , \lua_now:n
}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 502551a..f005760 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1039,7 +1039,7 @@
\cs_new:Npn \@@_if_eq_x:nn #1#2 { \pdftex_strcmp:D {#1} {#2} }
\cs_if_exist:NT \luatex_luatexversion:D
{
- \cs_set_eq:NN \lua_exp_x:n \luatex_expanded:D
+ \cs_set_eq:NN \lua_use_x:n \luatex_expanded:D
\cs_set_eq:NN \lua_escape_x:n \luatex_luaescapestring:D
\cs_set_eq:NN \lua_now_x:n \luatex_directlua:D
\cs_set:Npn \@@_if_eq_x:nn #1#2
@@ -1056,7 +1056,7 @@
\cs_new:Npn \@@_escape_x:n #1
{
\lua_escape_x:n
- { \__kernel_tl_to_str:w \lua_exp_x:n { {#1} } }
+ { \__kernel_tl_to_str:w \lua_use_x:n { {#1} } }
}
}
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index f786e54..cdc9d23 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5244,7 +5244,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5252,7 +5252,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index a3fb556..0d159db 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5500,7 +5500,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5508,7 +5508,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9c72557..80e1323 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5500,7 +5500,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5508,7 +5508,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 2bc1534..33c72c0 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5498,7 +5498,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5506,7 +5506,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 034bc52..b2039be 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5217,7 +5217,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5225,7 +5225,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index f786e54..cdc9d23 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5244,7 +5244,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5252,7 +5252,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index a3fb556..0d159db 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5500,7 +5500,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5508,7 +5508,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 9c72557..80e1323 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5500,7 +5500,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5508,7 +5508,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 2bc1534..33c72c0 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5498,7 +5498,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5506,7 +5506,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 034bc52..b2039be 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5217,7 +5217,7 @@ Defining \sys_if_output_pdf:F on line ...
Defining \sys_if_output_pdf:TF on line ...
Defining \sys_if_output_pdf_p: on line ...
Defining \c_sys_output_str on line ...
-Defining \__luatex_exp_x:n on line ...
+Defining \__luatex_use_x:n on line ...
Defining \__luatex_escape_x:n on line ...
Defining \__luatex_now_x:n on line ...
Defining \__luatex_shipout_x:n on line ...
@@ -5225,7 +5225,7 @@ Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
Defining \lua_shipout:n on line ...
-Defining \lua_exp_x:n on line ...
+Defining \lua_use_x:n on line ...
Defining \lua_escape_x:n on line ...
Defining \lua_escape:n on line ...
Defining message LaTeX/kernel/luatex-required on line ...
More information about the latex3-commits
mailing list