diff options
author | Karl Berry <karl@freefriends.org> | 2011-12-29 23:03:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-12-29 23:03:42 +0000 |
commit | 7a50f35d6fd3bd705c78298b1ccc085991638f87 (patch) | |
tree | 7f749391d34aa12a37a30a33c00b3098b2320e7c /Master/texmf-dist/tex/latex/l3kernel/l3fp.sty | |
parent | 0bc9393ae50667d7ff769a76321a9548a70351fc (diff) |
l3kernel 3109 (29dec11)
git-svn-id: svn://tug.org/texlive/trunk@24971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3fp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3fp.sty | 288 |
1 files changed, 144 insertions, 144 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty index 3eb68b0727d..00d73728018 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3fp.dtx 3029 2011-12-06 22:47:30Z joseph $ +\GetIdInfo$Id: l3fp.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental floating-point operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -121,9 +121,9 @@ \int_new:N \l_fp_trig_sign_int \int_new:N \l_fp_trig_decimal_int \int_new:N \l_fp_trig_extended_int -\cs_new_protected_nopar:Npn \fp_read:N #1 +\cs_new_protected:Npn \fp_read:N #1 { \exp_after:wN \fp_read_aux:w #1 \q_stop } -\cs_new_protected_nopar:Npn \fp_read_aux:w #1#2 . #3 e #4 \q_stop +\cs_new_protected:Npn \fp_read_aux:w #1#2 . #3 e #4 \q_stop { \if:w #1 - \l_fp_input_a_sign_int \c_minus_one @@ -134,7 +134,7 @@ \l_fp_input_a_decimal_int #3 \scan_stop: \l_fp_input_a_exponent_int #4 \scan_stop: } -\cs_new_protected_nopar:Npn \fp_split:Nn #1#2 +\cs_new_protected:Npn \fp_split:Nn #1#2 { \tl_set:Nx \l_fp_tmp_tl {#2} \tl_set_rescan:Nno \l_fp_tmp_tl { \char_set_catcode_ignore:n { 32 } } @@ -169,7 +169,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_split_exponent:w #1 e #2 e #3 \q_stop #4 +\cs_new_protected:Npn \fp_split_exponent:w #1 e #2 e #3 \q_stop #4 { \use:c { l_fp_input_ #4 _exponent_int } \int_eval:w 0 #2 \scan_stop: @@ -177,19 +177,19 @@ \use:c { l_fp_input_ #4 _integer_int } \int_eval:w 0 #1 . . \q_stop #4 } -\cs_new_protected_nopar:Npn \fp_split_aux_i:w #1 . #2 . #3 \q_stop +\cs_new_protected:Npn \fp_split_aux_i:w #1 . #2 . #3 \q_stop { \fp_split_aux_ii:w #2 000000000 \q_stop } -\cs_new_protected_nopar:Npn \fp_split_aux_ii:w #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_split_aux_ii:w #1#2#3#4#5#6#7#8#9 { \fp_split_aux_iii:w {#1#2#3#4#5#6#7#8#9} } -\cs_new_protected_nopar:Npn \fp_split_aux_iii:w #1#2 \q_stop +\cs_new_protected:Npn \fp_split_aux_iii:w #1#2 \q_stop { \l_fp_tmp_int 1 #1 \scan_stop: \exp_after:wN \fp_split_decimal:w \int_use:N \l_fp_tmp_int 000000000 \q_stop } -\cs_new_protected_nopar:Npn \fp_split_decimal:w #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_split_decimal:w #1#2#3#4#5#6#7#8#9 { \fp_split_decimal_aux:w {#2#3#4#5#6#7#8#9} } -\cs_new_protected_nopar:Npn \fp_split_decimal_aux:w #1#2#3 \q_stop #4 +\cs_new_protected:Npn \fp_split_decimal_aux:w #1#2#3 \q_stop #4 { \use:c { l_fp_input_ #4 _decimal_int } #1#2 \scan_stop: \if_int_compare:w @@ -206,7 +206,7 @@ \exp_after:wN \fp_overflow_msg: \fi: } -\cs_new_protected_nopar:Npn \fp_standardise:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_standardise:NNNN #1#2#3#4 { \if_int_compare:w \int_eval:w #2 + #3 = \c_zero @@ -218,7 +218,7 @@ \fi: #1#2#3#4 } -\cs_new_protected_nopar:Npn \fp_standardise_aux:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_standardise_aux:NNNN #1#2#3#4 { \cs_set_protected_nopar:Npn \fp_standardise_aux: { @@ -229,7 +229,7 @@ \exp_after:wN \fp_standardise_aux: \fi: } - \cs_set_protected_nopar:Npn + \cs_set_protected:Npn \fp_standardise_aux:w ##1##2##3##4##5##6##7##8##9 \q_stop { #2 ##2 \scan_stop: @@ -246,7 +246,7 @@ \exp_after:wN \fp_standardise_aux: \fi: } - \cs_set_protected_nopar:Npn + \cs_set_protected:Npn \fp_standardise_aux:w ##1##2##3##4##5##6##7##8##9 { #2 ##1##2##3##4##5##6##7##8 \scan_stop: @@ -293,7 +293,7 @@ \exp_after:wN \fp_level_input_exponents_a: \fi: } -\cs_new_protected_nopar:Npn \fp_level_input_exponents_a:NNNNNNNNN +\cs_new_protected:Npn \fp_level_input_exponents_a:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_input_b_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -318,7 +318,7 @@ \exp_after:wN \fp_level_input_exponents_b: \fi: } -\cs_new_protected_nopar:Npn \fp_level_input_exponents_b:NNNNNNNNN +\cs_new_protected:Npn \fp_level_input_exponents_b:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_input_a_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -333,28 +333,28 @@ \l_fp_input_a_decimal_int \l_fp_tmp_tl \scan_stop: \tex_advance:D \l_fp_input_a_exponent_int \c_one } -\cs_new_protected_nopar:Npn \fp_tmp:w #1#2 { } -\cs_new_protected_nopar:Npn \fp_new:N #1 +\cs_new_protected:Npn \fp_tmp:w #1#2 { } +\cs_new_protected:Npn \fp_new:N #1 { \tl_new:N #1 \tl_gset_eq:NN #1 \c_zero_fp } \cs_generate_variant:Nn \fp_new:N { c } -\cs_new_protected_nopar:Npn \fp_const:Nn #1#2 +\cs_new_protected:Npn \fp_const:Nn #1#2 { \fp_new:N #1 \fp_gset:Nn #1 {#2} } \cs_generate_variant:Nn \fp_const:Nn { c } -\cs_new_protected_nopar:Npn \fp_zero:N #1 +\cs_new_protected:Npn \fp_zero:N #1 { \tl_set_eq:NN #1 \c_zero_fp } -\cs_new_protected_nopar:Npn \fp_gzero:N #1 +\cs_new_protected:Npn \fp_gzero:N #1 { \tl_gset_eq:NN #1 \c_zero_fp } \cs_generate_variant:Nn \fp_zero:N { c } \cs_generate_variant:Nn \fp_gzero:N { c } \cs_new_protected_nopar:Npn \fp_set:Nn { \fp_set_aux:NNn \tl_set:Nn } \cs_new_protected_nopar:Npn \fp_gset:Nn { \fp_set_aux:NNn \tl_gset:Nn } -\cs_new_protected_nopar:Npn \fp_set_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_set_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -390,7 +390,7 @@ { \fp_set_from_dim_aux:NNn \tl_set:Nx } \cs_new_protected_nopar:Npn \fp_gset_from_dim:Nn { \fp_set_from_dim_aux:NNn \tl_gset:Nx } -\cs_new_protected_nopar:Npn \fp_set_from_dim_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_set_from_dim_aux:NNn #1#2#3 { \group_begin: \l_fp_tmp_skip \etex_glueexpr:D #3 \scan_stop: @@ -428,7 +428,7 @@ } \cs_set_protected_nopar:Npx \fp_set_from_dim_aux:w { - \cs_set_nopar:Npn \exp_not:N \fp_set_from_dim_aux:w + \cs_set:Npn \exp_not:N \fp_set_from_dim_aux:w ##1 \tl_to_str:n { pt } {##1} } \fp_set_from_dim_aux:w @@ -446,10 +446,10 @@ \cs_new_eq:NN \fp_gset_eq:cc \tl_gset_eq:cc \cs_new_eq:NN \fp_show:N \tl_show:N \cs_new_eq:NN \fp_show:c \tl_show:c -\cs_new_nopar:Npn \fp_use:N #1 +\cs_new:Npn \fp_use:N #1 { \exp_after:wN \fp_use_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_use:N { c } -\cs_new_nopar:Npn \fp_use_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_use_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -466,14 +466,14 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_use_none:w #1 e #2 \q_stop {#1} -\cs_new_nopar:Npn \fp_use_small:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_use_none:w #1 e #2 \q_stop {#1} +\cs_new:Npn \fp_use_small:w #1 . #2 e #3 \q_stop { 0 . \prg_replicate:nn { -#3 - 1 } { 0 } #1#2 } -\cs_new_nopar:Npn \fp_use_large:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_use_large:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 < \c_ten \exp_after:wN \fp_use_large_aux_i:w @@ -482,39 +482,39 @@ \fi: #1#2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_use_large_aux_i:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_use_large_aux_i:w #1#2 e #3 \q_stop { #1 \use:c { fp_use_large_aux_ #3 :w } #2 \q_stop } -\cs_new_nopar:cpn { fp_use_large_aux_1:w } #1#2 \q_stop { #1 . #2 } -\cs_new_nopar:cpn { fp_use_large_aux_2:w } #1#2#3 \q_stop +\cs_new:cpn { fp_use_large_aux_1:w } #1#2 \q_stop { #1 . #2 } +\cs_new:cpn { fp_use_large_aux_2:w } #1#2#3 \q_stop { #1#2 . #3 } -\cs_new_nopar:cpn { fp_use_large_aux_3:w } #1#2#3#4 \q_stop +\cs_new:cpn { fp_use_large_aux_3:w } #1#2#3#4 \q_stop { #1#2#3 . #4 } -\cs_new_nopar:cpn { fp_use_large_aux_4:w } #1#2#3#4#5 \q_stop +\cs_new:cpn { fp_use_large_aux_4:w } #1#2#3#4#5 \q_stop { #1#2#3#4 . #5 } -\cs_new_nopar:cpn { fp_use_large_aux_5:w } #1#2#3#4#5#6 \q_stop +\cs_new:cpn { fp_use_large_aux_5:w } #1#2#3#4#5#6 \q_stop { #1#2#3#4#5 . #6 } -\cs_new_nopar:cpn { fp_use_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_use_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop { #1#2#3#4#5#6 . #7 } -\cs_new_nopar:cpn { fp_use_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_use_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop { #1#2#3#4#6#7 . #8 } -\cs_new_nopar:cpn { fp_use_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_use_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 . #9 } -\cs_new_nopar:cpn { fp_use_large_aux_9:w } #1 \q_stop { #1 . } -\cs_new_nopar:Npn \fp_use_large_aux_ii:w #1 e #2 \q_stop +\cs_new:cpn { fp_use_large_aux_9:w } #1 \q_stop { #1 . } +\cs_new:Npn \fp_use_large_aux_ii:w #1 e #2 \q_stop { #1 \prg_replicate:nn { #2 - 9 } { 0 } . } -\cs_new_nopar:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt } +\cs_new:Npn \fp_to_dim:N #1 { \fp_use:N #1 pt } \cs_generate_variant:Nn \fp_to_dim:N { c } -\cs_new_nopar:Npn \fp_to_int:N #1 +\cs_new:Npn \fp_to_int:N #1 { \exp_after:wN \fp_to_int_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_to_int:N { c } -\cs_new_nopar:Npn \fp_to_int_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_int_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -526,7 +526,7 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_int_small:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_int_small:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 > \c_one \else: @@ -537,7 +537,7 @@ \fi: \fi: } -\cs_new_nopar:Npn \fp_to_int_large:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_int_large:w #1 . #2 e #3 \q_stop { \if_int_compare:w #3 < \c_ten \exp_after:wN \fp_to_int_large_aux_i:w @@ -546,26 +546,26 @@ \fi: #1#2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_int_large_aux_i:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_int_large_aux_i:w #1#2 e #3 \q_stop { \use:c { fp_to_int_large_aux_ #3 :w } #2 \q_stop {#1} } -\cs_new_nopar:cpn { fp_to_int_large_aux_1:w } #1#2 \q_stop +\cs_new:cpn { fp_to_int_large_aux_1:w } #1#2 \q_stop { \fp_to_int_large_aux:nnn { #2 0 } {#1} } -\cs_new_nopar:cpn { fp_to_int_large_aux_2:w } #1#2#3 \q_stop +\cs_new:cpn { fp_to_int_large_aux_2:w } #1#2#3 \q_stop { \fp_to_int_large_aux:nnn { #3 00 } {#1#2} } -\cs_new_nopar:cpn { fp_to_int_large_aux_3:w } #1#2#3#4 \q_stop +\cs_new:cpn { fp_to_int_large_aux_3:w } #1#2#3#4 \q_stop { \fp_to_int_large_aux:nnn { #4 000 } {#1#2#3} } -\cs_new_nopar:cpn { fp_to_int_large_aux_4:w } #1#2#3#4#5 \q_stop +\cs_new:cpn { fp_to_int_large_aux_4:w } #1#2#3#4#5 \q_stop { \fp_to_int_large_aux:nnn { #5 0000 } {#1#2#3#4} } -\cs_new_nopar:cpn { fp_to_int_large_aux_5:w } #1#2#3#4#5#6 \q_stop +\cs_new:cpn { fp_to_int_large_aux_5:w } #1#2#3#4#5#6 \q_stop { \fp_to_int_large_aux:nnn { #6 00000 } {#1#2#3#4#5} } -\cs_new_nopar:cpn { fp_to_int_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_to_int_large_aux_6:w } #1#2#3#4#5#6#7 \q_stop { \fp_to_int_large_aux:nnn { #7 000000 } {#1#2#3#4#5#6} } -\cs_new_nopar:cpn { fp_to_int_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_to_int_large_aux_7:w } #1#2#3#4#5#6#7#8 \q_stop { \fp_to_int_large_aux:nnn { #8 0000000 } {#1#2#3#4#5#6#7} } -\cs_new_nopar:cpn { fp_to_int_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_int_large_aux_8:w } #1#2#3#4#5#6#7#8#9 \q_stop { \fp_to_int_large_aux:nnn { #9 00000000 } {#1#2#3#4#5#6#7#8} } -\cs_new_nopar:cpn { fp_to_int_large_aux_9:w } #1 \q_stop {#1} -\cs_new_nopar:Npn \fp_to_int_large_aux:nnn #1#2#3 +\cs_new:cpn { fp_to_int_large_aux_9:w } #1 \q_stop {#1} +\cs_new:Npn \fp_to_int_large_aux:nnn #1#2#3 { \if_int_compare:w #1 < \c_five_hundred_million #3#2 @@ -573,15 +573,15 @@ \int_value:w \int_eval:w #3#2 + 1 \int_eval_end: \fi: } -\cs_new_nopar:Npn \fp_to_int_large_aux_ii:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_int_large_aux_ii:w #1 e #2 \q_stop { #1 \prg_replicate:nn { #2 - 9 } { 0 } } -\cs_new_nopar:Npn \fp_to_tl:N #1 +\cs_new:Npn \fp_to_tl:N #1 { \exp_after:wN \fp_to_tl_aux:w #1 \q_stop } \cs_generate_variant:Nn \fp_to_tl:N { c } -\cs_new_nopar:Npn \fp_to_tl_aux:w #1#2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_aux:w #1#2 e #3 \q_stop { \if:w #1 - - @@ -593,7 +593,7 @@ \fi: #2 e #3 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_tl_large:w #1 e #2 \q_stop { \if_int_compare:w #2 < \c_ten \exp_after:wN \fp_to_tl_large_aux_i:w @@ -602,66 +602,66 @@ \fi: #1 e #2 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large_aux_i:w #1 e #2 \q_stop +\cs_new:Npn \fp_to_tl_large_aux_i:w #1 e #2 \q_stop { \use:c { fp_to_tl_large_ #2 :w } #1 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_large_aux_ii:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_large_aux_ii:w #1 . #2 e #3 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 e #3 } -\cs_new_nopar:cpn { fp_to_tl_large_0:w } #1 . #2 \q_stop +\cs_new:cpn { fp_to_tl_large_0:w } #1 . #2 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 } -\cs_new_nopar:cpn { fp_to_tl_large_1:w } #1 . #2#3 \q_stop +\cs_new:cpn { fp_to_tl_large_1:w } #1 . #2#3 \q_stop { #1#2 \fp_to_tl_large_zeros:NNNNNNNNN #3 0 } -\cs_new_nopar:cpn { fp_to_tl_large_2:w } #1 . #2#3#4 \q_stop +\cs_new:cpn { fp_to_tl_large_2:w } #1 . #2#3#4 \q_stop { #1#2#3 \fp_to_tl_large_zeros:NNNNNNNNN #4 00 } -\cs_new_nopar:cpn { fp_to_tl_large_3:w } #1 . #2#3#4#5 \q_stop +\cs_new:cpn { fp_to_tl_large_3:w } #1 . #2#3#4#5 \q_stop { #1#2#3#4 \fp_to_tl_large_zeros:NNNNNNNNN #5 000 } -\cs_new_nopar:cpn { fp_to_tl_large_4:w } #1 . #2#3#4#5#6 \q_stop +\cs_new:cpn { fp_to_tl_large_4:w } #1 . #2#3#4#5#6 \q_stop { #1#2#3#4#5 \fp_to_tl_large_zeros:NNNNNNNNN #6 0000 } -\cs_new_nopar:cpn { fp_to_tl_large_5:w } #1 . #2#3#4#5#6#7 \q_stop +\cs_new:cpn { fp_to_tl_large_5:w } #1 . #2#3#4#5#6#7 \q_stop { #1#2#3#4#5#6 \fp_to_tl_large_zeros:NNNNNNNNN #7 00000 } -\cs_new_nopar:cpn { fp_to_tl_large_6:w } #1 . #2#3#4#5#6#7#8 \q_stop +\cs_new:cpn { fp_to_tl_large_6:w } #1 . #2#3#4#5#6#7#8 \q_stop { #1#2#3#4#5#6#7 \fp_to_tl_large_zeros:NNNNNNNNN #8 000000 } -\cs_new_nopar:cpn { fp_to_tl_large_7:w } #1 . #2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_tl_large_7:w } #1 . #2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 \fp_to_tl_large_zeros:NNNNNNNNN #9 0000000 } -\cs_new_nopar:cpn { fp_to_tl_large_8:w } #1 . +\cs_new:cpn { fp_to_tl_large_8:w } #1 . { #1 \use:c { fp_to_tl_large_8_aux:w } } -\cs_new_nopar:cpn { fp_to_tl_large_8_aux:w } #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new:cpn { fp_to_tl_large_8_aux:w } #1#2#3#4#5#6#7#8#9 \q_stop { #1#2#3#4#5#6#7#8 \fp_to_tl_large_zeros:NNNNNNNNN #9 00000000 } -\cs_new_nopar:cpn { fp_to_tl_large_9:w } #1 . #2 \q_stop {#1#2} -\cs_new_nopar:Npn \fp_to_tl_small:w #1 e #2 \q_stop +\cs_new:cpn { fp_to_tl_large_9:w } #1 . #2 \q_stop {#1#2} +\cs_new:Npn \fp_to_tl_small:w #1 e #2 \q_stop { \if_int_compare:w #2 = \c_minus_one \exp_after:wN \fp_to_tl_small_one:w @@ -674,7 +674,7 @@ \fi: #1 e #2 \q_stop } -\cs_new_nopar:Npn \fp_to_tl_small_one:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_one:w #1 . #2 e #3 \q_stop { \if_int_compare:w \fp_use_ix:NNNNNNNNN #2 > \c_four \if_int_compare:w @@ -693,7 +693,7 @@ \fp_to_tl_small_zeros:NNNNNNNNN #2 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_two:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_two:w #1 . #2 e #3 \q_stop { \if_int_compare:w \fp_use_iix_ix:NNNNNNNNN #2 > \c_forty_four \if_int_compare:w @@ -713,13 +713,13 @@ \fp_to_tl_small_zeros:NNNNNNNNN #2 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_aux:w #1 . #2 e #3 \q_stop +\cs_new:Npn \fp_to_tl_small_aux:w #1 . #2 e #3 \q_stop { #1 \fp_to_tl_large_zeros:NNNNNNNNN #2 e #3 } -\cs_new_nopar:Npn \fp_to_tl_large_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_to_tl_large_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w #9 = \c_zero \if_int_compare:w #8 = \c_zero @@ -758,7 +758,7 @@ . #1#2#3#4#5#6#7#8#9 \fi: } -\cs_new_nopar:Npn \fp_to_tl_small_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_to_tl_small_zeros:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w #9 = \c_zero \if_int_compare:w #8 = \c_zero @@ -797,11 +797,11 @@ #1#2#3#4#5#6#7#8#9 \fi: } -\cs_new_nopar:Npn \fp_use_iix_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#8#9} -\cs_new_nopar:Npn \fp_use_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#9} -\cs_new_nopar:Npn \fp_use_i_to_vii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_use_iix_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#8#9} +\cs_new:Npn \fp_use_ix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#9} +\cs_new:Npn \fp_use_i_to_vii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#1#2#3#4#5#6#7} -\cs_new_nopar:Npn \fp_use_i_to_iix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new:Npn \fp_use_i_to_iix:NNNNNNNNN #1#2#3#4#5#6#7#8#9 {#1#2#3#4#5#6#7#8} \cs_new_protected_nopar:Npn \fp_round_figures:Nn { \fp_round_figures_aux:NNn \tl_set:Nn } @@ -809,7 +809,7 @@ \cs_new_protected_nopar:Npn \fp_ground_figures:Nn { \fp_round_figures_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ground_figures:Nn { c } -\cs_new_protected_nopar:Npn \fp_round_figures_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_round_figures_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -844,7 +844,7 @@ \cs_new_protected_nopar:Npn \fp_ground_places:Nn { \fp_round_places_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ground_places:Nn { c } -\cs_new_protected_nopar:Npn \fp_round_places_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_round_places_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -883,7 +883,7 @@ \exp_after:wN \use_i:nn \exp_after:wN \fp_round_aux:NNNNNNNNN \int_use:N \l_fp_input_a_decimal_int } -\cs_new_protected_nopar:Npn \fp_round_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_round_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \fp_round_loop:N #9#8#7#6#5#4#3#2#1 \bool_if:NT \l_fp_round_carry_bool @@ -896,7 +896,7 @@ \tex_advance:D \l_fp_input_a_exponent_int \c_one \fi: } -\cs_new_protected_nopar:Npn \fp_round_loop:N #1 +\cs_new_protected:Npn \fp_round_loop:N #1 { \if_int_compare:w \l_fp_round_position_int < \l_fp_round_target_int \bool_if:NTF \l_fp_round_carry_bool @@ -926,7 +926,7 @@ \cs_new_protected_nopar:Npn \fp_gabs:N { \fp_abs_aux:NN \tl_gset:Nn } \cs_generate_variant:Nn \fp_abs:N { c } \cs_generate_variant:Nn \fp_gabs:N { c } -\cs_new_protected_nopar:Npn \fp_abs_aux:NN #1#2 +\cs_new_protected:Npn \fp_abs_aux:NN #1#2 { \group_begin: \fp_read:N #2 @@ -951,7 +951,7 @@ \cs_new_protected_nopar:Npn \fp_gneg:N { \fp_neg_aux:NN \tl_gset:Nn } \cs_generate_variant:Nn \fp_neg:N { c } \cs_generate_variant:Nn \fp_gneg:N { c } -\cs_new_protected_nopar:Npn \fp_neg_aux:NN #1#2 +\cs_new_protected:Npn \fp_neg_aux:NN #1#2 { \group_begin: \fp_read:N #2 @@ -977,7 +977,7 @@ \cs_new_protected_nopar:Npn \fp_gadd:Nn { \fp_add_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_add:Nn { c } \cs_generate_variant:Nn \fp_gadd:Nn { c } -\cs_new_protected_nopar:Npn \fp_add_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_add_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1007,7 +1007,7 @@ \l_fp_output_integer_int \l_fp_output_decimal_int \l_fp_output_exponent_int - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -1080,7 +1080,7 @@ \cs_new_protected_nopar:Npn \fp_gsub:Nn { \fp_sub_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_sub:Nn { c } \cs_generate_variant:Nn \fp_gsub:Nn { c } -\cs_new_protected_nopar:Npn \fp_sub_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_sub_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1098,7 +1098,7 @@ \cs_new_protected_nopar:Npn \fp_gmul:Nn { \fp_mul_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_mul:Nn { c } \cs_generate_variant:Nn \fp_gmul:Nn { c } -\cs_new_protected_nopar:Npn \fp_mul_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_mul_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1179,10 +1179,10 @@ \fp_mul_end_level: \l_fp_output_integer_int 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_mul_split:NNNN #1#2#3#4 +\cs_new_protected:Npn \fp_mul_split:NNNN #1#2#3#4 { \tex_advance:D #1 \c_one_thousand_million - \cs_set_protected_nopar:Npn \fp_mul_split_aux:w + \cs_set_protected:Npn \fp_mul_split_aux:w ##1##2##3##4##5##6##7##8##9 \q_stop { #2 ##2##3##4 \scan_stop: #3 ##5##6##7 \scan_stop: @@ -1191,7 +1191,7 @@ \exp_after:wN \fp_mul_split_aux:w \int_use:N #1 \q_stop \tex_advance:D #1 -\c_one_thousand_million } -\cs_new_protected_nopar:Npn \fp_mul_product:NN #1#2 +\cs_new_protected:Npn \fp_mul_product:NN #1#2 { \l_fp_mul_output_int \int_eval:w \l_fp_mul_output_int + #1 * #2 \scan_stop: @@ -1202,7 +1202,7 @@ \exp_after:wN \use_i:nn \exp_after:wN \fp_mul_end_level:NNNNNNNNN \int_use:N \l_fp_mul_output_int } -\cs_new_protected_nopar:Npn \fp_mul_end_level:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_mul_end_level:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \tl_set:Nx \l_fp_mul_output_tl { #7#8#9 \l_fp_mul_output_tl } \l_fp_mul_output_int #1#2#3#4#5#6 \scan_stop: @@ -1211,7 +1211,7 @@ \cs_new_protected_nopar:Npn \fp_gdiv:Nn { \fp_div_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_div:Nn { c } \cs_generate_variant:Nn \fp_gdiv:Nn { c } -\cs_new_protected_nopar:Npn \fp_div_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_div_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -1225,7 +1225,7 @@ \int_eval:w \l_fp_input_b_integer_int + \l_fp_input_b_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: #1 \exp_not:N #2 { \c_undefined_fp } @@ -1235,7 +1235,7 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: #1 \exp_not:N #2 { \c_zero_fp } @@ -1261,7 +1261,7 @@ \l_fp_output_integer_int \l_fp_output_decimal_int \l_fp_output_exponent_int - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -1353,13 +1353,13 @@ \int_eval_end: \tex_divide:D \l_fp_div_offset_int \c_ten } -\cs_new_protected_nopar:Npn \fp_div_loop_step:w #1#2#3#4#5#6#7#8#9 \q_stop +\cs_new_protected:Npn \fp_div_loop_step:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_integer_int \int_eval:w #2 + \l_fp_input_a_integer_int \int_eval_end: \l_fp_input_a_decimal_int #3#4#5#6#7#8#9 0 \scan_stop: } -\cs_new_protected_nopar:Npn \fp_add:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_add:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { #7 \int_eval:w #1 + #4 \int_eval_end: #8 \int_eval:w #2 + #5 \int_eval_end: @@ -1375,7 +1375,7 @@ \tex_advance:D #8 -\c_one_thousand_million \fi: } -\cs_new_protected_nopar:Npn \fp_sub:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_sub:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { #7 \int_eval:w #1 - #4 \int_eval_end: #8 \int_eval:w #2 - #5 \int_eval_end: @@ -1398,7 +1398,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_mul:NNNNNN #1#2#3#4#5#6 +\cs_new_protected:Npn \fp_mul:NNNNNN #1#2#3#4#5#6 { \fp_mul_split:NNNN #1 \l_fp_mul_a_i_int \l_fp_mul_a_ii_int \l_fp_mul_a_iii_int @@ -1442,7 +1442,7 @@ \fp_mul_end_level: #5 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_mul:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_mul:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \fp_mul_split:NNNN #2 \l_fp_mul_a_i_int \l_fp_mul_a_ii_int \l_fp_mul_a_iii_int @@ -1502,7 +1502,7 @@ \fp_mul_end_level: #7 0 \l_fp_mul_output_tl \scan_stop: } -\cs_new_protected_nopar:Npn \fp_div_integer:NNNNN #1#2#3#4#5 +\cs_new_protected:Npn \fp_div_integer:NNNNN #1#2#3#4#5 { \l_fp_tmp_int #1 \tex_divide:D \l_fp_tmp_int #3 @@ -1534,7 +1534,7 @@ \exp_after:wN \fp_extended_normalise_aux_i: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_aux_i:w +\cs_new_protected:Npn \fp_extended_normalise_aux_i:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_integer_int @@ -1544,7 +1544,7 @@ \exp_after:wN \fp_extended_normalise_aux_ii:w \int_use:N \l_fp_input_a_extended_int \q_stop } -\cs_new_protected_nopar:Npn \fp_extended_normalise_aux_ii:w +\cs_new_protected:Npn \fp_extended_normalise_aux_ii:w #1#2#3#4#5#6#7#8#9 \q_stop { \l_fp_input_a_decimal_int @@ -1562,7 +1562,7 @@ \exp_after:wN \fp_extended_normalise_aux_ii: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_ii_aux:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_ii_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_input_a_integer_int = \c_zero @@ -1595,7 +1595,7 @@ \exp_after:wN \fp_extended_normalise_output: \fi: } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux_i:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_output_aux_i:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_output_integer_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -1609,13 +1609,13 @@ \exp_after:wN \fp_extended_normalise_output_aux_ii:NNNNNNNNN \l_fp_tmp_tl } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux_ii:NNNNNNNNN +\cs_new_protected:Npn \fp_extended_normalise_output_aux_ii:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \l_fp_output_decimal_int #1#2#3#4#5#6#7#8#9 \scan_stop: \fp_extended_normalise_output_aux:N } -\cs_new_protected_nopar:Npn \fp_extended_normalise_output_aux:N #1 +\cs_new_protected:Npn \fp_extended_normalise_output_aux:N #1 { \tex_advance:D \l_fp_output_extended_int \c_one_thousand_million \tex_divide:D \l_fp_output_extended_int \c_ten @@ -1665,7 +1665,7 @@ \fi: \fi: } -\cs_new_protected_nopar:Npn \fp_trig_sub:NNN #1#2#3 +\cs_new_protected:Npn \fp_trig_sub:NNN #1#2#3 { \l_fp_input_a_integer_int \int_eval:w \l_fp_input_a_integer_int - #1 \int_eval_end: @@ -1763,7 +1763,7 @@ \cs_new_protected_nopar:Npn \fp_gsin:Nn { \fp_sin_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_sin:Nn { c } \cs_generate_variant:Nn \fp_gsin:Nn { c } -\cs_new_protected_nopar:Npn \fp_sin_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_sin_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -1860,7 +1860,7 @@ \cs_new_protected_nopar:Npn \fp_gcos:Nn { \fp_cos_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_cos:Nn { c } \cs_generate_variant:Nn \fp_gcos:Nn { c } -\cs_new_protected_nopar:Npn \fp_cos_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_cos_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2061,7 +2061,7 @@ \cs_new_protected_nopar:Npn \fp_gtan:Nn { \fp_tan_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_tan:Nn { c } \cs_generate_variant:Nn \fp_gtan:Nn { c } -\cs_new_protected_nopar:Npn \fp_tan_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_tan_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2254,7 +2254,7 @@ \cs_new_protected_nopar:Npn \fp_gexp:Nn { \fp_exp_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_exp:Nn { c } \cs_generate_variant:Nn \fp_gexp:Nn { c } -\cs_new_protected_nopar:Npn \fp_exp_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_exp_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2425,13 +2425,13 @@ \fi: \fp_exp_decimal: } -\cs_new_protected_nopar:Npn \fp_exp_integer_const:n #1 +\cs_new_protected:Npn \fp_exp_integer_const:n #1 { \exp_after:wN \exp_after:wN \exp_after:wN \fp_exp_integer_const:nnnn \cs:w c_fp_exp_ #1 _tl \cs_end: } -\cs_new_protected_nopar:Npn \fp_exp_integer_const:nnnn #1#2#3#4 +\cs_new_protected:Npn \fp_exp_integer_const:nnnn #1#2#3#4 { \l_fp_exp_integer_int #1 \scan_stop: \l_fp_exp_decimal_int #2 \scan_stop: @@ -2550,7 +2550,7 @@ \exp_after:wN \fp_exp_Taylor: \fi: } -\cs_new_protected_nopar:Npn \fp_exp_const:Nx #1#2 +\cs_new_protected:Npn \fp_exp_const:Nx #1#2 { \tl_new:N #1 \tl_gset:Nx #1 {#2} @@ -2572,7 +2572,7 @@ \cs_new_protected_nopar:Npn \fp_gln:Nn { \fp_ln_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_ln:Nn { c } \cs_generate_variant:Nn \fp_gln:Nn { c } -\cs_new_protected_nopar:Npn \fp_ln_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_ln_aux:NNn #1#2#3 { \group_begin: \fp_split:Nn a {#3} @@ -2588,7 +2588,7 @@ > \c_zero \exp_after:wN \exp_after:wN \exp_after:wN \fp_ln_aux: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 { \c_zero_fp } @@ -2596,7 +2596,7 @@ \exp_after:wN \exp_after:wN \exp_after:wN \fp_ln_error_msg: \fi: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 { \c_zero_fp } @@ -2622,7 +2622,7 @@ \else: \exp_after:wN \fp_ln_exponent: \fi: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 \exp_not:N ##2 @@ -2682,7 +2682,7 @@ \fi: \fp_ln_exponent_units: } -\cs_new_protected_nopar:Npn \fp_ln_exponent_tens:NN #1 #2 +\cs_new_protected:Npn \fp_ln_exponent_tens:NN #1 #2 { \l_fp_input_a_exponent_int #2 \scan_stop: \fp_ln_const:nn { 10 } { #1 } @@ -2718,7 +2718,7 @@ \l_fp_output_exponent_int \l_fp_exp_exponent_int \fi: } -\cs_new_protected_nopar:Npn \fp_ln_normalise_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_ln_normalise_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_exp_integer_int = \c_zero \l_fp_exp_decimal_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -2785,7 +2785,7 @@ \tex_divide:D \l_fp_input_a_decimal_int \c_two \tex_divide:D \l_fp_input_a_extended_int \c_two } -\cs_new_protected_nopar:Npn \fp_ln_const:nn #1#2 +\cs_new_protected:Npn \fp_ln_const:nn #1#2 { \exp_after:wN \exp_after:wN \exp_after:wN \fp_exp_integer_const:nnnn @@ -2855,7 +2855,7 @@ \exp_after:wN \fp_ln_fixed: \fi: } -\cs_new_protected_nopar:Npn \fp_ln_fixed_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 +\cs_new_protected:Npn \fp_ln_fixed_aux:NNNNNNNNN #1#2#3#4#5#6#7#8#9 { \if_int_compare:w \l_fp_output_integer_int = \c_zero \l_fp_output_decimal_int #1#2#3#4#5#6#7#8 \scan_stop: @@ -2906,7 +2906,7 @@ \cs_new_protected_nopar:Npn \fp_gpow:Nn { \fp_pow_aux:NNn \tl_gset:Nn } \cs_generate_variant:Nn \fp_pow:Nn { c } \cs_generate_variant:Nn \fp_gpow:Nn { c } -\cs_new_protected_nopar:Npn \fp_pow_aux:NNn #1#2#3 +\cs_new_protected:Npn \fp_pow_aux:NNn #1#2#3 { \group_begin: \fp_read:N #2 @@ -2928,13 +2928,13 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } } \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_zero_fp } @@ -2945,7 +2945,7 @@ \int_eval:w \l_fp_input_a_integer_int + \l_fp_input_a_decimal_int = \c_zero - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_one_fp } @@ -2978,14 +2978,14 @@ \exp_after:wN \fp_pow_aux_ii: \else: \group_end: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } } \fi: \else: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 { \c_undefined_fp } @@ -3031,7 +3031,7 @@ \fp_pow_aux_iv: \fi: \fi: - \cs_set_protected_nopar:Npx \fp_tmp:w ##1##2 + \cs_set_protected:Npx \fp_tmp:w ##1##2 { \group_end: ##1 ##2 @@ -3150,7 +3150,7 @@ \fp_read:N #1 \fp_compare_aux:N #2 } -\cs_new_protected_nopar:Npn \fp_compare_aux:N #1 +\cs_new_protected:Npn \fp_compare_aux:N #1 { \cs_if_exist:cTF { fp_compare_#1: } { \use:c { fp_compare_#1: } } @@ -3336,43 +3336,43 @@ } \l_fp_tmp_tl } -\cs_new_protected_nopar:Npn \fp_compare_aux_i:w #1 == #2 == #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_i:w #1 == #2 == #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_ii:w #1 != \q_nil != \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_ii:w #1 != #2 != #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_ii:w #1 != #2 != #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_iii:w #1 <= \q_nil <= \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_iii:w #1 <= #2 <= #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_iii:w #1 <= #2 <= #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_iv:w #1 >= \q_nil >= \q_stop } { \fp_compare:nNnTF {#1} > {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_iv:w #1 >= #2 >= #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_iv:w #1 >= #2 >= #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_v:w #1 = \q_nil \q_stop } { \fp_compare:nNnTF {#1} < {#2} \prg_return_false: \prg_return_true: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_v:w #1 = #2 = #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_v:w #1 = #2 = #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_vi:w #1 < \q_nil < \q_stop } { \fp_compare:nNnTF {#1} = {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_vi:w #1 < #2 < #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_vi:w #1 < #2 < #3 \q_stop { \quark_if_nil:nTF {#2} { \fp_compare_aux_vii:w #1 > \q_nil > \q_stop } { \fp_compare:nNnTF {#1} < {#2} \prg_return_true: \prg_return_false: } } -\cs_new_protected_nopar:Npn \fp_compare_aux_vii:w #1 > #2 > #3 \q_stop +\cs_new_protected:Npn \fp_compare_aux_vii:w #1 > #2 > #3 \q_stop { \quark_if_nil:nTF {#2} { \prg_return_false: } |