diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty index fce554e38d6..868dfd992ee 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty @@ -47,7 +47,7 @@ %% ----------------------------------------------------------------------- %% \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3candidates.dtx 4602 2013-11-18 23:19:01Z bruno $ +\GetIdInfo$Id: l3candidates.dtx 4633 2013-12-31 17:28:46Z joseph $ {L3 Experimental additions to l3kernel} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -784,8 +784,9 @@ { \__prop_get_Nn:nwwn {#1} } } \cs_generate_variant:Nn \prop_get:Nn { c } -\cs_new:Npn \seq_item:Nn #1 { \exp_after:wN \__seq_item:wNn #1 #1 } -\cs_new:Npn \__seq_item:wNn \s__seq #1 \s_obj_end #2#3 +\cs_new:Npn \seq_item:Nn #1 + { \exp_after:wN \__seq_item:wNn #1 \q_stop #1 } +\cs_new:Npn \__seq_item:wNn \s__seq #1 \q_stop #2#3 { \exp_args:Nf \__seq_item:nnn { @@ -809,17 +810,18 @@ } \cs_generate_variant:Nn \seq_item:Nn { c } \cs_new:Npn \seq_mapthread_function:NNN #1#2#3 - { \exp_after:wN \__seq_mapthread_function:wNN #2 #1 #3 } -\cs_new:Npn \__seq_mapthread_function:wNN \s__seq #1 \s_obj_end #2#3 { - \exp_after:wN \__seq_mapthread_function:wNw #2 #3 - #1 { ? \__prg_break: } { } + \exp_after:wN \__seq_mapthread_function:NNw + \exp_after:wN #3 + \exp_after:wN #1 + #2 { ? \__prg_break: } { } \__prg_break_point: } -\cs_new:Npn \__seq_mapthread_function:wNw \s__seq #1 \s_obj_end #2 +\cs_new:Npn \__seq_mapthread_function:NNw #1#2 { - \__seq_mapthread_function:Nnnwnn #2 - #1 { ? \__prg_break: } { } + \exp_after:wN \__seq_mapthread_function:Nnnwnn + \exp_after:wN #1 + #2 { ? \__prg_break: } { } \q_stop } \cs_new:Npn \__seq_mapthread_function:Nnnwnn #1#2#3#4 \q_stop #5#6 @@ -834,22 +836,22 @@ \cs_new_protected:Npn \seq_set_from_clist:NN #1#2 { \tl_set:Nx #1 - { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n \s_obj_end } + { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n } } \cs_new_protected:Npn \seq_set_from_clist:Nn #1#2 { \tl_set:Nx #1 - { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n \s_obj_end } + { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n } } \cs_new_protected:Npn \seq_gset_from_clist:NN #1#2 { \tl_gset:Nx #1 - { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n \s_obj_end } + { \s__seq \clist_map_function:NN #2 \__seq_wrap_item:n } } \cs_new_protected:Npn \seq_gset_from_clist:Nn #1#2 { \tl_gset:Nx #1 - { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n \s_obj_end } + { \s__seq \clist_map_function:nN {#2} \__seq_wrap_item:n } } \cs_generate_variant:Nn \seq_set_from_clist:NN { Nc } \cs_generate_variant:Nn \seq_set_from_clist:NN { c , cc } @@ -857,7 +859,6 @@ \cs_generate_variant:Nn \seq_gset_from_clist:NN { Nc } \cs_generate_variant:Nn \seq_gset_from_clist:NN { c , cc } \cs_generate_variant:Nn \seq_gset_from_clist:Nn { c } -\cs_new_protected_nopar:Npn \__seq_tmp:w { } \cs_new_protected_nopar:Npn \seq_reverse:N { \__seq_reverse:NN \tl_set:Nx } \cs_new_protected_nopar:Npn \seq_greverse:N @@ -866,11 +867,9 @@ { \cs_set_eq:NN \__seq_tmp:w \__seq_item:n \cs_set_eq:NN \__seq_item:n \__seq_reverse_item:nwn - #1 #2 { \exp_after:wN \__seq_reverse_setup:w #2 } + #1 #2 { #2 \exp_not:n { } } \cs_set_eq:NN \__seq_item:n \__seq_tmp:w } -\cs_new:Npn \__seq_reverse_setup:w #1 \s_obj_end - { #1 \exp_not:n { } \s_obj_end } \cs_new:Npn \__seq_reverse_item:nwn #1 #2 \exp_not:n #3 { #2 |