[latex3-commits] [latex3/latex3] main: Adapt doc and comments to sync with x-to-e switch, `|x|` markup (42f464398)

github at latex-project.org github at latex-project.org
Wed Nov 1 07:02:38 CET 2023


Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/42f464398a30210c38f11617dc5b2e045db71fd2

>---------------------------------------------------------------

commit 42f464398a30210c38f11617dc5b2e045db71fd2
Author: Yukai Chou <muzimuzhi at gmail.com>
Date:   Wed Nov 1 04:29:16 2023 +0800

    Adapt doc and comments to sync with x-to-e switch, `|x|` markup


>---------------------------------------------------------------

42f464398a30210c38f11617dc5b2e045db71fd2
 l3kernel/l3doc.dtx              |  2 +-
 l3kernel/l3expan.dtx            | 12 ++++++------
 l3kernel/l3kernel-functions.dtx |  2 +-
 l3kernel/l3regex.dtx            |  2 +-
 l3kernel/l3str.dtx              |  2 +-
 l3kernel/l3tl-analysis.dtx      |  2 +-
 l3kernel/l3tl-build.dtx         |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index f818a1544..6b68a1312 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -1190,7 +1190,7 @@ and all files in that bundle must be distributed together.
 %   Get predicate from a function's base name.  The code is not broken
 %   by functions with no signature.  The |n|-type version can be used
 %   for keys and other non-control sequences.  The output after
-%   |x|-expansion is a string.
+%   |e|-expansion is a string.
 %    \begin{macrocode}
 \cs_new:Npn \@@_predicate_from_base:n #1
   {
diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index 36787153c..d548963c0 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -685,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{} primitive \tn{unexpanded}.  In an
-%     |x|-expanding definition (\cs{cs_new:Npe}), \cs{exp_not:n}~|{#1}|
+%     |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}
@@ -947,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
@@ -1827,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
diff --git a/l3kernel/l3kernel-functions.dtx b/l3kernel/l3kernel-functions.dtx
index ce3ab2097..abf493f17 100644
--- a/l3kernel/l3kernel-functions.dtx
+++ b/l3kernel/l3kernel-functions.dtx
@@ -101,7 +101,7 @@
 %   given \meta{specific type} of token list.  Produces suitable error
 %   messages if the \meta{control sequence} does not exist, or if it is
 %   not a token list variable at all, or if the \meta{control sequence}
-%   differs from the result of |x|-expanding \meta{reconstruction}.  If
+%   differs from the result of |e|-expanding \meta{reconstruction}.  If
 %   all of these tests succeed then the \meta{true code} is run.
 % \end{function}
 %
diff --git a/l3kernel/l3regex.dtx b/l3kernel/l3regex.dtx
index 70ad1ca9e..a0f1afc62 100644
--- a/l3kernel/l3regex.dtx
+++ b/l3kernel/l3regex.dtx
@@ -7301,7 +7301,7 @@
 %     \@@_group_end_replace:N, \@@_group_end_replace_try:,
 %     \@@_group_end_replace_check:w, \@@_group_end_replace_check:n
 %   }
-%   At this stage \cs{l_@@_internal_a_tl} (|x|-expands to the desired
+%   At this stage \cs{l_@@_internal_a_tl} (|e|-expands to the desired
 %   result).  Guess from \cs{l_@@_balance_int} the number of braces to
 %   add before or after the result then try expanding.  The simplest
 %   case is when \cs{l_@@_internal_a_tl} together with the braces we
diff --git a/l3kernel/l3str.dtx b/l3kernel/l3str.dtx
index 433b8e0c3..c30f1af4d 100644
--- a/l3kernel/l3str.dtx
+++ b/l3kernel/l3str.dtx
@@ -1036,7 +1036,7 @@
 %   simplified version of the token list code because neither the
 %   delimiter nor the replacement can contain macro parameters or
 %   braces.  The delimiter \cs{s_@@_mark} cannot appear in the string to
-%   edit so it is used in all cases.  Some |x|-expansion is unnecessary.
+%   edit so it is used in all cases.  Some |e|-expansion is unnecessary.
 %   There is no need to avoid losing braces nor to protect against
 %   expansion.  The ending code is much simplified and does not need to
 %   hide in braces.
diff --git a/l3kernel/l3tl-analysis.dtx b/l3kernel/l3tl-analysis.dtx
index db87c7920..04b6f5399 100644
--- a/l3kernel/l3tl-analysis.dtx
+++ b/l3kernel/l3tl-analysis.dtx
@@ -1390,7 +1390,7 @@
 %   characters to anything else than character code~$32$), then we apply
 %   \cs{@@_analysis_b_char:Nn}, which detects active characters by
 %   comparing them to \cs{tex_undefined:D}, and we must have undefined
-%   the active space for this test to work ---we use an |x|-expanding
+%   the active space for this test to work ---we use an |e|-expanding
 %   assignment to get the active space in the right place.  Finally
 %   \cs{@@_peek_analysis_char:w} puts the arguments in the correct
 %   order, including \cs{exp_not:n} for macro parameter characters and
diff --git a/l3kernel/l3tl-build.dtx b/l3kernel/l3tl-build.dtx
index b8c0e2056..66c21df40 100644
--- a/l3kernel/l3tl-build.dtx
+++ b/l3kernel/l3tl-build.dtx
@@ -242,7 +242,7 @@
 %   See \cs{tl_build_put_right:Nn} for all the machinery.  We could
 %   easily provide \cs[no-index]{tl_build_put_left_right:Nnn}, by just
 %   adding the \meta{right} material after the \Arg{left} in the
-%   |x|-expanding assignment.
+%   |e|-expanding assignment.
 %    \begin{macrocode}
 \cs_new_protected:Npn \tl_build_put_left:Nn #1
   { \@@_build_put_left:NNn \cs_set_nopar:Npe #1 }





More information about the latex3-commits mailing list.