summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
committerKarl Berry <karl@freefriends.org>2023-10-10 20:27:00 +0000
commit1045e3f70340d9f7540d9c9328a282ee84f88a51 (patch)
treeab54e08e01a041bf9bfd650d8981c1f63214a169 /Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
parentf92a7f650889a8bbbd6ff151a911a35c25fa2901 (diff)
l3 (10oct23)
git-svn-id: svn://tug.org/texlive/trunk@68507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3doc.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3doc.dtx207
1 files changed, 118 insertions, 89 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index b1744b9f7bb..ed675106ba1 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -85,7 +85,7 @@ and all files in that bundle must be distributed together.
% require you to do updates, if the class changes.}}
%
% \author{\Team}
-% \date{Released 2023-08-29}
+% \date{Released 2023-10-10}
% \maketitle
% \tableofcontents
%
@@ -957,7 +957,7 @@ and all files in that bundle must be distributed together.
% \seq_set_split:NoV,
% \str_case:fn,
% \tl_count:f,
-% \tl_greplace_all:Nxn,
+% \tl_greplace_all:Nen,
% \tl_greplace_all:Nno,
% \tl_if_head_eq_charcode:oNTF,
% \tl_if_head_eq_charcode:oNT,
@@ -968,17 +968,14 @@ and all files in that bundle must be distributed together.
% \tl_if_in:NoTF,
% \tl_if_in:NoT,
% \tl_if_in:NoF,
-% \tl_remove_all:Nx,
-% \tl_replace_all:Nxn,
-% \tl_replace_all:Nnx,
+% \tl_remove_all:Ne,
+% \tl_replace_all:Nen,
+% \tl_replace_all:Nne,
% \tl_replace_all:Non,
% \tl_replace_all:Nno,
% \tl_replace_once:Noo,
% \tl_to_str:f,
% \tl_to_str:o,
-% \prop_get:NxNTF,
-% \prop_put:Nxn,
-% \prop_gput:NVx,
% }
% A few missing variants.
% \begin{macrocode}
@@ -1001,9 +998,6 @@ and all files in that bundle must be distributed together.
\cs_generate_variant:Nn \tl_replace_once:Nnn { Noo }
\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
\cs_generate_variant:Nn \tl_to_str:n { f , o }
-\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
-\cs_generate_variant:Nn \prop_put:Nnn { Nx }
-\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
% \end{macrocode}
% \end{macro}
%
@@ -1033,7 +1027,7 @@ and all files in that bundle must be distributed together.
\cs_new_protected:Npn \@@_trim_right:Nn #1#2
{
\cs_set:Npn \@@_tmp:w ##1 #2 ##2 \q_stop { \exp_not:n {##1} }
- \__kernel_tl_set:Nx #1 { \exp_after:wN \@@_tmp:w #1 #2 \q_stop }
+ \__kernel_tl_set:Ne #1 { \exp_after:wN \@@_tmp:w #1 #2 \q_stop }
}
\cs_generate_variant:Nn \@@_trim_right:Nn { No }
% \end{macrocode}
@@ -1076,7 +1070,7 @@ and all files in that bundle must be distributed together.
#1 \g_@@_module_name_tl
}
}
-\cs_new_protected:Npx \@@_replace_at_at_aux:Nn #1#2
+\cs_new_protected:Npe \@@_replace_at_at_aux:Nn #1#2
{
\tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
\tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
@@ -1130,7 +1124,7 @@ and all files in that bundle must be distributed together.
\@@_trim_right:Nn \l_@@_detect_internals_tl _
\@@_trim_right:Nn \l_@@_detect_internals_tl :
\@@_trim_right:No \l_@@_detect_internals_tl { \token_to_str:N : }
- \msg_warning:nnxxx { l3doc } { foreign-internal }
+ \msg_warning:nneee { l3doc } { foreign-internal }
{ \tl_to_str:N \l_@@_detect_internals_cs_tl }
{ \tl_to_str:N \l_@@_detect_internals_tl }
{ \tl_to_str:N \g_@@_module_name_tl }
@@ -1253,14 +1247,14 @@ and all files in that bundle must be distributed together.
\@@_if_almost_str:nTF {#1}
{
\@@_key_get_base_TF:nN {#1} \l_@@_tmpa_tl
- \__kernel_tl_set:Nx #2
+ \__kernel_tl_set:Ne #2
{ \@@_split_function_do:on \l_@@_tmpa_tl { \@@_base_form_aux:nnN } }
}
{ \tl_set:Nn #2 {#1} }
}
-\cs_new:Npx \@@_key_get_base_TF:nN #1#2
+\cs_new:Npe \@@_key_get_base_TF:nN #1#2
{
- \__kernel_tl_set:Nx #2 { \exp_not:N \tl_to_str:n {#1} }
+ \__kernel_tl_set:Ne #2 { \exp_not:N \tl_to_str:n {#1} }
\tl_if_in:NoF #2 { \tl_to_str:n {:} }
{ \exp_not:N \prg_break: }
\tl_if_in:onT { #2 z } { \tl_to_str:n {TF} z }
@@ -1312,7 +1306,7 @@ and all files in that bundle must be distributed together.
\tl_if_head_eq_charcode:nNTF {#4} :
{ #2 {#1} }
{
- \use:x
+ \use:e
{
\exp_not:n {#3}
{ \@@_base_form_aux:nnN {#4} {#5} #6 }
@@ -1602,7 +1596,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_set_protected:Npn \ifnot@excluded
{
- \exp_args:Nxx \expanded@notin
+ \exp_args:Nee \expanded@notin
{ \c_backslash_str \tl_to_str:N \macro@namepart , }
{ \exp_args:NV \tl_to_str:n \index@excludelist }
}
@@ -2016,7 +2010,7 @@ and all files in that bundle must be distributed together.
\verbatim@font
\@@_if_almost_str:VT \l_@@_cmd_tl
{
- \__kernel_tl_set:Nx \l_@@_cmd_tl { \tl_to_str:N \l_@@_cmd_tl }
+ \__kernel_tl_set:Ne \l_@@_cmd_tl { \tl_to_str:N \l_@@_cmd_tl }
\bool_if:NT \g_@@_cs_break_bool
{
\regex_replace_all:nnN
@@ -2038,13 +2032,13 @@ and all files in that bundle must be distributed together.
{
\quark_if_no_value:NF \l_@@_cmd_index_tl
{
- \__kernel_tl_set:Nx \l_@@_cmd_tl
+ \__kernel_tl_set:Ne \l_@@_cmd_tl
{ \c_backslash_str \exp_not:o { \l_@@_cmd_index_tl } }
}
\exp_args:No \@@_key_get:n { \l_@@_cmd_tl }
\quark_if_no_value:NF \l_@@_cmd_module_tl
{
- \__kernel_tl_set:Nx \l_@@_index_module_tl
+ \__kernel_tl_set:Ne \l_@@_index_module_tl
{ \tl_to_str:N \l_@@_cmd_module_tl }
}
\@@_special_index_module:ooonN
@@ -2153,19 +2147,19 @@ 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|.
% \begin{macrocode}
\cs_new_protected:Npn \@@_get_hyper_target:nN #1#2
{
- \__kernel_tl_set:Nx #2 { \tl_to_str:n {#1} }
- \tl_replace_all:Nxn #2 { \c_underscore_str } { / }
- \tl_remove_all:Nx #2 { \c_backslash_str }
+ \__kernel_tl_set:Ne #2 { \tl_to_str:n {#1} }
+ \tl_replace_all:Nen #2 { \c_underscore_str } { / }
+ \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}
%
@@ -2183,21 +2177,21 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_new_protected:Npn \@@_names_get_seq:nN #1#2
{
- \__kernel_tl_set:Nx \l_@@_tmpa_tl { \tl_to_str:n {#1} }
+ \__kernel_tl_set:Ne \l_@@_tmpa_tl { \tl_to_str:n {#1} }
\bool_if:NTF \l_@@_names_verb_bool
{
\seq_clear:N #2
\seq_put_right:NV #2 \l_@@_tmpa_tl
}
{
- \tl_remove_all:Nx \l_@@_tmpa_tl
+ \tl_remove_all:Ne \l_@@_tmpa_tl
{ \iow_char:N \^^M \c_percent_str }
- \tl_remove_all:Nx \l_@@_tmpa_tl { \tl_to_str:n { ^ ^ A } }
- \tl_remove_all:Nx \l_@@_tmpa_tl { \iow_char:N \^^I }
- \tl_remove_all:Nx \l_@@_tmpa_tl { \iow_char:N \^^M }
+ \tl_remove_all:Ne \l_@@_tmpa_tl { \tl_to_str:n { ^ ^ A } }
+ \tl_remove_all:Ne \l_@@_tmpa_tl { \iow_char:N \^^I }
+ \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 }
}
}
@@ -2238,14 +2232,14 @@ 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}
}
}
{
\bool_if:NT \l_@@_macro_TF_bool
- { \msg_error:nnx { l3doc } { no-signature-TF } {#4} }
+ { \msg_error:nne { l3doc } { no-signature-TF } {#4} }
\@@_names_parse_aux:nnn {#4} {#4} { \scan_stop: }
}
}
@@ -2294,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 }
}
}
@@ -2308,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
@@ -2318,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
}
@@ -2326,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}
@@ -2343,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}
%
@@ -2391,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
{
@@ -2479,7 +2473,7 @@ and all files in that bundle must be distributed together.
\exp_args:No \@@_date_compare:nNnT
{#1} > { \c_sys_year_int - \c_sys_month_int - \c_sys_day_int }
{
- \msg_error:nnxx { l3doc } { future-date }
+ \msg_error:nnee { l3doc } { future-date }
{ \tl_to_str:N \l_@@_macro_argument_tl }
{#1}
}
@@ -2707,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:
@@ -2723,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}
@@ -2796,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} }
@@ -2805,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}
@@ -3064,7 +3058,7 @@ and all files in that bundle must be distributed together.
\l_@@_macro_do_not_index_tl
\exp_args:NNV \seq_set_from_clist:Nn
\l_@@_tmpa_seq \l_@@_macro_do_not_index_tl
- \__kernel_tl_set:Nx \l_@@_macro_do_not_index_tl
+ \__kernel_tl_set:Ne \l_@@_macro_do_not_index_tl
{ \seq_use:Nn \l_@@_tmpa_seq { , } }
\exp_args:NV \DoNotIndex \l_@@_macro_do_not_index_tl
}
@@ -3105,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
}
}
@@ -3115,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}
%
@@ -3137,7 +3131,7 @@ and all files in that bundle must be distributed together.
\tl_set:Nn \saved@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
}
@@ -3191,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} }
@@ -3295,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) } }
@@ -3307,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}
%
@@ -3345,7 +3339,7 @@ and all files in that bundle must be distributed together.
{
\seq_set_filter:NNn \l_@@_tmpa_seq \l_@@_names_seq
{ ! \@@_if_macro_internal_p:n {##1} }
- \seq_gput_right:Nx \g_@@_not_tested_seq
+ \seq_gput_right:Ne \g_@@_not_tested_seq
{
\seq_use:Nn \l_@@_tmpa_seq { , }
\bool_if:NTF \l_@@_macro_pTF_bool {~(pTF)}
@@ -3415,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
}
@@ -3540,6 +3534,39 @@ and all files in that bundle must be distributed together.
% \end{macrocode}
% \end{environment}
%
+% \subsection{Footnote support}
+% The environments \env{function} and \env{variable} are boxes
+% and so looses footnotes. The following implements support.
+% It relies currently on an internal from hyperref to get the correct targets.
+%
+% \begin{macrocode}
+\providecommand\Hy@footnote@currentHref{}
+\prop_new:N\g_@@_fnmark_prop
+\cs_new_protected:Npn \@@_fn_store:
+ {
+ \prop_gput:Nee\g_@@_fnmark_prop
+ {fn\int_use:N\c@footnote}{{\Hy@footnote@currentHref}{\int_use:N\c@footnote}}
+ }
+\cs_new_protected:Npn \@@_fn_restore:n #1
+ {
+ \prop_get:NnN \g_@@_fnmark_prop {fn#1}\l_@@_tmpa_tl
+ \tl_gset:Ne\Hy@footnote@currentHref
+ {\exp_last_unbraced:NV\use_i:nn \l_@@_tmpa_tl }
+ \setcounter{footnote}{\exp_last_unbraced:NV\use_ii:nn \l_@@_tmpa_tl}
+ }
+
+\cs_generate_variant:Nn \hook_gput_next_code:nn {ne}
+\cs_new_protected:Npn \@@_fn_footnote:nn #1 #2
+ {
+ \footnotemark
+ \@@_fn_store:
+ \hook_gput_next_code:ne {env/#1/after}
+ {\exp_not:N\@@_fn_restore:n{\int_use:N\c@footnote}{\exp_not:n{\footnotetext{#2}}}}}
+
+\AddToHook{env/function/begin}{\def\footnote{\@@_fn_footnote:nn{function}}}
+\AddToHook{env/variable/begin}{\def\footnote{\@@_fn_footnote:nn{variable}}}
+% \end{macrocode}
+%
% \subsection{Documenting templates}
%
% \begin{macrocode}
@@ -3713,7 +3740,7 @@ and all files in that bundle must be distributed together.
\@tempswatrue
\if@partsw
\@tempswafalse
- \cs_set:Npx \@tempb {#1}
+ \cs_set:Npe \@tempb {#1}
\clist_map_inline:Nn \@partlist
{
\if_meaning:w \@tempa \@tempb
@@ -3734,7 +3761,7 @@ and all files in that bundle must be distributed together.
\part{\currentfile}
{
\cs_set_eq:NN \ttfamily\relax
- \cs_gset:Npx \filekey
+ \cs_gset:Npe \filekey
{ \filekey,~ \thepart = { \ttfamily \currentfile } }
}
\DocInput{\currentfile}
@@ -3920,6 +3947,8 @@ and all files in that bundle must be distributed together.
\tl_new:N \l_@@_doc_def_tl
\tl_new:N \l_@@_doc_undef_tl
\tl_new:N \l_@@_undoc_def_tl
+\tl_const:Nn \c_@@_iow_separator_tl { ---- }
+\tl_const:Nn \c_@@_iow_midrule_tl { -- }
% \end{macrocode}
%
% \begin{macrocode}
@@ -3928,7 +3957,7 @@ and all files in that bundle must be distributed together.
\bool_lazy_and:nnT
{ \g_@@_typeset_implementation_bool } { \g_@@_checkfunc_bool }
{
- \iow_term:x { \c_@@_iow_separator_tl \iow_newline: }
+ \iow_term:e { \c_@@_iow_separator_tl \iow_newline: }
\iow_open:Nn \g_@@_func_iow { \c_sys_jobname_str .cmds }
\tl_clear:N \l_@@_doc_def_tl
@@ -3938,12 +3967,12 @@ and all files in that bundle must be distributed together.
{
\seq_if_in:NnTF \g_doc_macros_seq {##1}
{
- \tl_put_right:Nx \l_@@_doc_def_tl
+ \tl_put_right:Ne \l_@@_doc_def_tl
{ ##1 \iow_newline: }
\iow_now:Nn \g_@@_func_iow { > ~ ##1 }
}
{
- \tl_put_right:Nx \l_@@_doc_undef_tl
+ \tl_put_right:Ne \l_@@_doc_undef_tl
{ ##1 \iow_newline: }
\iow_now:Nn \g_@@_func_iow { ! ~ ##1 }
}
@@ -3952,7 +3981,7 @@ and all files in that bundle must be distributed together.
{
\seq_if_in:NnF \g_doc_functions_seq {##1}
{
- \tl_put_right:Nx \l_@@_undoc_def_tl
+ \tl_put_right:Ne \l_@@_undoc_def_tl
{ ##1 \iow_newline: }
\iow_now:Nn \g_@@_func_iow { ? ~ ##1 }
}
@@ -3971,13 +4000,13 @@ and all files in that bundle must be distributed together.
\l_@@_undoc_def_tl
\iow_close:N \g_@@_func_iow
- \iow_term:x { \c_@@_iow_separator_tl }
+ \iow_term:e { \c_@@_iow_separator_tl }
}
}
\AtEndDocument { \@@_show_functions_defined: }
% \end{macrocode}
%
-% TODO: use \cs{iow_term:x}.
+% TODO: use \cs{iow_term:e}.
% \begin{macrocode}
\cs_new_protected:Npn \@@_functions_typeout:nN #1#2
{
@@ -4014,7 +4043,7 @@ and all files in that bundle must be distributed together.
\iow_newline:
\space\space\space\space\space\space * ~ ##1
}
- \tl_put_right:Nx \l_@@_tmpa_tl
+ \tl_put_right:Ne \l_@@_tmpa_tl
{
\iow_newline: \iow_newline:
The~ following~ macro(s)~ have~ incomplete~ tests:
@@ -4032,7 +4061,7 @@ and all files in that bundle must be distributed together.
\iow_newline:
\space\space\space\space ##1
}
- \tl_put_right:Nx \l_@@_tmpa_tl
+ \tl_put_right:Ne \l_@@_tmpa_tl
{
\iow_newline:
\iow_newline:
@@ -4073,7 +4102,7 @@ and all files in that bundle must be distributed together.
% \end{macrocode}
% Force targets on every code line.
% \begin{macrocode}
-\cs_set_nopar:Npx \theCodelineNo
+\cs_set_nopar:Npe \theCodelineNo
{
\group_begin:
\exp_not:N \HD@savedestfalse
@@ -4091,7 +4120,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\bool_new:N \l_@@_allow_indexing_bool
\bool_set_true:N \l_@@_allow_indexing_bool
-\use:x
+\use:e
{
\exp_not:n { \cs_set_nopar:Npn \@starttoc #1 }
{
@@ -4162,7 +4191,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_gset_protected:Npn \it@is@a #1
{
- \use:x
+ \use:e
{
\@@_special_index_module:nnnnN
{#1}
@@ -4223,7 +4252,7 @@ and all files in that bundle must be distributed together.
% \end{arguments}
% \begin{macrocode}
{
- \use:x
+ \use:e
{
\exp_not:n { \@@_special_index_aux:nnnnnn {#1} {#2} }
\tl_if_empty:nTF {#3}
@@ -4297,7 +4326,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\group_begin:
\char_set_active_eq:NN - \scan_stop:
-\tl_const:Nx \c_@@_active_minus_tl { \char_generate:nn { `- } { 13 } }
+\tl_const:Ne \c_@@_active_minus_tl { \char_generate:nn { `- } { 13 } }
\group_end:
\cs_new_eq:NN \@@_old_hdpindex:nn \hdpindex
\cs_new_eq:NN \@@_old_hdclindex:nnn \hdclindex
@@ -4308,7 +4337,7 @@ and all files in that bundle must be distributed together.
\cs_new_protected:Npn \@@_hdindex:nn #1#2
{
\tl_set:Nn \l_@@_tmpa_tl {#2}
- \tl_replace_all:Nxn \l_@@_tmpa_tl
+ \tl_replace_all:Nen \l_@@_tmpa_tl
{ \exp_not:V \c_@@_active_minus_tl \exp_not:V \c_@@_active_minus_tl }
{ -- }
\seq_set_split:NnV \l_@@_tmpa_seq { -- } \l_@@_tmpa_tl
@@ -4322,11 +4351,11 @@ and all files in that bundle must be distributed together.
\tl_replace_all:Nnn \l_@@_tmpa_tl { MMMM } { \use_none:nn }
\tl_if_in:NnT \l_@@_tmpa_tl { MMMD }
{
- \tl_replace_all:Nxn \l_@@_tmpa_tl
+ \tl_replace_all:Nen \l_@@_tmpa_tl
{ \exp_not:V \c_@@_active_minus_tl MMMD } { - MMMD }
\tl_replace_all:Nnn \l_@@_tmpa_tl { - MMMD } { \@@_hdindex_aux:w }
}
- \use:x { \exp_not:n {#1} { \exp_not:V \l_@@_tmpa_tl } }
+ \use:e { \exp_not:n {#1} { \exp_not:V \l_@@_tmpa_tl } }
}
\cs_new_protected:Npn \@@_hdindex_aux:w #1 M { }
% \end{macrocode}
@@ -4335,7 +4364,7 @@ and all files in that bundle must be distributed together.
% \begin{macrocode}
\cs_new_protected:Npn \@@_special_index_set:Nn #1#2
{
- \__kernel_tl_set:Nx #1 { \tl_to_str:n {#2} }
+ \__kernel_tl_set:Ne #1 { \tl_to_str:n {#2} }
\@@_if_almost_str:nTF {#2}
{
\tl_replace_all:Non #1 { \tl_to_str:n { __ } }
@@ -4344,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}
@@ -4353,7 +4382,7 @@ and all files in that bundle must be distributed together.
\token_to_str:N \verb * \verbatimchar
}
}
- \__kernel_tl_set:Nx #1
+ \__kernel_tl_set:Ne #1
{
\token_to_str:N \verb * \verbatimchar
#1 \verbatimchar
@@ -4377,7 +4406,7 @@ and all files in that bundle must be distributed together.
{
\tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar \bslash }
{
- \tl_replace_all:Nxn #1
+ \tl_replace_all:Nen #1
{ \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 }
}
}
@@ -4404,7 +4433,7 @@ and all files in that bundle must be distributed together.
\cs_new_protected:Npn \@@_key_get:n #1
{
\@@_key_get_base:nN {#1} \l_@@_index_macro_tl
- \__kernel_tl_set:Nx \l_@@_index_key_tl
+ \__kernel_tl_set:Ne \l_@@_index_key_tl
{ \tl_to_str:N \l_@@_index_macro_tl }
\tl_clear:N \l_@@_index_module_tl
\tl_if_in:NoTF \l_@@_index_key_tl { \tl_to_str:n { __ } }
@@ -4427,7 +4456,7 @@ and all files in that bundle must be distributed together.
}
\cs_new_protected:Npn \@@_key_pop:
{
- \__kernel_tl_set:Nx \l_@@_index_key_tl
+ \__kernel_tl_set:Ne \l_@@_index_key_tl
{ \tl_tail:N \l_@@_index_key_tl }
}
% \end{macrocode}
@@ -4442,7 +4471,7 @@ and all files in that bundle must be distributed together.
{
\cs_set:Npn \@@_tmpa:w ##1 #1 ##2 \q_stop
{ \exp_not:n {##1} }
- \__kernel_tl_set:Nx \l_@@_index_module_tl
+ \__kernel_tl_set:Ne \l_@@_index_module_tl
{ \exp_after:wN \@@_tmpa:w \l_@@_index_module_tl #1 \q_stop }
}
\cs_new_protected:Npn \@@_key_drop_underscores:
@@ -4495,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 }
@@ -4535,7 +4564,7 @@ and all files in that bundle must be distributed together.
% sorted differently in an index.
% \begin{macrocode}
\clist_new:N \g_@@_non_modules_clist
-\clist_gset:Nx \g_@@_non_modules_clist
+\clist_gset:Ne \g_@@_non_modules_clist
{
\tl_to_str:n
{