summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3sort.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3sort.dtx80
1 files changed, 48 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
index 265ae84fc05..5307712d1c4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
@@ -24,7 +24,7 @@
\documentclass[full]{l3doc}
%</driver>
%<*driver|package>
-\GetIdInfo$Id: l3sort.dtx 6847 2017-02-07 15:05:44Z bruno $
+\GetIdInfo$Id: l3sort.dtx 6967 2017-02-20 14:51:30Z bruno $
{L3 Sorting functions}
%</driver|package>
%<*driver>
@@ -199,26 +199,26 @@
\cs_new_protected:Npn \@@_shrink_range:
{
\int_set:Nn \l_@@_A_int
- { \l_@@_true_max_int - \l_@@_min_int + \c_one }
- \int_set:Nn \l_@@_block_int { \c_max_register_int / \c_two }
+ { \l_@@_true_max_int - \l_@@_min_int + 1 }
+ \int_set:Nn \l_@@_block_int { \c_max_register_int / 2 }
\@@_shrink_range_loop:
\int_set:Nn \l_@@_max_int
{
\int_compare:nNnTF
- { \l_@@_block_int * \c_three / \c_two } > \l_@@_A_int
+ { \l_@@_block_int * 3 / 2 } > \l_@@_A_int
{
\l_@@_min_int
- + ( \l_@@_A_int - \c_one ) / \c_two
- + \l_@@_block_int / \c_four
- - \c_one
+ + ( \l_@@_A_int - 1 ) / 2
+ + \l_@@_block_int / 4
+ - 1
}
- { \l_@@_true_max_int - \l_@@_block_int / \c_two }
+ { \l_@@_true_max_int - \l_@@_block_int / 2 }
}
}
\cs_new_protected:Npn \@@_shrink_range_loop:
{
\if_int_compare:w \l_@@_A_int < \l_@@_block_int
- \tex_divide:D \l_@@_block_int \c_two
+ \tex_divide:D \l_@@_block_int 2 \exp_stop_f:
\exp_after:wN \@@_shrink_range_loop:
\fi:
}
@@ -251,8 +251,8 @@
%<*package>
\cs_new_protected:Npn \@@_compute_range:
{
- \int_set:Nn \l_@@_min_int { \tex_count:D 15 + \c_one }
- \int_set:Nn \l_@@_true_max_int { \c_max_register_int + \c_one }
+ \int_set:Nn \l_@@_min_int { \tex_count:D 15 + 1 }
+ \int_set:Nn \l_@@_true_max_int { \c_max_register_int + 1 }
\@@_shrink_range:
\if_meaning:w \loctoks \tex_undefined:D \else:
\if_meaning:w \loctoks \scan_stop: \else:
@@ -288,8 +288,8 @@
{
\cs_gset_protected:Npn \@@_compute_range:
{
- \int_set:Nn \l_@@_min_int { #1 + \c_one }
- \int_set:Nn \l_@@_true_max_int { \c_max_register_int + \c_one }
+ \int_set:Nn \l_@@_min_int { #1 + 1 }
+ \int_set:Nn \l_@@_true_max_int { \c_max_register_int + 1 }
\@@_shrink_range:
}
}
@@ -300,9 +300,9 @@
{ ( \c_max_register_int + 1 ) * 3 / 4 }
\cs_new_protected:Npn \@@_compute_range:
{
- \int_set_eq:NN \l_@@_min_int \c_zero
- \int_set:Nn \l_@@_true_max_int { \c_max_register_int + \c_one }
- \int_set_eq:NN \l_@@_max_int \c_@@_max_length_int
+ \int_set:Nn \l_@@_min_int { 0 }
+ \int_set:Nn \l_@@_true_max_int { \c_max_register_int + 1 }
+ \int_set:Nn \l_@@_max_int { \c_@@_max_length_int }
}
%</initex>
% \end{macrocode}
@@ -335,12 +335,12 @@
\@@_too_long_error:NNw #3 #5
\fi:
\tex_toks:D \l_@@_top_int {##1}
- \tex_advance:D \l_@@_top_int \c_one
+ \int_incr:N \l_@@_top_int
}
\int_set:Nn \l_@@_length_int
{ \l_@@_top_int - \l_@@_min_int }
\cs_set:Npn \@@_compare:nn ##1 ##2 { #6 }
- \int_set_eq:NN \l_@@_block_int \c_one
+ \int_set:Nn \l_@@_block_int { 1 }
\@@_level:
\use:x
{
@@ -464,7 +464,7 @@
\if_int_compare:w #3 < \l_@@_top_int
#1 #2 { \tex_the:D \tex_toks:D #3 }
\exp_after:wN \@@_toks:NNw \exp_after:wN #1 \exp_after:wN #2
- \__int_value:w \__int_eval:w #3 + \c_one \exp_after:wN ;
+ \__int_value:w \__int_eval:w #3 + 1 \exp_after:wN ;
\fi:
}
% \end{macrocode}
@@ -522,9 +522,9 @@
\l_@@_B_int \l_@@_A_int
\l_@@_C_int \l_@@_top_int
\@@_copy_block:
- \tex_advance:D \l_@@_A_int - \c_one
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_A_int
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\exp_after:wN \@@_merge_blocks_aux:
\exp_after:wN \@@_merge_blocks:
\fi:
@@ -542,8 +542,8 @@
\cs_new_protected:Npn \@@_copy_block:
{
\tex_toks:D \l_@@_C_int \tex_toks:D \l_@@_B_int
- \tex_advance:D \l_@@_C_int \c_one
- \tex_advance:D \l_@@_B_int \c_one
+ \int_incr:N \l_@@_C_int
+ \int_incr:N \l_@@_B_int
\if_int_compare:w \l_@@_B_int = \l_@@_end_int
\use_i:nn
\fi:
@@ -621,8 +621,8 @@
\cs_new_protected:Npn \@@_return_same:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_C_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\if_int_compare:w \l_@@_C_int < \l_@@_top_int
\use_i:nn
\fi:
@@ -645,8 +645,8 @@
\cs_new_protected:Npn \@@_return_swapped:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_A_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_A_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_A_int
\if_int_compare:w \l_@@_A_int < \l_@@_begin_int
\@@_merge_blocks_end: \use_i:nn
\fi:
@@ -665,8 +665,8 @@
\cs_new_protected:Npn \@@_merge_blocks_end:
{
\tex_toks:D \l_@@_B_int \tex_toks:D \l_@@_C_int
- \tex_advance:D \l_@@_B_int - \c_one
- \tex_advance:D \l_@@_C_int - \c_one
+ \int_decr:N \l_@@_B_int
+ \int_decr:N \l_@@_C_int
\if_int_compare:w \l_@@_B_int < \l_@@_begin_int
\use_i:nn
\fi:
@@ -1086,8 +1086,24 @@
% \begin{macro}[deprecated = 2018-12-31]{\sort_ordered:, \sort_reversed:}
% These functions were renamed for consistency.
% \begin{macrocode}
-\cs_new_eq:NN \sort_ordered: \sort_return_same:
-\cs_new_eq:NN \sort_reversed: \sort_return_swapped:
+\cs_new_protected:Npn \sort_ordered:
+ {
+ \__msg_kernel_warning:nnxxx { kernel } { deprecated-command }
+ { 2018-12-31 }
+ { \token_to_str:N \sort_ordered: }
+ { \token_to_str:N \sort_return_same: }
+ \cs_gset_eq:NN \sort_ordered: \sort_return_same:
+ \sort_return_same:
+ }
+\cs_new_protected:Npn \sort_reversed:
+ {
+ \__msg_kernel_warning:nnxxx { kernel } { deprecated-command }
+ { 2018-12-31 }
+ { \token_to_str:N \sort_reversed: }
+ { \token_to_str:N \sort_return_swapped: }
+ \cs_gset_eq:NN \sort_reversed: \sort_return_swapped:
+ \sort_return_swapped:
+ }
% \end{macrocode}
% \end{macro}
%