diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty index 404a6d581c3..591a3c52294 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3sort/l3sort.sty @@ -46,8 +46,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/05/14] -\@ifpackagelater{expl3}{2016/05/14} +\RequirePackage{expl3}[2016/10/19] +\@ifpackagelater{expl3}{2016/10/19} {} {% \PackageError{l3sort}{Support package l3kernel too old} @@ -59,7 +59,7 @@ }% \endinput } -\GetIdInfo$Id: l3sort.dtx 6492 2016-05-14 20:27:55Z joseph $ +\GetIdInfo$Id: l3sort.dtx 6730 2016-10-19 11:19:38Z joseph $ {L3 Experimental sorting functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -93,33 +93,33 @@ #1 \exp_not:N #5 {#4} } } -\cs_new_protected_nopar:Npn \seq_sort:Nn +\cs_new_protected:Npn \seq_sort:Nn { \__sort_main:NNNnNn \tl_set:Nn \seq_map_inline:Nn \seq_map_break: { \s__seq \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; } } -\cs_new_protected_nopar:Npn \seq_gsort:Nn +\cs_new_protected:Npn \seq_gsort:Nn { \__sort_main:NNNnNn \tl_gset:Nn \seq_map_inline:Nn \seq_map_break: { \s__seq \__sort_toks:NNw \exp_not:N \__seq_item:n 0 ; } } -\cs_new_protected_nopar:Npn \tl_sort:Nn +\cs_new_protected:Npn \tl_sort:Nn { \__sort_main:NNNnNn \tl_set:Nn \tl_map_inline:Nn \tl_map_break: { \__sort_toks:NNw \prg_do_nothing: \prg_do_nothing: 0 ; } } -\cs_new_protected_nopar:Npn \tl_gsort:Nn +\cs_new_protected:Npn \tl_gsort:Nn { \__sort_main:NNNnNn \tl_gset:Nn \tl_map_inline:Nn \tl_map_break: { \__sort_toks:NNw \prg_do_nothing: \prg_do_nothing: 0 ; } } -\cs_new_protected_nopar:Npn \clist_sort:Nn +\cs_new_protected:Npn \clist_sort:Nn { \__sort_clist:NNn \tl_set:Nn } -\cs_new_protected_nopar:Npn \clist_gsort:Nn +\cs_new_protected:Npn \clist_gsort:Nn { \__sort_clist:NNn \tl_gset:Nn } \cs_new_protected:Npn \__sort_clist:NNn #1#2#3 { @@ -142,7 +142,7 @@ \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ; \fi: } -\cs_new_protected_nopar:Npn \__sort_level: +\cs_new_protected:Npn \__sort_level: { \if_int_compare:w \l__sort_block_int < \l__sort_length_int \l__sort_end_int \c_zero @@ -151,7 +151,7 @@ \exp_after:wN \__sort_level: \fi: } -\cs_new_protected_nopar:Npn \__sort_merge_blocks: +\cs_new_protected:Npn \__sort_merge_blocks: { \l__sort_begin_int \l__sort_end_int \tex_advance:D \l__sort_end_int \l__sort_block_int @@ -171,7 +171,7 @@ \exp_after:wN \__sort_merge_blocks: \fi: } -\cs_new_protected_nopar:Npn \sort_copy_block: +\cs_new_protected:Npn \sort_copy_block: { \tex_toks:D \l__sort_C_int \tex_toks:D \l__sort_B_int \tex_advance:D \l__sort_C_int \c_one @@ -181,13 +181,13 @@ \fi: \sort_copy_block: } -\cs_new_protected_nopar:Npn \__sort_merge_blocks_aux: +\cs_new_protected:Npn \__sort_merge_blocks_aux: { \exp_after:wN \sort_compare:nn \exp_after:wN { \tex_the:D \tex_toks:D \exp_after:wN \l__sort_A_int \exp_after:wN } \exp_after:wN { \tex_the:D \tex_toks:D \l__sort_C_int } } -\cs_new_protected_nopar:Npn \sort_ordered: +\cs_new_protected:Npn \sort_ordered: { \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int \tex_advance:D \l__sort_B_int \c_minus_one @@ -197,7 +197,7 @@ \fi: \__sort_merge_blocks_aux: } -\cs_new_protected_nopar:Npn \sort_reversed: +\cs_new_protected:Npn \sort_reversed: { \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_A_int \tex_advance:D \l__sort_B_int \c_minus_one @@ -207,7 +207,7 @@ \fi: \__sort_merge_blocks_aux: } -\cs_new_protected_nopar:Npn \__sort_merge_blocks_end: +\cs_new_protected:Npn \__sort_merge_blocks_end: { \tex_toks:D \l__sort_B_int \tex_toks:D \l__sort_C_int \tex_advance:D \l__sort_B_int \c_minus_one |