From 8bcf0c7ef3cd19666c206271cea9280846b5c7e6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Dec 2012 23:31:35 +0000 Subject: l3 (21dec12) git-svn-id: svn://tug.org/texlive/trunk@28608 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/l3kernel/l3seq.dtx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3kernel/l3seq.dtx') diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx index 1a3d34eeaac..f9c8f06e7e3 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3seq.dtx 4212 2012-09-09 12:24:04Z bruno $ +\GetIdInfo$Id: l3seq.dtx 4339 2012-11-24 19:16:43Z joseph $ {L3 Sequences and stacks} % %<*driver> @@ -815,7 +815,7 @@ % \begin{macro}[aux]{\@@_set_split:NNnn} % \begin{macro}[aux] % { -% \@@_set_split_i:w, \@@_set_split_ii:w, +% \@@_set_split_auxi:w, \@@_set_split_auxii:w, % \@@_set_split_end: % } % The goal is to split a given token list at a marker, @@ -824,11 +824,11 @@ % spaces the item is enclosed within braces. After % \cs{tl_replace_all:Nnn}, the token list \cs{l_@@_internal_a_tl} % is a repetition of the pattern -% \cs{@@_set_split_i:w} \cs{prg_do_nothing:} +% \cs{@@_set_split_auxi:w} \cs{prg_do_nothing:} % \meta{item with spaces} \cs{@@_set_split_end:}. -% Then, \texttt{x}-expansion causes \cs{@@_set_split_i:w} +% Then, \texttt{x}-expansion causes \cs{@@_set_split_auxi:w} % to trim spaces, and leaves its result as -% \cs{@@_set_split_ii:w} \meta{trimmed item} +% \cs{@@_set_split_auxii:w} \meta{trimmed item} % \cs{@@_set_split_end:}. This is then converted % to the \pkg{l3seq} internal structure by another % \texttt{x}-expansion. In the first step, we insert @@ -848,26 +848,26 @@ { \tl_set:Nn \l_@@_internal_a_tl { - \@@_set_split_i:w \prg_do_nothing: + \@@_set_split_auxi:w \prg_do_nothing: #4 \@@_set_split_end: } \tl_replace_all:Nnn \l_@@_internal_a_tl { #3 } { \@@_set_split_end: - \@@_set_split_i:w \prg_do_nothing: + \@@_set_split_auxi:w \prg_do_nothing: } \tl_set:Nx \l_@@_internal_a_tl { \l_@@_internal_a_tl } #1 #2 { \l_@@_internal_a_tl } } } -\cs_new:Npn \@@_set_split_i:w #1 \@@_set_split_end: +\cs_new:Npn \@@_set_split_auxi:w #1 \@@_set_split_end: { - \exp_not:N \@@_set_split_ii:w + \exp_not:N \@@_set_split_auxii:w \exp_args:No \tl_trim_spaces:n {#1} \exp_not:N \@@_set_split_end: } -\cs_new:Npn \@@_set_split_ii:w #1 \@@_set_split_end: +\cs_new:Npn \@@_set_split_auxii:w #1 \@@_set_split_end: { \@@_wrap_item:n {#1} } \cs_generate_variant:Nn \seq_set_split:Nnn { NnV } \cs_generate_variant:Nn \seq_gset_split:Nnn { NnV } @@ -1015,7 +1015,7 @@ % The idea of the code here is to avoid a relatively expensive addition of % items one at a time to an intermediate sequence. % The approach taken is therefore similar to -% that in \cs{@@_pop_right_aux_ii:NNN}, using a \enquote{flexible} +% that in \cs{@@_pop_right_aux:NNN}, using a \enquote{flexible} % \texttt{x}-type expansion to do most of the work. As \cs{tl_if_eq:nnT} % is not expandable, a two-part strategy is needed. First, the % \texttt{x}-type expansion uses \cs{str_if_eq:nnT} to find potential -- cgit v1.2.3