summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx40
1 files changed, 20 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
index ce26a6098ba..3d25a841a80 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3regex.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\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}
%</driver|package>
%<*driver>
@@ -1398,7 +1398,7 @@
% number of hexadecimal digits), or not (allowing up to two
% hexadecimal digits). We need to check for the end-of-string marker.
% Eventually, call either \cs{@@_escape_x_loop:N} or
-% \cs{@@_escape_x_ii:N}.
+% \cs{@@_escape_x:N}.
% \begin{macrocode}
\cs_new:Npn \@@_escape_x_test:N #1
{
@@ -1407,28 +1407,28 @@
\if_charcode:w \c_space_token #1
\exp_after:wN \@@_escape_x_test:N
\else:
- \exp_after:wN \@@_escape_x_test_ii:N
+ \exp_after:wN \@@_escape_x_test_two:N
\exp_after:wN #1
\fi:
}
}
-\cs_new:Npn \@@_escape_x_test_ii:N #1
+\cs_new:Npn \@@_escape_x_test_two:N #1
{
\if_charcode:w \c_lbrace_str #1
\exp_after:wN \@@_escape_x_loop:N
\else:
\__str_hexadecimal_use:NTF #1
- { \exp_after:wN \@@_escape_x_ii:N }
+ { \exp_after:wN \@@_escape_x:N }
{ ; \exp_after:wN \@@_escape_loop:N \exp_after:wN #1 }
\fi:
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux]{\@@_escape_x_ii:N}
+% \begin{macro}[aux]{\@@_escape_x:N}
% This looks for the second digit in the unbraced case.
% \begin{macrocode}
-\cs_new:Npn \@@_escape_x_ii:N #1
+\cs_new:Npn \@@_escape_x:N #1
{
\str_if_eq_x:nnTF {#1} { break } { ; }
{
@@ -2096,9 +2096,9 @@
% \begin{macro}[aux]+\@@_compile_quantifier_{:w+ ^^A}
% \begin{macro}[aux]
% {
-% \@@_compile_quantifier_braced_i:w,
-% \@@_compile_quantifier_braced_ii:w,
-% \@@_compile_quantifier_braced_iii:w,
+% \@@_compile_quantifier_braced_auxi:w,
+% \@@_compile_quantifier_braced_auxii:w,
+% \@@_compile_quantifier_braced_auxiii:w,
% }
% Three possible syntaxes: \texttt{\{\meta{int}\}},
% \texttt{\{\meta{int},\}}, or \texttt{\{\meta{int},\meta{int}\}}. Any
@@ -2114,10 +2114,10 @@
\cs_new_protected:cpn { @@_compile_quantifier_ \c_lbrace_str :w }
{
\@@_get_digits:NTFw \l_@@_internal_a_int
- { \@@_compile_quantifier_braced_i:w }
+ { \@@_compile_quantifier_braced_auxi:w }
{ \@@_compile_quantifier_abort:xNN { \c_lbrace_str } }
}
-\cs_new_protected:Npn \@@_compile_quantifier_braced_i:w #1#2
+\cs_new_protected:Npn \@@_compile_quantifier_braced_auxi:w #1#2
{
\str_case_x:nnn { #1 #2 }
{
@@ -2129,8 +2129,8 @@
{ \@@_compile_special:N , }
{
\@@_get_digits:NTFw \l_@@_internal_b_int
- { \@@_compile_quantifier_braced_iii:w }
- { \@@_compile_quantifier_braced_ii:w }
+ { \@@_compile_quantifier_braced_auxiii:w }
+ { \@@_compile_quantifier_braced_auxii:w }
}
}
{
@@ -2139,7 +2139,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \@@_compile_quantifier_braced_ii:w #1#2
+\cs_new_protected:Npn \@@_compile_quantifier_braced_auxii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \@@_compile_special:N \c_rbrace_str }
@@ -2153,7 +2153,7 @@
#1 #2
}
}
-\cs_new_protected:Npn \@@_compile_quantifier_braced_iii:w #1#2
+\cs_new_protected:Npn \@@_compile_quantifier_braced_auxiii:w #1#2
{
\str_if_eq_x:nnTF
{ #1 #2 } { \@@_compile_special:N \c_rbrace_str }
@@ -2495,7 +2495,7 @@
% \end{macro}
%
% \begin{macro}[aux]
-% {\@@_compile_class:TFNN, \@@_compile_class_ii:NN}
+% {\@@_compile_class:TFNN, \@@_compile_class:NN}
% If the first character is |^|, then the class is negative (use
% |#2|), otherwise it is positive (use |#1|). If the next character
% is a right bracket, then it should be changed to a raw one.
@@ -2506,14 +2506,14 @@
\str_if_eq:nnTF { #3 #4 } { \@@_compile_special:N ^ }
{
\__tl_build_one:n { #2 { \if_false: } \fi: }
- \@@_compile_class_ii:NN
+ \@@_compile_class:NN
}
{
\__tl_build_one:n { #1 { \if_false: } \fi: }
- \@@_compile_class_ii:NN #3 #4
+ \@@_compile_class:NN #3 #4
}
}
-\cs_new_protected:Npn \@@_compile_class_ii:NN #1#2
+\cs_new_protected:Npn \@@_compile_class:NN #1#2
{
\token_if_eq_charcode:NNTF #2 ]
{ \@@_compile_raw:N #2 }