summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3kernel/l3token.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3token.dtx')
-rw-r--r--macros/latex/contrib/l3kernel/l3token.dtx64
1 files changed, 32 insertions, 32 deletions
diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx
index ce274f9583..aedde78098 100644
--- a/macros/latex/contrib/l3kernel/l3token.dtx
+++ b/macros/latex/contrib/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-08-29}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -1490,7 +1490,7 @@
\char_set_lccode:nn { `\^^@ } { ##1 }
\tex_lowercase:D { \group_end: #2 ^^@ }
}
- \cs_new_protected:cpx { #1 :NN } ##1
+ \cs_new_protected:cpe { #1 :NN } ##1
{ \exp_not:c { #1 : nN } { `##1 } }
}
\@@_tmp:nN { char_set_active_eq } \cs_set_eq:NN
@@ -1614,7 +1614,7 @@
\char_set_catcode_math_superscript:n { 0 }
\tl_put_right:Nn \l_@@_tmp_tl { ^^@ \exp_not:N \or: }
\char_set_catcode_parameter:n { 0 }
- \tl_put_right:Nn \l_@@_tmp_tl { ^^@^^@ \exp_not:N \or: }
+ \tl_put_right:Nn \l_@@_tmp_tl { ^^@ \exp_not:N \or: }
\tl_put_right:Nn \l_@@_tmp_tl { { \if_false: } \fi: \exp_not:N \or: }
\char_set_catcode_alignment:n { 0 }
\tl_put_right:Nn \l_@@_tmp_tl { ^^@ \exp_not:N \or: }
@@ -1627,16 +1627,16 @@
% \end{macrocode}
% Convert the above temporary list into a series of constant token
% lists, one for each character code, using \cs{tex_lowercase:D} to
-% convert |^^@| in each case. The \texttt{x}-type expansion ensures
+% convert |^^@| in each case. The \texttt{e}-type expansion ensures
% that \cs{tex_lowercase:D} receives the contents of the token list.
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:n #1
{
\char_set_lccode:nn { 0 } {#1}
\char_set_lccode:nn { 32 } {#1}
- \exp_args:Nx \tex_lowercase:D
+ \exp_args:Ne \tex_lowercase:D
{
- \tl_const:Nx
+ \tl_const:Ne
\exp_not:c { c_@@_ \@@_int_to_roman:w #1 _tl }
{ \exp_not:o \l_@@_tmp_tl }
}
@@ -1848,7 +1848,7 @@
% \begin{macro}{\c_catcode_other_space_tl}
% Create a space with category code $12$: an \enquote{other} space.
% \begin{macrocode}
-\tl_const:Nx \c_catcode_other_space_tl { \char_generate:nn { `\ } { 12 } }
+\tl_const:Ne \c_catcode_other_space_tl { \char_generate:nn { `\ } { 12 } }
% \end{macrocode}
% \end{macro}
%
@@ -2127,17 +2127,17 @@
% detokenized.
%
% \begin{macrocode}
-\use:x
+\use:e
{
- \prg_new_conditional:Npnn \exp_not:N \token_if_macro:N ##1
+ \prg_new_conditional:Npnn \exp_not:N \token_if_macro:N #1
{ p , T , F , TF }
{
\exp_not:N \exp_after:wN \exp_not:N \@@_if_macro_p:w
- \exp_not:N \token_to_meaning:N ##1 \tl_to_str:n { ma : }
+ \exp_not:N \token_to_meaning:N #1 \tl_to_str:n { ma : }
\s_@@_stop
}
\cs_new:Npn \exp_not:N \@@_if_macro_p:w
- ##1 \tl_to_str:n { ma } ##2 \c_colon_str ##3 \s_@@_stop
+ #1 \tl_to_str:n { ma } #2 \c_colon_str #3 \s_@@_stop
}
{
\str_if_eq:nnTF { #2 } { cro }
@@ -2208,11 +2208,11 @@
\group_begin:
\cs_set_protected:Npn \@@_tmp:w #1
{
- \use:x
+ \use:e
{
\cs_new:Npn \exp_not:c { @@_delimit_by_ #1 :w }
- ####1 \tl_to_str:n {#1} ####2 \s_@@_stop
- { ####1 \tl_to_str:n {#1} }
+ ##1 \tl_to_str:n {#1} ##2 \s_@@_stop
+ { ##1 \tl_to_str:n {#1} }
}
}
\@@_tmp:w { char" }
@@ -2283,17 +2283,17 @@
\group_begin:
\cs_set_protected:Npn \@@_tmp:w #1#2#3
{
- \use:x
+ \use:e
{
- \prg_new_conditional:Npnn \exp_not:c { token_if_ #1 :N } ####1
+ \prg_new_conditional:Npnn \exp_not:c { token_if_ #1 :N } ##1
{ p , T , F , TF }
{
\cs_if_exist:cT { tex_ #2 :D }
{
- \exp_not:N \if_meaning:w ####1 \exp_not:c { tex_ #2 :D }
+ \exp_not:N \if_meaning:w ##1 \exp_not:c { tex_ #2 :D }
\exp_not:N \prg_return_false:
\exp_not:N \else:
- \exp_not:N \if_meaning:w ####1 \exp_not:c { tex_ #2 def:D }
+ \exp_not:N \if_meaning:w ##1 \exp_not:c { tex_ #2 def:D }
\exp_not:N \prg_return_false:
\exp_not:N \else:
}
@@ -2301,7 +2301,7 @@
{
\exp_not:N \exp_after:wN
\exp_not:c { @@_delimit_by_ #2 :w }
- \exp_not:N \token_to_meaning:N ####1
+ \exp_not:N \token_to_meaning:N ##1
? \tl_to_str:n {#2} \s_@@_stop
}
{ \exp_not:n {#3} }
@@ -2464,26 +2464,26 @@ end
}
{
\tex_chardef:D \c_@@_A_int = `A ~ %
- \use:x
+ \use:e
{
- \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N ##1
+ \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N #1
{ p , T , F , TF }
{
- \exp_not:N \token_if_macro:NTF ##1
+ \exp_not:N \token_if_macro:NTF #1
\exp_not:N \prg_return_false:
{
\exp_not:N \exp_after:wN \exp_not:N \@@_if_primitive:NNw
- \exp_not:N \token_to_meaning:N ##1
- \tl_to_str:n { : : : } \s_@@_stop ##1
+ \exp_not:N \token_to_meaning:N #1
+ \tl_to_str:n { : : : } \s_@@_stop #1
}
}
\cs_new:Npn \exp_not:N \@@_if_primitive:NNw
- ##1##2 ##3 \c_colon_str ##4 \s_@@_stop
+ #1#2 #3 \c_colon_str #4 \s_@@_stop
{
\exp_not:N \tl_if_empty:oTF
- { \exp_not:N \@@_if_primitive_space:w ##3 ~ }
+ { \exp_not:N \@@_if_primitive_space:w #3 ~ }
{
- \exp_not:N \@@_if_primitive_loop:N ##3
+ \exp_not:N \@@_if_primitive_loop:N #3
\c_colon_str \s_@@_stop
}
{ \exp_not:N \@@_if_primitive_nullfont:N }
@@ -2694,7 +2694,7 @@ end
% \begin{macrocode}
\cs_new_protected:Npn \peek_remove_spaces:n #1
{
- \cs_set:Npx \@@_false:w { \exp_not:n {#1} }
+ \cs_set:Npe \@@_false:w { \exp_not:n {#1} }
\group_align_safe_begin:
\cs_set:Npn \@@_true_aux:w { \peek_after:Nw \@@_remove_spaces: }
\@@_true_aux:w
@@ -2723,7 +2723,7 @@ end
\cs_new_protected:Npn \peek_remove_filler:n #1
{
\cs_set:Npn \@@_true_aux:w { \@@_remove_filler:w }
- \cs_set:Npx \@@_false:w
+ \cs_set:Npe \@@_false:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#1}
@@ -2786,13 +2786,13 @@ end
\group_align_safe_begin:
\cs_set_eq:NN \l_@@_search_token #3
\tl_set:Nn \l_@@_search_tl {#3}
- \cs_set:Npx \@@_true_aux:w
+ \cs_set:Npe \@@_true_aux:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#4}
}
\cs_set_eq:NN \@@_true:w #1
- \cs_set:Npx \@@_false:w
+ \cs_set:Npe \@@_false:w
{
\exp_not:N \group_align_safe_end:
\exp_not:n {#5}
@@ -2928,7 +2928,7 @@ end
{
\tl_map_inline:nn { { TF } { T } { F } }
{
- \cs_new_protected:cpx { peek_ #1 ##1 :N ####1 }
+ \cs_new_protected:cpe { peek_ #1 ##1 :N ####1 }
{
\exp_not:c { @@_token ##1 _generic:NN ####1 }
\exp_not:c { @@_execute_branches_ #1 : }