[latex3-commits] [git/LaTeX3-latex3-latex3] master: Condense l3sys further (4b502fb)
Bruno Le Floch
bruno at le-floch.fr
Fri Apr 27 21:08:22 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/4b502fb3489aaea21aadd06c9ea5b3fb2ee91dee
>---------------------------------------------------------------
commit 4b502fb3489aaea21aadd06c9ea5b3fb2ee91dee
Author: Bruno Le Floch <bruno at le-floch.fr>
Date: Fri Apr 27 15:08:22 2018 -0400
Condense l3sys further
>---------------------------------------------------------------
4b502fb3489aaea21aadd06c9ea5b3fb2ee91dee
l3kernel/l3candidates.dtx | 11 +---
l3kernel/l3sys.dtx | 103 +++++++++++++++----------------
l3kernel/testfiles/m3expl001.luatex.tlg | 7 ++-
l3kernel/testfiles/m3expl001.ptex.tlg | 7 ++-
l3kernel/testfiles/m3expl001.tlg | 7 ++-
l3kernel/testfiles/m3expl001.uptex.tlg | 7 ++-
l3kernel/testfiles/m3expl001.xetex.tlg | 7 ++-
l3kernel/testfiles/m3expl003.luatex.tlg | 7 ++-
l3kernel/testfiles/m3expl003.ptex.tlg | 7 ++-
l3kernel/testfiles/m3expl003.tlg | 7 ++-
l3kernel/testfiles/m3expl003.uptex.tlg | 7 ++-
l3kernel/testfiles/m3expl003.xetex.tlg | 7 ++-
12 files changed, 93 insertions(+), 91 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 3708509..0fd326d 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -2449,15 +2449,8 @@
% \begin{macro}[EXP, pTF]{\sys_if_rand_exist:}
% Currently, randomness exists under \pdfTeX{}, \LuaTeX{}, \pTeX{} and \upTeX{}.
% \begin{macrocode}
-\cs_if_exist:NTF \pdftex_uniformdeviate:D
- {
- \prg_new_conditional:Npnn \sys_if_rand_exist: { p , T , F , TF }
- { \prg_return_true: }
- }
- {
- \prg_new_conditional:Npnn \sys_if_rand_exist: { p , T , F , TF }
- { \prg_return_false: }
- }
+\@@_const:nn { sys_if_rand_exist }
+ { \cs_if_exist_p:N \pdftex_uniformdeviate:D }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3kernel/l3sys.dtx b/l3kernel/l3sys.dtx
index c215656..9522941 100644
--- a/l3kernel/l3sys.dtx
+++ b/l3kernel/l3sys.dtx
@@ -134,6 +134,10 @@
%<*initex|package>
% \end{macrocode}
%
+% \begin{macrocode}
+%<@@=sys>
+% \end{macrocode}
+%
% \subsection{The name of the job}
%
% \begin{variable}{\c_sys_jobname_str}
@@ -178,6 +182,29 @@
%
% \subsection{Detecting the engine}
%
+% \begin{macro}{\@@_const:nn}
+% Set the |T|, |F|, |TF|, |p| forms of |#1| to be constants equal to
+% the result of evaluating the boolean expression~|#2|.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_const:nn #1#2
+ {
+ \bool_if:nTF {#2}
+ {
+ \cs_new_eq:cN { #1 :T } \use:n
+ \cs_new_eq:cN { #1 :F } \use_none:n
+ \cs_new_eq:cN { #1 :TF } \use_i:nn
+ \cs_new_eq:cN { #1 _p: } \c_true_bool
+ }
+ {
+ \cs_new_eq:cN { #1 :T } \use_none:n
+ \cs_new_eq:cN { #1 :F } \use:n
+ \cs_new_eq:cN { #1 :TF } \use_ii:nn
+ \cs_new_eq:cN { #1 _p: } \c_false_bool
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[pTF, EXP]
% {
% \sys_if_engine_luatex:,
@@ -187,47 +214,32 @@
% \sys_if_engine_xetex:
% }
% \begin{variable}{\c_sys_engine_str}
-% \begin{macro}{\@@_tmp:n}
% Set up the engine tests on the basis exactly one test should be true.
% Mainly a case of looking for the appropriate marker primitive. For
% \upTeX{}, there is a complexity in that setting |-kanji-internal=sjis|
% or |-kanji-internal=euc| effective makes it more like \pTeX{}. In those
% cases we therefore report \pTeX{} rather than \upTeX{}.
% \begin{macrocode}
-\cs_set_protected:Npn \@@_tmp:n #1
- {
- \cs_new_eq:cN { sys_if_engine_ #1 :T } \use_none:n
- \cs_new_eq:cN { sys_if_engine_ #1 :F } \use:n
- \cs_new_eq:cN { sys_if_engine_ #1 :TF } \use_ii:nn
- \cs_new_eq:cN { sys_if_engine_ #1 _p: } \c_false_bool
- }
-\@@_tmp:n { luatex }
-\@@_tmp:n { pdftex }
-\@@_tmp:n { ptex }
-\@@_tmp:n { uptex }
-\@@_tmp:n { xetex }
-\cs_set_protected:Npn \@@_tmp:n #1
+\str_const:Nx \c_sys_engine_str
{
- \cs_gset_eq:cN { sys_if_engine_ #1 :T } \use:n
- \cs_gset_eq:cN { sys_if_engine_ #1 :F } \use_none:n
- \cs_gset_eq:cN { sys_if_engine_ #1 :TF } \use_i:nn
- \cs_gset_eq:cN { sys_if_engine_ #1 _p: } \c_true_bool
- \str_const:Nn \c_sys_engine_str {#1}
+ \cs_if_exist:NT \luatex_luatexversion:D { luatex }
+ \cs_if_exist:NT \pdftex_pdftexversion:D { pdftex }
+ \cs_if_exist:NT \ptex_kanjiskip:D
+ {
+ \bool_lazy_and:nnTF
+ { \cs_if_exist_p:N \uptex_disablecjktoken:D }
+ { \int_compare_p:nNn { \ptex_jis:D "2121 } = { "3000 } }
+ { uptex }
+ { ptex }
+ }
+ \cs_if_exist:NT \xetex_XeTeXversion:D { xetex }
}
-\cs_if_exist:NT \luatex_luatexversion:D { \@@_tmp:n { luatex } }
-\cs_if_exist:NT \pdftex_pdftexversion:D { \@@_tmp:n { pdftex } }
-\cs_if_exist:NT \ptex_kanjiskip:D
+\tl_map_inline:nn { { luatex } { pdftex } { ptex } { uptex } { xetex } }
{
- \bool_lazy_and:nnTF
- { \cs_if_exist_p:N \uptex_disablecjktoken:D }
- { \int_compare_p:nNn { \ptex_jis:D "2121 } = { "3000 } }
- { \@@_tmp:n { uptex } }
- { \@@_tmp:n { ptex } }
+ \@@_const:nn { sys_if_engine_ #1 }
+ { \str_if_eq_x_p:nn \c_sys_engine_str {#1} }
}
-\cs_if_exist:NT \xetex_XeTeXversion:D { \@@_tmp:n { xetex } }
-\cs_undefine:N \@@_tmp:n
% \end{macrocode}
-% \end{macro}
% \end{variable}
% \end{macro}
%
@@ -241,30 +253,17 @@
% \begin{variable}{\c_sys_output_str}
% This is a simple enough concept: the two views here are complementary.
% \begin{macrocode}
-\int_compare:nNnTF
- { \cs_if_exist_use:NF \pdftex_pdfoutput:D { 0 } } > { 0 }
- {
- \cs_new_eq:NN \sys_if_output_dvi:T \use_none:n
- \cs_new_eq:NN \sys_if_output_dvi:F \use:n
- \cs_new_eq:NN \sys_if_output_dvi:TF \use_ii:nn
- \cs_new_eq:NN \sys_if_output_dvi_p: \c_false_bool
- \cs_new_eq:NN \sys_if_output_pdf:T \use:n
- \cs_new_eq:NN \sys_if_output_pdf:F \use_none:n
- \cs_new_eq:NN \sys_if_output_pdf:TF \use_i:nn
- \cs_new_eq:NN \sys_if_output_pdf_p: \c_true_bool
- \str_const:Nn \c_sys_output_str { pdf }
- }
+\str_const:Nx \c_sys_output_str
{
- \cs_new_eq:NN \sys_if_output_dvi:T \use:n
- \cs_new_eq:NN \sys_if_output_dvi:F \use_none:n
- \cs_new_eq:NN \sys_if_output_dvi:TF \use_i:nn
- \cs_new_eq:NN \sys_if_output_dvi_p: \c_true_bool
- \cs_new_eq:NN \sys_if_output_pdf:T \use_none:n
- \cs_new_eq:NN \sys_if_output_pdf:F \use:n
- \cs_new_eq:NN \sys_if_output_pdf:TF \use_ii:nn
- \cs_new_eq:NN \sys_if_output_pdf_p: \c_false_bool
- \str_const:Nn \c_sys_output_str { dvi }
+ \int_compare:nNnTF
+ { \cs_if_exist_use:NF \pdftex_pdfoutput:D { 0 } } > { 0 }
+ { pdf }
+ { dvi }
}
+\@@_const:nn { sys_if_output_dvi }
+ { \str_if_eq_x_p:nn \c_sys_output_str { dvi } }
+\@@_const:nn { sys_if_output_pdf }
+ { \str_if_eq_x_p:nn \c_sys_output_str { pdf } }
% \end{macrocode}
% \end{variable}
% \end{macro}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index af668e5..eaa3fb2 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -1648,6 +1648,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1668,7 +1670,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1677,7 +1679,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5716,10 +5717,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index aafe9a3..7891577 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5709,10 +5710,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 0ee8e32..9c4052a 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5709,10 +5710,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 422a700..33b9901 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5707,10 +5708,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 9e92cab..91848c2 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5690,10 +5691,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index af668e5..eaa3fb2 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -1648,6 +1648,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1668,7 +1670,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1677,7 +1679,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5716,10 +5717,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index aafe9a3..7891577 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5709,10 +5710,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 0ee8e32..9c4052a 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5709,10 +5710,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 422a700..33b9901 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5707,10 +5708,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 9e92cab..91848c2 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -1646,6 +1646,8 @@ Defining \c_sys_hour_int on line ...
Defining \c_sys_day_int on line ...
Defining \c_sys_month_int on line ...
Defining \c_sys_year_int on line ...
+Defining \__sys_const:nn on line ...
+Defining \c_sys_engine_str on line ...
Defining \sys_if_engine_luatex:T on line ...
Defining \sys_if_engine_luatex:F on line ...
Defining \sys_if_engine_luatex:TF on line ...
@@ -1666,7 +1668,7 @@ Defining \sys_if_engine_xetex:T on line ...
Defining \sys_if_engine_xetex:F on line ...
Defining \sys_if_engine_xetex:TF on line ...
Defining \sys_if_engine_xetex_p: on line ...
-Defining \c_sys_engine_str on line ...
+Defining \c_sys_output_str on line ...
Defining \sys_if_output_dvi:T on line ...
Defining \sys_if_output_dvi:F on line ...
Defining \sys_if_output_dvi:TF on line ...
@@ -1675,7 +1677,6 @@ Defining \sys_if_output_pdf:T on line ...
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 \c_empty_clist on line ...
Defining \l__clist_internal_clist on line ...
Defining \__clist_tmp:w on line ...
@@ -5690,10 +5691,10 @@ Defining \seq_rand_item:c on line ...
Defining \seq_const_from_clist:Nn on line ...
Defining \seq_const_from_clist:cn on line ...
Defining \skip_split_finite_else_action:nnNN on line ...
-Defining \sys_if_rand_exist_p: on line ...
Defining \sys_if_rand_exist:T on line ...
Defining \sys_if_rand_exist:F on line ...
Defining \sys_if_rand_exist:TF on line ...
+Defining \sys_if_rand_exist_p: on line ...
Defining \sys_rand_seed: on line ...
Defining \sys_gset_rand_seed:n on line ...
Defining \c_sys_shell_escape_int on line ...
More information about the latex3-commits
mailing list