[latex3-commits] [latex3/latex3] main: Swtich from x-type to e-type in l3doc (007b309a7)
github at latex-project.org
github at latex-project.org
Tue Oct 10 12:59:28 CEST 2023
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/007b309a770f2973f7bdc2a24aad148821aa3f70
>---------------------------------------------------------------
commit 007b309a770f2973f7bdc2a24aad148821aa3f70
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Sep 25 22:51:03 2023 +0100
Swtich from x-type to e-type in l3doc
Technically all-internal but rather separate from
other modules.
>---------------------------------------------------------------
007b309a770f2973f7bdc2a24aad148821aa3f70
l3kernel/l3doc.dtx | 64 +++++++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index 5faccb265..dd2756bd9 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1596,7 +1596,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_set_protected:Npn \ifnot at excluded
{
- \exp_args:Nxx \expanded at notin
+ \exp_args:Nee \expanded at notin
{ \c_backslash_str \tl_to_str:N \macro at namepart , }
{ \exp_args:NV \tl_to_str:n \index at excludelist }
}
@@ -2147,7 +2147,7 @@ and all files in that bundle must be distributed together.
% \end{macro}
%
% \begin{macro}
-% {\@@_get_hyper_target:nN, \@@_get_hyper_target:oN, \@@_get_hyper_target:xN}
+% {\@@_get_hyper_target:nN, \@@_get_hyper_target:oN, \@@_get_hyper_target:eN}
% Create a \pkg{hyperref} anchor from a macro name~|#1| and stores it
% in the token list variable~|#2|. For instance, |\prg_replicate:nn|
% gives |doc/function//prg/replicate:nn|.
@@ -2159,7 +2159,7 @@ and all files in that bundle must be distributed together.
\tl_remove_all:Ne #2 { \c_backslash_str }
\tl_put_left:Nn #2 { doc/function// }
}
-\cs_generate_variant:Nn \@@_get_hyper_target:nN { o , x }
+\cs_generate_variant:Nn \@@_get_hyper_target:nN { o , e }
% \end{macrocode}
% \end{macro}
%
@@ -2191,7 +2191,7 @@ and all files in that bundle must be distributed together.
\tl_remove_all:Ne \l_@@_tmpa_tl { \iow_char:N \^^M }
\@@_detect_internals:N \l_@@_tmpa_tl
\@@_replace_at_at:N \l_@@_tmpa_tl
- \exp_args:NNx \seq_set_from_clist:Nn #2
+ \exp_args:NNe \seq_set_from_clist:Nn #2
{ \tl_to_str:N \l_@@_tmpa_tl }
}
}
@@ -2232,7 +2232,7 @@ and all files in that bundle must be distributed together.
\tl_if_head_eq_charcode:nNTF {#2} :
{ \@@_names_parse_aux:nnn {#4} {#4} { \scan_stop: } }
{
- \exp_args:Nx \@@_names_parse_aux:nnn
+ \exp_args:Ne \@@_names_parse_aux:nnn
{ \@@_base_form_aux:nnN {#1} {#2} #3 }
{#1} {#2}
}
@@ -2288,12 +2288,12 @@ and all files in that bundle must be distributed together.
\str_if_eq:VnTF \l_@@_tmpa_tl { \scan_stop: }
{
\seq_gclear:N \g_@@_variants_seq
- \@@_names_typeset_auxii:x { \g_@@_base_name_tl }
+ \@@_names_typeset_auxii:e { \g_@@_base_name_tl }
}
{
\seq_gset_eq:NN \g_@@_variants_seq #1
\seq_gpop:NN \g_@@_variants_seq \l_@@_tmpb_tl
- \@@_names_typeset_auxii:x
+ \@@_names_typeset_auxii:e
{ \g_@@_base_name_tl : \l_@@_tmpb_tl }
}
}
@@ -2302,7 +2302,7 @@ and all files in that bundle must be distributed together.
% \end{macro}
%
% \begin{macro}
-% {\@@_names_typeset_auxii:n, \@@_names_typeset_auxii:x}
+% {\@@_names_typeset_auxii:n, \@@_names_typeset_auxii:e}
% In case the option |pTF| was given, typeset predicates before the
% |TF| functions. In case the option |noTF| was given, typeset the
% non-|TF| function as well. Pass the relevant boolean in both cases
@@ -2312,7 +2312,7 @@ and all files in that bundle must be distributed together.
{
\bool_if:NT \l_@@_macro_pTF_bool
{
- \@@_names_typeset_block:xN
+ \@@_names_typeset_block:eN
{ \@@_predicate_from_base:n {#1} }
\c_false_bool
}
@@ -2320,11 +2320,11 @@ and all files in that bundle must be distributed together.
{ \@@_names_typeset_block:nN {#1} \c_false_bool }
\@@_names_typeset_block:nN {#1} \l_@@_macro_TF_bool
}
-\cs_generate_variant:Nn \@@_names_typeset_auxii:n { x }
+\cs_generate_variant:Nn \@@_names_typeset_auxii:n { e }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_names_typeset_block:nN, \@@_names_typeset_block:xN}
+% \begin{macro}{\@@_names_typeset_block:nN, \@@_names_typeset_block:eN}
% Names in \env{function} and \env{macro} environments are typeset
% differently. To distinguish the two note that
% \cs{l_@@_nested_macro_int} is at least one when in an \env{macro}
@@ -2337,7 +2337,7 @@ and all files in that bundle must be distributed together.
{ \@@_typeset_function_block:nN }
{ \@@_macro_typeset_block:nN }
}
-\cs_generate_variant:Nn \@@_names_typeset_block:nN { x }
+\cs_generate_variant:Nn \@@_names_typeset_block:nN { e }
% \end{macrocode}
% \end{macro}
%
@@ -2385,7 +2385,7 @@ and all files in that bundle must be distributed together.
\seq_set_eq:NN \l_@@_tmpa_seq ##1
\seq_pop:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
\seq_get:NN \l_@@_tmpa_seq \l_@@_tmpb_tl
- \exp_args:NNx
+ \exp_args:NNe
\group_end:
#1
{
@@ -2701,15 +2701,15 @@ and all files in that bundle must be distributed together.
%
% ^^A TODO: collect all index targets from a given function environment in a box and stick it at the top.
% \begin{macro}
-% {\@@_typeset_function_block:nN, \@@_typeset_function_block:xN}
-% \begin{macro}{\@@_function_index:n, \@@_function_index:x}
+% {\@@_typeset_function_block:nN, \@@_typeset_function_block:eN}
+% \begin{macro}{\@@_function_index:n, \@@_function_index:e}
% |#1| is a csname, |#2| a boolean indicating whether to add |TF| or not.
% \begin{macrocode}
\cs_new_protected:Npn \@@_typeset_function_block:nN #1#2
{
- \@@_function_index:x
+ \@@_function_index:e
{ #1 \bool_if:NT #2 { \tl_to_str:n {TF} } }
- \@@_function_label:xN {#1} #2
+ \@@_function_label:eN {#1} #2
#1
\bool_if:NT #2 { \@@_typeset_TF: }
\@@_typeset_expandability:
@@ -2717,13 +2717,13 @@ and all files in that bundle must be distributed together.
{ \@@_typeset_variant_list:nN {#1} #2 }
\\
}
-\cs_generate_variant:Nn \@@_typeset_function_block:nN { x }
+\cs_generate_variant:Nn \@@_typeset_function_block:nN { e }
\cs_new_protected:Npn \@@_function_index:n #1
{
\seq_gput_right:Nn \g_doc_functions_seq {#1}
\@@_special_index:nn {#1} { usage }
}
-\cs_generate_variant:Nn \@@_function_index:n { x }
+\cs_generate_variant:Nn \@@_function_index:n { e }
% \end{macrocode}
%
% \begin{macrocode}
@@ -2790,7 +2790,7 @@ and all files in that bundle must be distributed together.
{
\bool_if:NF \l_@@_no_label_bool
{
- \@@_get_hyper_target:xN
+ \@@_get_hyper_target:eN
{
\exp_not:n {#1}
\bool_if:NT #2 { \tl_to_str:n {TF} }
@@ -2799,7 +2799,7 @@ and all files in that bundle must be distributed together.
\exp_args:No \label { \l_@@_tmpa_tl }
}
}
-\cs_generate_variant:Nn \@@_function_label:nN { x }
+\cs_generate_variant:Nn \@@_function_label:nN { e }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3099,7 +3099,7 @@ and all files in that bundle must be distributed together.
\@@_macro_single:nNN {#1} \c_true_bool #2
\seq_if_empty:NF \g_@@_variants_seq
{
- \@@_macro_typeset_variant_list:xN
+ \@@_macro_typeset_variant_list:eN
{ \@@_get_function_name:n {#1} } #2
}
}
@@ -3109,7 +3109,7 @@ and all files in that bundle must be distributed together.
\seq_map_inline:Nn \g_@@_variants_seq
{ \@@_macro_single:nNN { #1 : ##1 } \c_false_bool #2 }
}
-\cs_generate_variant:Nn \@@_macro_typeset_variant_list:nN { x }
+\cs_generate_variant:Nn \@@_macro_typeset_variant_list:nN { e }
% \end{macrocode}
% \end{macro}
%
@@ -3131,7 +3131,7 @@ and all files in that bundle must be distributed together.
\tl_set:Nn \saved at macroname {#1}
\@@_macro_typeset_one:nN {#1} #3
\bool_if:NT #3 { \DoNotIndex {#1} }
- \exp_args:Nx \@@_macro_index:nN
+ \exp_args:Ne \@@_macro_index:nN
{ #1 \bool_if:NT #3 { \tl_to_str:n { TF } } }
#2
}
@@ -3185,7 +3185,7 @@ and all files in that bundle must be distributed together.
\cs_new_protected:Npn \@@_print_macroname:nN #1#2
{
\strut
- \@@_get_hyper_target:xN
+ \@@_get_hyper_target:eN
{
\exp_not:n {#1}
\bool_if:NT #2 { \tl_to_str:n {TF} }
@@ -3289,7 +3289,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_missing:n #1
{
- \@@_test_missing_aux:Nxn
+ \@@_test_missing_aux:Nen
\g_@@_missing_tests_prop
{ \seq_use:Nn \l_@@_names_seq { , } }
{ { \g_file_curr_name_str \c_space_tl (#1) } }
@@ -3301,7 +3301,7 @@ and all files in that bundle must be distributed together.
{ \tl_set:Nn \l_@@_tmpa_tl {#3} }
\prop_put:Nno #1 {#2} \l_@@_tmpa_tl
}
-\cs_generate_variant:Nn \@@_test_missing_aux:Nnn { Nx }
+\cs_generate_variant:Nn \@@_test_missing_aux:Nnn { Ne }
% \end{macrocode}
% \end{macro}
%
@@ -3409,10 +3409,10 @@ and all files in that bundle must be distributed together.
\bool_if:NTF \l_@@_macro_var_bool {variable} {function}
\int_compare:nNnTF \l_@@_tmpa_int = 1 {~is~} {s~are~}
documented~on~page~
- \@@_get_hyper_target:xN
+ \@@_get_hyper_target:eN
{ \seq_item:Nn \g_@@_nested_names_seq { 1 } }
\l_@@_tmpa_tl
- \exp_args:Nx \pageref { \l_@@_tmpa_tl } .
+ \exp_args:Ne \pageref { \l_@@_tmpa_tl } .
}
\seq_gclear:N \g_@@_nested_names_seq
}
@@ -3544,7 +3544,7 @@ and all files in that bundle must be distributed together.
\prop_new:N\g_@@_fnmark_prop
\cs_new_protected:Npn \@@_fn_store:
{
- \prop_gput:Nxx\g_@@_fnmark_prop
+ \prop_gput:Nee\g_@@_fnmark_prop
{fn\int_use:N\c at footnote}{{\Hy at footnote@currentHref}{\int_use:N\c at footnote}}
}
\cs_new_protected:Npn \@@_fn_restore:n #1
@@ -4373,7 +4373,7 @@ and all files in that bundle must be distributed together.
\token_to_str:N \_ \token_to_str:N \_
\token_to_str:N \verb * \verbatimchar
}
- \exp_args:Nx \tl_map_inline:nn
+ \exp_args:Ne \tl_map_inline:nn
{ \tl_to_str:N \verbatimchar \token_to_str:N _ }
{
\tl_replace_all:Nnn #1 {##1}
@@ -4524,7 +4524,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_new_protected:Npn \@@_key_var:
{
- \exp_args:Nx \tl_if_head_eq_charcode:nNTF
+ \exp_args:Ne \tl_if_head_eq_charcode:nNTF
{ \exp_args:No \str_tail:n \l_@@_index_key_tl } _
{
\str_case:fn { \str_head:N \l_@@_index_key_tl }
More information about the latex3-commits
mailing list.