summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-15 21:27:01 +0000
committerKarl Berry <karl@freefriends.org>2017-07-15 21:27:01 +0000
commitb1ce47fe4d0e1f06d1b019c3c6eb5f1b0ecd5e14 (patch)
tree58362abe4b603bb5f6db898b9b835bc8af730b3e /Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
parent03b8dcfa3435f0265dfad4fd09aaab8f4ff9c617 (diff)
l3 (15jul17)
git-svn-id: svn://tug.org/texlive/trunk@44813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3sort.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3sort.dtx32
1 files changed, 16 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
index 009d228859e..98e256c3b29 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
@@ -41,7 +41,7 @@
% }^^A
% }
%
-% \date{Released 2017/05/29}
+% \date{Released 2017/07/15}
%
% \maketitle
%
@@ -63,7 +63,7 @@
% { \sort_return_same: }
% }
% \end{verbatim}
-% will result in \cs{l_foo_clist} holding the values
+% results in \cs{l_foo_clist} holding the values
% |{ -2 , 01 , +1 , 3 , 5 }| sorted in non-decreasing order.
%
% The code defining the comparison should call
@@ -73,10 +73,10 @@
% the order of this pair of items should not be changed.
%
% For instance, a \meta{comparison code} consisting only
-% of \cs{sort_return_same:} with no test will yield a trivial
+% of \cs{sort_return_same:} with no test yields a trivial
% sort: the final order is identical to the original order.
% Conversely, using a \meta{comparison code} consisting only
-% of \cs{sort_return_swapped:} will reverse the list (in a fairly
+% of \cs{sort_return_swapped:} reverses the list (in a fairly
% inefficient way).
%
% \begin{texnote}
@@ -116,7 +116,7 @@
% \cs{l_@@_min_int} to $\cs{l_@@_top_int}-1$. While reading the
% sequence in memory, we check that \cs{l_@@_top_int} remains at most
% \cs{l_@@_max_int}, precomputed by \cs{@@_compute_range:}. That
-% bound is such that the merge sort will only use \tn{toks} registers
+% bound is such that the merge sort only uses \tn{toks} registers
% less than \cs{l_@@_true_max_int}, namely those that have not been
% allocated for use in other code: the user's comparison code could
% alter these.
@@ -489,7 +489,7 @@
% pair of blocks). If shifting by one block to the right we reach
% the end of the list, then this pass has ended: the end of the
% list is sorted already. Otherwise, store the result of that shift in $A$,
-% which will index the first block starting from the top end.
+% which indexes the first block starting from the top end.
% Then locate the end-point (maximum) of the second block: shift
% \texttt{end} upwards by one more block, but keeping it
% $\leq\texttt{top}$. Copy this upper block of \tn{toks}
@@ -585,14 +585,14 @@
\cs_new_protected:Npn \@@_return_mark:N #1 { }
\cs_new_protected:Npn \@@_return_none_error:
{
- \__msg_kernel_error:nnxx { sort } { return-none }
+ \__msg_kernel_error:nnxx { kernel } { return-none }
{ \tex_the:D \tex_toks:D \l_@@_A_int }
{ \tex_the:D \tex_toks:D \l_@@_C_int }
\@@_return_same:
}
\cs_new_protected:Npn \@@_return_two_error:w
#1 \@@_return_none_error:
- { \__msg_kernel_error:nn { sort } { return-two } }
+ { \__msg_kernel_error:nn { kernel } { return-two } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -710,7 +710,7 @@
%
% In the simple version of the code, \cs{@@:nnNnn} is called
% \(O(n\ln n)\) times on average (the number of comparisons required by
-% the quicksort algorithm). Hence most of our focus will be on
+% the quicksort algorithm). Hence most of our focus is on
% optimizing that function.
%
% The first speed up is to avoid testing for the end of the list at
@@ -830,7 +830,7 @@
% when~|#4| contains \cs{__prg_break_point:}, then the
% \texttt{prepare_end} auxiliary finds the prepared token list
% as~|#4|. The scene is then set up for \cs{@@_quick_split:NnNn},
-% which will sort the prepared list and perform the post action placed
+% which sorts the prepared list and perform the post action placed
% after \cs{q_mark}, namely removing the trailing \cs{s__stop} and
% \cs{q_stop} and leaving \cs{exp_stop_f:} to stop
% \texttt{f}-expansion.
@@ -1013,12 +1013,12 @@
{ \cs_set_eq:NN \toksdef \@@_disabled_toksdef:n }
\cs_new_protected:Npn \@@_disabled_toksdef:n #1
{
- \__msg_kernel_error:nnx { sort } { toksdef }
+ \__msg_kernel_error:nnx { kernel } { toksdef }
{ \token_to_str:N #1 }
\@@_error:
\tex_toksdef:D #1
}
-\__msg_kernel_new:nnnn { sort } { toksdef }
+\__msg_kernel_new:nnnn { kernel } { toksdef }
{ Allocation~of~\iow_char:N\\toks~registers~impossible~while~sorting. }
{
The~comparison~code~used~for~sorting~a~list~has~attempted~to~
@@ -1037,13 +1037,13 @@
\cs_new_protected:Npn \@@_too_long_error:NNw #1#2 \fi:
{
\fi:
- \__msg_kernel_error:nnxxx { sort } { too-large }
+ \__msg_kernel_error:nnxxx { kernel } { too-large }
{ \token_to_str:N #2 }
{ \int_eval:n { \l_@@_true_max_int - \l_@@_min_int } }
{ \int_eval:n { \l_@@_top_int - \l_@@_min_int } }
#1 \@@_error:
}
-\__msg_kernel_new:nnnn { sort } { too-large }
+\__msg_kernel_new:nnnn { kernel } { too-large }
{ The~list~#1~is~too~long~to~be~sorted~by~TeX. }
{
TeX~has~#2~toks~registers~still~available:~
@@ -1054,7 +1054,7 @@
% \end{macro}
%
% \begin{macrocode}
-\__msg_kernel_new:nnnn { sort } { return-none }
+\__msg_kernel_new:nnnn { kernel } { return-none }
{ The~comparison~code~did~not~return. }
{
When~sorting~a~list,~the~code~to~compare~items~#1~and~#2~
@@ -1063,7 +1063,7 @@
\iow_char:N\\sort_return_swapped: .~
Exactly~one~of~these~should~be~called.
}
-\__msg_kernel_new:nnnn { sort } { return-two }
+\__msg_kernel_new:nnnn { kernel } { return-two }
{ The~comparison~code~returned~multiple~times. }
{
When~sorting~a~list,~the~code~to~compare~items~called~