[latex3-commits] [l3svn] branch master updated: Back out 'space' changes ... [ci skip]
noreply at latex-project.org
noreply at latex-project.org
Tue Sep 26 21:44:24 CEST 2017
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
The following commit(s) were added to refs/heads/master by this push:
new 575a3eb Back out 'space' changes ... [ci skip]
575a3eb is described below
commit 575a3ebc0647514f0dc15ce83947a475872d73b8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Sep 26 20:43:22 2017 +0100
Back out 'space' changes ... [ci skip]
... pending more discussion.
---
l3kernel/l3tl.dtx | 94 +++++++++++++++++++++++------------------------------
1 file changed, 40 insertions(+), 54 deletions(-)
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index 573a91e..c54c25c 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -70,7 +70,7 @@
% as a list of \enquote{items},
% or a list of \enquote{tokens}. An item is whatever \cs{use:n} would
% grab as its argument: a single non-space token or a brace group,
-% with optional leading explicit \meta{space tokens} (each item is thus
+% with optional leading explicit space characters (each item is thus
% itself a token list). A token is either a normal \texttt{N} argument,
% or \verb*| |, |{|, or |}| (assuming normal \TeX{} category codes).
% Thus for example
@@ -84,27 +84,6 @@
% Functions which act on items are often faster than their analogue acting
% directly on tokens.
%
-% \section{Space tokens}
-%
-% During tokenization, \TeX{} normalises the representation of spaces.
-% Any character with category code $10$ will be normalised to \verb*| |
-% (character code $32$) as part of tokenization: the result is a
-% \meta{space token}. In the following descriptions, \meta{space token}
-% \emph{always} refers to such normalised values.
-%
-% Explicit \meta{space tokens} are ignored in a number of contexts: at the start
-% of input lines, after function and variable names, when absorbing undelimited
-% arguments, and in mappings and functions which use mappings, such as
-% \cs{tl_count:n}. Note this does not apply to implicit \meta{space tokens}
-% (\cs{c_space_token} or equivalent).
-%
-% \begin{texnote}
-% In \pkg{expl3} there is no interface for generating \enquote{funny spaces},
-% that is category code $10$ tokens but with character code not equal to $32$.
-% Where such tokens are generated by other code, they will not be treated as
-% \meta{space tokens} as used in the following definitions.
-% \end{texnote}
-%
% \section{Creating and initialising token list variables}
%
% \begin{function}{\tl_new:N, \tl_new:c}
@@ -379,9 +358,10 @@
% \cs{tl_if_blank_p:n} \Arg{token list}
% \cs{tl_if_blank:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
% \end{syntax}
-% Tests if the \meta{token list} consists only of explicit \meta{space tokens}
+% Tests if the \meta{token list} consists only of blank spaces
% (\emph{i.e.}~contains no item). The test is \texttt{true} if
-% \meta{token list} is zero or more explicit \meta{space tokens},
+% \meta{token list} is zero or more explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$),
% and is \texttt{false} otherwise.
% \end{function}
%
@@ -460,10 +440,10 @@
% \cs{tl_if_single:NTF} \meta{tl~var} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests if the content of the \meta{tl~var} consists of a single item,
-% \emph{i.e.}~is a single normal token (neither an explicit \meta{space
-% token} nor a begin-group character) or a single brace group,
-% surrounded by optional \meta{space tokens} on both sides. In other words,
-% such a token list has token count $1$ according to \cs{tl_count:N}.
+% \emph{i.e.}~is a single normal token (neither an explicit space
+% character nor a begin-group character) or a single brace group,
+% surrounded by optional spaces on both sides. In other words, such a
+% token list has token count $1$ according to \cs{tl_count:N}.
% \end{function}
%
% \begin{function}[updated = 2011-08-13, EXP,pTF]{\tl_if_single:n}
@@ -472,10 +452,10 @@
% \cs{tl_if_single:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests if the \meta{token list} has exactly one item, \emph{i.e.}~is
-% a single normal token (neither an explicit \meta{space token} nor a
+% a single normal token (neither an explicit space character nor a
% begin-group character) or a single brace group, surrounded by
-% optional \meta{space tokens} on both sides. In other words, such a token
-% list has token count $1$ according to \cs{tl_count:n}.
+% optional spaces on both sides. In other words, such a token list has
+% token count $1$ according to \cs{tl_count:n}.
% \end{function}
%
% \begin{function}[added = 2013-07-24, EXP, noTF]{\tl_case:Nn, \tl_case:cn}
@@ -689,25 +669,23 @@
% \cs{tl_count:n} \Arg{tokens}
% \end{syntax}
% Counts the number of \meta{items} in \meta{tokens} and leaves this
-% information in the input stream as an \meta{integer denotation}.
-% See also \cs{tl_count:N}.
-% \begin{texnote}
-% This function requires three expansions to reach an
-% \meta{integer denotation}.
-% \end{texnote}
+% information in the input stream. Unbraced tokens count as one
+% element as do each token group (|{|\ldots|}|). This process
+% ignores any unprotected spaces within \meta{tokens}. See also
+% \cs{tl_count:N}. This function requires three expansions,
+% giving an \meta{integer denotation}.
% \end{function}
%
% \begin{function}[added = 2012-05-13, EXP]{\tl_count:N, \tl_count:c}
% \begin{syntax}
% \cs{tl_count:N} \meta{tl~var}
% \end{syntax}
-% Counts the number of \meta{items} in \meta{tl~var} and leaves this
-% information in the input stream as an \meta{integer denotation}.
-% See also \cs{tl_count:n}.
-% \begin{texnote}
-% This function requires three expansions to reach an
-% \meta{integer denotation}.
-% \end{texnote}
+% Counts the number of token groups in the \meta{tl~var}
+% and leaves this information in the input stream. Unbraced tokens
+% count as one element as do each token group (|{|\ldots|}|). This
+% process ignores any unprotected spaces within the \meta{tl~var}.
+% See also \cs{tl_count:n}. This function requires three expansions,
+% giving an \meta{integer denotation}.
% \end{function}
%
% \begin{function}[updated = 2012-01-08, EXP]
@@ -771,7 +749,8 @@
% \begin{syntax}
% \cs{tl_trim_spaces:n} \Arg{token list}
% \end{syntax}
-% Removes any leading and trailing explicit \meta{space tokens}
+% Removes any leading and trailing explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$)
% from the \meta{token list} and leaves the result in the input
% stream.
% \begin{texnote}
@@ -789,7 +768,8 @@
% \begin{syntax}
% \cs{tl_trim_spaces:N} \meta{tl~var}
% \end{syntax}
-% Removes any leading and trailing explicit \meta{space tokens}
+% Removes any leading and trailing explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$)
% from the content of the \meta{tl~var}. Note that this therefore
% \emph{resets} the content of the variable.
% \end{function}
@@ -835,7 +815,9 @@
% \end{syntax}
% Leaves in the input stream the first \meta{item} in the
% \meta{token list}, discarding the rest of the \meta{token list}.
-% All leading explicit \meta{space tokens} are discarded; for example
+% All leading explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$)
+% are discarded; for example
% \begin{verbatim}
% \tl_head:n { abc }
% \end{verbatim}
@@ -865,9 +847,10 @@
% \end{syntax}
% Leaves in the input stream the first \meta{item} in the
% \meta{token list}, discarding the rest of the \meta{token list}.
-% All leading explicit \meta{space tokens} are discarded.
-% A blank \meta{token list} (which consists only of explicit
-% \meta{space tokens})
+% All leading explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$)
+% are discarded.
+% A blank \meta{token list} (which consists only of space characters)
% results in a low-level \TeX{} error, which may be avoided by the
% inclusion of an empty group in the input (as shown), without the need
% for an explicit test. Alternatively, \cs{tl_if_blank:nF} may be used to
@@ -882,7 +865,8 @@
% \begin{syntax}
% \cs{tl_tail:n} \Arg{token list}
% \end{syntax}
-% Discards all leading explicit \meta{space tokens}
+% Discards all leading explicit space characters
+% (explicit tokens with character code~$32$ and category code~$10$)
% and the first \meta{item} in the \meta{token list}, and leaves the
% remaining tokens in the input stream. Thus for example
% \begin{verbatim}
@@ -958,7 +942,8 @@
% \end{syntax}
% Tests if the first \meta{token} in the \meta{token list}
% is a normal \texttt{N}-type argument. In other words,
-% it is neither an explicit \meta{space token}
+% it is neither an explicit space character
+% (explicit token with character code~$32$ and category code~$10$)
% nor an explicit begin-group character
% (with category code~1 and any character code). An empty
% argument yields \texttt{false}, as it does not have a \enquote{normal}
@@ -973,7 +958,8 @@
% \cs{tl_if_head_is_space:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
% \end{syntax}
% Tests if the first \meta{token} in the \meta{token list}
-% is an explicit \meta{space token}.
+% is an explicit space character
+% (explicit token with character code~$12$ and category code~$10$).
% In particular, the test is \texttt{false} if the \meta{token list}
% starts with an implicit token such as \cs{c_space_token}, or if it
% is empty.
@@ -1049,7 +1035,7 @@
% \end{variable}
%
% \begin{variable}{\c_space_tl}
-% An explicit \meta{space token} contained in a token list (compare this with
+% An explicit space character contained in a token list (compare this with
% \cs{c_space_token}). For use where an explicit space is required.
% \end{variable}
%
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list