summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-19 20:38:20 +0000
committerKarl Berry <karl@freefriends.org>2016-10-19 20:38:20 +0000
commit52b787d36c60fda90673669dd2809c95c1fdfca5 (patch)
treebeb7faf87e1ab5be65f7437e500619b20eba20a1 /Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
parent97a401ad817da2dafd1069df9d87a28ed39df69b (diff)
l3 (19oct16)
git-svn-id: svn://tug.org/texlive/trunk@42306 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx50
1 files changed, 25 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
index 9c3d53d797d..d3dbf085569 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
@@ -36,7 +36,7 @@
%
%<*driver>
\documentclass[full]{l3doc}
-\GetIdInfo$Id: l3fp-parse.dtx 6441 2016-03-24 10:11:59Z joseph $
+\GetIdInfo$Id: l3fp-parse.dtx 6685 2016-08-19 16:26:52Z bruno $
{L3 Floating-point expression parsing}
\begin{document}
\DocInput{\jobname.dtx}
@@ -195,7 +195,7 @@
% \cs{exp_after:wN}~|;| expanded what follows once, we need |\add:ww|
% to do the calculation, and in the process to expand the following
% once. This is also true in our real application: all the functions of
-% the form \cs{@@_..._o:ww} expand what follows once. This comes at the
+% the form \cs[no-index]{@@_\ldots_o:ww} expand what follows once. This comes at the
% cost of leaving tokens in the input stack, and we will need to be
% careful not to waste this memory. All of our discussion above is nice
% but simplistic, as operations should not simply be performed in the
@@ -688,7 +688,7 @@
\@@_tmp:w {iii} \@@_parse_digits_ii:N { 000 ; 3 }
\@@_tmp:w {ii} \@@_parse_digits_i:N { 00 ; 2 }
\@@_tmp:w {i} \@@_parse_digits_:N { 0 ; 1 }
-\cs_new_nopar:Npn \@@_parse_digits_:N { ; ; 0 }
+\cs_new:Npn \@@_parse_digits_:N { ; ; 0 }
% \end{macrocode}
% \end{macro}
%
@@ -1839,7 +1839,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:w #1 #2
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{ \exp_after:wN #2 \exp:w \exp_end_continue_f:w \@@_parse_infix:NN }
}
\@@_tmp:w { inf } \c_inf_fp
@@ -1864,7 +1864,7 @@
% \begin{macrocode}
\cs_set_protected:Npn \@@_tmp:w #1 #2
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{
\@@_exp_after_f:nw { \@@_parse_infix:NN }
\s_@@ \@@_chk:w 10 #2 ;
@@ -1890,7 +1890,7 @@
% \begin{macrocode}
\tl_map_inline:nn { {em} {ex} }
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{
\exp_after:wN \@@_from_dim_test:ww
\exp_after:wN 0 \exp_after:wN ,
@@ -1943,17 +1943,17 @@
% Those functions are also unary (not binary), but may receive a
% variable number of arguments.
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_word_acot:N
+\cs_new:Npn \@@_parse_word_acot:N
{ \@@_parse_function:NNN \@@_acot_o:Nw \use_i:nn }
-\cs_new_nopar:Npn \@@_parse_word_acotd:N
+\cs_new:Npn \@@_parse_word_acotd:N
{ \@@_parse_function:NNN \@@_acot_o:Nw \use_ii:nn }
-\cs_new_nopar:Npn \@@_parse_word_atan:N
+\cs_new:Npn \@@_parse_word_atan:N
{ \@@_parse_function:NNN \@@_atan_o:Nw \use_i:nn }
-\cs_new_nopar:Npn \@@_parse_word_atand:N
+\cs_new:Npn \@@_parse_word_atand:N
{ \@@_parse_function:NNN \@@_atan_o:Nw \use_ii:nn }
-\cs_new_nopar:Npn \@@_parse_word_max:N
+\cs_new:Npn \@@_parse_word_max:N
{ \@@_parse_function:NNN \@@_minmax_o:Nw 2 }
-\cs_new_nopar:Npn \@@_parse_word_min:N
+\cs_new:Npn \@@_parse_word_min:N
{ \@@_parse_function:NNN \@@_minmax_o:Nw 0 }
% \end{macrocode}
% \end{macro}
@@ -1969,11 +1969,11 @@
% \begin{macrocode}
\cs_new:Npn \@@_parse_word_abs:N
{ \@@_parse_unary_function:nNN { set_sign } 0 }
-\cs_new_nopar:Npn \@@_parse_word_exp:N
+\cs_new:Npn \@@_parse_word_exp:N
{ \@@_parse_unary_function:nNN {exp} ? }
-\cs_new_nopar:Npn \@@_parse_word_ln:N
+\cs_new:Npn \@@_parse_word_ln:N
{ \@@_parse_unary_function:nNN {ln} ? }
-\cs_new_nopar:Npn \@@_parse_word_sqrt:N
+\cs_new:Npn \@@_parse_word_sqrt:N
{ \@@_parse_unary_function:nNN {sqrt} ? }
% \end{macrocode}
% \end{macro}
@@ -2009,9 +2009,9 @@
{cos} {cot} {csc} {sec} {sin} {tan}
}
{
- \cs_new_nopar:cpn { @@_parse_word_#1:N }
+ \cs_new:cpn { @@_parse_word_#1:N }
{ \@@_parse_unary_function:nNN {#1} \use_i:nn }
- \cs_new_nopar:cpn { @@_parse_word_#1d:N }
+ \cs_new:cpn { @@_parse_word_#1d:N }
{ \@@_parse_unary_function:nNN {#1} \use_ii:nn }
}
% \end{macrocode}
@@ -2024,11 +2024,11 @@
% \@@_parse_word_ceil:N
% }
% \begin{macrocode}
-\cs_new_nopar:Npn \@@_parse_word_trunc:N
+\cs_new:Npn \@@_parse_word_trunc:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_zero:NNN }
-\cs_new_nopar:Npn \@@_parse_word_floor:N
+\cs_new:Npn \@@_parse_word_floor:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_ninf:NNN }
-\cs_new_nopar:Npn \@@_parse_word_ceil:N
+\cs_new:Npn \@@_parse_word_ceil:N
{ \@@_parse_function:NNN \@@_round_o:Nw \@@_round_to_pinf:NNN }
% \end{macrocode}
% \end{macro}
@@ -2231,7 +2231,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[aux, EXP]+\@@_parse_infix_,:N+
+% \begin{macro}[aux, verb, EXP]{\__fp_parse_infix_,:N}
% \begin{macrocode}
\group_begin:
\char_set_catcode_letter:N \,
@@ -2286,7 +2286,7 @@
% \begin{macrocode}
\group_begin:
%<*package>
- \cs_set_nopar:Npn \+ { }
+ \cs_set:Npn \+ { }
%</package>
\char_set_catcode_other:N \&
\char_set_catcode_letter:N \^
@@ -2611,7 +2611,7 @@
%
% \subsection{Candidate: defining new \pkg{l3fp} functions}
%
-% \begin{macro}[EXP]{\fp_function:Nw}
+% \begin{macro}[EXP,int]{\fp_function:Nw}
% Parse the argument of the function~|#1| using
% \cs{@@_parse_operand:Nw} with a precedence of~$16$, and pass the
% function and argument to \cs{@@_function_apply:nw}.
@@ -2626,7 +2626,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\fp_new_function:Npn}
+% \begin{macro}[int]{\fp_new_function:Npn}
% \begin{macro}[aux]{\@@_new_function:NNnnn, \@@_new_function:Ncfnn}
% \begin{macro}[aux]{\@@_function_args:Nwn}
% Save the code provided by the user in the control sequence
@@ -2648,7 +2648,7 @@
}
\cs_new_protected:Npn \@@_new_function:NNnnn #1#2#3#4#5
{
- \cs_new_nopar:Npn #1
+ \cs_new:Npn #1
{
\exp_after:wN \@@_function_apply:nw \exp_after:wN
{