[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move \tl_if_single_token:n(TF) to stable (509bf63)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Apr 1 14:09:17 CEST 2019
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/509bf63587abd3687e1ec7243d7134202be7b8ed
>---------------------------------------------------------------
commit 509bf63587abd3687e1ec7243d7134202be7b8ed
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Mon Apr 1 13:09:17 2019 +0100
Move \tl_if_single_token:n(TF) to stable
>---------------------------------------------------------------
509bf63587abd3687e1ec7243d7134202be7b8ed
l3kernel/CHANGELOG.md | 4 ++++
l3kernel/l3candidates.dtx | 40 -------------------------------
l3kernel/l3tl.dtx | 36 ++++++++++++++++++++++++++++
l3kernel/testfiles/m3expl001.luatex.tlg | 8 +++----
l3kernel/testfiles/m3expl001.ptex.tlg | 8 +++----
l3kernel/testfiles/m3expl001.tlg | 8 +++----
l3kernel/testfiles/m3expl001.uptex.tlg | 8 +++----
l3kernel/testfiles/m3expl001.xetex.tlg | 8 +++----
l3kernel/testfiles/m3expl003.luatex.tlg | 8 +++----
l3kernel/testfiles/m3expl003.ptex.tlg | 8 +++----
l3kernel/testfiles/m3expl003.tlg | 8 +++----
l3kernel/testfiles/m3expl003.uptex.tlg | 8 +++----
l3kernel/testfiles/m3expl003.xetex.tlg | 8 +++----
13 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index f50f8d2..0251206 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+### Changed
+
+- Moved `\tl_if_single_token:n(TF)` to stable
+
## [2019-03-26]
### Fixed
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 8c4b64e..10c1185 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -983,16 +983,6 @@
%
% \section{Additions to \pkg{l3tl}}
%
-% \begin{function}[EXP,pTF]{\tl_if_single_token:n}
-% \begin{syntax}
-% \cs{tl_if_single_token_p:n} \Arg{token list}
-% \cs{tl_if_single_token:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
-% \end{syntax}
-% Tests if the token list consists of exactly one token, \emph{i.e.}~is
-% either a single space character or a single \enquote{normal} token.
-% Token groups (|{|\ldots|}|) are not single tokens.
-% \end{function}
-%
% \begin{function}[EXP, added = 2014-06-30, updated = 2016-01-12]
% {
% \tl_lower_case:n, \tl_upper_case:n, \tl_mixed_case:n,
@@ -2554,36 +2544,6 @@
%
% \subsection{Additions to \pkg{l3tl}}
%
-% \begin{macrocode}
-%<@@=tl>
-% \end{macrocode}
-%
-% \begin{macro}[EXP,pTF]{\tl_if_single_token:n}
-% There are four cases: empty token list, token list starting with a
-% normal token, with a brace group, or with a space token. If the
-% token list starts with a normal token, remove it and check for
-% emptiness. For the next case, an empty token list is not a single
-% token. Finally, we have a non-empty token list starting with a
-% space or a brace group. Applying \texttt{f}-expansion yields an
-% empty result if and only if the token list is a single space.
-% \begin{macrocode}
-\prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF }
- {
- \tl_if_head_is_N_type:nTF {#1}
- { \@@_if_empty_if:o { \use_none:n #1 } }
- {
- \tl_if_empty:nTF {#1}
- { \if_false: }
- { \@@_if_empty_if:o { \exp:w \exp_end_continue_f:w #1 } }
- }
- \prg_return_true:
- \else:
- \prg_return_false:
- \fi:
- }
-% \end{macrocode}
-% \end{macro}
-%
% \subsubsection{Unicode case changing}
%
% The mechanisms needed for case changing are somewhat involved, particularly
diff --git a/l3kernel/l3tl.dtx b/l3kernel/l3tl.dtx
index a5eae16..7940b21 100644
--- a/l3kernel/l3tl.dtx
+++ b/l3kernel/l3tl.dtx
@@ -469,6 +469,16 @@
% token count $1$ according to \cs{tl_count:n}.
% \end{function}
%
+% \begin{function}[EXP,pTF]{\tl_if_single_token:n}
+% \begin{syntax}
+% \cs{tl_if_single_token_p:n} \Arg{token list}
+% \cs{tl_if_single_token:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
+% \end{syntax}
+% Tests if the token list consists of exactly one token, \emph{i.e.}~is
+% either a single space character or a single \enquote{normal} token.
+% Token groups (|{|\ldots|}|) are not single tokens.
+% \end{function}
+%
% \begin{function}[added = 2013-07-24, EXP, noTF]{\tl_case:Nn, \tl_case:cn}
% \begin{syntax}
% \cs{tl_case:NnTF} \meta{test token list variable} \\
@@ -2224,6 +2234,32 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}[EXP,pTF]{\tl_if_single_token:n}
+% There are four cases: empty token list, token list starting with a
+% normal token, with a brace group, or with a space token. If the
+% token list starts with a normal token, remove it and check for
+% emptiness. For the next case, an empty token list is not a single
+% token. Finally, we have a non-empty token list starting with a
+% space or a brace group. Applying \texttt{f}-expansion yields an
+% empty result if and only if the token list is a single space.
+% \begin{macrocode}
+\prg_new_conditional:Npnn \tl_if_single_token:n #1 { p , T , F , TF }
+ {
+ \tl_if_head_is_N_type:nTF {#1}
+ { \@@_if_empty_if:o { \use_none:n #1 } }
+ {
+ \tl_if_empty:nTF {#1}
+ { \if_false: }
+ { \@@_if_empty_if:o { \exp:w \exp_end_continue_f:w #1 } }
+ }
+ \prg_return_true:
+ \else:
+ \prg_return_false:
+ \fi:
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[EXP, noTF]{\tl_case:Nn, \tl_case:cn}
% \begin{macro}[EXP]{\@@_case:nnTF}
% \begin{macro}[EXP]{\@@_case:Nw}
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 3de6726..9f9b6ed 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -510,6 +510,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6035,10 +6039,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 0f2527f..64c8ae3 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6073,10 +6077,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index 763d6a8..c887062 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6073,10 +6077,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index e2d2ebf..13fe109 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6070,10 +6074,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 8c21098..1870647 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6043,10 +6047,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 3de6726..9f9b6ed 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -510,6 +510,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6035,10 +6039,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 0f2527f..64c8ae3 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6073,10 +6077,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 763d6a8..c887062 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6073,10 +6077,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index e2d2ebf..13fe109 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6070,10 +6074,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 8c21098..1870647 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -551,6 +551,10 @@ Defining \tl_if_single:nT on line ...
Defining \tl_if_single:nF on line ...
Defining \tl_if_single:nTF on line ...
Defining \__tl_if_single:nnw on line ...
+Defining \tl_if_single_token_p:n on line ...
+Defining \tl_if_single_token:nT on line ...
+Defining \tl_if_single_token:nF on line ...
+Defining \tl_if_single_token:nTF on line ...
Defining \tl_case:Nn on line ...
Defining \tl_case:NnT on line ...
Defining \tl_case:NnF on line ...
@@ -6043,10 +6047,6 @@ Defining \sys_shell_now:n on line ...
Defining \sys_shell_now:x on line ...
Defining \sys_shell_shipout:n on line ...
Defining \sys_shell_shipout:x on line ...
-Defining \tl_if_single_token_p:n on line ...
-Defining \tl_if_single_token:nT on line ...
-Defining \tl_if_single_token:nF on line ...
-Defining \tl_if_single_token:nTF on line ...
Defining \char_lower_case:N on line ...
Defining \char_upper_case:N on line ...
Defining \char_mixed_case:N on line ...
More information about the latex3-commits
mailing list