[latex3-commits] [git/LaTeX3-latex3-latex3] master: Move definition of \int_rand:nn (583110a)
Joseph Wright
joseph.wright at morningstar2.co.uk
Tue Apr 3 23:50:24 CEST 2018
Repository : https://github.com/latex3/latex3
On branch : master
Link : https://github.com/latex3/latex3/commit/583110a8764edea783372742eb3347ee764d32d2
>---------------------------------------------------------------
commit 583110a8764edea783372742eb3347ee764d32d2
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Tue Apr 3 22:44:37 2018 +0100
Move definition of \int_rand:nn
This deals with an __ issue, and makes \int_rand:nn stable (seems reasonable).
>---------------------------------------------------------------
583110a8764edea783372742eb3347ee764d32d2
l3kernel/l3candidates.dtx | 100 -------------------------------
l3kernel/l3fp-random.dtx | 71 ++++++++++++++++++++++
l3kernel/l3int.dtx | 17 ++++++
l3kernel/l3msg.dtx | 2 +
l3kernel/testfiles/m3expl001.luatex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.ptex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.tlg | 12 ++--
l3kernel/testfiles/m3expl001.uptex.tlg | 12 ++--
l3kernel/testfiles/m3expl001.xetex.tlg | 3 +-
l3kernel/testfiles/m3expl003.luatex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.ptex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.tlg | 12 ++--
l3kernel/testfiles/m3expl003.uptex.tlg | 12 ++--
l3kernel/testfiles/m3expl003.xetex.tlg | 3 +-
14 files changed, 142 insertions(+), 150 deletions(-)
diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index fa60c46..a7ac8da 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -345,17 +345,6 @@
% locally.
% \end{function}
%
-% \section{Additions to \pkg{l3int}}
-%
-% \begin{function}[EXP, added = 2016-12-06]{\int_rand:nn}
-% \begin{syntax}
-% \cs{int_rand:nn} \Arg{intexpr_1} \Arg{intexpr_2}
-% \end{syntax}
-% Evaluates the two \meta{integer expressions} and produces a
-% pseudo-random number between the two (with bounds included). This
-% is only available in \pdfTeX{} and \LuaTeX{}.
-% \end{function}
-%
% \section{Additions to \pkg{l3msg}}
%
% In very rare cases it may be necessary to produce errors in an
@@ -1997,95 +1986,6 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Additions to \pkg{l3int}}
-%
-% \begin{macrocode}
-%<@@=int>
-% \end{macrocode}
-%
-% \begin{macro}[EXP]{\int_rand:nn}
-% \begin{macro}[EXP]
-% {
-% \@@_rand:ww, \@@_rand_narrow:n,
-% \@@_rand_narrow:nnn, \@@_rand_narrow:nnnn
-% }
-% Evaluate the argument and filter out the case where the lower
-% bound~|#1| is more than the upper bound~|#2|. Then determine
-% whether the range is narrower than \cs{c__fp_rand_size_int}; |#2-#1|
-% may overflow for very large positive~|#2| and negative~|#1|. If the
-% range is wide, use slower code from \pkg{l3fp}. If the range is
-% narrow, call \cs{@@_rand_narrow:nn} \Arg{choices} |{#1}| where
-% \meta{choices} is the number of possible outcomes. Then
-% \cs{@@_rand_narrow:nnnn} receives a random number reduced modulo
-% \meta{choices}, the random number itself, \meta{choices} and |#1|.
-% To avoid bias, throw away the random number if it lies in the last,
-% incomplete, interval of size \meta{choices} in
-% $[0,\cs{c__fp_rand_size_int}-1]$, and try again.
-% \begin{macrocode}
-\cs_if_exist:NTF \pdftex_uniformdeviate:D
- {
- \cs_new:Npn \int_rand:nn #1#2
- {
- \exp_after:wN \@@_rand:ww
- \int_value:w \int_eval:n {#1} \exp_after:wN ;
- \int_value:w \int_eval:n {#2} ;
- }
- \cs_new:Npn \@@_rand:ww #1; #2;
- {
- \int_compare:nNnTF {#1} > {#2}
- {
- \__kernel_msg_expandable_error:nnnn
- { kernel } { backward-range } {#1} {#2}
- \@@_rand:ww #2; #1;
- }
- {
- \int_compare:nNnTF {#1} > 0
- { \int_compare:nNnTF { #2 - #1 } < \c__fp_rand_size_int }
- { \int_compare:nNnTF {#2} < { #1 + \c__fp_rand_size_int } }
- {
- \exp_args:Nf \@@_rand_narrow:nn
- { \int_eval:n { #2 - #1 + 1 } } {#1}
- }
- { \fp_to_int:n { randint(#1,#2) } }
- }
- }
- \cs_new:Npn \@@_rand_narrow:nn
- {
- \exp_args:No \@@_rand_narrow:nnn
- { \pdftex_uniformdeviate:D \c__fp_rand_size_int }
- }
- \cs_new:Npn \@@_rand_narrow:nnn #1#2
- {
- \exp_args:Nf \@@_rand_narrow:nnnn
- { \int_mod:nn {#1} {#2} } {#1} {#2}
- }
- \cs_new:Npn \@@_rand_narrow:nnnn #1#2#3#4
- {
- \int_compare:nNnTF { #2 - #1 + #3 } > \c__fp_rand_size_int
- { \@@_rand_narrow:nn {#3} {#4} }
- { \int_eval:n { #4 + #1 } }
- }
- }
- {
- \cs_new:Npn \int_rand:nn #1#2
- {
- \__kernel_msg_expandable_error:nn { kernel } { fp-no-random }
- \int_eval:n {#1}
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% The following must be added to \pkg{l3msg}.
-% \begin{macrocode}
-\cs_if_exist:NT \pdftex_uniformdeviate:D
- {
- \__kernel_msg_new:nnn { kernel } { backward-range }
- { Bounds~ordered~backwards~in~\int_rand:nn {#1}~{#2}. }
- }
-% \end{macrocode}
-%
% \subsection{Additions to \pkg{l3msg}}
%
% \begin{macrocode}
diff --git a/l3kernel/l3fp-random.dtx b/l3kernel/l3fp-random.dtx
index c1c294e..c66d5c6 100644
--- a/l3kernel/l3fp-random.dtx
+++ b/l3kernel/l3fp-random.dtx
@@ -87,6 +87,11 @@
\exp_after:wN \c_nan_fp
}
\cs_new_eq:NN \@@_randint_o:Nw \@@_rand_o:Nw
+ \cs_new:Npn \int_rand:nn #1#2
+ {
+ \__kernel_msg_expandable_error:nn { kernel } { fp-no-random }
+ \int_eval:n {#1}
+ }
}
\cs_if_exist:NT \pdftex_uniformdeviate:D
{
@@ -325,6 +330,72 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\int_rand:nn}
+% \begin{macro}{\@@_randint:ww}
+% \begin{macro}{\@@_randint_narrow:nn}
+% \begin{macro}{\@@_randint_narrow:nnn}
+% \begin{macro}{\@@_randint_narrow:nnnn}
+% Evaluate the argument and filter out the case where the lower
+% bound~|#1| is more than the upper bound~|#2|. Then determine
+% whether the range is narrower than \cs{c__fp_rand_size_int}; |#2-#1|
+% may overflow for very large positive~|#2| and negative~|#1|. If the
+% range is wide, use slower code from \pkg{l3fp}. If the range is
+% narrow, call \cs{@@_randint_narrow:nn} \Arg{choices} |{#1}| where
+% \meta{choices} is the number of possible outcomes. Then
+% \cs{@@_randint_narrow:nnnn} receives a random number reduced modulo
+% \meta{choices}, the random number itself, \meta{choices} and |#1|.
+% To avoid bias, throw away the random number if it lies in the last,
+% incomplete, interval of size \meta{choices} in
+% $[0,\cs{c_@@_rand_size_int}-1]$, and try again.
+% \begin{macrocode}
+ \cs_new:Npn \int_rand:nn #1#2
+ {
+ \exp_after:wN \@@_randint:ww
+ \int_value:w \int_eval:n {#1} \exp_after:wN ;
+ \int_value:w \int_eval:n {#2} ;
+ }
+ \cs_new:Npn \@@_randint:ww #1; #2;
+ {
+ \int_compare:nNnTF {#1} > {#2}
+ {
+ \__kernel_msg_expandable_error:nnnn
+ { kernel } { randint-backward-range } {#1} {#2}
+ \@@_randint:ww #2; #1;
+ }
+ {
+ \int_compare:nNnTF {#1} > 0
+ { \int_compare:nNnTF { #2 - #1 } < \c_@@_rand_size_int }
+ { \int_compare:nNnTF {#2} < { #1 + \c_@@_rand_size_int } }
+ {
+ \exp_args:Nf \@@_randint_narrow:nn
+ { \int_eval:n { #2 - #1 + 1 } } {#1}
+ }
+ { \fp_to_int:n { randint(#1,#2) } }
+ }
+ }
+ \cs_new:Npn \@@_randint_narrow:nn
+ {
+ \exp_args:No \@@_randint_narrow:nnn
+ { \pdftex_uniformdeviate:D \c_@@_rand_size_int }
+ }
+ \cs_new:Npn \@@_randint_narrow:nnn #1#2
+ {
+ \exp_args:Nf \@@_randint_narrow:nnnn
+ { \int_mod:nn {#1} {#2} } {#1} {#2}
+ }
+ \cs_new:Npn \@@_randint_narrow:nnnn #1#2#3#4
+ {
+ \int_compare:nNnTF { #2 - #1 + #3 } > \c_@@_rand_size_int
+ { \@@_randint_narrow:nn {#3} {#4} }
+ { \int_eval:n { #4 + #1 } }
+ }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% End the initial conditional that ensures these commands are only
% defined in \pdfTeX{} and \LuaTeX{}.
% \begin{macrocode}
diff --git a/l3kernel/l3int.dtx b/l3kernel/l3int.dtx
index 0410e24..481d297 100644
--- a/l3kernel/l3int.dtx
+++ b/l3kernel/l3int.dtx
@@ -764,6 +764,17 @@
% \cs{int_to_Base:nn}.
% \end{function}
%
+% \section{Random integers}
+%
+% \begin{function}[EXP, added = 2016-12-06]{\int_rand:nn}
+% \begin{syntax}
+% \cs{int_rand:nn} \Arg{intexpr_1} \Arg{intexpr_2}
+% \end{syntax}
+% Evaluates the two \meta{integer expressions} and produces a
+% pseudo-random number between the two (with bounds included). This
+% is only available in \pdfTeX{} and \LuaTeX{}.
+% \end{function}
+%
% \section{Viewing integers}
%
% \begin{function}{\int_show:N, \int_show:c}
@@ -2435,6 +2446,12 @@
% \end{macrocode}
% \end{macro}
%
+%\subsection{Random integers}
+%
+% \begin{macro}{\int_rand:nn}
+% Defined in \pkg{l3fp-random}.
+% \end{macro}
+%
% \subsection{Constant integers}
%
% \begin{variable}{\c_zero}
diff --git a/l3kernel/l3msg.dtx b/l3kernel/l3msg.dtx
index 5a0c65b..7b8cb29 100644
--- a/l3kernel/l3msg.dtx
+++ b/l3kernel/l3msg.dtx
@@ -1718,6 +1718,8 @@
LaTeX~has~been~asked~to~define~'#1'~as~a~protected~predicate.~
Only~expandable~tests~can~have~a~predicate~version.
}
+\__kernel_msg_new:nnn { kernel } { randint-backward-range }
+ { Bounds~ordered~backwards~in~\int_rand:nn {#1}~{#2}. }
\__kernel_msg_new:nnnn { kernel } { conditional-form-unknown }
{ Conditional~form~'#1'~for~function~'#2'~unknown. }
{
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 4d5a730..4c1acd8 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -3008,6 +3008,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4615,6 +4616,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5743,12 +5749,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index 5cbdbdc..f66d1fb 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5682,12 +5688,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index f4c1f2a..47fbf05 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5682,12 +5688,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 3955b26..1b8e4e3 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5680,12 +5686,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index dcbfefb..92df2a9 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -3006,6 +3006,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4592,6 +4593,7 @@ Defining \__fp_parse_word_randint:N on line ...
Defining message LaTeX/kernel/fp-no-random on line ...
Defining \__fp_rand_o:Nw on line ...
Defining \__fp_randint_o:Nw on line ...
+Defining \int_rand:nn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5720,7 +5722,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 4d5a730..4c1acd8 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -3008,6 +3008,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4615,6 +4616,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5743,12 +5749,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index 5cbdbdc..f66d1fb 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5682,12 +5688,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index f4c1f2a..47fbf05 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5682,12 +5688,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 3955b26..1b8e4e3 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -2945,6 +2945,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4552,6 +4553,11 @@ Defining \__fp_randint_e:wwwNnn on line ...
Defining \__fp_randint_narrow_e:nnnn on line ...
Defining \__fp_randint_wide_e:nnnn on line ...
Defining \__fp_randint_wide_e:wnnn on line ...
+Defining \int_rand:nn on line ...
+Defining \__fp_randint:ww on line ...
+Defining \__fp_randint_narrow:nn on line ...
+Defining \__fp_randint_narrow:nnn on line ...
+Defining \__fp_randint_narrow:nnnn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5680,12 +5686,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
-Defining \__int_rand:ww on line ...
-Defining \__int_rand_narrow:nn on line ...
-Defining \__int_rand_narrow:nnn on line ...
-Defining \__int_rand_narrow:nnnn on line ...
-Defining message LaTeX/kernel/backward-range on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index dcbfefb..92df2a9 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -3006,6 +3006,7 @@ Defining message LaTeX/kernel/missing-colon on line ..
Defining message LaTeX/kernel/overflow on line ...
Defining message LaTeX/kernel/out-of-bounds on line ...
Defining message LaTeX/kernel/protected-predicate on line ...
+Defining message LaTeX/kernel/randint-backward-range on line ...
Defining message LaTeX/kernel/conditional-form-unknown on line ...
Defining message LaTeX/kernel/key-no-property on line ...
Defining message LaTeX/kernel/key-property-boolean-values-only on line ...
@@ -4592,6 +4593,7 @@ Defining \__fp_parse_word_randint:N on line ...
Defining message LaTeX/kernel/fp-no-random on line ...
Defining \__fp_rand_o:Nw on line ...
Defining \__fp_randint_o:Nw on line ...
+Defining \int_rand:nn on line ...
Defining \c__intarray_sp_dim on line ...
\c__intarray_sp_dim=\dimen...
Defining \g__intarray_font_int on line ...
@@ -5720,7 +5722,6 @@ Defining \file_if_exist_input:n on line ...
Defining \file_if_exist_input:nF on line ...
Defining \file_input_stop: on line ...
Defining \flag_raise_if_clear:n on line ...
-Defining \int_rand:nn on line ...
Defining \msg_expandable_error:nnnnnn on line ...
Defining \msg_expandable_error:nnnnn on line ...
Defining \msg_expandable_error:nnnn on line ...
More information about the latex3-commits
mailing list