[latex3-commits] [git/LaTeX3-latex3-latex3] master: review docs to mention e-type expansion where relevant (4f0c371)
Will Robertson
wspr81 at gmail.com
Sat Feb 16 01:27:28 CET 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/4f0c37152af31ef7086e4cdfe78a029cb61e7753
>---------------------------------------------------------------
commit 4f0c37152af31ef7086e4cdfe78a029cb61e7753
Author: Will Robertson <wspr81 at gmail.com>
Date: Sat Feb 16 10:57:28 2019 +1030
review docs to mention e-type expansion where relevant
(may have missed some cases)
[ci skip]
>---------------------------------------------------------------
4f0c37152af31ef7086e4cdfe78a029cb61e7753
l3kernel/l3basics.dtx | 18 +++++++++---------
l3kernel/l3clist.dtx | 2 +-
l3kernel/l3expan.dtx | 8 ++++----
l3kernel/l3syntax-changes.tex | 4 ++--
l3kernel/l3tl.dtx | 4 ++--
l3kernel/source3body.tex | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/l3kernel/l3basics.dtx b/l3kernel/l3basics.dtx
index 7730ede..192c3db 100644
--- a/l3kernel/l3basics.dtx
+++ b/l3kernel/l3basics.dtx
@@ -163,7 +163,7 @@
% Create a new function with the \texttt{protected} restriction,
% such as \cs{cs_set_protected:Npn}. The parameter may contain
% \cs{par} tokens but the function will not expand within an
-% \texttt{x}-type expansion.
+% \texttt{x}-type or \texttt{e}-type expansion.
% \end{description}
%
% Finally, the functions in
@@ -244,7 +244,7 @@
% \emph{etc.}) will be replaced by those absorbed by the function.
% When the \meta{function} is used the \meta{parameters} absorbed
% cannot contain \cs{par} tokens. The \meta{function} will not
-% expand within an \texttt{x}-type argument. The definition is global
+% expand within an \texttt{x}-type or \texttt{e}-type argument. The definition is global
% and an error results if the \meta{function} is already defined.
% \end{function}
%
@@ -289,7 +289,7 @@
% \emph{etc.}) will be replaced by those absorbed by the function.
% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level. The \meta{function} will
-% not expand within an \texttt{x}-type argument.
+% not expand within an \texttt{x}-type or \texttt{e}-type argument.
% \end{function}
%
% \begin{function}
@@ -307,7 +307,7 @@
% cannot contain \cs{par} tokens. The assignment of a meaning
% to the \meta{function} is restricted to the current \TeX{} group
% level. The \meta{function} will not expand within an
-% \texttt{x}-type argument.
+% \texttt{x}-type or \texttt{e}-type argument.
% \end{function}
%
% \begin{function}{\cs_gset:Npn, \cs_gset:cpn, \cs_gset:Npx, \cs_gset:cpx}
@@ -353,7 +353,7 @@
% The assignment of a meaning to the \meta{function} is \emph{not}
% restricted to the current \TeX{} group level: the assignment is
% global. The \meta{function} will not expand within an
-% \texttt{x}-type argument.
+% \texttt{x}-type or \texttt{e}-type argument.
% \end{function}
%
% \begin{function}
@@ -441,7 +441,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
-% expand within an \texttt{x}-type argument. The definition is global and
+% expand within an \texttt{x}-type or \texttt{e}-type argument. The definition is global and
% an error results if the \meta{function} is already defined.
% \end{function}
%
@@ -512,7 +512,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
-% expand within an \texttt{x}-type argument.
+% expand within an \texttt{x}-type or \texttt{e}-type argument.
% The assignment of a meaning to the \meta{function} is restricted to
% the current \TeX{} group level.
% \end{function}
@@ -581,7 +581,7 @@
% (|#1|, |#2|, \emph{etc.}) will be replaced by those absorbed by the
% function. When the \meta{function} is used the \meta{parameters}
% absorbed cannot contain \cs{par} tokens. The \meta{function} will not
-% expand within an \texttt{x}-type argument.
+% expand within an \texttt{x}-type or \texttt{e}-type argument.
% The assignment of a meaning to the \meta{function} is global.
% \end{function}
%
@@ -794,7 +794,7 @@
% of category code $10$. The result does \emph{not} include
% the current escape token, contrarily to \cs{token_to_str:N}.
% Full expansion of this function requires exactly $2$ expansion
-% steps, and so an \texttt{x}-type expansion, or two
+% steps, and so an \texttt{x}-type or \texttt{e}-type expansion, or two
% \texttt{o}-type expansions are required to
% convert the \meta{control sequence} to a sequence of characters
% in the input stream. In most cases, an \texttt{f}-expansion
diff --git a/l3kernel/l3clist.dtx b/l3kernel/l3clist.dtx
index 0fa0818..9f359eb 100644
--- a/l3kernel/l3clist.dtx
+++ b/l3kernel/l3clist.dtx
@@ -337,7 +337,7 @@
% \begin{texnote}
% The result is returned within \tn{unexpanded}, which means that the
% comma list does not expand further when appearing in an
-% \texttt{x}-type argument expansion.
+% \texttt{x}-type or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
diff --git a/l3kernel/l3expan.dtx b/l3kernel/l3expan.dtx
index dd4d70f..d171f04 100644
--- a/l3kernel/l3expan.dtx
+++ b/l3kernel/l3expan.dtx
@@ -713,7 +713,7 @@
% \cs{exp_not:o} \Arg{tokens}
% \end{syntax}
% Expands the \meta{tokens} once, then prevents any further expansion
-% in |x|-type arguments using \cs{exp_not:n}.
+% in |x|-type or \texttt{e}-type arguments using \cs{exp_not:n}.
% \end{function}
%
% \begin{function}[EXP]{\exp_not:V}
@@ -721,7 +721,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 arguments using \cs{exp_not:n}.
+% of this material in |x|-type or \texttt{e}-type arguments using \cs{exp_not:n}.
% \end{function}
%
% \begin{function}[EXP]{\exp_not:v}
@@ -732,7 +732,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 arguments is prevented using \cs{exp_not:n}.
+% expansion in |x|-type or \texttt{e}-type arguments is prevented using \cs{exp_not:n}.
% \begin{texnote}
% Protected macros that appear in a \texttt{v}-type argument are
% expanded despite being protected; \cs{exp_not:n} also has no
@@ -759,7 +759,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 arguments
+% expanded) is protected from further expansion in |x|-type or \texttt{e}-type arguments
% using \cs{exp_not:n}.
% \end{function}
%
diff --git a/l3kernel/l3syntax-changes.tex b/l3kernel/l3syntax-changes.tex
index 9b80174..065b8ad 100644
--- a/l3kernel/l3syntax-changes.tex
+++ b/l3kernel/l3syntax-changes.tex
@@ -94,7 +94,7 @@ changes after August 2011 are listed, with an approximate date.
functions.
\item \cs{tl_trim_spaces:n} now requires a variable number of
expansions to fully expand, rather than exactly two. Of course,
- \texttt{x}-type expansion still correctly evaluates this function.
+ \texttt{x}-type or \texttt{e}-type expansion still correctly evaluates this function.
\end{itemize}
\section{July 2012}
@@ -110,7 +110,7 @@ changes after August 2011 are listed, with an approximate date.
\begin{itemize}
\item \cs{lua_now:x} is now a standard \texttt{x}-type expansion of
\cs{lua_now:n}, which does no expansion. Engine-level expansion is moved
- to \cs{lua_now_x:n}, reflecting the fact that this is non-standard in the
+ to \cs{lua_now:e}, reflecting the fact that this is non-standard in the
same way as for example \cs{str_if_eq_x:nn(TF)}.
\end{itemize}
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 1c88673..158b8bd 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -822,7 +822,7 @@
% \begin{texnote}
% The result is returned within \cs{exp_not:n}, which means that the
% token list does not expand further when appearing in an
-% \texttt{x}-type argument expansion.
+% \texttt{x}-type or \texttt{e}-type argument expansion.
% \end{texnote}
% \end{function}
%
@@ -2949,7 +2949,7 @@
% then check for the brace balance. The extra \texttt{?}
% caters for an empty argument.\footnote{Bruno: this could
% be made faster, but we don't: if we hope to ever have
-% an e-type argument, we need all brace \enquote{tricks}
+% an \texttt{e}-type argument, we need all brace \enquote{tricks}
% to happen in one step of expansion, keeping the token
% list brace balanced at all times.}
% \begin{macrocode}
diff --git a/l3kernel/source3body.tex b/l3kernel/source3body.tex
index 51f9542..cbe37a8 100644
--- a/l3kernel/source3body.tex
+++ b/l3kernel/source3body.tex
@@ -321,7 +321,7 @@ different types of argument:
\paragraph{Fully expandable functions}
\hypertarget{expstar}{Some functions are fully expandable},
which allows them to be used within
-an \texttt{x}-type argument (in plain \TeX{} terms, inside an \cs{edef}),
+an \texttt{x}-type or \texttt{e}-type argument (in plain \TeX{} terms, inside an \cs{edef}),
as well as within an \texttt{f}-type argument.
These fully expandable functions are indicated in the documentation by
a star:
More information about the latex3-commits
mailing list