[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct prefix of some internals (5c8a243)
Bruno Le Floch
bruno at le-floch.fr
Fri Apr 13 21:17:08 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/5c8a24333fb0fe9a27af6874079393e8610247ff
>---------------------------------------------------------------
commit 5c8a24333fb0fe9a27af6874079393e8610247ff
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Fri Apr 13 15:17:08 2018 -0400
Correct prefix of some internals
>---------------------------------------------------------------
5c8a24333fb0fe9a27af6874079393e8610247ff
l3kernel/l3luatex.dtx | 4 ++++
l3kernel/l3str.dtx | 2 +-
l3kernel/testfiles/m3expl001.luatex.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.ptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.uptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl001.xetex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.luatex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.ptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.uptex.tlg | 8 ++++----
l3kernel/testfiles/m3expl003.xetex.tlg | 8 ++++----
12 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index 702d822..a32a2df 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -202,6 +202,10 @@
%<*tex>
% \end{macrocode}
%
+% \begin{macrocode}
+%<@@=luatex>
+% \end{macrocode}
+%
% \begin{macro}[EXP]{\@@_exp_x:n, \@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n}
% Copies of primitives.
% \begin{macrocode}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 9e4138d..502551a 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -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_exp_x:n { {#1} } }
}
}
% \end{macrocode}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 5cee75c..f786e54 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5244,10 +5244,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 0b708ac..a3fb556 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5500,10 +5500,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 9ae50ad..9c72557 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5500,10 +5500,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index dfd4c89..2bc1534 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5498,10 +5498,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index daa1243..034bc52 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5217,10 +5217,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 5cee75c..f786e54 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5244,10 +5244,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 0b708ac..a3fb556 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5500,10 +5500,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 9ae50ad..9c72557 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5500,10 +5500,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index dfd4c89..2bc1534 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5498,10 +5498,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index daa1243..034bc52 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5217,10 +5217,10 @@ 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 \__coffin_exp_x:n on line ...
-Defining \__coffin_escape_x:n on line ...
-Defining \__coffin_now_x:n on line ...
-Defining \__coffin_shipout_x:n on line ...
+Defining \__luatex_exp_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 ...
Defining \lua_now_x:n on line ...
Defining \lua_now:n on line ...
Defining \lua_shipout_x:n on line ...
More information about the latex3-commits
mailing list