summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3experimental/l3str
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3str')
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty28
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty28
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty52
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty64
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty110
5 files changed, 141 insertions, 141 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
index 156d2c1393f..ccb695c0f0e 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $
+\GetIdInfo$Id: l3regex.dtx 4341 2012-11-27 08:39:42Z bruno $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -366,22 +366,22 @@
\if_charcode:w \c_space_token #1
\exp_after:wN \__regex_escape_x_test:N
\else:
- \exp_after:wN \__regex_escape_x_test_ii:N
+ \exp_after:wN \__regex_escape_x_test_two:N
\exp_after:wN #1
\fi:
}
}
-\cs_new:Npn \__regex_escape_x_test_ii:N #1
+\cs_new:Npn \__regex_escape_x_test_two:N #1
{
\if_charcode:w \c_lbrace_str #1
\exp_after:wN \__regex_escape_x_loop:N
\else:
\__str_hexadecimal_use:NTF #1
- { \exp_after:wN \__regex_escape_x_ii:N }
+ { \exp_after:wN \__regex_escape_x:N }
{ ; \exp_after:wN \__regex_escape_loop:N \exp_after:wN #1 }
\fi:
}
-\cs_new:Npn \__regex_escape_x_ii:N #1
+\cs_new:Npn \__regex_escape_x:N #1
{
\str_if_eq_x:nnTF {#1} { break } { ; }
{
@@ -701,10 +701,10 @@
\cs_new_protected:cpn { __regex_compile_quantifier_ \c_lbrace_str :w }
{
\__regex_get_digits:NTFw \l__regex_internal_a_int
- { \__regex_compile_quantifier_braced_i:w }
+ { \__regex_compile_quantifier_braced_auxi:w }
{ \__regex_compile_quantifier_abort:xNN { \c_lbrace_str } }
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_i:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxi:w #1#2
{
\str_case_x:nnn { #1 #2 }
{
@@ -716,8 +716,8 @@
{ \__regex_compile_special:N , }
{
\__regex_get_digits:NTFw \l__regex_internal_b_int
- { \__regex_compile_quantifier_braced_iii:w }
- { \__regex_compile_quantifier_braced_ii:w }
+ { \__regex_compile_quantifier_braced_auxiii:w }
+ { \__regex_compile_quantifier_braced_auxii:w }
}
}
{
@@ -726,7 +726,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_ii:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \__regex_compile_special:N \c_rbrace_str }
@@ -740,7 +740,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_iii:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxiii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \__regex_compile_special:N \c_rbrace_str }
@@ -957,14 +957,14 @@
\str_if_eq:nnTF { #3 #4 } { \__regex_compile_special:N ^ }
{
\__tl_build_one:n { #2 { \if_false: } \fi: }
- \__regex_compile_class_ii:NN
+ \__regex_compile_class:NN
}
{
\__tl_build_one:n { #1 { \if_false: } \fi: }
- \__regex_compile_class_ii:NN #3 #4
+ \__regex_compile_class:NN #3 #4
}
}
-\cs_new_protected:Npn \__regex_compile_class_ii:NN #1#2
+\cs_new_protected:Npn \__regex_compile_class:NN #1#2
{
\token_if_eq_charcode:NNTF #2 ]
{ \__regex_compile_raw:N #2 }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
index eba57ade74e..5273399d7be 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3regex.dtx 4219 2012-09-09 13:28:51Z bruno $
+\GetIdInfo$Id: l3regex.dtx 4341 2012-11-27 08:39:42Z bruno $
{L3 Experimental regular expressions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -364,22 +364,22 @@
\if_charcode:w \c_space_token #1
\exp_after:wN \__regex_escape_x_test:N
\else:
- \exp_after:wN \__regex_escape_x_test_ii:N
+ \exp_after:wN \__regex_escape_x_test_two:N
\exp_after:wN #1
\fi:
}
}
-\cs_new:Npn \__regex_escape_x_test_ii:N #1
+\cs_new:Npn \__regex_escape_x_test_two:N #1
{
\if_charcode:w \c_lbrace_str #1
\exp_after:wN \__regex_escape_x_loop:N
\else:
\__str_hexadecimal_use:NTF #1
- { \exp_after:wN \__regex_escape_x_ii:N }
+ { \exp_after:wN \__regex_escape_x:N }
{ ; \exp_after:wN \__regex_escape_loop:N \exp_after:wN #1 }
\fi:
}
-\cs_new:Npn \__regex_escape_x_ii:N #1
+\cs_new:Npn \__regex_escape_x:N #1
{
\str_if_eq_x:nnTF {#1} { break } { ; }
{
@@ -699,10 +699,10 @@
\cs_new_protected:cpn { __regex_compile_quantifier_ \c_lbrace_str :w }
{
\__regex_get_digits:NTFw \l__regex_internal_a_int
- { \__regex_compile_quantifier_braced_i:w }
+ { \__regex_compile_quantifier_braced_auxi:w }
{ \__regex_compile_quantifier_abort:xNN { \c_lbrace_str } }
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_i:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxi:w #1#2
{
\str_case_x:nnn { #1 #2 }
{
@@ -714,8 +714,8 @@
{ \__regex_compile_special:N , }
{
\__regex_get_digits:NTFw \l__regex_internal_b_int
- { \__regex_compile_quantifier_braced_iii:w }
- { \__regex_compile_quantifier_braced_ii:w }
+ { \__regex_compile_quantifier_braced_auxiii:w }
+ { \__regex_compile_quantifier_braced_auxii:w }
}
}
{
@@ -724,7 +724,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_ii:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \__regex_compile_special:N \c_rbrace_str }
@@ -738,7 +738,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \__regex_compile_quantifier_braced_iii:w #1#2
+\cs_new_protected:Npn \__regex_compile_quantifier_braced_auxiii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \__regex_compile_special:N \c_rbrace_str }
@@ -955,14 +955,14 @@
\str_if_eq:nnTF { #3 #4 } { \__regex_compile_special:N ^ }
{
\__tl_build_one:n { #2 { \if_false: } \fi: }
- \__regex_compile_class_ii:NN
+ \__regex_compile_class:NN
}
{
\__tl_build_one:n { #1 { \if_false: } \fi: }
- \__regex_compile_class_ii:NN #3 #4
+ \__regex_compile_class:NN #3 #4
}
}
-\cs_new_protected:Npn \__regex_compile_class_ii:NN #1#2
+\cs_new_protected:Npn \__regex_compile_class:NN #1#2
{
\token_if_eq_charcode:NNTF #2 ]
{ \__regex_compile_raw:N #2 }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 902d147cd3f..57e71f04988 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -63,51 +63,51 @@
\cs_generate_variant:Nn \__str_format_put:nw { o , f }
\cs_new:Npn \__str_format_parse:n #1
{
- \exp_last_unbraced:Nf \__str_format_parse_i:NN
+ \exp_last_unbraced:Nf \__str_format_parse_auxi:NN
\__str_to_other:n {#1} \s__stop \s__stop {#1}
}
-\cs_new:Npx \__str_format_parse_i:NN #1#2
+\cs_new:Npx \__str_format_parse_auxi:NN #1#2
{
\exp_not:N \__str_if_contains_char:nNTF { < > = ^ } #2
- { \exp_not:N \__str_format_parse_iii:nN { #1 #2 } }
+ { \exp_not:N \__str_format_parse_auxiii:nN { #1 #2 } }
{
- \exp_not:N \__str_format_parse_ii:nN
+ \exp_not:N \__str_format_parse_auxii:nN
{ \c_catcode_other_space_tl } #1 #2
}
}
-\cs_new:Npn \__str_format_parse_ii:nN #1#2
+\cs_new:Npn \__str_format_parse_auxii:nN #1#2
{
\__str_if_contains_char:nNTF { < > = ^ } #2
- { \__str_format_parse_iii:nN { #1 #2 } }
- { \__str_format_parse_iii:nN { #1 ? } #2 }
+ { \__str_format_parse_auxiii:nN { #1 #2 } }
+ { \__str_format_parse_auxiii:nN { #1 ? } #2 }
}
-\cs_new:Npx \__str_format_parse_iii:nN #1#2
+\cs_new:Npx \__str_format_parse_auxiii:nN #1#2
{
\exp_not:N \__str_if_contains_char:nNTF
{ + - \c_catcode_other_space_tl }
#2
- { \exp_not:N \__str_format_parse_iv:nwN { #1 #2 } ; }
- { \exp_not:N \__str_format_parse_iv:nwN { #1 ? } ; #2 }
+ { \exp_not:N \__str_format_parse_auxiv:nwN { #1 #2 } ; }
+ { \exp_not:N \__str_format_parse_auxiv:nwN { #1 ? } ; #2 }
}
-\cs_new:Npn \__str_format_parse_iv:nwN #1#2; #3
+\cs_new:Npn \__str_format_parse_auxiv:nwN #1#2; #3
{
\__str_format_if_digit:NTF #3
- { \__str_format_parse_iv:nwN {#1} #2 #3 ; }
- { \__str_format_parse_v:nN { #1 {#2} } #3 }
+ { \__str_format_parse_auxiv:nwN {#1} #2 #3 ; }
+ { \__str_format_parse_auxv:nN { #1 {#2} } #3 }
}
-\cs_new:Npn \__str_format_parse_v:nN #1#2
+\cs_new:Npn \__str_format_parse_auxv:nN #1#2
{
\token_if_eq_charcode:NNTF . #2
- { \__str_format_parse_vi:nwN {#1} 0 ; }
- { \__str_format_parse_vii:nN { #1 { } } #2 }
+ { \__str_format_parse_auxvi:nwN {#1} 0 ; }
+ { \__str_format_parse_auxvii:nN { #1 { } } #2 }
}
-\cs_new:Npn \__str_format_parse_vi:nwN #1#2; #3
+\cs_new:Npn \__str_format_parse_auxvi:nwN #1#2; #3
{
\__str_format_if_digit:NTF #3
- { \__str_format_parse_vi:nwN {#1} #2 #3 ; }
- { \__str_format_parse_vii:nN { #1 {#2} } #3 }
+ { \__str_format_parse_auxvi:nwN {#1} #2 #3 ; }
+ { \__str_format_parse_auxvii:nN { #1 {#2} } #3 }
}
-\cs_new:Npn \__str_format_parse_vii:nN #1#2
+\cs_new:Npn \__str_format_parse_auxvii:nN #1#2
{
\token_if_eq_meaning:NNTF \s__stop #2
{ \__str_format_parse_end:nwn { #1 ? } #2 }
@@ -367,12 +367,12 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \__str_format_fp_e_ii:wn
+ \exp_last_unbraced:Nf \__str_format_fp_e_aux:wn
\__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2#3 ; { #4 + 1 }
{#4}
}
}
- \cs_new:Npn \__str_format_fp_e_ii:wn
+ \cs_new:Npn \__str_format_fp_e_aux:wn
\s__fp \__fp_chk:w #1#2 #3 #4#5#6#7 ; #8
{
\__str_format_put:fw { \int_eval:n { #3 - 1 } }
@@ -399,14 +399,14 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \__str_format_fp_f_ii:wwwn
+ \exp_last_unbraced:Nf \__str_format_fp_f_aux:wwwn
\fp_to_decimal:n
{ abs ( round ( \s__fp \__fp_chk:w #1#2#3 ; , #4 ) ) }
. . ;
{#4}
}
}
-\cs_new:Npn \__str_format_fp_f_ii:wwwn #1 . #2 . #3 ; #4
+\cs_new:Npn \__str_format_fp_f_aux:wwwn #1 . #2 . #3 ; #4
{
\use:nf
{ #1 . #2 }
@@ -421,13 +421,13 @@
{3} { nan }
}
{
- \exp_last_unbraced:Nf \__str_format_fp_g_ii:wn
+ \exp_last_unbraced:Nf \__str_format_fp_g_aux:wn
\__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2 ;
{ \int_max:nn {1} {#3} }
{ \int_max:nn {1} {#3} }
}
}
-\cs_new:Npn \__str_format_fp_g_ii:wn #1; #2
+\cs_new:Npn \__str_format_fp_g_aux:wn #1; #2
{
\int_compare:nNnTF { \__fp_exponent:w #1; } < { -3 }
{ \fp_to_scientific:n }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
index 05cd375a84d..8fb7f22b337 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{expl3}
-\GetIdInfo$Id: l3str.dtx 4119 2012-08-16 22:35:59Z bruno $
+\GetIdInfo$Id: l3str.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Experimental strings}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -231,17 +231,17 @@
\cs_new_nopar:Npn \str_tail:N { \exp_args:No \str_tail:n }
\cs_set:Npn \str_tail:n #1
{
- \exp_after:wN \__str_tail:w
+ \exp_after:wN \__str_tail_auxi:w
\reverse_if:N \if_charcode:w
\scan_stop: \tl_to_str:n {#1} X X \q_stop
}
-\cs_set:Npn \__str_tail:w #1 X #2 \q_stop { \fi: #1 }
+\cs_set:Npn \__str_tail_auxi:w #1 X #2 \q_stop { \fi: #1 }
\cs_new:Npn \str_tail_ignore_spaces:n #1
{
- \exp_after:wN \__str_tail_ii:w
+ \exp_after:wN \__str_tail_auxii:w
\tl_to_str:n {#1} X X \q_stop
}
-\cs_new:Npn \__str_tail_ii:w #1 #2 X #3 \q_stop { #2 }
+\cs_new:Npn \__str_tail_auxii:w #1 #2 X #3 \q_stop { #2 }
\cs_new:Npn \__str_skip_c_zero:w #1;
{
\if_int_compare:w \__int_eval:w #1 > \c_eight
@@ -256,11 +256,11 @@
{ \exp_after:wN \__str_skip_c_zero:w \int_use:N \__int_eval:w #1 - \c_eight ; }
\cs_new:Npn \__str_skip_end:w #1 ;
{
- \exp_after:wN \__str_skip_end_ii:NNNNNNNN
+ \exp_after:wN \__str_skip_end:NNNNNNNN
\if_case:w \if_int_compare:w #1 > \c_zero #1 \else: 0 \fi: \exp_stop_f:
\or: \or: \or: \or: \or: \or: \or: \or:
}
-\cs_new:Npn \__str_skip_end_ii:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \c_zero }
+\cs_new:Npn \__str_skip_end:NNNNNNNN #1#2#3#4#5#6#7#8 { \fi: \c_zero }
\cs_new:Npn \__str_collect_delimit_by_q_stop:w #1;
{
\exp_after:wN \__str_collect_loop:wn
@@ -270,13 +270,13 @@
\cs_new:Npn \__str_collect_loop:wn #1 ;
{
\if_int_compare:w #1 > \c_seven
- \exp_after:wN \__str_collect_loop_ii:wnNNNNNNN
+ \exp_after:wN \__str_collect_loop:wnNNNNNNN
\else:
\exp_after:wN \__str_collect_end:wn
\fi:
#1 ;
}
-\cs_new:Npn \__str_collect_loop_ii:wnNNNNNNN #1; #2 #3#4#5#6#7#8#9
+\cs_new:Npn \__str_collect_loop:wnNNNNNNN #1; #2 #3#4#5#6#7#8#9
{
\exp_after:wN \__str_collect_loop:wn
\int_use:N \__int_eval:w #1 - \c_seven ;
@@ -284,11 +284,11 @@
}
\cs_new:Npn \__str_collect_end:wn #1 ;
{
- \exp_after:wN \__str_collect_end_ii:nnnnnnnnw
+ \exp_after:wN \__str_collect_end:nnnnnnnnw
\if_case:w \if_int_compare:w #1 > \c_zero #1 \else: 0 \fi: \exp_stop_f:
\or: \or: \or: \or: \or: \or: \fi:
}
-\cs_new:Npn \__str_collect_end_ii:nnnnnnnnw #1#2#3#4#5#6#7#8 #9 \q_stop
+\cs_new:Npn \__str_collect_end:nnnnnnnnw #1#2#3#4#5#6#7#8 #9 \q_stop
{ #1#2#3#4#5#6#7#8 }
\cs_new_nopar:Npn \str_item:Nn { \exp_args:No \str_item:nn }
\cs_new:Npn \str_item:nn #1#2
@@ -342,23 +342,23 @@
{ \exp_args:No \__str_substr_unsafe:nnn { \tl_to_str:n {#1} } }
\cs_new:Npn \__str_substr_unsafe:nnn #1#2#3
{
- \exp_after:wN \__str_substr_ii:www
+ \exp_after:wN \__str_substr:www
\__int_value:w \__str_count_unsafe:n {#1} \exp_after:wN ;
\int_use:N \__int_eval:w #2 + \c_zero \exp_after:wN ;
\int_use:N \__int_eval:w
- \exp_args:Nf \__str_substr_i:nN {#3} \c_max_int ;
+ \exp_args:Nf \__str_substr:nN {#3} \c_max_int ;
{ } #1
\q_stop
}
-\cs_new:Npn \__str_substr_i:nN #1 #2
+\cs_new:Npn \__str_substr:nN #1 #2
{ \tl_if_empty:nTF {#1} {#2} {#1} }
-\cs_new:Npn \__str_substr_ii:www #1; #2; #3;
+\cs_new:Npn \__str_substr:www #1; #2; #3;
{
- \exp_args:Nf \__str_substr_iii:nnw
+ \exp_args:Nf \__str_substr:nnw
{ \__str_substr_normalize_range:nn {#2} {#1} }
{ \__str_substr_normalize_range:nn {#3} {#1} }
}
-\cs_new:Npn \__str_substr_iii:nnw #1#2
+\cs_new:Npn \__str_substr:nnw #1#2
{
\exp_after:wN \__str_collect_delimit_by_q_stop:w
\int_use:N \__int_eval:w #2 + \c_one - #1 \exp_after:wN ;
@@ -539,14 +539,14 @@
\cs_new_protected:Npn \__str_if_flag_times:nT #1#2
{ \flag_if_raised:nT {#1} { #2~(x \flag_height:n {#1} ) } }
\cs_new_protected_nopar:Npn \str_set_convert:Nnnn
- { \__str_convert_i:nNNnnn { } \tl_set_eq:NN }
+ { \__str_convert:nNNnnn { } \tl_set_eq:NN }
\cs_new_protected_nopar:Npn \str_gset_convert:Nnnn
- { \__str_convert_i:nNNnnn { } \tl_gset_eq:NN }
+ { \__str_convert:nNNnnn { } \tl_gset_eq:NN }
\prg_new_protected_conditional:Npnn
\str_set_convert:Nnnn #1#2#3#4 { T , F , TF }
{
\bool_gset_false:N \g__str_error_bool
- \__str_convert_i:nNNnnn
+ \__str_convert:nNNnnn
{ \cs_set_eq:NN \__str_if_flag_error:nnx \__str_if_flag_no_error:nnx }
\tl_set_eq:NN #1 {#2} {#3} {#4}
\bool_if:NTF \g__str_error_bool \prg_return_false: \prg_return_true:
@@ -555,22 +555,22 @@
\str_gset_convert:Nnnn #1#2#3#4 { T , F , TF }
{
\bool_gset_false:N \g__str_error_bool
- \__str_convert_i:nNNnnn
+ \__str_convert:nNNnnn
{ \cs_set_eq:NN \__str_if_flag_error:nnx \__str_if_flag_no_error:nnx }
\tl_gset_eq:NN #1 {#2} {#3} {#4}
\bool_if:NTF \g__str_error_bool \prg_return_false: \prg_return_true:
}
-\cs_new_protected:Npn \__str_convert_i:nNNnnn #1#2#3#4#5#6
+\cs_new_protected:Npn \__str_convert:nNNnnn #1#2#3#4#5#6
{
\group_begin:
#1
\__str_gset_other:Nn \g__str_result_tl {#4}
- \exp_after:wN \__str_convert_ii:wwwnn
+ \exp_after:wN \__str_convert:wwwnn
\tl_to_str:n {#5} /// \q_stop
{ decode } { unescape }
\prg_do_nothing:
\__str_convert_decode_:
- \exp_after:wN \__str_convert_ii:wwwnn
+ \exp_after:wN \__str_convert:wwwnn
\tl_to_str:n {#6} /// \q_stop
{ encode } { escape }
\use_ii_i:nn
@@ -578,15 +578,15 @@
\group_end:
#2 #3 \g__str_result_tl
}
-\cs_new_protected:Npn \__str_convert_ii:wwwnn
+\cs_new_protected:Npn \__str_convert:wwwnn
#1 / #2 // #3 \q_stop #4#5
{
- \__str_convert_iv:nnn {enc} {#4} {#1}
- \__str_convert_iv:nnn {esc} {#5} {#2}
- \exp_args:Ncc \__str_convert_iii:NNnNN
+ \__str_convert:nnn {enc} {#4} {#1}
+ \__str_convert:nnn {esc} {#5} {#2}
+ \exp_args:Ncc \__str_convert:NNnNN
{ __str_convert_#4_#1: } { __str_convert_#5_#2: } {#2}
}
-\cs_new_protected:Npn \__str_convert_iii:NNnNN #1#2#3#4#5
+\cs_new_protected:Npn \__str_convert:NNnNN #1#2#3#4#5
{
\if_meaning:w #1 #5
\tl_if_empty:nF {#3}
@@ -596,16 +596,16 @@
#4 #2 #1
\fi:
}
-\cs_new_protected:Npn \__str_convert_iv:nnn #1#2#3
+\cs_new_protected:Npn \__str_convert:nnn #1#2#3
{
\cs_if_exist:cF { __str_convert_#2_#3: }
{
- \exp_args:Nx \__str_convert_v:nnnn
+ \exp_args:Nx \__str_convert:nnnn
{ \__str_convert_lowercase_alphanum:n {#3} }
{#1} {#2} {#3}
}
}
-\cs_new_protected:Npn \__str_convert_v:nnnn #1#2#3#4
+\cs_new_protected:Npn \__str_convert:nnnn #1#2#3#4
{
\cs_if_exist:cF { __str_convert_#3_#1: }
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
index eb4a612e028..134eeed9815 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3tl-analysis.sty
@@ -87,8 +87,8 @@
\group_begin:
\group_align_safe_begin:
\__tl_analysis_setup:n {#1}
- \__tl_analysis_i:n {#1}
- \__tl_analysis_ii:n {#1}
+ \__tl_analysis_a:n {#1}
+ \__tl_analysis_b:n {#1}
\group_align_safe_end:
\group_end:
}
@@ -108,18 +108,18 @@
\__tl_analysis_disable_loop:N
}
\group_end:
-\cs_new_protected:Npn \__tl_analysis_i:n #1
+\cs_new_protected:Npn \__tl_analysis_a:n #1
{
\int_set:Nn \tex_escapechar:D { 92 }
\int_zero:N \l__tl_analysis_normal_int
\int_zero:N \l__tl_analysis_index_int
\int_zero:N \l__tl_analysis_nesting_int
- \if_false: { \fi: \__tl_analysis_i_loop:w #1 }
+ \if_false: { \fi: \__tl_analysis_a_loop:w #1 }
\int_decr:N \l__tl_analysis_index_int
}
-\cs_new_protected_nopar:Npn \__tl_analysis_i_loop:w
- { \tex_futurelet:D \l__tl_analysis_token \__tl_analysis_i_type:w }
-\cs_new_protected_nopar:Npn \__tl_analysis_i_type:w
+\cs_new_protected_nopar:Npn \__tl_analysis_a_loop:w
+ { \tex_futurelet:D \l__tl_analysis_token \__tl_analysis_a_type:w }
+\cs_new_protected_nopar:Npn \__tl_analysis_a_type:w
{
\l__tl_analysis_type_int =
\if_meaning:w \l__tl_analysis_token \c_space_token
@@ -136,61 +136,61 @@
\fi:
\fi:
\if_case:w \l__tl_analysis_type_int
- \exp_after:wN \__tl_analysis_i_space:w
- \or: \exp_after:wN \__tl_analysis_i_bgroup:w
- \or: \exp_after:wN \__tl_analysis_i_safe:N
- \else: \exp_after:wN \__tl_analysis_i_egroup:w
+ \exp_after:wN \__tl_analysis_a_space:w
+ \or: \exp_after:wN \__tl_analysis_a_bgroup:w
+ \or: \exp_after:wN \__tl_analysis_a_safe:N
+ \else: \exp_after:wN \__tl_analysis_a_egroup:w
\fi:
}
-\cs_new_protected_nopar:Npn \__tl_analysis_i_space:w
+\cs_new_protected_nopar:Npn \__tl_analysis_a_space:w
{
- \tex_afterassignment:D \__tl_analysis_i_space_test:w
+ \tex_afterassignment:D \__tl_analysis_a_space_test:w
\exp_after:wN \cs_set_eq:NN
\exp_after:wN \l__tl_analysis_char_token
\token_to_str:N
}
-\cs_new_protected_nopar:Npn \__tl_analysis_i_space_test:w
+\cs_new_protected_nopar:Npn \__tl_analysis_a_space_test:w
{
\if_meaning:w \l__tl_analysis_char_token \c_space_token
\tex_toks:D \l__tl_analysis_index_int { \exp_not:n { ~ } }
- \__tl_analysis_i_store:
+ \__tl_analysis_a_store:
\else:
\int_incr:N \l__tl_analysis_normal_int
\fi:
- \__tl_analysis_i_loop:w
+ \__tl_analysis_a_loop:w
}
\group_begin:
\char_set_catcode_group_begin:N \^^@
\char_set_catcode_group_end:N \^^E
- \cs_new_protected_nopar:Npn \__tl_analysis_i_bgroup:w
- { \__tl_analysis_i_group:nw { \exp_after:wN ^^@ \if_false: ^^E \fi: } }
+ \cs_new_protected_nopar:Npn \__tl_analysis_a_bgroup:w
+ { \__tl_analysis_a_group:nw { \exp_after:wN ^^@ \if_false: ^^E \fi: } }
\char_set_catcode_group_begin:N \^^B
\char_set_catcode_group_end:N \^^@
- \cs_new_protected_nopar:Npn \__tl_analysis_i_egroup:w
- { \__tl_analysis_i_group:nw { \if_false: ^^B \fi: ^^@ } }
+ \cs_new_protected_nopar:Npn \__tl_analysis_a_egroup:w
+ { \__tl_analysis_a_group:nw { \if_false: ^^B \fi: ^^@ } }
\group_end:
-\cs_new_protected:Npn \__tl_analysis_i_group:nw #1
+\cs_new_protected:Npn \__tl_analysis_a_group:nw #1
{
\tex_lccode:D \c_zero = \__tl_analysis_extract_charcode: \scan_stop:
\tl_to_lowercase:n { \tex_toks:D \l__tl_analysis_index_int {#1} }
\if_int_compare:w \tex_lccode:D \c_zero = \tex_escapechar:D
\int_set:Nn \tex_escapechar:D { 139 - \tex_escapechar:D }
\fi:
- \tex_afterassignment:D \__tl_analysis_i_group_test:w
+ \tex_afterassignment:D \__tl_analysis_a_group_test:w
\exp_after:wN \cs_set_eq:NN
\exp_after:wN \l__tl_analysis_char_token
\token_to_str:N
}
-\cs_new_protected_nopar:Npn \__tl_analysis_i_group_test:w
+\cs_new_protected_nopar:Npn \__tl_analysis_a_group_test:w
{
\if_charcode:w \l__tl_analysis_token \l__tl_analysis_char_token
- \__tl_analysis_i_store:
+ \__tl_analysis_a_store:
\else:
\int_incr:N \l__tl_analysis_normal_int
\fi:
- \__tl_analysis_i_loop:w
+ \__tl_analysis_a_loop:w
}
-\cs_new_protected_nopar:Npn \__tl_analysis_i_store:
+\cs_new_protected_nopar:Npn \__tl_analysis_a_store:
{
\tex_advance:D \l__tl_analysis_nesting_int \l__tl_analysis_type_int
\if_int_compare:w \tex_lccode:D \c_zero = \c_thirty_two
@@ -201,10 +201,10 @@
\int_incr:N \l__tl_analysis_index_int
\int_zero:N \l__tl_analysis_normal_int
\if_int_compare:w \l__tl_analysis_nesting_int = \c_minus_one
- \cs_set_eq:NN \__tl_analysis_i_loop:w \scan_stop:
+ \cs_set_eq:NN \__tl_analysis_a_loop:w \scan_stop:
\fi:
}
-\cs_new_protected:Npn \__tl_analysis_i_safe:N #1
+\cs_new_protected:Npn \__tl_analysis_a_safe:N #1
{
\if_charcode:w
\scan_stop:
@@ -212,11 +212,11 @@
\scan_stop:
\int_incr:N \l__tl_analysis_normal_int
\else:
- \__tl_analysis_cs_space_count:NN \__tl_analysis_i_cs:ww #1
+ \__tl_analysis_cs_space_count:NN \__tl_analysis_a_cs:ww #1
\fi:
- \__tl_analysis_i_loop:w
+ \__tl_analysis_a_loop:w
}
-\cs_new_protected:Npn \__tl_analysis_i_cs:ww #1; #2;
+\cs_new_protected:Npn \__tl_analysis_a_cs:ww #1; #2;
{
\if_int_compare:w #1 > \c_zero
\tex_skip:D \l__tl_analysis_index_int
@@ -227,36 +227,36 @@
\tex_advance:D \l__tl_analysis_normal_int #2 \exp_stop_f:
\fi:
}
-\cs_new_protected:Npn \__tl_analysis_ii:n #1
+\cs_new_protected:Npn \__tl_analysis_b:n #1
{
\tl_gset:Nx \g__tl_analysis_result_tl
{
- \__tl_analysis_ii_loop:w 0; #1
+ \__tl_analysis_b_loop:w 0; #1
\__prg_break_point:
}
}
-\cs_new:Npn \__tl_analysis_ii_loop:w #1;
+\cs_new:Npn \__tl_analysis_b_loop:w #1;
{
- \exp_after:wN \__tl_analysis_ii_normals:ww
+ \exp_after:wN \__tl_analysis_b_normals:ww
\__int_value:w \tex_skip:D #1 ; #1 ;
}
-\cs_new:Npn \__tl_analysis_ii_normals:ww #1;
+\cs_new:Npn \__tl_analysis_b_normals:ww #1;
{
\if_int_compare:w #1 = \c_zero
- \__tl_analysis_ii_special:w
+ \__tl_analysis_b_special:w
\fi:
- \__tl_analysis_ii_normal:wwN #1;
+ \__tl_analysis_b_normal:wwN #1;
}
-\cs_new:Npn \__tl_analysis_ii_normal:wwN #1; #2; #3
+\cs_new:Npn \__tl_analysis_b_normal:wwN #1; #2; #3
{
\exp_not:n { \exp_not:n { #3 } } \s__tl
\if_charcode:w
\scan_stop:
\exp_after:wN \use_none:n \token_to_str:N #3 \prg_do_nothing:
\scan_stop:
- \exp_after:wN \__tl_analysis_ii_char:Nww
+ \exp_after:wN \__tl_analysis_b_char:Nww
\else:
- \exp_after:wN \__tl_analysis_ii_cs:Nww
+ \exp_after:wN \__tl_analysis_b_cs:Nww
\fi:
#3 #1; #2;
}
@@ -267,7 +267,7 @@
\char_set_uccode:nn { `? } { `D }
\tl_to_uppercase:n
{
- \cs_new:Npn \__tl_analysis_ii_char:Nww #1
+ \cs_new:Npn \__tl_analysis_b_char:Nww #1
{
\if_meaning:w #1 \c_undefined:D ? \else:
\if_catcode:w #1 \c_catcode_other_token C \else:
@@ -280,19 +280,19 @@
6
\fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi:
\__int_value:w `#1 \s__tl
- \exp_after:wN \__tl_analysis_ii_normals:ww
+ \exp_after:wN \__tl_analysis_b_normals:ww
\int_use:N \__int_eval:w \c_minus_one +
}
}
\group_end:
-\cs_new:Npn \__tl_analysis_ii_cs:Nww #1
+\cs_new:Npn \__tl_analysis_b_cs:Nww #1
{
0 -1 \s__tl
- \__tl_analysis_cs_space_count:NN \__tl_analysis_ii_cs_test:ww #1
+ \__tl_analysis_cs_space_count:NN \__tl_analysis_b_cs_test:ww #1
}
-\cs_new:Npn \__tl_analysis_ii_cs_test:ww #1 ; #2 ; #3 ; #4 ;
+\cs_new:Npn \__tl_analysis_b_cs_test:ww #1 ; #2 ; #3 ; #4 ;
{
- \exp_after:wN \__tl_analysis_ii_normals:ww
+ \exp_after:wN \__tl_analysis_b_normals:ww
\int_use:N \__int_eval:w
\if_int_compare:w #1 = \c_zero
#3
@@ -305,8 +305,8 @@
}
\group_begin:
\char_set_catcode_other:N A
- \cs_new:Npn \__tl_analysis_ii_special:w
- \fi: \__tl_analysis_ii_normal:wwN 0 ; #1 ;
+ \cs_new:Npn \__tl_analysis_b_special:w
+ \fi: \__tl_analysis_b_normal:wwN 0 ; #1 ;
{
\fi:
\if_int_compare:w #1 = \l__tl_analysis_index_int
@@ -320,23 +320,23 @@
\else: 2
\fi:
\if_int_odd:w \etex_gluestretch:D \tex_skip:D #1 \exp_stop_f:
- \exp_after:wN \__tl_analysis_ii_special_char:wN \int_use:N
+ \exp_after:wN \__tl_analysis_b_special_char:wN \int_use:N
\else:
- \exp_after:wN \__tl_analysis_ii_special_space:w \int_use:N
+ \exp_after:wN \__tl_analysis_b_special_space:w \int_use:N
\fi:
\__int_eval:w \c_one + #1 \exp_after:wN ;
\token_to_str:N
}
\group_end:
-\cs_new:Npn \__tl_analysis_ii_special_char:wN #1 ; #2
+\cs_new:Npn \__tl_analysis_b_special_char:wN #1 ; #2
{
\__int_value:w `#2 \s__tl
- \__tl_analysis_ii_loop:w #1 ;
+ \__tl_analysis_b_loop:w #1 ;
}
-\cs_new:Npn \__tl_analysis_ii_special_space:w #1 ; ~
+\cs_new:Npn \__tl_analysis_b_special_space:w #1 ; ~
{
32 \s__tl
- \__tl_analysis_ii_loop:w #1 ;
+ \__tl_analysis_b_loop:w #1 ;
}
\cs_new_protected:Npn \__tl_analysis_map_inline:nn #1
{