[latex3-commits] [l3svn] 02/04: Remove \tl_expandable_(lower|upper)case:n
noreply at latex-project.org
noreply at latex-project.org
Wed Sep 23 14:42:11 CEST 2015
This is an automated email from the git hooks/post-receive script.
joseph pushed a commit to branch master
in repository l3svn.
commit c4b7a966d9102f4e2bbf5efd5efcb79b4c44e760
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Wed Sep 23 09:35:39 2015 +0100
Remove \tl_expandable_(lower|upper)case:n
---
l3kernel/l3candidates.dtx | 100 -------------------------------
l3kernel/testfiles/m3expl001.luatex.tlg | 9 +--
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 | 9 +--
l3kernel/testfiles/m3expl003.ptex.tlg | 8 ---
l3kernel/testfiles/m3expl003.tlg | 8 ---
l3kernel/testfiles/m3expl003.uptex.tlg | 8 ---
l3kernel/testfiles/m3expl003.xetex.tlg | 8 ---
l3kernel/testfiles/m3tl007.lvt | 44 --------------
l3kernel/testfiles/m3tl007.tlg | 22 +------
l3kernel/testfiles/m3tl009.lvt | 2 -
l3kernel/testfiles/m3tl009.tlg | 10 ----
15 files changed, 3 insertions(+), 257 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index a007b70..9b5e40d 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -783,28 +783,6 @@
% giving an \meta{integer denotation}.
% \end{function}
%
-% \begin{function}[EXP]{\tl_expandable_uppercase:n, \tl_expandable_lowercase:n}
-% \begin{syntax}
-% \cs{tl_expandable_uppercase:n} \Arg{tokens}
-% \cs{tl_expandable_lowercase:n} \Arg{tokens}
-% \end{syntax}
-% The \cs{tl_expandable_uppercase:n} function works through all of
-% the \meta{tokens}, replacing characters in the range |a|--|z|
-% (with arbitrary category code) by the corresponding letter
-% in the range |A|--|Z|, with category code $11$ (letter). Similarly,
-% \cs{tl_expandable_lowercase:n} replaces characters in the range
-% |A|--|Z| by letters in the range |a|--|z|, and leaves other tokens
-% unchanged. This function requires two steps of expansion.
-% \begin{texnote}
-% Begin-group and end-group characters are normalized and become
-% |{| and |}|, respectively.
-% The result is returned within the \tn{unexpanded}
-% primitive (\cs{exp_not:n}), which means that the token
-% list will not expand further when appearing in an \texttt{x}-type
-% argument expansion.
-% \end{texnote}
-% \end{function}
-%
% \begin{function}[EXP, added = 2014-06-30, updated = 2015-05-07]^^A
% {
% \tl_lower_case:n, \tl_upper_case:n, \tl_mixed_case:n,
@@ -2825,84 +2803,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{variable}{\c_@@_act_uppercase_tl, \c_@@_act_lowercase_tl}
-% These constants contain the correspondence between lowercase
-% and uppercase letters, in the form |aAbBcC...| and |AaBbCc...|
-% respectively.
-% \begin{macrocode}
-\tl_const:Nn \c_@@_act_uppercase_tl
- {
- aA bB cC dD eE fF gG hH iI jJ kK lL mM
- nN oO pP qQ rR sS tT uU vV wW xX yY zZ
- }
-\tl_const:Nn \c_@@_act_lowercase_tl
- {
- Aa Bb Cc Dd Ee Ff Gg Hh Ii Jj Kk Ll Mm
- Nn Oo Pp Qq Rr Ss Tt Uu Vv Ww Xx Yy Zz
- }
-% \end{macrocode}
-% \end{variable}
-%
-% \begin{macro}[EXP]{\tl_expandable_uppercase:n, \tl_expandable_lowercase:n}
-% \begin{macro}[EXP,aux]{\@@_act_case_normal:nN,
-% \@@_act_case_group:nn, \@@_act_case_space:n}
-% The only difference between uppercasing and lowercasing is
-% the table of correspondence that is used. As for other
-% token list actions, we feed \cs{@@_act:NNNnn} three
-% functions, and this time, we use the \meta{parameters}
-% argument to carry which case-changing we are applying.
-% A space is simply output. A normal token is compared
-% to each letter in the alphabet using \cs{str_if_eq:nn}
-% tests, and converted if necessary to upper/lowercase,
-% before being output. For a group, we must perform the
-% conversion within the group (the \cs{exp_after:wN} trigger
-% \cs{exp:w}, which expands fully to give the
-% converted group), then output.
-% \begin{macrocode}
-\cs_new:Npn \tl_expandable_uppercase:n #1
- {
- \etex_unexpanded:D \exp_after:wN
- {
- \exp:w
- \@@_act_case_aux:nn { \c_@@_act_uppercase_tl } {#1}
- }
- }
-\cs_new:Npn \tl_expandable_lowercase:n #1
- {
- \etex_unexpanded:D \exp_after:wN
- {
- \exp:w
- \@@_act_case_aux:nn { \c_@@_act_lowercase_tl } {#1}
- }
- }
-\cs_new:Npn \@@_act_case_aux:nn
- {
- \@@_act:NNNnn
- \@@_act_case_normal:nN
- \@@_act_case_group:nn
- \@@_act_case_space:n
- }
-\cs_new:Npn \@@_act_case_space:n #1 { \@@_act_output:n {~} }
-\cs_new:Npn \@@_act_case_normal:nN #1 #2
- {
- \exp_args:Nf \@@_act_output:n
- {
- \exp_args:NNo \str_case:nnF #2 {#1}
- { \exp_stop_f: #2 }
- }
- }
-\cs_new:Npn \@@_act_case_group:nn #1 #2
- {
- \exp_after:wN \@@_act_output:n \exp_after:wN
- {
- \exp_after:wN
- { \exp:w \@@_act_case_aux:nn {#1} {#2} }
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \begin{macro}^^A
% {
% \tl_set_from_file:Nnn, \tl_set_from_file:cnn,
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 4214bfb..16132c8 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -18,6 +18,7 @@ Don't change this file in any respect.
%%
(expl3.sty
(expl3-code.tex
+\ucharcat at table=\catcodetable5
Defining \cs_set_nopar:cpn on line ...
Defining \cs_set_nopar:cpx on line ...
Defining \cs_gset_nopar:cpn on line ...
@@ -4211,14 +4212,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 6e93a8d..9540a33 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -4210,14 +4210,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index e79088c..6bad018 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -4210,14 +4210,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 6e93a8d..9540a33 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -4210,14 +4210,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index 197f94e..9211a5b 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -4210,14 +4210,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index f2573ff..62caa95 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -18,6 +18,7 @@ Don't change this file in any respect.
%%
(expl3.sty
(expl3-code.tex
+\ucharcat at table=\catcodetable5
Defining \cs_set_nopar:cpn on line ...
Defining \cs_set_nopar:cpx on line ...
Defining \cs_gset_nopar:cpn on line ...
@@ -4212,14 +4213,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 3c767b7..47dc204 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -4211,14 +4211,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index 673cb7e..2d85ddd 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -4211,14 +4211,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3c767b7..47dc204 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -4211,14 +4211,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index 149f024..2f251c4 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -4211,14 +4211,6 @@ Defining \tl_count_tokens:n on line ...
Defining \__tl_act_count_normal:nN on line ...
Defining \__tl_act_count_space:n on line ...
Defining \__tl_act_count_group:nn on line ...
-Defining \c__tl_act_uppercase_tl on line ...
-Defining \c__tl_act_lowercase_tl on line ...
-Defining \tl_expandable_uppercase:n on line ...
-Defining \tl_expandable_lowercase:n on line ...
-Defining \__tl_act_case_aux:nn on line ...
-Defining \__tl_act_case_space:n on line ...
-Defining \__tl_act_case_normal:nN on line ...
-Defining \__tl_act_case_group:nn on line ...
Defining \tl_set_from_file:Nnn on line ...
Defining \tl_gset_from_file:Nnn on line ...
Defining \tl_set_from_file:cnn on line ...
diff --git a/l3kernel/testfiles/m3tl007.lvt b/l3kernel/testfiles/m3tl007.lvt
index 6d7e467..a63d2aa 100644
--- a/l3kernel/testfiles/m3tl007.lvt
+++ b/l3kernel/testfiles/m3tl007.lvt
@@ -74,50 +74,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\TEST{tl_expandable_uppercase}{
- \test_f:n { \tl_expandable_uppercase:n { } }
- \test_f:n { \tl_expandable_uppercase:n {a\bc} }
- \test_f:n { \tl_expandable_uppercase:n {a~\bc} }
- \use:x
- {
- \test_f:n
- {
- \exp_not:N \tl_expandable_uppercase:n
- { a ~ \use:n {~} \exp_not:N \b \c_space_tl }
- }
- }
- \test_f:n { \tl_expandable_uppercase:n { { } } }
- \test_f:n
- {
- \tl_expandable_uppercase:n
- { a ~ { \b { { } c } D # & \if_false: } }
- }
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\TEST{tl_expandable_lowercase}{
- \test_f:n { \tl_expandable_lowercase:n { } }
- \test_f:n { \tl_expandable_lowercase:n {A\bc} }
- \test_f:n { \tl_expandable_lowercase:n {A~\bc} }
- \use:x
- {
- \test_f:n
- {
- \exp_not:N \tl_expandable_lowercase:n
- { A ~ \use:n {~} \exp_not:N \b \c_space_tl }
- }
- }
- \test_f:n { \tl_expandable_lowercase:n { { } } }
- \test_f:n
- {
- \tl_expandable_lowercase:n
- { a ~ { \b { { } C } D # & \if_false: } }
- }
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\TEST{tl_reverse_items}{
\test_f:n { \tl_reverse_items:n { } }
\test_f:n { \tl_reverse_items:n {a\bc} }
diff --git a/l3kernel/testfiles/m3tl007.tlg b/l3kernel/testfiles/m3tl007.tlg
index c308b47..5537ca3 100644
--- a/l3kernel/testfiles/m3tl007.tlg
+++ b/l3kernel/testfiles/m3tl007.tlg
@@ -48,27 +48,7 @@ TEST 3: tl_count_tokens
|14|
============================================================
============================================================
-TEST 4: tl_expandable_uppercase
-============================================================
-||
-|A\bc |
-|A \bc |
-|A \b |
-|{}|
-|A {\b {{}C}D##&\if_false: }|
-============================================================
-============================================================
-TEST 5: tl_expandable_lowercase
-============================================================
-||
-|a\bc |
-|a \bc |
-|a \b |
-|{}|
-|a {\b {{}c}d##&\if_false: }|
-============================================================
-============================================================
-TEST 6: tl_reverse_items
+TEST 4: tl_reverse_items
============================================================
||
|{\bc }{a}|
diff --git a/l3kernel/testfiles/m3tl009.lvt b/l3kernel/testfiles/m3tl009.lvt
index 72f8f72..3008ff2 100644
--- a/l3kernel/testfiles/m3tl009.lvt
+++ b/l3kernel/testfiles/m3tl009.lvt
@@ -212,8 +212,6 @@
\tex_cr:D
\TYPE{1} \tl_reverse_tokens:n { \tex_cr:D & }
\TYPE{1} \tl_reverse:n { \tex_cr:D & }
- \TYPE{1} \tl_expandable_uppercase:n { & \tex_cr:D }
- \TYPE{1} \tl_expandable_lowercase:n { & \tex_cr:D }
}
}
}
diff --git a/l3kernel/testfiles/m3tl009.tlg b/l3kernel/testfiles/m3tl009.tlg
index 69a261c..121e1a7 100644
--- a/l3kernel/testfiles/m3tl009.tlg
+++ b/l3kernel/testfiles/m3tl009.tlg
@@ -137,16 +137,6 @@ TEST 9: tl advanced tests
2
3
4
-0
-1
-2
-3
-4
-0
-1
-2
-3
-4
============================================================
============================================================
TEST 10: tl if in
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the latex3-commits
mailing list