diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/l3str/l3regex-trace.sty | 28 |
1 files changed, 14 insertions, 14 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 } |