l3kernel 2678 (28aug11)

git-svn-id: svn://tug.org/texlive/trunk@23738 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 14 insertions, 120 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 3aeca13b29d..c67a876db3d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -35,7 +35,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 2579 2011-08-14 16:22:30Z bruno $
+\GetIdInfo$Id: l3token.dtx 2665 2011-08-25 22:15:27Z joseph $
   {L3 Experimental token manipulation}
 %</driver|package>
 %<*driver>
@@ -437,10 +437,7 @@
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of a begin group token
 %   (|{| when normal \TeX{} category codes are in ^^A }
-%   force). The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   force).
 %   Note that an explicit begin group token cannot be tested in this way,
 %   as it is not a valid \texttt{N}-type argument.
 % \end{function}
@@ -453,11 +450,7 @@
 %    \end{syntax}
 %   Tests if \meta{token} has the category code of an end group token
 %   (^^A {
-%   |}| when normal \TeX{} category codes are in force). The branching
-%   versions then leave either \meta{true code} or \meta{false code} in the
-%   input stream, as appropriate to the truth of the test and the variant
-%   of the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate version.
+%   |}| when normal \TeX{} category codes are in force).
 %   Note that an explicit end group token cannot be tested in this way,
 %   as it is not a valid \texttt{N}-type argument.
 % \end{function}
@@ -469,11 +462,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of a math shift token
-%   (|$| when normal \TeX{} category codes are in force). The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   (|$| when normal \TeX{} category codes are in force).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_alignment:N}
@@ -483,11 +472,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of an alignment token
-%   (|&| when normal \TeX{} category codes are in force). The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   (|&| when normal \TeX{} category codes are in force).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_parameter:N}
@@ -497,11 +482,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of a macro parameter token
-%   (|#| when normal \TeX{} category codes are in force). The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   (|#| when normal \TeX{} category codes are in force).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_math_superscript:N}
@@ -511,11 +492,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of a superscript token
-%   (|^| when normal \TeX{} category codes are in force). The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   (|^| when normal \TeX{} category codes are in force).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_math_subscript:N}
@@ -525,11 +502,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of a subscript token
-%   (|_| when normal \TeX{} category codes are in force). The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   (|_| when normal \TeX{} category codes are in force).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_space:N}
@@ -538,11 +511,7 @@
 %     \cs{token_if_space:NTF} \meta{token} \Arg{true code}
 %     ~~\Arg{false code}
 %   \end{syntax}
-%   Tests if \meta{token} has the category code of a space token. The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   Tests if \meta{token} has the category code of a space token.
 %   Note that an explicit space token with character code $32$ cannot
 %   be tested in this way, as it is not a valid \texttt{N}-type argument.
 % \end{function}
@@ -553,11 +522,7 @@
 %     \cs{token_if_letter:NTF} \meta{token} \Arg{true code}
 %     ~~\Arg{false code}
 %   \end{syntax}
-%   Tests if \meta{token} has the category code of a letter token. The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   Tests if \meta{token} has the category code of a letter token.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_other:N}
@@ -567,10 +532,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of an \enquote{other}
-%   token. The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   token.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_active:N}
@@ -580,10 +542,6 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token} has the category code of an active character.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_eq_catcode:NN}
@@ -592,11 +550,7 @@
 %     \cs{token_if_eq_catcode:NNTF} \meta{token1} \meta{token2}
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
-%   Tests if the two \meta{tokens} have the same category code. The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   Tests if the two \meta{tokens} have the same category code.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_eq_charcode:NN}
@@ -605,11 +559,7 @@
 %     \cs{token_if_eq_charcode:NNTF} \meta{token1} \meta{token2}
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
-%   Tests if the two \meta{tokens} have the same character code. The
-%   branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   Tests if the two \meta{tokens} have the same character code.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_eq_meaning:NN}
@@ -619,10 +569,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the two \meta{tokens} have the same meaning when expanded.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_macro:N}
@@ -631,10 +577,6 @@
 %     \cs{token_if_macro:NTF} \meta{token} \Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is a \TeX{} macro.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_cs:N}
@@ -643,10 +585,6 @@
 %     \cs{token_if_cs:NTF} \meta{token} \Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is a control sequence.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_expandable:N}
@@ -657,10 +595,6 @@
 %   \end{syntax}
 %   Tests if the \meta{token} is expandable. This test returns \meta{false}
 %   for an undefined token.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_long_macro:N}
@@ -670,10 +604,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is a long macro.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_protected_macro:N}
@@ -683,11 +613,7 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is a protected macro: a macro which
-%   is both protected and long will return logical false.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
+%   is both protected and long will return logical \texttt{false}.
 % \end{function}
 %
 %% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N}
@@ -697,10 +623,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is a protected long macro.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_chardef:N}
@@ -710,10 +632,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a chardef.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_mathchardef:N}
@@ -723,10 +641,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a mathchardef.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_dim_register:N}
@@ -736,10 +650,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a dimension register.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_int_register:N}
@@ -749,10 +659,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a integer register.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_skip_register:N}
@@ -762,10 +668,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a skip register.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_toks_register:N}
@@ -776,10 +678,6 @@
 %   \end{syntax}
 %   Tests if the \meta{token} is defined to be a toks register
 %   (not used by\LaTeX3).
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\token_if_primitive:N}
@@ -789,10 +687,6 @@
 %     ~~\Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token} is an engine primitive.
-%   The branching versions then leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth of
-%   the test and the variant of the function chosen. The logical truth of
-%   the test is left in the input stream by the predicate version.
 % \end{function}
 %
 % \section{Peeking ahead at the next token}