diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx index 22c4e73d42e..1b3ac4d507a 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3sort/l3sort.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: l3sort.dtx 3991 2012-07-16 19:00:35Z joseph $ +\GetIdInfo$Id: l3sort.dtx 4339 2012-11-24 19:16:43Z joseph $ {L3 Experimental sorting functions} %</driver|package> %<*driver> @@ -277,49 +277,49 @@ % \begin{macro}[EXP]{\tl_sort:nN} % \begin{macro}[EXP, aux] % { -% \@@_quick_i:nNn, \@@_quick_ii:wn, -% \@@_quick_iii:nnNnn, \@@_quick_iv:nnNnwn +% \@@_quick:nNn, \@@_quick:wn, +% \@@_quick:nnNnn, \@@_quick:nnNnwn % } -% The \cs{@@_quick_i:nNn} function sorts |#1| using the comparison +% The \cs{@@_quick:nNn} function sorts |#1| using the comparison % |#2|, then places its third argument (\meta{continuation}) before % the result. This essentially avoids the rather slow \cs{use:ff}. % First test if |#1| is blank: if it is, \cs{use_none:n} eats the -% break point, and \cs{@@_quick_ii:wn} removes all until the ending +% break point, and \cs{@@_quick:wn} removes all until the ending % break point, unbracing the \meta{continuation}. If it is not blank, -% \cs{@@_quick_ii:wn} simply removes the end of that test until the +% \cs{@@_quick:wn} simply removes the end of that test until the % break point. The third auxiliary plays the role of |\__sort:nnNnn| % above, with an end-test replaced by \cs{__prg_break:}, which skips % to the break point two lines later, unless |#5| is itself a break -% point. In that case, \cs{@@_quick_iv:nnNnwn} calls the first +% point. In that case, \cs{@@_quick:nnNnwn} calls the first % auxiliary, which sorts |#2| and places another call to itself before % the result. % \begin{macrocode} -\cs_new:Npn \tl_sort:nN #1#2 { \@@_quick_i:nNn {#1} #2 { } } -\cs_new:Npn \@@_quick_i:nNn #1#2 +\cs_new:Npn \tl_sort:nN #1#2 { \@@_quick:nNn {#1} #2 { } } +\cs_new:Npn \@@_quick:nNn #1#2 { - \exp_after:wN \@@_quick_ii:wn + \exp_after:wN \@@_quick:wn \use_none:n #1 \__prg_break_point: - \@@_quick_iii:nnNnn { } { } #2 + \@@_quick:nnNnn { } { } #2 #1 { \__prg_break_point: } \__prg_break_point: } -\cs_new:Npn \@@_quick_ii:wn #1 \__prg_break_point: #2 {#2} -\cs_new:Npn \@@_quick_iii:nnNnn #1#2#3#4#5 +\cs_new:Npn \@@_quick:wn #1 \__prg_break_point: #2 {#2} +\cs_new:Npn \@@_quick:nnNnn #1#2#3#4#5 { \__prg_break: #5 - \@@_quick_iv:nnNnwn {#1} {#2} + \@@_quick:nnNnwn {#1} {#2} \__prg_break_point: #3 {#4} {#5} - { \@@_quick_iii:nnNnn {#1} { #2 {#5} } } - { \@@_quick_iii:nnNnn { #1 {#5} } {#2} } + { \@@_quick:nnNnn {#1} { #2 {#5} } } + { \@@_quick:nnNnn { #1 {#5} } {#2} } #3 {#4} } -\cs_new:Npn \@@_quick_iv:nnNnwn +\cs_new:Npn \@@_quick:nnNnwn #1#2 \__prg_break_point: #3#4 #5 \__prg_break_point: #6 { - \@@_quick_i:nNn {#2} #3 - { \@@_quick_i:nNn {#1} #3 {#6} {#4} } + \@@_quick:nNn {#2} #3 + { \@@_quick:nNn {#1} #3 {#6} {#4} } } % \end{macrocode} % \end{macro} |