summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx32
1 files changed, 14 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
index cc1864eb9eb..f8ca2c4a81e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% File: l3fp-random.dtx Copyright (C) 2016,2017 The LaTeX3 Project
+%% File: l3fp-random.dtx Copyright (C) 2016-2018 The LaTeX3 Project
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -38,7 +38,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2017/12/16}
+% \date{Released 2018/02/21}
%
% \maketitle
%
@@ -79,11 +79,11 @@
% \begin{macrocode}
\cs_if_exist:NF \pdftex_uniformdeviate:D
{
- \__msg_kernel_new:nnn { kernel } { fp-no-random }
+ \__kernel_msg_new:nnn { kernel } { fp-no-random }
{ Random~numbers~unavailable }
\cs_new:Npn \@@_rand_o:Nw ? #1 @
{
- \__msg_kernel_expandable_error:nn { kernel } { fp-no-random }
+ \__kernel_msg_expandable_error:nn { kernel } { fp-no-random }
\exp_after:wN \c_nan_fp
}
\cs_new_eq:NN \@@_randint_o:Nw \@@_rand_o:Nw
@@ -197,7 +197,7 @@
\tl_if_empty:nTF {#1}
{ \@@_rand_o: }
{
- \__msg_kernel_expandable_error:nnnnn
+ \__kernel_msg_expandable_error:nnnnn
{ kernel } { fp-num-args } { rand() } { 0 } { 0 }
\exp_after:wN \c_nan_fp
}
@@ -213,8 +213,9 @@
% \begin{macro}[EXP]{\@@_randint_o:Nw}
% \begin{macro}[EXP]
% {
+% \@@_randint_default:w,
% \@@_randint_badarg:w,
-% \@@_randint_e:w,
+% \@@_randint_o:w,
% \@@_randint_e:wnn,
% \@@_randint_e:wwNnn,
% \@@_randint_e:wwwNnn,
@@ -243,19 +244,13 @@
% bound. The result is compared to the upper bound and the process
% repeats if needed.
% \begin{macrocode}
-\cs_new:Npn \@@_randint_o:Nw ? #1 @
+\cs_new:Npn \@@_randint_o:Nw ?
{
- \if_case:w
- \__int_eval:w \@@_array_count:n {#1} - 1 \__int_eval_end:
- \exp_after:wN \@@_randint_e:w \c_one_fp #1
- \or: \@@_randint_e:w #1
- \else:
- \__msg_kernel_expandable_error:nnnnn
- { kernel } { fp-num-args } { randint() } { 1 } { 2 }
- \exp_after:wN \c_nan_fp \exp:w
- \fi:
- \exp_after:wN \exp_end:
+ \@@_parse_function_one_two:nnw
+ { randint }
+ { \@@_randint_default:w \@@_randint_o:w }
}
+\cs_new:Npn \@@_randint_default:w #1 { \exp_after:wN #1 \c_one_fp }
\cs_new:Npn \@@_randint_badarg:w \s_@@ \@@_chk:w #1#2#3;
{
\@@_int:wTF \s_@@ \@@_chk:w #1#2#3;
@@ -269,7 +264,7 @@
}
{ 1 \exp_stop_f: }
}
-\cs_new:Npn \@@_randint_e:w #1; #2;
+\cs_new:Npn \@@_randint_o:w #1; #2; @
{
\if_case:w
\@@_randint_badarg:w #1;
@@ -282,6 +277,7 @@
{ randint } { \@@_array_to_clist:n { #1; #2; } }
\exp:w
\fi:
+ \exp_after:wN \exp_end:
}
\cs_new:Npn \@@_randint_e:wnn #1;
{