diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3expan.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3expan.dtx | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index 3bf2bd61536..d133eaae455 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-10-23} +% \date{Released 2023-11-01} % % \maketitle % @@ -229,7 +229,7 @@ % contrast to |e|, all macro parameter characters |#| must be doubled, % and omitting this leads to low-level errors. In addition this type of % expansion is not expandable, namely functions that have |x| in their -% signature do not themselves expand when appearing inside |x| or |e| +% signature do not themselves expand when appearing inside |e| or |x| % expansion. % % The |f| type is so special that it deserves an example. It is @@ -264,8 +264,7 @@ % \begin{quote} % |\example:n { 3 , 7 }| % \end{quote} -% at the cost of being protected (for |x| type) or very much slower in -% old engines (for |e| type). +% at the cost of being protected for |x|-type. % If you use |f| type expansion in conditional processing then % you should stick to using |TF| type functions only as the expansion % does not finish any |\if... \fi:| itself! @@ -642,7 +641,7 @@ % appropriate argument specifier variant or the appropriate % \cs[no-index]{exp_args:N\meta{variant}} function. % \begin{texnote} -% This is the \TeX{} primitive \tn{expandafter} renamed. +% This is the \TeX{} primitive \tn{expandafter}. % \end{texnote} % \end{function} % @@ -659,10 +658,10 @@ % \cs{exp_not:N} \meta{token} % \end{syntax} % Prevents expansion of the \meta{token} in a context where it would -% otherwise be expanded, for example an |x|-type argument or the first -% token in an |o| or |e| or |f| argument. +% otherwise be expanded, for example an |e|-type or |x|-type argument or +% the first token in an |o|-type or |f|-type argument. % \begin{texnote} -% This is the \TeX{} \tn{noexpand} primitive. It only prevents +% This is the \TeX{} primitive \tn{noexpand}. It only prevents % expansion. At the beginning of an |f|-type argument, a space % \meta{token} is removed even if it appears as \cs{exp_not:N} % \cs{c_space_token}. In an |e|-expanding definition @@ -686,16 +685,16 @@ % \begin{syntax} % \cs{exp_not:n} \Arg{tokens} % \end{syntax} -% Prevents expansion of the \meta{tokens} in an |e| or |x|-type argument. In -% all other cases the \meta{tokens} continue to be expanded, for +% Prevents expansion of the \meta{tokens} in an |e|-type or |x|-type argument. +% In all other cases the \meta{tokens} continue to be expanded, for % example in the input stream or in other types of arguments such as % \texttt{c}, \texttt{f}, \texttt{v}. The argument of \cs{exp_not:n} % \emph{must} be surrounded by braces. % \begin{texnote} -% This is the \eTeX{} \tn{unexpanded} primitive. In an -% |x|-expanding definition (\cs{cs_new:Npe}), \cs{exp_not:n}~|{#1}| +% This is the \eTeX{} primitive \tn{unexpanded}. In an +% |e|-expanding definition (\cs{cs_new:Npe}), \cs{exp_not:n}~|{#1}| % is equivalent to |##1| rather than to~|#1|, namely it inserts the -% two characters |#| and~|1|. In an |e|-type argument +% two characters |#| and~|1|, and % \cs{exp_not:n}~|{#}| is equivalent to |#|, namely it inserts the % character~|#|. % \end{texnote} @@ -706,7 +705,7 @@ % \cs{exp_not:o} \Arg{tokens} % \end{syntax} % Expands the \meta{tokens} once, then prevents any further expansion -% in |x|-type or \texttt{e}-type arguments using \cs{exp_not:n}. +% in |e|-type or |x|-type arguments using \cs{exp_not:n}. % \end{function} % % \begin{function}[EXP]{\exp_not:V} @@ -714,7 +713,7 @@ % \cs{exp_not:V} \meta{variable} % \end{syntax} % Recovers the content of the \meta{variable}, then prevents expansion -% of this material in |x|-type or \texttt{e}-type arguments using \cs{exp_not:n}. +% of this material in |e|-type or |x|-type arguments using \cs{exp_not:n}. % \end{function} % % \begin{function}[EXP]{\exp_not:v} @@ -725,7 +724,7 @@ % converts this into a control sequence which should be a \meta{variable} % name. % The content of the \meta{variable} is recovered, and further -% expansion in |x|-type or \texttt{e}-type arguments is prevented using \cs{exp_not:n}. +% expansion in |e|-type or |x|-type arguments is prevented using \cs{exp_not:n}. % \end{function} % % \begin{function}[EXP]{\exp_not:e} @@ -734,7 +733,7 @@ % \end{syntax} % Expands \meta{tokens} exhaustively, then protects the result of the % expansion (including any tokens which were not expanded) from -% further expansion in |e| or |x|-type arguments using \cs{exp_not:n}. +% further expansion in |e|-type or |x|-type arguments using \cs{exp_not:n}. % This is very rarely useful but is provided for consistency. % \end{function} % @@ -745,7 +744,7 @@ % Expands \meta{tokens} fully until the first unexpandable token is % found (if it is a space it is removed). Expansion then stops, and % the result of the expansion (including any tokens which were not -% expanded) is protected from further expansion in |x|-type or \texttt{e}-type arguments +% expanded) is protected from further expansion in |e|-type or |x|-type arguments % using \cs{exp_not:n}. % \end{function} % @@ -758,7 +757,7 @@ % and all of \meta{tokens} are expandable \cs{exp_stop_f:} % terminates the expansion of tokens even if \meta{more tokens} % are also expandable. The function itself is an implicit space -% token. Inside an \texttt{x}-type or \texttt{e}-type expansion, it retains its +% token. Inside an \texttt{e}-type or \texttt{x}-type expansion, it retains its % form, but when typeset it produces the underlying space (\verb*| |). % \end{function} % @@ -948,7 +947,7 @@ % In this section a general mechanism for defining functions that handle % arguments is defined. These general expansion functions are % expandable unless |x| is used. (Any version of |x| is going to have -% to use one of the \LaTeX3 names for \cs{cs_set:Npe} at some +% to use one of the \LaTeX3 names for \cs{cs_set:Npx} at some % point, and so is never going to be expandable.) % % The definition of expansion functions with this technique happens @@ -1062,7 +1061,7 @@ % Since the expansion of \cs{exp:w} \cs{exp_end_continue_f:w} is % empty, we wind up with a fully expanded list, only \TeX{} has not % tried to execute any of the non-expandable tokens. This is what -% differentiates this function from the |x| argument type. +% differentiates this function from the |e| and |x| argument type. % \begin{macrocode} \cs_new:Npn \::f #1 \::: #2#3 { @@ -1818,7 +1817,7 @@ % trigger an error, because we do not have a means to replace % |o|-expansion by |x|-expansion. % More generally, we can only convert |N| to |c|, or convert |n| -% to |V|, |v|, |o|, |f|, |x|. +% to |V|, |v|, |o|, |e|, |f|, or |x|. % \end{itemize} % All this boils down to a few rules. Only |n| and |N|-type % arguments can be replaced by \cs{cs_generate_variant:Nn}. Other @@ -1828,7 +1827,7 @@ % part is ignored. % % We compare the base and variant signatures one character at a time -% within |x|-expansion. The result is given to +% within |e|-expansion. The result is given to % \cs{@@_generate_variant:wwNN} (defined later) in the form % \meta{processed variant signature} \cs{s_@@_mark} \meta{errors} % \cs{s_@@_stop} \meta{base function} \meta{new function}. If all went @@ -1889,7 +1888,7 @@ % % The case where the two letters are different is only allowed if the % base is |N| and the variant is |c|, or when the base is |n| and the -% variant is |o|, |V|, |v|, |f| or |x|. Otherwise, call +% variant is |V|, |v|, |o|, |e|, |f|, or |x|. Otherwise, call % \cs{@@_generate_variant_loop_invalid:NNwNNnn} to remove the end of % the loop, get arguments at the end of the loop, and place an % appropriate error message as a second argument of |