summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-23 17:15:00 +0000
committerKarl Berry <karl@freefriends.org>2012-07-23 17:15:00 +0000
commit134349701bddf7cbbacf6030c6b9f9838aff96fa (patch)
treeec1140c46e1c0347a671a6fa3cf8af5a79e95f93 /Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
parentf7855c12c18bb97b7b9e49ab685ee558d8c0b47b (diff)
l3kernel 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3expan.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3expan.sty241
1 files changed, 132 insertions, 109 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index d6463b70fac..234f1e45a27 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -46,63 +46,63 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 3460 2012-02-26 12:16:41Z will $
- {L3 Experimental argument expansion}
+\GetIdInfo$Id: l3expan.dtx 3986 2012-07-15 19:23:51Z joseph $
+ {L3 Argument expansion}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\package_check_loaded_expl:
-\cs_new_nopar:Npn \l_exp_internal_tl { }
-\cs_new:Npn \exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } }
-\cs_new:Npn \exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } }
+\__expl_package_check:
+\cs_new_nopar:Npn \l__exp_internal_tl { }
+\cs_new:Npn \__exp_arg_next:nnn #1#2#3 { #2 \::: { #3 {#1} } }
+\cs_new:Npn \__exp_arg_next:Nnn #1#2#3 { #2 \::: { #3 #1 } }
\cs_new:Npn \::: #1 {#1}
\cs_new:Npn \::n #1 \::: #2#3 { #1 \::: { #2 {#3} } }
\cs_new:Npn \::N #1 \::: #2#3 { #1 \::: {#2#3} }
\cs_new:Npn \::c #1 \::: #2#3
- { \exp_after:wN \exp_arg_next:Nnn \cs:w #3 \cs_end: {#1} {#2} }
+ { \exp_after:wN \__exp_arg_next:Nnn \cs:w #3 \cs_end: {#1} {#2} }
\cs_new:Npn \::o #1 \::: #2#3
- { \exp_after:wN \exp_arg_next:nnn \exp_after:wN {#3} {#1} {#2} }
+ { \exp_after:wN \__exp_arg_next:nnn \exp_after:wN {#3} {#1} {#2} }
\cs_new:Npn \::f #1 \::: #2#3
{
- \exp_after:wN \exp_arg_next:nnn
+ \exp_after:wN \__exp_arg_next:nnn
\exp_after:wN { \tex_romannumeral:D -`0 #3 }
{#1} {#2}
}
\use:nn { \cs_new_eq:NN \exp_stop_f: } { ~ }
\cs_new_protected:Npn \::x #1 \::: #2#3
{
- \cs_set_nopar:Npx \l_exp_internal_tl { {#3} }
- \exp_after:wN \exp_arg_next:nnn \l_exp_internal_tl {#1} {#2}
+ \cs_set_nopar:Npx \l__exp_internal_tl { {#3} }
+ \exp_after:wN \__exp_arg_next:nnn \l__exp_internal_tl {#1} {#2}
}
\cs_new:Npn \::V #1 \::: #2#3
{
- \exp_after:wN \exp_arg_next:nnn
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:N #3 }
+ \exp_after:wN \__exp_arg_next:nnn
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:N #3 }
{#1} {#2}
}
\cs_new:Npn \::v # 1\::: #2#3
{
- \exp_after:wN \exp_arg_next:nnn
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:c {#3} }
+ \exp_after:wN \__exp_arg_next:nnn
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:c {#3} }
{#1} {#2}
}
-\cs_new:Npn \exp_eval_register:N #1
+\cs_new:Npn \__exp_eval_register:N #1
{
\exp_after:wN \if_meaning:w \exp_not:N #1 #1
\if_meaning:w \scan_stop: #1
- \exp_eval_error_msg:w
+ \__exp_eval_error_msg:w
\fi:
\else:
\exp_after:wN \use_i_ii:nnn
\fi:
\exp_after:wN \c_zero \tex_the:D #1
}
-\cs_new:Npn \exp_eval_register:c #1
- { \exp_after:wN \exp_eval_register:N \cs:w #1 \cs_end: }
-\cs_new:Npn \exp_eval_error_msg:w #1 \tex_the:D #2
+\cs_new:Npn \__exp_eval_register:c #1
+ { \exp_after:wN \__exp_eval_register:N \cs:w #1 \cs_end: }
+\cs_new:Npn \__exp_eval_error_msg:w #1 \tex_the:D #2
{
\fi:
\fi:
- \msg_expandable_kernel_error:nnn { kernel } { bad-var } {#2}
+ \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#2}
\c_zero
}
\cs_new:Npn \exp_args:No #1#2 { \exp_after:wN #1 \exp_after:wN {#2} }
@@ -128,12 +128,12 @@
\cs_new:Npn \exp_args:Nv #1#2
{
\exp_after:wN #1 \exp_after:wN
- { \tex_romannumeral:D \exp_eval_register:c {#2} }
+ { \tex_romannumeral:D \__exp_eval_register:c {#2} }
}
\cs_new:Npn \exp_args:NV #1#2
{
\exp_after:wN #1 \exp_after:wN
- { \tex_romannumeral:D \exp_eval_register:N #2 }
+ { \tex_romannumeral:D \__exp_eval_register:N #2 }
}
\cs_new:Npn \exp_args:NNf #1#2#3
{
@@ -145,13 +145,13 @@
{
\exp_after:wN #1
\exp_after:wN #2
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:c {#3} }
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:c {#3} }
}
\cs_new:Npn \exp_args:NNV #1#2#3
{
\exp_after:wN #1
\exp_after:wN #2
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:N #3 }
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:N #3 }
}
\cs_new:Npn \exp_args:Nco #1#2#3
{
@@ -169,15 +169,15 @@
{
\exp_after:wN #1
\exp_after:wN { \tex_romannumeral:D \exp_after:wN
- \exp_eval_register:N \exp_after:wN #2 \exp_after:wN }
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:N #3 }
+ \__exp_eval_register:N \exp_after:wN #2 \exp_after:wN }
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:N #3 }
}
\cs_new:Npn \exp_args:NNNV #1#2#3#4
{
\exp_after:wN #1
\exp_after:wN #2
\exp_after:wN #3
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:N #4 }
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:N #4 }
}
\cs_new:Npn \exp_args:NcNc #1#2#3#4
{
@@ -228,33 +228,33 @@
\cs_new_protected_nopar:Npn \exp_args:Nccx { \::c \::c \::x \::: }
\cs_new_protected_nopar:Npn \exp_args:Ncnx { \::c \::n \::x \::: }
\cs_new_protected_nopar:Npn \exp_args:Noox { \::o \::o \::x \::: }
-\cs_new:Npn \exp_arg_last_unbraced:nn #1#2 { #2#1 }
+\cs_new:Npn \__exp_arg_last_unbraced:nn #1#2 { #2#1 }
\cs_new:Npn \::f_unbraced \::: #1#2
{
- \exp_after:wN \exp_arg_last_unbraced:nn
+ \exp_after:wN \__exp_arg_last_unbraced:nn
\exp_after:wN { \tex_romannumeral:D -`0 #2 } {#1}
}
\cs_new:Npn \::o_unbraced \::: #1#2
- { \exp_after:wN \exp_arg_last_unbraced:nn \exp_after:wN {#2} {#1} }
+ { \exp_after:wN \__exp_arg_last_unbraced:nn \exp_after:wN {#2} {#1} }
\cs_new:Npn \::V_unbraced \::: #1#2
{
- \exp_after:wN \exp_arg_last_unbraced:nn
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:N #2 } {#1}
+ \exp_after:wN \__exp_arg_last_unbraced:nn
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:N #2 } {#1}
}
\cs_new:Npn \::v_unbraced \::: #1#2
{
- \exp_after:wN \exp_arg_last_unbraced:nn
- \exp_after:wN { \tex_romannumeral:D \exp_eval_register:c {#2} } {#1}
+ \exp_after:wN \__exp_arg_last_unbraced:nn
+ \exp_after:wN { \tex_romannumeral:D \__exp_eval_register:c {#2} } {#1}
}
\cs_new_protected:Npn \::x_unbraced \::: #1#2
{
- \cs_set_nopar:Npx \l_exp_internal_tl { \exp_not:n {#1} #2 }
- \l_exp_internal_tl
+ \cs_set_nopar:Npx \l__exp_internal_tl { \exp_not:n {#1} #2 }
+ \l__exp_internal_tl
}
\cs_new:Npn \exp_last_unbraced:NV #1#2
- { \exp_after:wN #1 \tex_romannumeral:D \exp_eval_register:N #2 }
+ { \exp_after:wN #1 \tex_romannumeral:D \__exp_eval_register:N #2 }
\cs_new:Npn \exp_last_unbraced:Nv #1#2
- { \exp_after:wN #1 \tex_romannumeral:D \exp_eval_register:c {#2} }
+ { \exp_after:wN #1 \tex_romannumeral:D \__exp_eval_register:c {#2} }
\cs_new:Npn \exp_last_unbraced:No #1#2 { \exp_after:wN #1 #2 }
\cs_new:Npn \exp_last_unbraced:Nf #1#2
{ \exp_after:wN #1 \tex_romannumeral:D -`0 #2 }
@@ -264,13 +264,13 @@
{
\exp_after:wN #1
\cs:w #2 \exp_after:wN \cs_end:
- \tex_romannumeral:D \exp_eval_register:N #3
+ \tex_romannumeral:D \__exp_eval_register:N #3
}
\cs_new:Npn \exp_last_unbraced:NNV #1#2#3
{
\exp_after:wN #1
\exp_after:wN #2
- \tex_romannumeral:D \exp_eval_register:N #3
+ \tex_romannumeral:D \__exp_eval_register:N #3
}
\cs_new:Npn \exp_last_unbraced:NNo #1#2#3
{ \exp_after:wN #1 \exp_after:wN #2 #3 }
@@ -279,7 +279,7 @@
\exp_after:wN #1
\exp_after:wN #2
\exp_after:wN #3
- \tex_romannumeral:D \exp_eval_register:N #4
+ \tex_romannumeral:D \__exp_eval_register:N #4
}
\cs_new:Npn \exp_last_unbraced:NNNo #1#2#3#4
{ \exp_after:wN #1 \exp_after:wN #2 \exp_after:wN #3 #4 }
@@ -289,8 +289,8 @@
\cs_new_nopar:Npn \exp_last_unbraced:NnNo { \::n \::N \::o_unbraced \::: }
\cs_new_protected_nopar:Npn \exp_last_unbraced:Nx { \::x_unbraced \::: }
\cs_new:Npn \exp_last_two_unbraced:Noo #1#2#3
- { \exp_after:wN \exp_last_two_unbraced_aux:noN \exp_after:wN {#3} {#2} #1 }
-\cs_new:Npn \exp_last_two_unbraced_aux:noN #1#2#3
+ { \exp_after:wN \__exp_last_two_unbraced:noN \exp_after:wN {#3} {#2} #1 }
+\cs_new:Npn \__exp_last_two_unbraced:noN #1#2#3
{ \exp_after:wN #3 #2 #1 }
\cs_new:Npn \exp_not:o #1 { \etex_unexpanded:D \exp_after:wN {#1} }
\cs_new:Npn \exp_not:c #1 { \exp_after:wN \exp_not:N \cs:w #1 \cs_end: }
@@ -299,55 +299,90 @@
\cs_new:Npn \exp_not:V #1
{
\etex_unexpanded:D \exp_after:wN
- { \tex_romannumeral:D \exp_eval_register:N #1 }
+ { \tex_romannumeral:D \__exp_eval_register:N #1 }
}
\cs_new:Npn \exp_not:v #1
{
\etex_unexpanded:D \exp_after:wN
- { \tex_romannumeral:D \exp_eval_register:c {#1} }
+ { \tex_romannumeral:D \__exp_eval_register:c {#1} }
}
-\cs_new_protected:Npn \cs_generate_variant:Nn #1
+\cs_new_protected:Npn \cs_generate_variant:Nn #1#2
{
- \chk_if_exist_cs:N #1
- \cs_generate_variant_aux:N #1
- \cs_split_function:NN #1 \cs_generate_variant_aux:nnNNn
- #1
+ \__chk_if_exist_cs:N #1
+ \__cs_generate_variant:N #1
+ \exp_after:wN \__cs_split_function:NN
+ \exp_after:wN #1
+ \exp_after:wN \__cs_generate_variant:nnNN
+ \exp_after:wN #1
+ \etex_detokenize:D {#2} , ? , \q_recursion_stop
}
-\cs_new_protected:Npn \cs_generate_variant_aux:nnNNn #1#2#3#4#5
- { \cs_generate_variant_aux:Nnnw #4 {#1}{#2} #5 , ? , \q_recursion_stop }
-\cs_new_protected:Npn \cs_generate_variant_aux:Nnnw #1#2#3#4 ,
+\group_begin:
+ \tex_lccode:D `\Z = `\d \scan_stop:
+ \tex_lccode:D `\? =`\\ \scan_stop:
+ \tex_catcode:D `\P = 12 \scan_stop:
+ \tex_catcode:D `\R = 12 \scan_stop:
+ \tex_catcode:D `\O = 12 \scan_stop:
+ \tex_catcode:D `\T = 12 \scan_stop:
+ \tex_catcode:D `\E = 12 \scan_stop:
+ \tex_catcode:D `\C = 12 \scan_stop:
+ \tex_catcode:D `\Z = 12 \scan_stop:
+\tex_lowercase:D
+ {
+ \group_end:
+ \cs_new_protected:Npn \__cs_generate_variant:N #1
+ {
+ \exp_after:wN \__cs_generate_variant:w
+ \token_to_meaning:N #1
+ \q_mark \cs_new_protected_nopar:Npx
+ ? PROTECTEZ
+ \q_mark \cs_new_nopar:Npx
+ \q_stop
+ }
+ \cs_new_protected:Npn \__cs_generate_variant:w
+ #1 ? PROTECTEZ #2 \q_mark #3 #4 \q_stop
+ {
+ \cs_set_eq:NN \__cs_tmp:w #3
+ }
+ }
+\cs_new_protected:Npn \__cs_generate_variant:nnNN #1#2#3#4
+ { \__cs_generate_variant:Nnnw #4 {#1}{#2} }
+\cs_new_protected:Npn \__cs_generate_variant:Nnnw #1#2#3#4 ,
{
\if:w ? #4
\exp_after:wN \use_none_delimit_by_q_recursion_stop:w
\fi:
- \exp_args:NNc \cs_generate_variant_aux:NNn
- #1
- {
- #2 : #4
- \exp_after:wN \use_i_delimit_by_q_stop:nw
- \use_none:nnnnnnnnn #4
- \use_none:nnnnnnnnn
- \use_none:nnnnnnnn
- \use_none:nnnnnnn
- \use_none:nnnnnn
- \use_none:nnnnn
- \use_none:nnnn
- \use_none:nnn
- \use_none:nn
- \use_none:n
- { }
+ \exp_after:wN \__cs_generate_variant:NNn
+ \exp_after:wN #1
+ \cs:w
+ #2 :
+ \__cs_generate_variant_loop:NwN
+ ? #3
+ \q_mark #4 \__cs_generate_variant_loop_end:w
+ \q_mark \__cs_generate_variant_loop_error:wnNNnn
\q_stop
- #3
- }
+ \cs_end:
{#4}
- \cs_generate_variant_aux:Nnnw #1 {#2} {#3}
+ \__cs_generate_variant:Nnnw #1 {#2} {#3}
}
-\cs_new_protected:Npn \cs_generate_variant_aux:NNn #1 #2 #3
+\cs_new:Npn \__cs_generate_variant_loop:NwN #1 #2 \q_mark #3
+ { #3 \__cs_generate_variant_loop:NwN #2 \q_mark }
+\cs_new:Npn \__cs_generate_variant_loop_end:w #1#2 \q_mark #3 \q_stop {#2}
+\cs_new:Npn \__cs_generate_variant_loop_error:wnNNnn
+ #1 \q_stop \cs_end: #2 #3#4#5#6
+ {
+ \cs_end: {#2}
+ \__msg_kernel_error:nnxx { kernel } { variant-too-long }
+ { \tl_to_str:n {#2} } { \token_to_str:N #4 }
+ #3 #4 {#5} {#6}
+ }
+\cs_new_protected:Npn \__cs_generate_variant:NNn #1 #2 #3
{
\cs_if_free:NTF #2
{
- \cs_tmp:w #2 { \exp_not:c { exp_args:N #3 } \exp_not:N #1 }
- \cs_generate_internal_variant:n {#3}
+ \group_begin:
+ \__cs_generate_internal_variant:n {#3}
+ \__cs_tmp:w #2 { \exp_not:c { exp_args:N #3 } \exp_not:N #1 }
+ \group_end:
}
{
\iow_log:x
@@ -359,48 +394,35 @@
}
}
\group_begin:
- \tex_lccode:D `\Z = `\d \scan_stop:
- \tex_lccode:D `\? =`\\ \scan_stop:
- \tex_catcode:D `\P = 12 \scan_stop:
- \tex_catcode:D `\R = 12 \scan_stop:
- \tex_catcode:D `\O = 12 \scan_stop:
- \tex_catcode:D `\T = 12 \scan_stop:
- \tex_catcode:D `\E = 12 \scan_stop:
- \tex_catcode:D `\C = 12 \scan_stop:
- \tex_catcode:D `\Z = 12 \scan_stop:
+ \tex_catcode:D `\X = 12 \scan_stop:
+ \tex_lccode:D `\N = `\N \scan_stop:
\tex_lowercase:D
{
\group_end:
- \cs_new_protected:Npn \cs_generate_variant_aux:N #1
+ \cs_new_protected:Npn \__cs_generate_internal_variant:n #1
{
- \exp_after:wN \cs_generate_variant_aux:w
- \token_to_meaning:N #1
- \q_mark \cs_new_protected_nopar:Npx
- ? PROTECTEZ
- \q_mark \cs_new_nopar:Npx
- \q_stop
- }
- \cs_new_protected:Npn \cs_generate_variant_aux:w
- #1 ? PROTECTEZ #2 \q_mark #3 #4 \q_stop
- {
- \cs_set_eq:NN \cs_tmp:w #3
+ \__cs_generate_internal_variant:wwnNwnn
+ #1 \q_mark
+ { \cs_set_eq:NN \__cs_tmp:w \cs_new_protected_nopar:Npx }
+ \cs_new_protected_nopar:cpx
+ X \q_mark
+ { }
+ \cs_new_nopar:cpx
+ \q_stop
+ { exp_args:N #1 }
+ { \__cs_generate_internal_variant_loop:n #1 { : \use_i:nn } }
}
- }
-\cs_new_protected:Npn \cs_generate_internal_variant:n #1
- {
- \cs_if_free:cT { exp_args:N #1 }
+ \cs_new_protected:Npn \__cs_generate_internal_variant:wwnNwnn
+ #1 X #2 \q_mark #3 #4 #5 \q_stop #6 #7
{
- \cs_new:cpx { exp_args:N #1 }
- { \cs_generate_internal_variant_aux:N #1 : }
+ #3
+ \cs_if_free:cT {#6} { #4 {#6} {#7} }
}
}
-\cs_new:Npn \cs_generate_internal_variant_aux:N #1
+\cs_new:Npn \__cs_generate_internal_variant_loop:n #1
{
- \exp_not:c { :: #1 }
- \if_meaning:w : #1
- \exp_after:wN \use_none:n
- \fi:
- \cs_generate_internal_variant_aux:N
+ \exp_after:wN \exp_not:N \cs:w :: #1 \cs_end:
+ \__cs_generate_internal_variant_loop:n
}
\cs_generate_variant:Nn \str_if_eq_p:nn { V , o }
\cs_generate_variant:Nn \str_if_eq_p:nn { nV , no , VV }
@@ -410,6 +432,7 @@
\cs_generate_variant:Nn \str_if_eq:nnF { nV , no , VV }
\cs_generate_variant:Nn \str_if_eq:nnTF { V , o }
\cs_generate_variant:Nn \str_if_eq:nnTF { nV , no , VV }
+\cs_generate_variant:Nn \str_case:nnn { o }
%%
%%
%% End of file `l3expan.sty'.