[latex3-commits] [git/LaTeX3-latex3-latex3] master: Rename \lua_shipout_x:n as \lua_shipout_e:n (6ccd423)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Jun 18 18:14:45 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/6ccd4235174d8ea24fe7baf06be0d6afb9ced142
>---------------------------------------------------------------
commit 6ccd4235174d8ea24fe7baf06be0d6afb9ced142
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Jun 18 17:05:18 2018 +0100
Rename \lua_shipout_x:n as \lua_shipout_e:n
The behaviour of # here is e-type not x-type.
>---------------------------------------------------------------
6ccd4235174d8ea24fe7baf06be0d6afb9ced142
l3kernel/CHANGELOG.md | 4 ++--
l3kernel/l3luatex.dtx | 28 ++++++++++++++++------------
l3kernel/l3obsolete.txt | 1 +
l3kernel/testfiles/m3expl001.luatex.tlg | 5 +++--
l3kernel/testfiles/m3expl001.ptex.tlg | 5 +++--
l3kernel/testfiles/m3expl001.tlg | 5 +++--
l3kernel/testfiles/m3expl001.uptex.tlg | 5 +++--
l3kernel/testfiles/m3expl001.xetex.tlg | 5 +++--
l3kernel/testfiles/m3expl003.luatex.tlg | 5 +++--
l3kernel/testfiles/m3expl003.ptex.tlg | 5 +++--
l3kernel/testfiles/m3expl003.tlg | 5 +++--
l3kernel/testfiles/m3expl003.uptex.tlg | 5 +++--
l3kernel/testfiles/m3expl003.xetex.tlg | 5 +++--
13 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index 460b79f..6cb8247 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -8,10 +8,10 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
## Added
-- `\lua_now:e` and `\lua_escape:e`
+- `\lua_escape:e`, `\lua_now:e` and `\lua_shipout_e:n`
## Deprecated
-- `\lua_now_x:n` and `\lua_escape_x:n`
+- `\lua_escape_x:n`, `\lua_now_x:n` and `\lua_shipout_x:n`
## [2018-06-14]
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index b722f11..087c4dc 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -74,7 +74,7 @@
% \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}
@@ -88,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
@@ -192,12 +192,12 @@
%<@@=lua>
% \end{macrocode}
%
-% \begin{macro}[EXP]{\@@_escape:n, \@@_now:n, \@@_shipout_x:n}
+% \begin{macro}[EXP]{\@@_escape:n, \@@_now:n, \@@_shipout:n}
% Copies of primitives.
% \begin{macrocode}
-\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
+\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}
%
@@ -209,7 +209,7 @@
% \end{macrocode}
%
% \begin{macro}[EXP]{\lua_now:n, \lua_now:e}
-% \begin{macro}{\lua_shipout_x:n, \lua_shipout:n}
+% \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.
@@ -217,9 +217,9 @@
% \begin{macrocode}
\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_e:n #1 { \@@_shiphout:n {#1} }
\cs_new_protected:Npn \lua_shipout:n #1
- { \lua_shipout_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
@@ -237,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
{
@@ -264,15 +264,19 @@
%
% \subsection{Deprecated functions}
%
-% \begin{macro}[deprecated = 2019-12-31]{\lua_now_x:n, \lua_escape_x:n}
+% \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>
diff --git a/l3kernel/l3obsolete.txt b/l3kernel/l3obsolete.txt
index 45dfd69..1993c60 100644
--- a/l3kernel/l3obsolete.txt
+++ b/l3kernel/l3obsolete.txt
@@ -55,6 +55,7 @@ Function Expires end
\iow_log_streams: 2018
\lua_escape_x:n 2019
\lua_now_x:n 2019
+\lua_shipout_x:n 2019
\luatex_...:D 2019
\pdftex_...:D 2019
\ptex_...:D 2019
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index efa764d..ca32ada 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5320,16 +5320,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 a4af837..3b49a0b 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5616,16 +5616,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 2f79ce0..ee3b7f3 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5616,16 +5616,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 d08ff20..8ddabe4 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5613,16 +5613,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 790ce0b..0dad117 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5331,16 +5331,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 efa764d..ca32ada 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5320,16 +5320,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 a4af837..3b49a0b 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5616,16 +5616,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 2f79ce0..ee3b7f3 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5616,16 +5616,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 d08ff20..8ddabe4 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5613,16 +5613,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 790ce0b..0dad117 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5331,16 +5331,17 @@ Defining message LaTeX/kernel/unknown-coffin-pole on line ...
Defining message LaTeX/kernel/show-coffin on line ...
Defining \__lua_escape:n on line ...
Defining \__lua_now:n on line ...
-Defining \__lua_shipout_x:n on line ...
+Defining \__lua_shipout: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_e:n on line ...
Defining \lua_shipout: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 \lua_shipout_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 ...
More information about the latex3-commits
mailing list