[latex3-commits] [latex3/latex3] e-type: Switch from x-type to e-type in l3trial (94056c328)
github at latex-project.org
github at latex-project.org
Tue Sep 26 17:36:46 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : e-type
Link : https://github.com/latex3/latex3/commit/94056c328ca2ffddff891eabb6e7e6c8a4d2553a
>---------------------------------------------------------------
commit 94056c328ca2ffddff891eabb6e7e6c8a4d2553a
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Sep 25 22:37:36 2023 +0100
Switch from x-type to e-type in l3trial
>---------------------------------------------------------------
94056c328ca2ffddff891eabb6e7e6c8a4d2553a
l3trial/l3bigint/l3bigint.dtx | 4 +-
l3trial/l3check/l3check.dtx | 8 +--
l3trial/l3fp-extras/l3fp-functions.dtx | 2 +-
l3trial/l3htoks/l3htoks.dtx | 8 +--
l3trial/l3kernel-extras/l3kernel-extras.dtx | 10 ++--
.../testfiles/m3kernel-extras004.lvt | 2 +-
l3trial/l3ldb/l3ldb.dtx | 58 +++++++++++-----------
l3trial/l3ldb/l3ldbparse.dtx | 4 +-
l3trial/l3ldb/l3precom.dtx | 4 +-
l3trial/l3trace/l3trace.dtx | 30 +++++------
10 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/l3trial/l3bigint/l3bigint.dtx b/l3trial/l3bigint/l3bigint.dtx
index 9597d1d94..03a4f7486 100644
--- a/l3trial/l3bigint/l3bigint.dtx
+++ b/l3trial/l3bigint/l3bigint.dtx
@@ -2427,7 +2427,7 @@
%
% \begin{macro}{\bigint_set:Nn, \bigint_set:cn}
% \begin{macro}{\bigint_gset:Nn, \bigint_gset:cn}
-% Use \cs{tl_set:Nx} with \cs{@@_parse:n} to evaluate the expression.
+% Use \cs{tl_set:Ne} with \cs{@@_parse:n} to evaluate the expression.
% \begin{macrocode}
\cs_new_protected:Npn \bigint_set:Nn #1#2
{ \tl_set:Ne #1 { \exp:w \@@_parse:n {#2} } }
@@ -2781,7 +2781,7 @@
\cs_new_protected:Npn \@@_show_aux:NN #1#2
{
\cs_if_exist:NTF #2
- { \exp_args:Nx #1 { \token_to_str:N #2 = \bigint_use:N #2 } }
+ { \exp_args:Ne #1 { \token_to_str:N #2 = \bigint_use:N #2 } }
{ \tl_show:N #2 }
}
\cs_new_protected:Npn \bigint_show:n
diff --git a/l3trial/l3check/l3check.dtx b/l3trial/l3check/l3check.dtx
index bf81f1ef3..2eddc1165 100644
--- a/l3trial/l3check/l3check.dtx
+++ b/l3trial/l3check/l3check.dtx
@@ -1179,7 +1179,7 @@
%
% Let us do |\cs_(set/gset/new)(/_protected)(/_nopar):N(/p)(n/x)|, $48$
% assignment functions. For now, just check that the first argument is
-% a single token, is a function (not yet), and for the |:Nn|/|:Nx|
+% a single token, is a function (not yet), and for the |:Nn|/|:Ne|
% defining functions, check that the signature is right. Additionally,
% check that \enquote{nopar} is used properly: have a warning when
% trying to define a long macro with no parameter or a non-long macro
@@ -1796,8 +1796,8 @@
% \subsubsection{\pkg{l3clist}}
%
% |\clist_new:(N/c)|, |\clist_const:Nn| abuses |\tl_const:Ne|, |\clist_(g/)clear:(N/c)|, |\clist_(g/)clear_new:(N/c)|,
-% |\clist_(g/)set_eq:(N/c)(N/c)|, |\clist_(g/)set_from_seq:NN| abuses |\tl_(g/)set:N?|, |\clist_(g/)concat:NNN| abuses |\tl_(g/)set:Nx|,
-% |\clist_if_exist:(N/c)|(TF), |\clist_(g/)set:Nn| abuses |\tl_(g/)set:Nx|, |\clist_(g/)put_(left/right):Nn| just N-type, |\clist_(get/pop/gpop):NN|(TF) abuse |\tl_(g/)set:N(n/x)|, |\clist_(g/)push:Nn|, |\clist_(g/)remove_duplicates:N|, |\clist_(g/)remove_all:Nn|, |\clist_(g/)reverse:N|, |\clist_if_in:Nn|(TF), |\clist_map_function:(N/n)N|, |\clist_map_inline:Nn|, |\clist_map_variable:(N/n)Nn|, |\clist_count:N|, |\clist_use:Nn(/nn)|, |\clist_item:Nn|, |\clist_(show/log):N|
+% |\clist_(g/)set_eq:(N/c)(N/c)|, |\clist_(g/)set_from_seq:NN| abuses |\tl_(g/)set:N?|, |\clist_(g/)concat:NNN| abuses |\tl_(g/)set:Ne|,
+% |\clist_if_exist:(N/c)|(TF), |\clist_(g/)set:Nn| abuses |\tl_(g/)set:Ne|, |\clist_(g/)put_(left/right):Nn| just N-type, |\clist_(get/pop/gpop):NN|(TF) abuse |\tl_(g/)set:N(n/x)|, |\clist_(g/)push:Nn|, |\clist_(g/)remove_duplicates:N|, |\clist_(g/)remove_all:Nn|, |\clist_(g/)reverse:N|, |\clist_if_in:Nn|(TF), |\clist_map_function:(N/n)N|, |\clist_map_inline:Nn|, |\clist_map_variable:(N/n)Nn|, |\clist_count:N|, |\clist_use:Nn(/nn)|, |\clist_item:Nn|, |\clist_(show/log):N|
%
% \subsubsection{\pkg{l3token}}
%
@@ -1869,7 +1869,7 @@
% |\fp_compare:nNn|(TF), |\fp_(do_until/do_while/until_do/while_do):nNnn|
% |\fp_to_(scientific/decimal/tl/dim/int):N|, |\fp_use:N|,
%
-% |\fp_new:N|, |\fp_(set/gset/const):Nn| abuses |\tl_(set/gset/const):Nx|
+% |\fp_new:N|, |\fp_(set/gset/const):Nn| abuses |\tl_(set/gset/const):Ne|
% |\fp_(g/)set_eq:NN|, |\fp_(g/)zero(/_new):N|, |\fp_(show/log):N|,
%
% |\fp_(g/)set_from_dim:Nn| (deprecated!)
diff --git a/l3trial/l3fp-extras/l3fp-functions.dtx b/l3trial/l3fp-extras/l3fp-functions.dtx
index 273d14e83..27220ff05 100644
--- a/l3trial/l3fp-extras/l3fp-functions.dtx
+++ b/l3trial/l3fp-extras/l3fp-functions.dtx
@@ -290,7 +290,7 @@
\exp_args:No \clist_map_inline:nn { \tl_to_str:n {#3} }
{
\int_incr:N \l_@@_function_arg_int
- \exp_args:Nx \@@_clear_variable:n
+ \exp_args:Ne \@@_clear_variable:n
{ _ \tex_romannumeral:D \l_@@_function_arg_int }
\fp_clear_variable:n {##1}
\cs_set_nopar:cpe { l_@@_variable_##1_fp }
diff --git a/l3trial/l3htoks/l3htoks.dtx b/l3trial/l3htoks/l3htoks.dtx
index 8de909b54..bc633e810 100644
--- a/l3trial/l3htoks/l3htoks.dtx
+++ b/l3trial/l3htoks/l3htoks.dtx
@@ -80,7 +80,7 @@
% \end{function}
%
% \begin{function}{\htoks_code:n}
-% \begin{function}{\htoks_tokens:n, \htoks_tokens:V, \htoks_tokens:x}
+% \begin{function}{\htoks_tokens:n, \htoks_tokens:V, \htoks_tokens:e}
% \begin{syntax}
% \cs{htoks_code:n} \Arg{code}
% \cs{htoks_tokens:n} \Arg{tokens}
@@ -1171,7 +1171,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\htoks_tokens:n, \htoks_tokens:V, \htoks_tokens:x}
+% \begin{macro}{\htoks_tokens:n, \htoks_tokens:V, \htoks_tokens:e}
% \begin{macrocode}
\msg_new:nnn { htoks } { not-parsing }
{ The~function~#1~can~only~be~used~within~#2. }
@@ -1189,7 +1189,7 @@
{ \token_to_str:N \htoks_set:Nn }
}
}
-\cs_generate_variant:Nn \htoks_tokens:n { V , x }
+\cs_generate_variant:Nn \htoks_tokens:n { V , e }
\msg_new:nnn { htoks } { not-active }
{ The~#1~command~was~used~outside~#2. }
% \end{macrocode}
@@ -1205,7 +1205,7 @@
\skip_set:Nn \l_tmpa_skip {#2}
\IfBooleanTF {#1}
{
- \htoks_tokens:x { \hspace* { \skip_use:N \l_tmpa_skip } }
+ \htoks_tokens:e { \hspace* { \skip_use:N \l_tmpa_skip } }
\htoks_code:n
{
\tex_vrule:D width \c_zero_dim \scan_stop:
diff --git a/l3trial/l3kernel-extras/l3kernel-extras.dtx b/l3trial/l3kernel-extras/l3kernel-extras.dtx
index ac64d9a88..692c10352 100644
--- a/l3trial/l3kernel-extras/l3kernel-extras.dtx
+++ b/l3trial/l3kernel-extras/l3kernel-extras.dtx
@@ -87,7 +87,7 @@
%
% \subsection{\pkg{l3basics}}
%
-% \begin{function}{\group_insert_after:n, \group_insert_after:x}
+% \begin{function}{\group_insert_after:n, \group_insert_after:e}
% \begin{syntax}
% \cs{group_insert_after:n} \Arg{tokens}
% \end{syntax}
@@ -102,7 +102,7 @@
% \group_end:
% \end{verbatim}
% will use the value of \cs{l_example_tl} when \cs{tl_use:N}, which is
-% outside the group. Using \cs{group_insert_after:x} would instead
+% outside the group. Using \cs{group_insert_after:e} would instead
% use \enquote{\texttt{inside}}.
% \end{function}
%
@@ -736,7 +736,7 @@
%
% \subsection{\pkg{l3basics}}
%
-% \begin{macro}{\group_insert_after:n, \group_insert_after:x}
+% \begin{macro}{\group_insert_after:n, \group_insert_after:e}
% \begin{macro}[EXP]{\__group_insert_after:NNn}
% The material to insert at the end of a given group is stored in a
% global variable, whose name is built from the
@@ -753,7 +753,7 @@
\exp_args:NNc \__group_insert_after:NNn \tl_gput_right:Nn
{ g_group_after_ \int_use:N \tex_currentgrouplevel:D _tl }
}
-\cs_new_protected:Npn \group_insert_after:x
+\cs_new_protected:Npn \group_insert_after:e
{
\exp_args:NNc \__group_insert_after:NNn \tl_gput_right:Ne
{ g_group_after_ \int_use:N \tex_currentgrouplevel:D _tl }
@@ -795,7 +795,7 @@
\cs_new_protected:Npn \group_after_set:NNn #1#2#3
{
#1 #2 {#3}
- \group_insert_after:x { \exp_not:n { #1 #2 } { \exp_not:V #2 } }
+ \group_insert_after:e { \exp_not:n { #1 #2 } { \exp_not:V #2 } }
}
% \end{macrocode}
% \end{macro}
diff --git a/l3trial/l3kernel-extras/testfiles/m3kernel-extras004.lvt b/l3trial/l3kernel-extras/testfiles/m3kernel-extras004.lvt
index 8da83fbfb..f11091815 100644
--- a/l3trial/l3kernel-extras/testfiles/m3kernel-extras004.lvt
+++ b/l3trial/l3kernel-extras/testfiles/m3kernel-extras004.lvt
@@ -94,7 +94,7 @@
\group_insert_after:N \tl_show:n
\group_insert_after:n { { abc } }
\group_insert_after:N \cs_show:N
- \group_insert_after:x { \exp_not:c { foo: } }
+ \group_insert_after:e { \exp_not:c { foo: } }
\cs_show:N \foo:
\group_end:
}
diff --git a/l3trial/l3ldb/l3ldb.dtx b/l3trial/l3ldb/l3ldb.dtx
index 67f0bd67f..686fdf755 100644
--- a/l3trial/l3ldb/l3ldb.dtx
+++ b/l3trial/l3ldb/l3ldb.dtx
@@ -263,7 +263,7 @@
\cs_set:Npn \ldb_tmp:w ##1 #1 ##2 \ldb_tmp:w
{
%<*trace>
- \trace_ldb_internal:x
+ \trace_ldb_internal:e
{
... will~
\tl_if_empty:nTF {##2} { add~ } { move~ } \token_to_str:N#1~
@@ -338,7 +338,7 @@
\cs_new_protected:Npn \ldb_enter:nnn #1#2#3
{
\ldb_parse:n {#1}
-%<trace> \trace_ldb_internal:x { { lex:~ \tl_to_str:N \g_ldb_triples_tl } }
+%<trace> \trace_ldb_internal:e { { lex:~ \tl_to_str:N \g_ldb_triples_tl } }
% \end{macrocode}
% Depending on the type of parameter we do different things: a
% register gets updated using direct assignments internally, a
@@ -515,7 +515,7 @@
\tl_set_eq:NN \l_ldb_internal_tl \l_ldb_lc_tl
\fi:
\or: % parsing finished we now update assignments
-%<trace> \trace_ldb_internal:x { qstop~found:~update~parm }
+%<trace> \trace_ldb_internal:e { qstop~found:~update~parm }
\if_meaning:w \l_ldb_assign_tl \q_nil
%FMi this one really holds tokens not a pointer (which is a prop)
\cs_ggen_sym:N \l_ldb_assign_tl
@@ -647,8 +647,8 @@
{
%<*trace>
\tl_set:Ne \l_ldb_internal_tl { \if_mode_vertical: (sequenced) ~ \fi: }
- \trace_ldb:x { }
- \trace_ldb:x
+ \trace_ldb:e { }
+ \trace_ldb:e
{
Begin~Processing~*****~#1~*****~ \l_ldb_internal_tl
\msg_line_context:
@@ -712,7 +712,7 @@
%<speed> \if_meaning:w \c_empty_tl #1 \else:
%<*trace>
\tl_set:Nn \l_trace_tl { #3 ML }
- \trace_ldb_internal:x
+ \trace_ldb_internal:e
{
Updating~parms~with~class~`\tl_to_str:N \l_ldb_class_tl'~
using~#3~list:~`\tl_to_str:N #1'
@@ -752,7 +752,7 @@
\cs_new_protected:Npn \ldb_update_single_aux:NN #1#2
{
%<*trace>
- \trace_ldb_internal:x
+ \trace_ldb_internal:e
{
..~looking~for~\tl_to_str:N \l_ldb_class_tl \c_space_tl
in~\l_trace_tl\space\token_to_str:N#2~containing
@@ -763,12 +763,12 @@
%</trace>
\prop_get:NoNTF #2 \l_ldb_class_tl \l_ldb_internal_tl
{
-%<trace> \trace_ldb_internal:x {...~found~\tl_to_str:N \l_ldb_internal_tl}
+%<trace> \trace_ldb_internal:e {...~found~\tl_to_str:N \l_ldb_internal_tl}
\exp_after:wN #1 \l_ldb_internal_tl
\q_nil \q_nil \q_nil \q_nil \q_nil \q_nil \q_nil \q_nil \q_stop
}
{
-%<trace> \trace_ldb_internal:x {...~no~match~found}
+%<trace> \trace_ldb_internal:e {...~no~match~found}
}
}
% \end{macrocode}
@@ -828,8 +828,8 @@
{
%<*trace>
\tl_set:Ne \l_ldb_internal_tl { \if_mode_vertical: (sequenced)~ \fi: }
- \trace_ldb:x { }
- \trace_ldb:x
+ \trace_ldb:e { }
+ \trace_ldb:e
{
End~Processing~*****~#1~*****~\l_ldb_internal_tl
\msg_line_context:
@@ -910,7 +910,7 @@
{
\if_meaning:w #1 \q_nil \else:
%<*trace>
- \trace_ldb:x {...~execute~\token_to_str:N #1}
+ \trace_ldb:e {...~execute~\token_to_str:N #1}
\ldb_show_pointer:N #1
%</trace>
#1 % execute values
@@ -1032,24 +1032,24 @@
%<*trace>
% \end{macrocode}
%
-% \begin{macro}{\trace_ldb:x, \trace_ldb_internal:x}
+% \begin{macro}{\trace_ldb:e, \trace_ldb_internal:e}
% \begin{variable}{\g_trace_ldb_status}
-% \cs{trace_ldb_internal:x} shows some internal infos if requested.
+% \cs{trace_ldb_internal:e} shows some internal infos if requested.
% \begin{macrocode}
-\cs_new_protected:Npn \trace_ldb:x #1
+\cs_new_protected:Npn \trace_ldb:e #1
{
\if_int_compare:w \g_trace_ldb_status > \c_zero_int
\iow_term:e { LDB:~ #1 }
\fi:
}
-\cs_new_protected:Npn \trace_ldb_internal:x #1
+\cs_new_protected:Npn \trace_ldb_internal:e #1
{
\if_int_compare:w \g_trace_ldb_status > \c_one_int
\iow_term:e { LDB:~ #1 }
\fi:
}
\cs_new_protected:Npn \trace_ldb_internal:n #1
- { \trace_ldb_internal:x { \exp_not:n {#1} } }
+ { \trace_ldb_internal:e { \exp_not:n {#1} } }
\int_new:N \g_trace_ldb_status
% \end{macrocode}
% Default is to show a bit.
@@ -1066,7 +1066,7 @@
\cs_new_protected:Npn \show_ldb_entry:nnn #1#2#3
{
\tl_gset:Nn \g_ldb_internal_tl {#3}
- \trace_ldb:x
+ \trace_ldb:e
{
Set~\token_to_str:N#2~
with~value~\tl_to_str:N \g_ldb_internal_tl \space in~#1
@@ -1089,8 +1089,8 @@
{
%<*trace>
\tl_gset:Nn \g_ldb_internal_tl {#2}
- \trace_ldb:x { .....~ Change~ \token_to_str:N#1~because~ of~ `#3':}
- \trace_ldb:x
+ \trace_ldb:e { .....~ Change~ \token_to_str:N#1~because~ of~ `#3':}
+ \trace_ldb:e
{ ..........~\exp_not:o {#1}~->~ \tl_to_str:N \g_ldb_internal_tl }
%</trace>
\cs_set:Npn #1 {#2}
@@ -1124,8 +1124,8 @@
\cs_new_protected:Npn \show_function_update:Nnn #1#2#3
{
%<*trace>
- \trace_ldb:x { .....~ Execute~ function~ because~ of~ `#3':}
- \trace_ldb:x { ......=>..~\exp_not:n{#1}~ \exp_not:n{ {#2} } }
+ \trace_ldb:e { .....~ Execute~ function~ because~ of~ `#3':}
+ \trace_ldb:e { ......=>..~\exp_not:n{#1}~ \exp_not:n{ {#2} } }
%</trace>
#1 {#2}
}
@@ -1139,8 +1139,8 @@
{
%<*trace>
\tl_gset:Nn \g_ldb_internal_tl {#2}
- \trace_ldb:x { .....~ Change~ \token_to_str:N#1 ~ because~ of~ `#3': }
- \trace_ldb:x
+ \trace_ldb:e { .....~ Change~ \token_to_str:N#1 ~ because~ of~ `#3': }
+ \trace_ldb:e
{ ..........~ \tex_the:D#1~ ->~ \tl_to_str:N \g_ldb_internal_tl }
%</trace>
#1 #2 \scan_stop:
@@ -1154,7 +1154,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \ldb_show_pointer:N #1
{
- \trace_ldb:x
+ \trace_ldb:e
{
Value~ of~\token_to_str:N#1~containing\iow_newline:
<<\tl_to_str:N#1>>
@@ -1430,14 +1430,14 @@
%
% \subsubsection{Functions}
%
-% \begin{function}{\trace_ldb:x}
+% \begin{function}{\trace_ldb:e}
% \begin{syntax}
-% \cs{trace_rdb:n} \Arg{text}
+% \cs{trace_ldb:n} \Arg{text}
% \end{syntax}
% \end{function}
%
-% \begin{function}{\trace_ldb_internal:x}
+% \begin{function}{\trace_ldb_internal:e}
% \begin{syntax}
-% \cs{trace_ldb_internal:x} \Arg{text}
+% \cs{trace_ldb_internal:e} \Arg{text}
% \end{syntax}
% \end{function}
diff --git a/l3trial/l3ldb/l3ldbparse.dtx b/l3trial/l3ldb/l3ldbparse.dtx
index 005545b41..30bbb5035 100644
--- a/l3trial/l3ldb/l3ldbparse.dtx
+++ b/l3trial/l3ldb/l3ldbparse.dtx
@@ -152,13 +152,13 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\glet_gtmp:N, \gdef_gtmp:n, \gdef_gtmp:x}
+% \begin{macro}{\glet_gtmp:N, \gdef_gtmp:n, \gdef_gtmp:e}
% Very convenient abbreviations for defining a continuation in
% |\gtmp:w| for immediate use.
% \begin{macrocode}
\cs_new_protected:Npn \glet_gtmp:N { \cs_gset_eq:NN \gtmp:w }
\cs_new_protected:Npn \gdef_gtmp:n { \cs_gset:Npn \gtmp:w }
-\cs_new_protected:Npn \gdef_gtmp:x { \cs_gset:Npe \gtmp:w }
+\cs_new_protected:Npn \gdef_gtmp:e { \cs_gset:Npe \gtmp:w }
% \end{macrocode}
% \end{macro}
%
diff --git a/l3trial/l3ldb/l3precom.dtx b/l3trial/l3ldb/l3precom.dtx
index b98b6eabc..ffd206421 100644
--- a/l3trial/l3ldb/l3precom.dtx
+++ b/l3trial/l3ldb/l3precom.dtx
@@ -246,10 +246,10 @@
% \begin{macrocode}
\cs_new_protected:Npn \cs_ggen_sym:N #1
{
-%<trace> \trace_ldb_internal:x { \exp_not:n { \cs_ggen_sym:N { #1 } } }
+%<trace> \trace_ldb_internal:e { \exp_not:n { \cs_ggen_sym:N { #1 } } }
\int_gincr:N \g_ggen_sym_int
\tl_set:Ne #1 { \exp_not:c { g*\__int_to_roman:w \g_ggen_sym_int } }
-%<trace> \trace_ldb_internal:x { \token_to_meaning:N #1 ~ ... ~ allocated }
+%<trace> \trace_ldb_internal:e { \token_to_meaning:N #1 ~ ... ~ allocated }
%<precompile> \exp_after:wN \cs_record_name:N #1
\exp_after:wN \tl_clear_new:N #1
}
diff --git a/l3trial/l3trace/l3trace.dtx b/l3trial/l3trace/l3trace.dtx
index ba7f5d903..195fa02c9 100644
--- a/l3trial/l3trace/l3trace.dtx
+++ b/l3trial/l3trace/l3trace.dtx
@@ -163,30 +163,30 @@
%
% \subsection{Code-level functions}
%
-% \begin{macro}{\trace_push:nnx, \trace_push:nnn}
+% \begin{macro}{\trace_push:nne, \trace_push:nnn}
% The arguments are: the \meta{module} name, the \meta{level} of
% tracing (positive), and the function to be pushed. We only trace if
% the \meta{module} is declared and if the \meta{level} is at most the
% \meta{module}'s current tracing level.
% \begin{macrocode}
-\cs_new_protected:Npn \trace_push:nnx #1#2#3
+\cs_new_protected:Npn \trace_push:nne #1#2#3
{
\trace_chk_module_declared:nT {#1}
{
\int_compare:nNnF {#2} >
{ \int_use:c { g_trace_ \tl_to_str:n {#1} _level_int } }
{
- \trace_display:x { entering~#3 }
+ \trace_display:e { entering~#3 }
\seq_gput_right:Ne \g_trace_nesting_seq { \tl_to_str:n {#1} }
}
}
}
\cs_new_protected:Npn \trace_push:nnn #1#2#3
- { \trace_push:nnx {#1} {#2} { \exp_not:n {#3} } }
+ { \trace_push:nne {#1} {#2} { \exp_not:n {#3} } }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\trace_pop:nnx, \trace_pop:nnn}
+% \begin{macro}{\trace_pop:nne, \trace_pop:nnn}
% Under the same conditions as \cs{trace_push:nnn}, we leave the
% function. Maybe we shouldn't record this in the case where the
% \meta{level} is equal to the module's current tracing level:
@@ -197,7 +197,7 @@
% \begin{macrocode}
\tl_new:N \l_trace_internal_a_tl
\tl_new:N \l_trace_internal_b_tl
-\cs_new_protected:Npn \trace_pop:nnx #1#2#3
+\cs_new_protected:Npn \trace_pop:nne #1#2#3
{
\trace_chk_module_declared:nT {#1}
{
@@ -212,41 +212,41 @@
{ \tl_to_str:N \l_trace_internal_a_tl }
{ \tl_to_str:N \l_trace_internal_b_tl }
}
- \trace_display:x { leaving~#3 }
+ \trace_display:e { leaving~#3 }
}
}
}
\cs_new_protected:Npn \trace_pop:nnn #1#2#3
- { \trace_pop:nnx {#1} {#2} { \exp_not:n {#3} } }
+ { \trace_pop:nne {#1} {#2} { \exp_not:n {#3} } }
% \msg_new:nnn { trace } { mismatched-pop } { }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\trace:nnx, \trace:nnn}
-% Similar to \cs{trace_push:nnx} and \cs{trace_pop:nnx} for the tests,
+% \begin{macro}{\trace:nne, \trace:nnn}
+% Similar to \cs{trace_push:nne} and \cs{trace_pop:nne} for the tests,
% but has no side-effect.
% \begin{macrocode}
-\cs_new_protected:Npn \trace:nnx #1#2#3
+\cs_new_protected:Npn \trace:nne #1#2#3
{
\trace_chk_module_declared:nT {#1}
{
\int_compare:nNnF {#2} >
{ \int_use:c { g_trace_ \tl_to_str:n {#1} _level_int } }
- { \trace_display:x { #3 } }
+ { \trace_display:e { #3 } }
}
}
\cs_new_protected:Npn \trace:nnn #1#2#3
- { \trace:nnx {#1} {#2} { \exp_not:n {#3} } }
+ { \trace:nne {#1} {#2} { \exp_not:n {#3} } }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\trace_display:x}
+% \begin{macro}{\trace_display:e}
% This macro unconditionally displays some tracing information on the
% screen.
% In case we want to show the content of some sequence we locally redefine
% their data structures (may have to be done for other types as well).
% \begin{macrocode}
-\cs_new:Npn \trace_display:x #1
+\cs_new:Npn \trace_display:e #1
{
\__seq_push_item_def:n { ##1 \space }
\typeout
More information about the latex3-commits
mailing list.