summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3tl.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3tl.dtx50
1 files changed, 25 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
index b48cbcd1854..0f166541978 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3tl.dtx 4244 2012-09-28 22:46:36Z bruno $
+\GetIdInfo$Id: l3tl.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Token lists}
%</driver|package>
%<*driver>
@@ -2011,21 +2011,21 @@
% \begin{macro}[int]{\@@_trim_spaces:nn}
% \begin{macro}[aux]
% {
-% \@@_trim_spaces_i:w, \@@_trim_spaces_ii:w
-% \@@_trim_spaces_iii:w, \@@_trim_spaces_iv:w
+% \@@_trim_spaces_auxi:w, \@@_trim_spaces_auxii:w
+% \@@_trim_spaces_auxiii:w, \@@_trim_spaces_auxiv:w
% }
% Trimming spaces from around the input is done using delimited
% arguments and quarks, and to get spaces at odd places in the
% definitions, we nest those in \cs{@@_tmp:w}, which then receives
% a single space as its argument: |#1| is \verb*+ +.
-% Removing leading spaces is done with \cs{@@_trim_spaces_i:w},
+% Removing leading spaces is done with \cs{@@_trim_spaces_auxi:w},
% which loops until \cs{q_mark}\verb*+ + matches the end of the token
% list: then |##1| is the token list and |##3| is
-% \cs{@@_trim_spaces_ii:w}. This hands the relevant tokens to the
-% loop \cs{@@_trim_spaces_iii:w}, responsible for trimming
+% \cs{@@_trim_spaces_auxii:w}. This hands the relevant tokens to the
+% loop \cs{@@_trim_spaces_auxiii:w}, responsible for trimming
% trailing spaces. The end is reached when \verb*+ + \cs{q_nil}
% matches the one present in the definition of \cs{tl_trim_spacs:n}.
-% Then \cs{@@_trim_spaces_iv:w} puts the token list into a group,
+% Then \cs{@@_trim_spaces_auxiv:w} puts the token list into a group,
% with \cs{use_none:n} placed there to gobble a lingering \cs{q_mark},
% and feeds this to the \meta{continuation}.
% \begin{macrocode}
@@ -2033,37 +2033,37 @@
{
\cs_new:Npn \@@_trim_spaces:nn ##1
{
- \@@_trim_spaces_i:w
+ \@@_trim_spaces_auxi:w
##1
\q_nil
\q_mark #1 { }
- \q_mark \@@_trim_spaces_ii:w
- \@@_trim_spaces_iii:w
+ \q_mark \@@_trim_spaces_auxii:w
+ \@@_trim_spaces_auxiii:w
#1 \q_nil
- \@@_trim_spaces_iv:w
+ \@@_trim_spaces_auxiv:w
\q_stop
}
- \cs_new:Npn \@@_trim_spaces_i:w ##1 \q_mark #1 ##2 \q_mark ##3
+ \cs_new:Npn \@@_trim_spaces_auxi:w ##1 \q_mark #1 ##2 \q_mark ##3
{
##3
- \@@_trim_spaces_i:w
+ \@@_trim_spaces_auxi:w
\q_mark
##2
\q_mark #1 {##1}
}
- \cs_new:Npn \@@_trim_spaces_ii:w
- \@@_trim_spaces_i:w \q_mark \q_mark ##1
+ \cs_new:Npn \@@_trim_spaces_auxii:w
+ \@@_trim_spaces_auxi:w \q_mark \q_mark ##1
{
- \@@_trim_spaces_iii:w
+ \@@_trim_spaces_auxiii:w
##1
}
- \cs_new:Npn \@@_trim_spaces_iii:w ##1 #1 \q_nil ##2
+ \cs_new:Npn \@@_trim_spaces_auxiii:w ##1 #1 \q_nil ##2
{
##2
##1 \q_nil
- \@@_trim_spaces_iii:w
+ \@@_trim_spaces_auxiii:w
}
- \cs_new:Npn \@@_trim_spaces_iv:w ##1 \q_nil ##2 \q_stop ##3
+ \cs_new:Npn \@@_trim_spaces_auxiv:w ##1 \q_nil ##2 \q_stop ##3
{ ##3 { \use_none:n ##1 } }
}
\@@_tmp:w { ~ }
@@ -2224,7 +2224,7 @@
% \subsection{The first token from a token list}
%
% \begin{macro}{\tl_head:N, \tl_head:n, \tl_head:V, \tl_head:v, \tl_head:f}
-% \begin{macro}[aux]{\@@_head_i:nw, \@@_head_ii:nw}
+% \begin{macro}[aux]{\@@_head_auxi:nw, \@@_head_auxii:nw}
% \begin{macro}{\tl_head:w}
% \begin{macro}{\tl_tail:N, \tl_tail:n, \tl_tail:V, \tl_tail:v, \tl_tail:f}
% Finding the head of a token list expandably will always strip braces, which
@@ -2242,11 +2242,11 @@
\cs_new:Npn \tl_head:n #1
{
\etex_unexpanded:D
- \if_false: { \fi: \@@_head_i:nw #1 { } \q_stop }
+ \if_false: { \fi: \@@_head_auxi:nw #1 { } \q_stop }
}
-\cs_new:Npn \@@_head_i:nw #1#2 \q_stop
- { \exp_after:wN \@@_head_ii:nw \exp_after:wN { \if_false: } \fi: {#1} }
-\cs_new:Npn \@@_head_ii:nw #1
+\cs_new:Npn \@@_head_auxi:nw #1#2 \q_stop
+ { \exp_after:wN \@@_head_auxii:nw \exp_after:wN { \if_false: } \fi: {#1} }
+\cs_new:Npn \@@_head_auxii:nw #1
{
\exp_after:wN \if_meaning:w \exp_after:wN \q_nil
\tl_to_str:n \exp_after:wN { \use_none:n #1 } \q_nil
@@ -2255,7 +2255,7 @@
\exp_after:wN \use_ii:nn
\fi:
{#1}
- { \if_false: { \fi: \@@_head_i:nw #1 } }
+ { \if_false: { \fi: \@@_head_auxi:nw #1 } }
}
\cs_generate_variant:Nn \tl_head:n { V , v , f }
\cs_new:Npn \tl_head:w #1#2 \q_stop {#1}