[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move LuaTeX primitives to \tex_... namespace (7a9ddcc)
Joseph Wright
joseph.wright at morningstar2.co.uk
Wed May 2 16:31:44 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/7a9ddccf6cf9591d46d98073c75ad78bf999533b
>---------------------------------------------------------------
commit 7a9ddccf6cf9591d46d98073c75ad78bf999533b
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed May 2 10:39:33 2018 +0100
Move LuaTeX primitives to \tex_... namespace
>---------------------------------------------------------------
7a9ddccf6cf9591d46d98073c75ad78bf999533b
l3kernel/l3alloc.dtx | 4 +-
l3kernel/l3basics.dtx | 4 +-
l3kernel/l3candidates.dtx | 2 +-
l3kernel/l3drivers.dtx | 24 +-
l3kernel/l3file.dtx | 2 +-
l3kernel/l3fp-aux.dtx | 6 +-
l3kernel/l3int.dtx | 4 +-
l3kernel/l3luatex.dtx | 6 +-
l3kernel/l3names.dtx | 442 ++++++++++++++++-----------
l3kernel/l3str.dtx | 6 +-
l3kernel/l3sys.dtx | 2 +-
l3trial/l3bigint/l3bigint.dtx | 2 +-
l3trial/l3kernel-extras/l3kernel-extras.dtx | 8 +-
13 files changed, 306 insertions(+), 206 deletions(-)
diff --git a/l3kernel/l3alloc.dtx b/l3kernel/l3alloc.dtx
index 9dfb496..e9be250 100644
--- a/l3kernel/l3alloc.dtx
+++ b/l3kernel/l3alloc.dtx
@@ -124,7 +124,7 @@
% At present there are no \pkg{expl3} allocators for these concepts so the
% names and numbers of the tracking variables may change.
% \begin{macrocode}
-\tex_ifdefined:D \luatex_luatexversion:D
+\tex_ifdefined:D \tex_luatexversion:D
\tex_global:D \tex_countdef:D \g_@@_attribute_int = 21 ~
\tex_global:D \tex_countdef:D \g_@@_bytecode_int = 22 ~
\tex_global:D \tex_countdef:D \g_@@_chunkname_int = 23 ~
@@ -141,7 +141,7 @@
\cs_new_protected:Npx \box_new:N #1
{
\exp_not:N \@@_reg:nNnN { box }
- \cs_if_exist:NTF \luatex_luatexversion:D
+ \cs_if_exist:NTF \tex_luatexversion:D
{ \tex_chardef:D }
{ \tex_mathchardef:D }
\c_max_register_int
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 6bccea7..3ef6dee 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -1349,7 +1349,7 @@
% This is here as this particular integer is needed both in package
% mode and to bootstrap \pkg{l3alloc}, and is documented in \pkg{l3int}.
% \begin{macrocode}
-\tex_ifdefined:D \luatex_luatexversion:D
+\tex_ifdefined:D \tex_luatexversion:D
\tex_chardef:D \c_max_register_int = 65 535 ~
\tex_else:D
\tex_mathchardef:D \c_max_register_int = 32 767 ~
@@ -1458,7 +1458,7 @@
% A candidate, but needed early as it links to string comparisons.
% Currently \LuaTeX-only.
% \begin{macrocode}
-\cs_set:Npn \use_x:n #1 { \luatex_expanded:D {#1} }
+\cs_set:Npn \use_x:n #1 { \tex_expanded:D {#1} }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 07b245e..c6f6e2f 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2562,7 +2562,7 @@
{
\sys_if_engine_luatex:TF
{
- \luatex_directlua:D
+ \tex_directlua:D
{ tex.sprint(status.shell_escape~or~os.execute()) }
}
{
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 89aa948..f462995 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -738,8 +738,8 @@
{ \@@_color_select:n { /#1 ~ cs ~ /#1 ~ CS ~ #2 ~ sc ~ #2 ~ SC } }
\cs_new_protected:Npx \@@_color_select:n #1
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D colorstack }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D colorstack }
{ \tex_pdfcolorstack:D }
\exp_not:N \l_@@_color_stack_int push {#1}
\group_insert_after:N \exp_not:N \@@_color_reset:
@@ -747,8 +747,8 @@
\cs_generate_variant:Nn \@@_color_select:n { x }
\cs_new_protected:Npx \@@_color_reset:
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D colorstack }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D colorstack }
{ \tex_pdfcolorstack:D }
\exp_not:N \l_@@_color_stack_int pop \scan_stop:
}
@@ -1349,8 +1349,8 @@
% \begin{macrocode}
\cs_new_protected:Npx \@@_literal_pdf:n #1
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D literal }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D literal }
{ \tex_pdfliteral:D }
{ \exp_not:N \exp_not:n {#1} }
}
@@ -1363,14 +1363,14 @@
% \begin{macrocode}
\cs_new_protected:Npx \@@_scope_begin:
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D save \scan_stop: }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D save \scan_stop: }
{ \tex_pdfsave:D }
}
\cs_new_protected:Npx \@@_scope_end:
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D restore \scan_stop: }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D restore \scan_stop: }
{ \tex_pdfrestore:D }
}
% \end{macrocode}
@@ -1383,8 +1383,8 @@
% \begin{macrocode}
\cs_new_protected:Npx \@@_matrix:n #1
{
- \cs_if_exist:NTF \luatex_pdfextension:D
- { \luatex_pdfextension:D setmatrix }
+ \cs_if_exist:NTF \tex_pdfextension:D
+ { \tex_pdfextension:D setmatrix }
{ \tex_pdfsetmatrix:D }
{ \exp_not:N \exp_not:n {#1} }
}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 948f820..87a9643 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1020,7 +1020,7 @@
{
\bool_lazy_and:nnTF
{ \sys_if_engine_luatex_p: }
- { \int_compare_p:nNn \luatex_luatexversion:D > { 80 } }
+ { \int_compare_p:nNn \tex_luatexversion:D > { 80 } }
{ 128 }
{ 16 }
}
diff --git a/l3kernel/l3fp-aux.dtx b/l3kernel/l3fp-aux.dtx
index 8027813..4f3817e 100644
--- a/l3kernel/l3fp-aux.dtx
+++ b/l3kernel/l3fp-aux.dtx
@@ -1250,12 +1250,12 @@
{
\cs_set:Npn \@@_str_if_eq_x:nn #1#2
{
- \luatex_directlua:D
+ \tex_directlua:D
{
l3kernel.strcmp
(
- " \luatex_luaescapestring:D {#1}",
- " \luatex_luaescapestring:D {#2}"
+ " \tex_luaescapestring:D {#1}",
+ " \tex_luaescapestring:D {#2}"
)
}
}
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 9bbf622..5876029 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -1236,7 +1236,7 @@
}
\cs_generate_variant:Nn \int_const:Nn { c }
\if_int_odd:w 0
- \cs_if_exist:NT \luatex_luatexversion:D { 1 }
+ \cs_if_exist:NT \tex_luatexversion:D { 1 }
\cs_if_exist:NT \uptex_disablecjktoken:D
{ \if_int_compare:w \ptex_jis:D "2121 = "3000 ~ 1 \fi: }
\cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~
@@ -2574,7 +2574,7 @@
\int_const:Nn \c_max_char_int
{
\if_int_odd:w 0
- \cs_if_exist:NT \luatex_luatexversion:D { 1 }
+ \cs_if_exist:NT \tex_luatexversion:D { 1 }
\cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~
"10FFFF
\else:
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index 77431db..6b4eed8 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -203,9 +203,9 @@
% \begin{macro}[EXP]{\@@_escape_x:n, \@@_now_x:n, \@@_shipout_x:n}
% Copies of primitives.
% \begin{macrocode}
-\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
+\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
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3names.dtx b/l3kernel/l3names.dtx
index 5b7215d..900d967 100644
--- a/l3kernel/l3names.dtx
+++ b/l3kernel/l3names.dtx
@@ -66,8 +66,7 @@
% them:
% \begin{itemize}
% \item[{\cs[no-index]{tex_\ldots}}] Introduced by \TeX{}, \eTeX{},
-% \pdfTeX{} and \XeTeX{};
-% \item[{\cs[no-index]{luatex_\ldots}}] Introduced by \LuaTeX{};
+% \pdfTeX{}, \XeTeX{} and \LuaTeX{};
% \item[{\cs[no-index]{utex_\ldots}}] Introduced by \XeTeX{} and \LuaTeX{};
% \item[{\cs[no-index]{ptex_\ldots}}] Introduced by \pTeX{};
% \item[{\cs[no-index]{uptex_\ldots}}] Introduced by \upTeX{}.
@@ -768,128 +767,116 @@
\@@_primitive:NN \shellescape \tex_shellescape:D
% \end{macrocode}
% Primitives from \LuaTeX{}, some of which have been ported back to
-% \XeTeX{}. Notice that \tn{expanded} was intended for \pdfTeX{}~1.50 but
-% as that was not released we call this a \LuaTeX{} primitive.
+% \XeTeX{}.
% \begin{macrocode}
- \@@_primitive:NN \alignmark \luatex_alignmark:D
- \@@_primitive:NN \aligntab \luatex_aligntab:D
- \@@_primitive:NN \attribute \luatex_attribute:D
- \@@_primitive:NN \attributedef \luatex_attributedef:D
+ \@@_primitive:NN \alignmark \tex_alignmark:D
+ \@@_primitive:NN \aligntab \tex_aligntab:D
+ \@@_primitive:NN \attribute \tex_attribute:D
+ \@@_primitive:NN \attributedef \tex_attributedef:D
\@@_primitive:NN \automaticdiscretionary
- \luatex_automaticdiscretionary:D
- \@@_primitive:NN \automatichyphenmode
- \luatex_automatichyphenmode:D
+ \tex_automaticdiscretionary:D
+ \@@_primitive:NN \automatichyphenmode \tex_automatichyphenmode:D
\@@_primitive:NN \automatichyphenpenalty
- \luatex_automatichyphenpenalty:D
- \@@_primitive:NN \begincsname \luatex_begincsname:D
- \@@_primitive:NN \breakafterdirmode \luatex_breakafterdirmode:D
- \@@_primitive:NN \catcodetable \luatex_catcodetable:D
- \@@_primitive:NN \clearmarks \luatex_clearmarks:D
- \@@_primitive:NN \crampeddisplaystyle
- \luatex_crampeddisplaystyle:D
+ \tex_automatichyphenpenalty:D
+ \@@_primitive:NN \begincsname \tex_begincsname:D
+ \@@_primitive:NN \breakafterdirmode \tex_breakafterdirmode:D
+ \@@_primitive:NN \catcodetable \tex_catcodetable:D
+ \@@_primitive:NN \clearmarks \tex_clearmarks:D
+ \@@_primitive:NN \crampeddisplaystyle \tex_crampeddisplaystyle:D
\@@_primitive:NN \crampedscriptscriptstyle
- \luatex_crampedscriptscriptstyle:D
- \@@_primitive:NN \crampedscriptstyle \luatex_crampedscriptstyle:D
- \@@_primitive:NN \crampedtextstyle \luatex_crampedtextstyle:D
- \@@_primitive:NN \directlua \luatex_directlua:D
- \@@_primitive:NN \dviextension \luatex_dviextension:D
- \@@_primitive:NN \dvifeedback \luatex_dvifeedback:D
- \@@_primitive:NN \dvivariable \luatex_dvivariable:D
- \@@_primitive:NN \etoksapp \luatex_etoksapp:D
- \@@_primitive:NN \etokspre \luatex_etokspre:D
- \@@_primitive:NN \explicithyphenpenalty
- \luatex_explicithyphenpenalty:D
- \@@_primitive:NN \expanded \luatex_expanded:D
- \@@_primitive:NN \explicitdiscretionary
- \luatex_explicitdiscretionary:D
- \@@_primitive:NN \firstvalidlanguage \luatex_firstvalidlanguage:D
- \@@_primitive:NN \fontid \luatex_fontid:D
- \@@_primitive:NN \formatname \luatex_formatname:D
- \@@_primitive:NN \hjcode \luatex_hjcode:D
- \@@_primitive:NN \hpack \luatex_hpack:D
- \@@_primitive:NN \hyphenationbounds \luatex_hyphenationbounds:D
- \@@_primitive:NN \hyphenationmin \luatex_hyphenationmin:D
- \@@_primitive:NN \hyphenpenaltymode \luatex_hyphenpenaltymode:D
- \@@_primitive:NN \gleaders \luatex_gleaders:D
- \@@_primitive:NN \initcatcodetable \luatex_initcatcodetable:D
- \@@_primitive:NN \lastnamedcs \luatex_lastnamedcs:D
- \@@_primitive:NN \latelua \luatex_latelua:D
- \@@_primitive:NN \letcharcode \luatex_letcharcode:D
- \@@_primitive:NN \luaescapestring \luatex_luaescapestring:D
- \@@_primitive:NN \luafunction \luatex_luafunction:D
- \@@_primitive:NN \luatexbanner \luatex_luatexbanner:D
- \@@_primitive:NN \luatexrevision \luatex_luatexrevision:D
- \@@_primitive:NN \luatexversion \luatex_luatexversion:D
- \@@_primitive:NN \mathdelimitersmode \luatex_mathdelimitersmode:D
- \@@_primitive:NN \mathdisplayskipmode
- \luatex_mathdisplayskipmode:D
- \@@_primitive:NN \matheqnogapstep \luatex_matheqnogapstep:D
- \@@_primitive:NN \mathnolimitsmode \luatex_mathnolimitsmode:D
- \@@_primitive:NN \mathoption \luatex_mathoption:D
- \@@_primitive:NN \mathpenaltiesmode \luatex_mathpenaltiesmode:D
- \@@_primitive:NN \mathrulesfam \luatex_mathrulesfam:D
- \@@_primitive:NN \mathscriptsmode \luatex_mathscriptsmode:D
- \@@_primitive:NN \mathscriptboxmode \luatex_mathscriptboxmode:D
- \@@_primitive:NN \mathstyle \luatex_mathstyle:D
- \@@_primitive:NN \mathsurroundmode \luatex_mathsurroundmode:D
- \@@_primitive:NN \mathsurroundskip \luatex_mathsurroundskip:D
- \@@_primitive:NN \nohrule \luatex_nohrule:D
- \@@_primitive:NN \nokerns \luatex_nokerns:D
- \@@_primitive:NN \noligs \luatex_noligs:D
- \@@_primitive:NN \nospaces \luatex_nospaces:D
- \@@_primitive:NN \novrule \luatex_novrule:D
- \@@_primitive:NN \outputbox \luatex_outputbox:D
- \@@_primitive:NN \pagebottomoffset \luatex_pagebottomoffset:D
- \@@_primitive:NN \pageleftoffset \luatex_pageleftoffset:D
- \@@_primitive:NN \pagerightoffset \luatex_pagerightoffset:D
- \@@_primitive:NN \pagetopoffset \luatex_pagetopoffset:D
- \@@_primitive:NN \pdfextension \luatex_pdfextension:D
- \@@_primitive:NN \pdffeedback \luatex_pdffeedback:D
- \@@_primitive:NN \pdfvariable \luatex_pdfvariable:D
- \@@_primitive:NN \postexhyphenchar \luatex_postexhyphenchar:D
- \@@_primitive:NN \posthyphenchar \luatex_posthyphenchar:D
- \@@_primitive:NN \prebinoppenalty \luatex_prebinoppenalty:D
- \@@_primitive:NN \predisplaygapfactor
- \luatex_predisplaygapfactor:D
- \@@_primitive:NN \preexhyphenchar \luatex_preexhyphenchar:D
- \@@_primitive:NN \prehyphenchar \luatex_prehyphenchar:D
- \@@_primitive:NN \prerelpenalty \luatex_prerelpenalty:D
- \@@_primitive:NN \savecatcodetable \luatex_savecatcodetable:D
- \@@_primitive:NN \scantextokens \luatex_scantextokens:D
- \@@_primitive:NN \setfontid \luatex_setfontid:D
- \@@_primitive:NN \shapemode \luatex_shapemode:D
- \@@_primitive:NN \suppressifcsnameerror
- \luatex_suppressifcsnameerror:D
- \@@_primitive:NN \suppresslongerror \luatex_suppresslongerror:D
- \@@_primitive:NN \suppressmathparerror
- \luatex_suppressmathparerror:D
- \@@_primitive:NN \suppressoutererror \luatex_suppressoutererror:D
+ \tex_crampedscriptscriptstyle:D
+ \@@_primitive:NN \crampedscriptstyle \tex_crampedscriptstyle:D
+ \@@_primitive:NN \crampedtextstyle \tex_crampedtextstyle:D
+ \@@_primitive:NN \directlua \tex_directlua:D
+ \@@_primitive:NN \dviextension \tex_dviextension:D
+ \@@_primitive:NN \dvifeedback \tex_dvifeedback:D
+ \@@_primitive:NN \dvivariable \tex_dvivariable:D
+ \@@_primitive:NN \etoksapp \tex_etoksapp:D
+ \@@_primitive:NN \etokspre \tex_etokspre:D
+ \@@_primitive:NN \explicithyphenpenalty \tex_explicithyphenpenalty:D
+ \@@_primitive:NN \expanded \tex_expanded:D
+ \@@_primitive:NN \explicitdiscretionary \tex_explicitdiscretionary:D
+ \@@_primitive:NN \firstvalidlanguage \tex_firstvalidlanguage:D
+ \@@_primitive:NN \fontid \tex_fontid:D
+ \@@_primitive:NN \formatname \tex_formatname:D
+ \@@_primitive:NN \hjcode \tex_hjcode:D
+ \@@_primitive:NN \hpack \tex_hpack:D
+ \@@_primitive:NN \hyphenationbounds \tex_hyphenationbounds:D
+ \@@_primitive:NN \hyphenationmin \tex_hyphenationmin:D
+ \@@_primitive:NN \hyphenpenaltymode \tex_hyphenpenaltymode:D
+ \@@_primitive:NN \gleaders \tex_gleaders:D
+ \@@_primitive:NN \initcatcodetable \tex_initcatcodetable:D
+ \@@_primitive:NN \lastnamedcs \tex_lastnamedcs:D
+ \@@_primitive:NN \latelua \tex_latelua:D
+ \@@_primitive:NN \letcharcode \tex_letcharcode:D
+ \@@_primitive:NN \luaescapestring \tex_luaescapestring:D
+ \@@_primitive:NN \luafunction \tex_luafunction:D
+ \@@_primitive:NN \luatexbanner \tex_luatexbanner:D
+ \@@_primitive:NN \luatexrevision \tex_luatexrevision:D
+ \@@_primitive:NN \luatexversion \tex_luatexversion:D
+ \@@_primitive:NN \mathdelimitersmode \tex_mathdelimitersmode:D
+ \@@_primitive:NN \mathdisplayskipmode \tex_mathdisplayskipmode:D
+ \@@_primitive:NN \matheqnogapstep \tex_matheqnogapstep:D
+ \@@_primitive:NN \mathnolimitsmode \tex_mathnolimitsmode:D
+ \@@_primitive:NN \mathoption \tex_mathoption:D
+ \@@_primitive:NN \mathpenaltiesmode \tex_mathpenaltiesmode:D
+ \@@_primitive:NN \mathrulesfam \tex_mathrulesfam:D
+ \@@_primitive:NN \mathscriptsmode \tex_mathscriptsmode:D
+ \@@_primitive:NN \mathscriptboxmode \tex_mathscriptboxmode:D
+ \@@_primitive:NN \mathstyle \tex_mathstyle:D
+ \@@_primitive:NN \mathsurroundmode \tex_mathsurroundmode:D
+ \@@_primitive:NN \mathsurroundskip \tex_mathsurroundskip:D
+ \@@_primitive:NN \nohrule \tex_nohrule:D
+ \@@_primitive:NN \nokerns \tex_nokerns:D
+ \@@_primitive:NN \noligs \tex_noligs:D
+ \@@_primitive:NN \nospaces \tex_nospaces:D
+ \@@_primitive:NN \novrule \tex_novrule:D
+ \@@_primitive:NN \outputbox \tex_outputbox:D
+ \@@_primitive:NN \pagebottomoffset \tex_pagebottomoffset:D
+ \@@_primitive:NN \pageleftoffset \tex_pageleftoffset:D
+ \@@_primitive:NN \pagerightoffset \tex_pagerightoffset:D
+ \@@_primitive:NN \pagetopoffset \tex_pagetopoffset:D
+ \@@_primitive:NN \pdfextension \tex_pdfextension:D
+ \@@_primitive:NN \pdffeedback \tex_pdffeedback:D
+ \@@_primitive:NN \pdfvariable \tex_pdfvariable:D
+ \@@_primitive:NN \postexhyphenchar \tex_postexhyphenchar:D
+ \@@_primitive:NN \posthyphenchar \tex_posthyphenchar:D
+ \@@_primitive:NN \prebinoppenalty \tex_prebinoppenalty:D
+ \@@_primitive:NN \predisplaygapfactor \tex_predisplaygapfactor:D
+ \@@_primitive:NN \preexhyphenchar \tex_preexhyphenchar:D
+ \@@_primitive:NN \prehyphenchar \tex_prehyphenchar:D
+ \@@_primitive:NN \prerelpenalty \tex_prerelpenalty:D
+ \@@_primitive:NN \savecatcodetable \tex_savecatcodetable:D
+ \@@_primitive:NN \scantextokens \tex_scantextokens:D
+ \@@_primitive:NN \setfontid \tex_setfontid:D
+ \@@_primitive:NN \shapemode \tex_shapemode:D
+ \@@_primitive:NN \suppressifcsnameerror \tex_suppressifcsnameerror:D
+ \@@_primitive:NN \suppresslongerror \tex_suppresslongerror:D
+ \@@_primitive:NN \suppressmathparerror \tex_suppressmathparerror:D
+ \@@_primitive:NN \suppressoutererror \tex_suppressoutererror:D
\@@_primitive:NN \suppressprimitiveerror
- \luatex_suppressprimitiveerror:D
- \@@_primitive:NN \toksapp \luatex_toksapp:D
- \@@_primitive:NN \tokspre \luatex_tokspre:D
- \@@_primitive:NN \tpack \luatex_tpack:D
- \@@_primitive:NN \vpack \luatex_vpack:D
+ \tex_suppressprimitiveerror:D
+ \@@_primitive:NN \toksapp \tex_toksapp:D
+ \@@_primitive:NN \tokspre \tex_tokspre:D
+ \@@_primitive:NN \tpack \tex_tpack:D
+ \@@_primitive:NN \vpack \tex_vpack:D
% \end{macrocode}
-% Slightly more awkward are the directional primitives in \LuaTeX{}. These
-% come from Omega/Aleph, but we do not support those engines and
-% so it seems most sensible to treat them as \LuaTeX{} primitives for prefix
-% purposes. One here is \enquote{new} but fits into the general set.
+% These come from Omega/Aleph, but we do not support those engines and
+% so list them here.
% \begin{macrocode}
- \@@_primitive:NN \bodydir \luatex_bodydir:D
- \@@_primitive:NN \boxdir \luatex_boxdir:D
- \@@_primitive:NN \leftghost \luatex_leftghost:D
- \@@_primitive:NN \linedir \luatex_linedir:D
- \@@_primitive:NN \localbrokenpenalty \luatex_localbrokenpenalty:D
- \@@_primitive:NN \localinterlinepenalty
- \luatex_localinterlinepenalty:D
- \@@_primitive:NN \localleftbox \luatex_localleftbox:D
- \@@_primitive:NN \localrightbox \luatex_localrightbox:D
- \@@_primitive:NN \mathdir \luatex_mathdir:D
- \@@_primitive:NN \pagedir \luatex_pagedir:D
- \@@_primitive:NN \pardir \luatex_pardir:D
- \@@_primitive:NN \rightghost \luatex_rightghost:D
- \@@_primitive:NN \textdir \luatex_textdir:D
+ \@@_primitive:NN \bodydir \tex_bodydir:D
+ \@@_primitive:NN \boxdir \tex_boxdir:D
+ \@@_primitive:NN \leftghost \tex_leftghost:D
+ \@@_primitive:NN \linedir \tex_linedir:D
+ \@@_primitive:NN \localbrokenpenalty \tex_localbrokenpenalty:D
+ \@@_primitive:NN \localinterlinepenalty \tex_localinterlinepenalty:D
+ \@@_primitive:NN \localleftbox \tex_localleftbox:D
+ \@@_primitive:NN \localrightbox \tex_localrightbox:D
+ \@@_primitive:NN \mathdir \tex_mathdir:D
+ \@@_primitive:NN \pagedir \tex_pagedir:D
+ \@@_primitive:NN \pardir \tex_pardir:D
+ \@@_primitive:NN \rightghost \tex_rightghost:D
+ \@@_primitive:NN \textdir \tex_textdir:D
% \end{macrocode}
% Primitives from \pdfTeX{} that \LuaTeX{} renames.
% \begin{macrocode}
@@ -1234,8 +1221,8 @@
\tex_ifdefined:D \pdftracingfonts
\tex_let:D \tex_tracingfonts:D \pdftracingfonts
\tex_else:D
- \tex_ifdefined:D \luatex_directlua:D
- \luatex_directlua:D { tex.enableprimitives("@@@@", {"tracingfonts"}) }
+ \tex_ifdefined:D \tex_directlua:D
+ \tex_directlua:D { tex.enableprimitives("@@@@", {"tracingfonts"}) }
\tex_let:D \tex_tracingfonts:D \luatextracingfonts
\tex_fi:D
\tex_fi:D
@@ -1246,65 +1233,65 @@
% that get the right names anyway so are missing here!
% \begin{macrocode}
\tex_ifdefined:D \luatexsuppressfontnotfounderror
- \tex_let:D \luatex_alignmark:D \luatexalignmark
- \tex_let:D \luatex_aligntab:D \luatexaligntab
- \tex_let:D \luatex_attribute:D \luatexattribute
- \tex_let:D \luatex_attributedef:D \luatexattributedef
- \tex_let:D \luatex_catcodetable:D \luatexcatcodetable
- \tex_let:D \luatex_clearmarks:D \luatexclearmarks
- \tex_let:D \luatex_crampeddisplaystyle:D \luatexcrampeddisplaystyle
- \tex_let:D \luatex_crampedscriptscriptstyle:D
+ \tex_let:D \tex_alignmark:D \luatexalignmark
+ \tex_let:D \tex_aligntab:D \luatexaligntab
+ \tex_let:D \tex_attribute:D \luatexattribute
+ \tex_let:D \tex_attributedef:D \luatexattributedef
+ \tex_let:D \tex_catcodetable:D \luatexcatcodetable
+ \tex_let:D \tex_clearmarks:D \luatexclearmarks
+ \tex_let:D \tex_crampeddisplaystyle:D \luatexcrampeddisplaystyle
+ \tex_let:D \tex_crampedscriptscriptstyle:D
\luatexcrampedscriptscriptstyle
- \tex_let:D \luatex_crampedscriptstyle:D \luatexcrampedscriptstyle
- \tex_let:D \luatex_crampedtextstyle:D \luatexcrampedtextstyle
- \tex_let:D \luatex_fontid:D \luatexfontid
- \tex_let:D \luatex_formatname:D \luatexformatname
- \tex_let:D \luatex_gleaders:D \luatexgleaders
- \tex_let:D \luatex_initcatcodetable:D \luatexinitcatcodetable
- \tex_let:D \luatex_latelua:D \luatexlatelua
- \tex_let:D \luatex_luaescapestring:D \luatexluaescapestring
- \tex_let:D \luatex_luafunction:D \luatexluafunction
- \tex_let:D \luatex_mathstyle:D \luatexmathstyle
- \tex_let:D \luatex_nokerns:D \luatexnokerns
- \tex_let:D \luatex_noligs:D \luatexnoligs
- \tex_let:D \luatex_outputbox:D \luatexoutputbox
- \tex_let:D \luatex_pageleftoffset:D \luatexpageleftoffset
- \tex_let:D \luatex_pagetopoffset:D \luatexpagetopoffset
- \tex_let:D \luatex_postexhyphenchar:D \luatexpostexhyphenchar
- \tex_let:D \luatex_posthyphenchar:D \luatexposthyphenchar
- \tex_let:D \luatex_preexhyphenchar:D \luatexpreexhyphenchar
- \tex_let:D \luatex_prehyphenchar:D \luatexprehyphenchar
- \tex_let:D \luatex_savecatcodetable:D \luatexsavecatcodetable
- \tex_let:D \luatex_scantextokens:D \luatexscantextokens
- \tex_let:D \luatex_suppressifcsnameerror:D
+ \tex_let:D \tex_crampedscriptstyle:D \luatexcrampedscriptstyle
+ \tex_let:D \tex_crampedtextstyle:D \luatexcrampedtextstyle
+ \tex_let:D \tex_fontid:D \luatexfontid
+ \tex_let:D \tex_formatname:D \luatexformatname
+ \tex_let:D \tex_gleaders:D \luatexgleaders
+ \tex_let:D \tex_initcatcodetable:D \luatexinitcatcodetable
+ \tex_let:D \tex_latelua:D \luatexlatelua
+ \tex_let:D \tex_luaescapestring:D \luatexluaescapestring
+ \tex_let:D \tex_luafunction:D \luatexluafunction
+ \tex_let:D \tex_mathstyle:D \luatexmathstyle
+ \tex_let:D \tex_nokerns:D \luatexnokerns
+ \tex_let:D \tex_noligs:D \luatexnoligs
+ \tex_let:D \tex_outputbox:D \luatexoutputbox
+ \tex_let:D \tex_pageleftoffset:D \luatexpageleftoffset
+ \tex_let:D \tex_pagetopoffset:D \luatexpagetopoffset
+ \tex_let:D \tex_postexhyphenchar:D \luatexpostexhyphenchar
+ \tex_let:D \tex_posthyphenchar:D \luatexposthyphenchar
+ \tex_let:D \tex_preexhyphenchar:D \luatexpreexhyphenchar
+ \tex_let:D \tex_prehyphenchar:D \luatexprehyphenchar
+ \tex_let:D \tex_savecatcodetable:D \luatexsavecatcodetable
+ \tex_let:D \tex_scantextokens:D \luatexscantextokens
+ \tex_let:D \tex_suppressifcsnameerror:D
\luatexsuppressifcsnameerror
- \tex_let:D \luatex_suppresslongerror:D \luatexsuppresslongerror
- \tex_let:D \luatex_suppressmathparerror:D
+ \tex_let:D \tex_suppresslongerror:D \luatexsuppresslongerror
+ \tex_let:D \tex_suppressmathparerror:D
\luatexsuppressmathparerror
- \tex_let:D \luatex_suppressoutererror:D \luatexsuppressoutererror
+ \tex_let:D \tex_suppressoutererror:D \luatexsuppressoutererror
\tex_let:D \utex_char:D \luatexUchar
\tex_let:D \tex_suppressfontnotfounderror:D
\luatexsuppressfontnotfounderror
% \end{macrocode}
% Which also covers those slightly odd ones.
% \begin{macrocode}
- \tex_let:D \luatex_bodydir:D \luatexbodydir
- \tex_let:D \luatex_boxdir:D \luatexboxdir
- \tex_let:D \luatex_leftghost:D \luatexleftghost
- \tex_let:D \luatex_localbrokenpenalty:D \luatexlocalbrokenpenalty
- \tex_let:D \luatex_localinterlinepenalty:D
+ \tex_let:D \tex_bodydir:D \luatexbodydir
+ \tex_let:D \tex_boxdir:D \luatexboxdir
+ \tex_let:D \tex_leftghost:D \luatexleftghost
+ \tex_let:D \tex_localbrokenpenalty:D \luatexlocalbrokenpenalty
+ \tex_let:D \tex_localinterlinepenalty:D
\luatexlocalinterlinepenalty
- \tex_let:D \luatex_localleftbox:D \luatexlocalleftbox
- \tex_let:D \luatex_localrightbox:D \luatexlocalrightbox
- \tex_let:D \luatex_mathdir:D \luatexmathdir
- \tex_let:D \luatex_pagebottomoffset:D \luatexpagebottomoffset
- \tex_let:D \luatex_pagedir:D \luatexpagedir
+ \tex_let:D \tex_localleftbox:D \luatexlocalleftbox
+ \tex_let:D \tex_localrightbox:D \luatexlocalrightbox
+ \tex_let:D \tex_mathdir:D \luatexmathdir
+ \tex_let:D \tex_pagebottomoffset:D \luatexpagebottomoffset
+ \tex_let:D \tex_pagedir:D \luatexpagedir
\tex_let:D \tex_pageheight:D \luatexpageheight
- \tex_let:D \luatex_pagerightoffset:D \luatexpagerightoffset
+ \tex_let:D \tex_pagerightoffset:D \luatexpagerightoffset
\tex_let:D \tex_pagewidth:D \luatexpagewidth
- \tex_let:D \luatex_pardir:D \luatexpardir
- \tex_let:D \luatex_rightghost:D \luatexrightghost
- \tex_let:D \luatex_textdir:D \luatextextdir
+ \tex_let:D \tex_pardir:D \luatexpardir
+ \tex_let:D \tex_rightghost:D \luatexrightghost
+ \tex_let:D \tex_textdir:D \luatextextdir
\tex_fi:D
% \end{macrocode}
% Only \pdfTeX{} and \LuaTeX{} define \tn{pdfmapfile} and \tn{pdfmapline}:
@@ -1313,7 +1300,7 @@
% \begin{macrocode}
\tex_ifnum:D 0
\tex_ifdefined:D \tex_pdftexversion:D 1 \tex_fi:D
- \tex_ifdefined:D \luatex_luatexversion:D 1 \tex_fi:D
+ \tex_ifdefined:D \tex_luatexversion:D 1 \tex_fi:D
= 0 %
\tex_let:D \tex_mapfile:D \tex_undefined:D
\tex_let:D \tex_mapline:D \tex_undefined:D
@@ -1342,7 +1329,7 @@
% confusing. Removing them means that \cs{tex_pdftexversion:D} is
% a marker for \pdfTeX{} alone: useful in engine-dependent code later.
% \begin{macrocode}
-\tex_ifdefined:D \luatex_luatexversion:D
+\tex_ifdefined:D \tex_luatexversion:D
\tex_let:D \tex_pdftexbanner:D \tex_undefined:D
\tex_let:D \tex_pdftexrevision:D \tex_undefined:D
\tex_let:D \tex_pdftexversion:D \tex_undefined:D
@@ -1367,15 +1354,15 @@
\tex_let:D \tex_over:D \normalover
\tex_let:D \tex_vcenter:D \normalvcenter
\tex_let:D \tex_unexpanded:D \normalunexpanded
- \tex_let:D \luatex_expanded:D \normalexpanded
+ \tex_let:D \tex_expanded:D \normalexpanded
\tex_fi:D
\tex_ifdefined:D \normalitaliccorrection
\tex_let:D \tex_hoffset:D \normalhoffset
\tex_let:D \tex_italiccorrection:D \normalitaliccorrection
\tex_let:D \tex_voffset:D \normalvoffset
\tex_let:D \tex_showtokens:D \normalshowtokens
- \tex_let:D \luatex_bodydir:D \spac_directions_normal_body_dir
- \tex_let:D \luatex_pagedir:D \spac_directions_normal_page_dir
+ \tex_let:D \tex_bodydir:D \spac_directions_normal_body_dir
+ \tex_let:D \tex_pagedir:D \spac_directions_normal_page_dir
\tex_fi:D
\tex_ifdefined:D \normalleft
\tex_let:D \tex_left:D \normalleft
@@ -1688,6 +1675,119 @@
\@@_primitive:NN \XeTeXvariationname \xetex_variationname:D
\@@_primitive:NN \XeTeXrevision \xetex_XeTeXrevision:D
\@@_primitive:NN \XeTeXversion \xetex_XeTeXversion:D
+ \@@_primitive:NN \alignmark \luatex_alignmark:D
+ \@@_primitive:NN \aligntab \luatex_aligntab:D
+ \@@_primitive:NN \attribute \luatex_attribute:D
+ \@@_primitive:NN \attributedef \luatex_attributedef:D
+ \@@_primitive:NN \automaticdiscretionary
+ \luatex_automaticdiscretionary:D
+ \@@_primitive:NN \automatichyphenmode
+ \luatex_automatichyphenmode:D
+ \@@_primitive:NN \automatichyphenpenalty
+ \luatex_automatichyphenpenalty:D
+ \@@_primitive:NN \begincsname \luatex_begincsname:D
+ \@@_primitive:NN \breakafterdirmode \luatex_breakafterdirmode:D
+ \@@_primitive:NN \catcodetable \luatex_catcodetable:D
+ \@@_primitive:NN \clearmarks \luatex_clearmarks:D
+ \@@_primitive:NN \crampeddisplaystyle
+ \luatex_crampeddisplaystyle:D
+ \@@_primitive:NN \crampedscriptscriptstyle
+ \luatex_crampedscriptscriptstyle:D
+ \@@_primitive:NN \crampedscriptstyle \luatex_crampedscriptstyle:D
+ \@@_primitive:NN \crampedtextstyle \luatex_crampedtextstyle:D
+ \@@_primitive:NN \directlua \luatex_directlua:D
+ \@@_primitive:NN \dviextension \luatex_dviextension:D
+ \@@_primitive:NN \dvifeedback \luatex_dvifeedback:D
+ \@@_primitive:NN \dvivariable \luatex_dvivariable:D
+ \@@_primitive:NN \etoksapp \luatex_etoksapp:D
+ \@@_primitive:NN \etokspre \luatex_etokspre:D
+ \@@_primitive:NN \explicithyphenpenalty
+ \luatex_explicithyphenpenalty:D
+ \@@_primitive:NN \expanded \luatex_expanded:D
+ \@@_primitive:NN \explicitdiscretionary
+ \luatex_explicitdiscretionary:D
+ \@@_primitive:NN \firstvalidlanguage \luatex_firstvalidlanguage:D
+ \@@_primitive:NN \fontid \luatex_fontid:D
+ \@@_primitive:NN \formatname \luatex_formatname:D
+ \@@_primitive:NN \hjcode \luatex_hjcode:D
+ \@@_primitive:NN \hpack \luatex_hpack:D
+ \@@_primitive:NN \hyphenationbounds \luatex_hyphenationbounds:D
+ \@@_primitive:NN \hyphenationmin \luatex_hyphenationmin:D
+ \@@_primitive:NN \hyphenpenaltymode \luatex_hyphenpenaltymode:D
+ \@@_primitive:NN \gleaders \luatex_gleaders:D
+ \@@_primitive:NN \initcatcodetable \luatex_initcatcodetable:D
+ \@@_primitive:NN \lastnamedcs \luatex_lastnamedcs:D
+ \@@_primitive:NN \latelua \luatex_latelua:D
+ \@@_primitive:NN \letcharcode \luatex_letcharcode:D
+ \@@_primitive:NN \luaescapestring \luatex_luaescapestring:D
+ \@@_primitive:NN \luafunction \luatex_luafunction:D
+ \@@_primitive:NN \luatexbanner \luatex_luatexbanner:D
+ \@@_primitive:NN \luatexrevision \luatex_luatexrevision:D
+ \@@_primitive:NN \luatexversion \luatex_luatexversion:D
+ \@@_primitive:NN \mathdelimitersmode \luatex_mathdelimitersmode:D
+ \@@_primitive:NN \mathdisplayskipmode
+ \luatex_mathdisplayskipmode:D
+ \@@_primitive:NN \matheqnogapstep \luatex_matheqnogapstep:D
+ \@@_primitive:NN \mathnolimitsmode \luatex_mathnolimitsmode:D
+ \@@_primitive:NN \mathoption \luatex_mathoption:D
+ \@@_primitive:NN \mathpenaltiesmode \luatex_mathpenaltiesmode:D
+ \@@_primitive:NN \mathrulesfam \luatex_mathrulesfam:D
+ \@@_primitive:NN \mathscriptsmode \luatex_mathscriptsmode:D
+ \@@_primitive:NN \mathscriptboxmode \luatex_mathscriptboxmode:D
+ \@@_primitive:NN \mathstyle \luatex_mathstyle:D
+ \@@_primitive:NN \mathsurroundmode \luatex_mathsurroundmode:D
+ \@@_primitive:NN \mathsurroundskip \luatex_mathsurroundskip:D
+ \@@_primitive:NN \nohrule \luatex_nohrule:D
+ \@@_primitive:NN \nokerns \luatex_nokerns:D
+ \@@_primitive:NN \noligs \luatex_noligs:D
+ \@@_primitive:NN \nospaces \luatex_nospaces:D
+ \@@_primitive:NN \novrule \luatex_novrule:D
+ \@@_primitive:NN \outputbox \luatex_outputbox:D
+ \@@_primitive:NN \pagebottomoffset \luatex_pagebottomoffset:D
+ \@@_primitive:NN \pageleftoffset \luatex_pageleftoffset:D
+ \@@_primitive:NN \pagerightoffset \luatex_pagerightoffset:D
+ \@@_primitive:NN \pagetopoffset \luatex_pagetopoffset:D
+ \@@_primitive:NN \pdfextension \luatex_pdfextension:D
+ \@@_primitive:NN \pdffeedback \luatex_pdffeedback:D
+ \@@_primitive:NN \pdfvariable \luatex_pdfvariable:D
+ \@@_primitive:NN \postexhyphenchar \luatex_postexhyphenchar:D
+ \@@_primitive:NN \posthyphenchar \luatex_posthyphenchar:D
+ \@@_primitive:NN \prebinoppenalty \luatex_prebinoppenalty:D
+ \@@_primitive:NN \predisplaygapfactor
+ \luatex_predisplaygapfactor:D
+ \@@_primitive:NN \preexhyphenchar \luatex_preexhyphenchar:D
+ \@@_primitive:NN \prehyphenchar \luatex_prehyphenchar:D
+ \@@_primitive:NN \prerelpenalty \luatex_prerelpenalty:D
+ \@@_primitive:NN \savecatcodetable \luatex_savecatcodetable:D
+ \@@_primitive:NN \scantextokens \luatex_scantextokens:D
+ \@@_primitive:NN \setfontid \luatex_setfontid:D
+ \@@_primitive:NN \shapemode \luatex_shapemode:D
+ \@@_primitive:NN \suppressifcsnameerror
+ \luatex_suppressifcsnameerror:D
+ \@@_primitive:NN \suppresslongerror \luatex_suppresslongerror:D
+ \@@_primitive:NN \suppressmathparerror
+ \luatex_suppressmathparerror:D
+ \@@_primitive:NN \suppressoutererror \luatex_suppressoutererror:D
+ \@@_primitive:NN \suppressprimitiveerror
+ \luatex_suppressprimitiveerror:D
+ \@@_primitive:NN \toksapp \luatex_toksapp:D
+ \@@_primitive:NN \tokspre \luatex_tokspre:D
+ \@@_primitive:NN \tpack \luatex_tpack:D
+ \@@_primitive:NN \vpack \luatex_vpack:D
+ \@@_primitive:NN \bodydir \luatex_bodydir:D
+ \@@_primitive:NN \boxdir \luatex_boxdir:D
+ \@@_primitive:NN \leftghost \luatex_leftghost:D
+ \@@_primitive:NN \linedir \luatex_linedir:D
+ \@@_primitive:NN \localbrokenpenalty \luatex_localbrokenpenalty:D
+ \@@_primitive:NN \localinterlinepenalty
+ \luatex_localinterlinepenalty:D
+ \@@_primitive:NN \localleftbox \luatex_localleftbox:D
+ \@@_primitive:NN \localrightbox \luatex_localrightbox:D
+ \@@_primitive:NN \mathdir \luatex_mathdir:D
+ \@@_primitive:NN \pagedir \luatex_pagedir:D
+ \@@_primitive:NN \pardir \luatex_pardir:D
+ \@@_primitive:NN \rightghost \luatex_rightghost:D
+ \@@_primitive:NN \textdir \luatex_textdir:D
\tex_endgroup:D
%</package>
% \end{macrocode}
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 7b8f278..f0e47d6 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1044,10 +1044,10 @@
% such tokens.
% \begin{macrocode}
\cs_new:Npn \@@_if_eq_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
-\cs_if_exist:NT \luatex_luatexversion:D
+\cs_if_exist:NT \tex_luatexversion: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_eq:NN \lua_escape_x:n \tex_luaescapestring:D
+ \cs_set_eq:NN \lua_now_x:n \tex_directlua:D
\cs_set:Npn \@@_if_eq_x:nn #1#2
{
\lua_now_x:n
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index e305652..866a8c3 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -222,7 +222,7 @@
% \begin{macrocode}
\str_const:Nx \c_sys_engine_str
{
- \cs_if_exist:NT \luatex_luatexversion:D { luatex }
+ \cs_if_exist:NT \tex_luatexversion:D { luatex }
\cs_if_exist:NT \tex_pdftexversion:D { pdftex }
\cs_if_exist:NT \ptex_kanjiskip:D
{
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 96a8fa8..516f5ee 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -627,7 +627,7 @@
% comparison requires this.
% \begin{macrocode}
\cs_new:Npn \@@_str_cmp_x:nn #1#2 { \tex_strcmp:D {#1} {#2} }
-\cs_if_exist:NT \luatex_luatexversion:D
+\cs_if_exist:NT \tex_luatexversion:D
{
\cs_set:Npn \@@_str_cmp_x:nn #1#2
{
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index 449cdae..d63955c 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -731,11 +731,11 @@
{
\cs_gset:Npn \__msg_expandable_warning:n #1
{
- \luatex_directlua:D
+ \tex_directlua:D
{
texio.write_nl
( "
- \luatex_luaescapestring:D
+ \tex_luaescapestring:D
{
l. \int_use:N \tex_inputlineno:D \c_space_tl
LaTeX3~ warning:~ \tl_to_str:n {#1}
@@ -753,13 +753,13 @@
{
\cs_gset:Npx \__msg_expandable_error:n #1
{
- \exp_not:N \luatex_directlua:D
+ \exp_not:N \tex_directlua:D
\exp_not:N \use:n
{
{
tex.error
( "
- \exp_not:N \luatex_luaescapestring:D
+ \exp_not:N \tex_luaescapestring:D
{ \exp_not:N \tl_to_str:n { LaTeX3~error:~#1} }
" )
\prg_replicate:nn { 50 } { ~ }
More information about the latex3-commits
mailing list