summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx134
1 files changed, 6 insertions, 128 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
index f5ad9fc0a00..6c65d33db05 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
@@ -38,7 +38,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3candidates.dtx 6002 2015-09-11 22:13:30Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 6039 2015-09-23 12:41:26Z joseph $
{L3 Experimental additions to l3kernel}
%</driver|package>
%<*driver>
@@ -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,
@@ -4598,12 +4498,7 @@
% \cs{@@_token_generic:NNTF} function.
% \begin{macrocode}
\group_begin:
- \char_set_catcode_other:N \O
- \char_set_catcode_other:N \U
- \char_set_catcode_other:N \T
- \char_set_catcode_other:N \E
- \char_set_catcode_other:N \R
- \tl_to_lowercase:n
+ \cs_set_protected:Npn \@@_tmp:w #1 \q_stop
{
\cs_new_protected_nopar:Npn \@@_execute_branches_N_type:
{
@@ -4615,16 +4510,17 @@
\exp_after:wN \@@_N_type:w
\token_to_meaning:N \l_peek_token
\q_mark \@@_N_type_aux:nnw
- OUTER \q_mark \use_none_delimit_by_q_stop:w
+ #1 \q_mark \use_none_delimit_by_q_stop:w
\q_stop
\exp_after:wN \@@_true:w
\else:
\exp_after:wN \@@_false:w
\fi:
}
- \cs_new_protected:Npn \@@_N_type:w #1 OUTER #2 \q_mark #3
- { #3 {#1} {#2} }
+ \cs_new_protected:Npn \@@_N_type:w ##1 #1 ##2 \q_mark ##3
+ { ##3 {##1} {##2} }
}
+ \exp_after:wN \@@_tmp:w \tl_to_str:n { outer } \q_stop
\group_end:
\cs_new_protected:Npn \@@_N_type_aux:nnw #1 #2 #3 \fi:
{
@@ -4643,24 +4539,6 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Deprecated candidates}
-%
-% \begin{macro}
-% {
-% \fp_set_from_dim:Nn, \fp_set_from_dim:cn,
-% \fp_gset_from_dim:Nn, \fp_gset_from_dim:cn
-% }
-% Deprecated 2014-07-17.
-% \begin{macrocode}
-\cs_new_protected:Npn \fp_set_from_dim:Nn #1#2
- { \fp_set:Nn #1 { \dim_to_fp:n {#2} } }
-\cs_new_protected:Npn \fp_gset_from_dim:Nn #1#2
- { \fp_gset:Nn #1 { \dim_to_fp:n {#2} } }
-\cs_generate_variant:Nn \fp_set_from_dim:Nn { c }
-\cs_generate_variant:Nn \fp_gset_from_dim:Nn { c }
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}