[latex3-commits] [git/LaTeX3-latex3-latex3] lmtx: "luametatex" no "lmtx" (5db4aaea9)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Apr 20 23:58:54 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : lmtx
Link : https://github.com/latex3/latex3/commit/5db4aaea9e71fc82703799afaf03b0520d790fa6
>---------------------------------------------------------------
commit 5db4aaea9e71fc82703799afaf03b0520d790fa6
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Apr 20 22:58:54 2023 +0100
"luametatex" no "lmtx"
>---------------------------------------------------------------
5db4aaea9e71fc82703799afaf03b0520d790fa6
l3backend/l3backend-basics.dtx | 6 +++---
l3backend/l3backend-pdf.dtx | 4 ++--
l3backend/l3backend.ins | 16 ++++++++--------
l3kernel/l3cctab.dtx | 20 ++++++++++----------
l3kernel/l3file.dtx | 12 ++++++------
l3kernel/l3sys.dtx | 43 ++++++++++++++++++++----------------------
6 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/l3backend/l3backend-basics.dtx b/l3backend/l3backend-basics.dtx
index 70617d58c..93efd4515 100644
--- a/l3backend/l3backend-basics.dtx
+++ b/l3backend/l3backend-basics.dtx
@@ -81,10 +81,10 @@
{l3backend-dvisvgm.def}{2023-04-19}{}
{L3 backend support: dvisvgm}
%</dvisvgm>
-%<*lmtx>
- {l3backend-lmtx.def}{2023-04-19}{}
+%<*luametatex>
+ {l3backend-luametatex.def}{2023-04-19}{}
{L3 backend support: LuaMetaTeX}
-%</lmtx>
+%</luametatex>
%<*luatex>
{l3backend-luatex.def}{2023-04-19}{}
{L3 backend support: PDF output (LuaTeX)}
diff --git a/l3backend/l3backend-pdf.dtx b/l3backend/l3backend-pdf.dtx
index e1708207a..fd3f6cbdf 100644
--- a/l3backend/l3backend-pdf.dtx
+++ b/l3backend/l3backend-pdf.dtx
@@ -72,7 +72,7 @@
% are common to most backends.
%
% \begin{macrocode}
-%<*!dvisvgm&!lmtx>
+%<*!dvisvgm&!luametatex>
% \end{macrocode}
%
% \begin{variable}{\l_@@_internal_box}
@@ -82,7 +82,7 @@
% \end{variable}
%
% \begin{macrocode}
-%</!dvisvgm&!lmtx>
+%</!dvisvgm&!luametatex>
% \end{macrocode}
%
% \subsection{\texttt{dvips} backend}
diff --git a/l3backend/l3backend.ins b/l3backend/l3backend.ins
index 0d6de5544..3d0b1aa24 100644
--- a/l3backend/l3backend.ins
+++ b/l3backend/l3backend.ins
@@ -99,15 +99,15 @@ and all files in that bundle must be distributed together.
}
\generate
{
- \file{l3backend-lmtx.def}
+ \file{l3backend-luametatex.def}
{
- \from{l3backend-basics.dtx} {package,lmtx}
- \from{l3backend-color.dtx} {package,lmtx}
- \from{l3backend-box.dtx} {package,lmtx}
- \from{l3backend-draw.dtx} {package,lmtx}
- \from{l3backend-graphics.dtx}{package,lmtx}
- \from{l3backend-pdf.dtx} {package,lmtx}
- \from{l3backend-opacity.dtx} {package,lmtx}
+ \from{l3backend-basics.dtx} {package,luametatex}
+ \from{l3backend-color.dtx} {package,luametatex}
+ \from{l3backend-box.dtx} {package,luametatex}
+ \from{l3backend-draw.dtx} {package,luametatex}
+ \from{l3backend-graphics.dtx}{package,luametatex}
+ \from{l3backend-pdf.dtx} {package,luametatex}
+ \from{l3backend-opacity.dtx} {package,luametatex}
}
}
\generate
diff --git a/l3kernel/l3cctab.dtx b/l3kernel/l3cctab.dtx
index 99e411f3e..c601a4fd5 100644
--- a/l3kernel/l3cctab.dtx
+++ b/l3kernel/l3cctab.dtx
@@ -255,7 +255,7 @@
% so that is added explicitly.
% \begin{macrocode}
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new_protected:Npn \cctab_new:N #1
@@ -315,7 +315,7 @@
% catcodes and the \tn{endlinechar} in an intarray variable.
% \begin{macrocode}
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new_protected:Npn \@@_gset:n #1
@@ -413,7 +413,7 @@
% \end{verbatim}
% \begin{macrocode}
\bool_lazy_if:nnT
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\@@_new:N \g_@@_internal_cctab
@@ -440,7 +440,7 @@
{ \@@_chk_if_valid:NT #1 { \@@_select:N #1 } }
\cs_generate_variant:Nn \cctab_select:N { c }
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new_protected:Npn \@@_select:N #1
@@ -486,7 +486,7 @@
% restore them at \cs{cctab_end:}.
% \begin{macrocode}
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new_protected:Npn \@@_begin_aux:
@@ -650,7 +650,7 @@
% extracted from the |cctab| variable.
% \begin{macrocode}
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ \cs_new:Npn \@@_nesting_number:N #1 {#1} }
{
@@ -693,7 +693,7 @@
\cs_new:Npn \cctab_item:Nn #1#2
{ \exp_args:Nf \@@_item:nN { \int_eval:n {#2} } #1 }
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new:Npn \@@_item:nN #1#2
@@ -752,7 +752,7 @@
}
}
\bool_lazy_if:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new_protected:Npn \@@_chk_if_valid_aux:NTF #1
@@ -837,7 +837,7 @@
\char_set_catcode_invalid:n { 0 }
\bool_lazy_any:nTF
{
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ \sys_if_engine_xetex_p: }
}
@@ -867,7 +867,7 @@
\char_set_catcode_invalid:n { 127 } % ^^?
\bool_lazy_any:nF
{
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ \sys_if_engine_xetex_p: }
}
diff --git a/l3kernel/l3file.dtx b/l3kernel/l3file.dtx
index 28cee887f..805793efd 100644
--- a/l3kernel/l3file.dtx
+++ b/l3kernel/l3file.dtx
@@ -1104,7 +1104,7 @@
\prop_gput:NVn \exp_not:N \g_@@_streams_prop #1 {#2}
\tex_openin:D #1
\bool_lazy_or:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ {#2} }
{ \exp_not:N \__kernel_file_name_quote:n {#2} \scan_stop: }
@@ -1414,7 +1414,7 @@
\bool_lazy_and:nnTF
{
\bool_lazy_or_p:nn
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
}
{ \int_compare_p:nNn \tex_luatexversion:D > { 80 } }
@@ -2721,7 +2721,7 @@
\exp_not:N \exp_after:wN \exp_not:N \prg_do_nothing:
\exp_not:N \tex_input:D
\bool_lazy_or:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ {#1} }
{ \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
@@ -3068,7 +3068,7 @@
\cs_new:Npn \file_hex_dump:n #1
{ \exp_args:Ne \@@_hex_dump:n { \file_full_name:n {#1} } }
\bool_lazy_or:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\cs_new:Npn \@@_hex_dump:n #1
@@ -3320,7 +3320,7 @@
\exp_not:N \@@_input_push:n {#1}
\exp_not:N \tex_input:D
\bool_lazy_or:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{ {#1} }
{ \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
@@ -3774,7 +3774,7 @@
% file searching.
% \begin{macrocode}
\bool_lazy_or:nnTF
- { \sys_if_engine_lmtx_p: }
+ { \sys_if_engine_luametatex_p: }
{ \sys_if_engine_luatex_p: }
{
\str_const:Nx \c_sys_platform_str
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index 6a2ba9076..3059d8623 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -83,7 +83,7 @@
%
% \begin{function}[added = 2015-09-07, updated = 2023-04-20, EXP, pTF]
% {
-% \sys_if_engine_lmtx: ,
+% \sys_if_engine_luametatex: ,
% \sys_if_engine_luatex:,
% \sys_if_engine_pdftex:,
% \sys_if_engine_ptex: ,
@@ -103,12 +103,12 @@
%
% \begin{variable}[added = 2015-09-19]{\c_sys_engine_str}
% The current engine given as a lower case string: one of
-% |lmtx|, |luatex|, |pdftex|, |ptex|, |uptex| or |xetex|.
+% |luametatex|, |luatex|, |pdftex|, |ptex|, |uptex| or |xetex|.
% \end{variable}
%
% \begin{variable}[added = 2020-08-20, updated = 2023-04-20]{\c_sys_engine_exec_str}
% The name of the standard executable for the current \TeX{} engine given
-% as a lower case string: one of |lmtx|, |luatex|,
+% as a lower case string: one of |luametatex|, |luatex|,
% |luahbtex|, |pdftex|, |eptex|, |euptex| or |xetex|. Note that
% \end{variable}
%
@@ -375,7 +375,7 @@
%
% \begin{macro}[pTF, EXP]
% {
-% \sys_if_engine_lmtx:,
+% \sys_if_engine_luametatex:,
% \sys_if_engine_luatex:,
% \sys_if_engine_pdftex:,
% \sys_if_engine_ptex:,
@@ -392,7 +392,7 @@
{
\int_compare:nNnTF \tex_luatexversion:D < 200
{ luatex }
- { lmtx }
+ { luametatex }
}
\cs_if_exist:NT \tex_pdftexversion:D { pdftex }
\cs_if_exist:NT \tex_kanjiskip:D
@@ -404,7 +404,7 @@
\cs_if_exist:NT \tex_XeTeXversion:D { xetex }
}
\tl_map_inline:nn
- { { lmtx } { luatex } { pdftex } { ptex } { uptex } { xetex } }
+ { { luametatex } { luatex } { pdftex } { ptex } { uptex } { xetex } }
{
\@@_const:nn { sys_if_engine_ #1 }
{ \str_if_eq_p:Vn \c_sys_engine_str {#1} }
@@ -431,24 +431,21 @@
\cs_set_eq:NN \lua_now:e \tex_directlua:D
\str_const:Nx \c_sys_engine_exec_str
{
- \sys_if_engine_lmtx:TF
- { lmtx }
+ \sys_if_engine_pdftex:T { pdf }
+ \sys_if_engine_xetex:T { xe }
+ \sys_if_engine_ptex:T { ep }
+ \sys_if_engine_uptex:T { eup }
+ \sys_if_engine_luametex:T { luameta }
+ \sys_if_engine_luatex:T
{
- \sys_if_engine_pdftex:T { pdf }
- \sys_if_engine_xetex:T { xe }
- \sys_if_engine_ptex:T { ep }
- \sys_if_engine_uptex:T { eup }
- \sys_if_engine_luatex:T
+ lua \lua_now:e
{
- lua \lua_now:e
- {
- if (pcall(require, 'luaharfbuzz')) then ~
- tex.print("hb") ~
- end
- }
+ if (pcall(require, 'luaharfbuzz')) then ~
+ tex.print("hb") ~
+ end
}
- tex
}
+ tex
}
\group_end:
\str_const:Nx \c_sys_engine_format_str
@@ -572,8 +569,8 @@
}
}
{
- \sys_if_engine_lmtx:TF
- { \tl_gset:Nn #1 { lmtx } }
+ \sys_if_engine_luametatex:TF
+ { \tl_gset:Nn #1 { luametatex } }
{
\str_case:VnF #1
{
@@ -1050,7 +1047,7 @@ end
{ \cs_if_exist_use:NF \tex_pdfoutput:D { 0 } } > { 0 }
{ pdf }
{
- \sys_if_engine_lmtx:F
+ \sys_if_engine_luametatex:F
{ dvi }
}
}
More information about the latex3-commits
mailing list.