diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx index 77a092f8f00..e6821415089 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2018/03/05} +% \date{Released 2018-04-30} % % \maketitle % @@ -131,7 +131,7 @@ \if_int_compare:w \exp_after:wN \@@_compare_aux:wn \exp:w \exp_end_continue_f:w \@@_parse:n {#1} {#3} - = \__int_eval:w `#2 - `= \__int_eval_end: + = \@@_int_eval:w `#2 - `= \@@_int_eval_end: \prg_return_true: \else: \prg_return_false: @@ -182,7 +182,7 @@ \s_@@ \@@_chk:w #1 #2 #3; \s_@@ \@@_chk:w #4 #5 #6; { - \__int_value:w + \int_value:w \if_meaning:w 3 #1 \exp_after:wN \@@_compare_nan:w \fi: \if_meaning:w 3 #4 \exp_after:wN \@@_compare_nan:w \fi: \if_meaning:w 2 #5 - \fi: @@ -214,7 +214,7 @@ % Tuple and floating point numbers are not comparable so return $2$ in % mixed cases or when tuples have a different number of items. % Otherwise compare pairs of items with \cs{@@_compare_back_any:ww} -% and if any don't match return~$2$ (as \cs{__int_value:w} |02| +% and if any don't match return~$2$ (as \cs{int_value:w} |02| % \cs{exp_stop_f:}). % \begin{macrocode} \cs_new:Npn \@@_compare_back_tuple:ww #1; #2; { 2 } @@ -223,13 +223,14 @@ \s_@@_tuple \@@_tuple_chk:w #1; \s_@@_tuple \@@_tuple_chk:w #2; { - \int_compare:nNnTF { \@@_array_count:n {#1} } = { \@@_array_count:n {#2} } + \int_compare:nNnTF { \@@_array_count:n {#1} } = + { \@@_array_count:n {#2} } { - \__int_value:w 0 + \int_value:w 0 \@@_tuple_compare_back_loop:w - #1 { \s_@@ \__prg_break: } ; @ - #2 { \s_@@ \__prg_break: } ; - \__prg_break_point: + #1 { \s_@@ \prg_break: } ; @ + #2 { \s_@@ \prg_break: } ; + \prg_break_point: \exp_stop_f: } { 2 } @@ -241,7 +242,7 @@ \if_int_compare:w \@@_compare_back_any:ww #1 #2 ; #4 #5 ; = 0 \exp_stop_f: \else: - 2 \exp_after:wN \__prg_break: + 2 \exp_after:wN \prg_break: \fi: \@@_tuple_compare_back_loop:w #3 @ } @@ -256,7 +257,7 @@ % \Arg{expo_1} \meta{body_1} |;| % \Arg{expo_2} \meta{body_2} |;| % \end{quote} -% Within an \cs{__int_value:w} \ldots{} \cs{exp_stop_f:} construction, +% Within an \cs{int_value:w} \ldots{} \cs{exp_stop_f:} construction, % this expands to $0$ if the two numbers are equal, $-1$ if the first % is smaller, and $1$ if the first is bigger. First compare the % exponents: the larger one denotes the larger number. If they are @@ -398,11 +399,11 @@ % \begin{macrocode} \cs_new:Npn \@@_step:wwwN #1#2; #3#4; #5#6; #7 { - \@@_if_type_fp:NTwFw #1 { } \s_@@ \__prg_break: \q_stop - \@@_if_type_fp:NTwFw #3 { } \s_@@ \__prg_break: \q_stop - \@@_if_type_fp:NTwFw #5 { } \s_@@ \__prg_break: \q_stop + \@@_if_type_fp:NTwFw #1 { } \s_@@ \prg_break: \q_stop + \@@_if_type_fp:NTwFw #3 { } \s_@@ \prg_break: \q_stop + \@@_if_type_fp:NTwFw #5 { } \s_@@ \prg_break: \q_stop \use_i:nnnn { \@@_step_fp:wwwN #1#2; #3#4; #5#6; #7 } - \__prg_break_point: + \prg_break_point: \use:n { \@@_error:nfff { fp-step-tuple } { \fp_to_tl:n { #1#2 ; } } @@ -419,7 +420,10 @@ } { \token_if_eq_meaning:NNTF #2 0 - { \__kernel_msg_expandable_error:nnn { kernel } { zero-step } {#6} } + { + \__kernel_msg_expandable_error:nnn { kernel } + { zero-step } {#6} + } { \@@_error:nnfn { fp-bad-step } { } { \fp_to_tl:n { \s_@@ \@@_chk:w #2#3#4 ; } } {#6} @@ -457,17 +461,17 @@ % \begin{macrocode} \cs_new_protected:Npn \fp_step_inline:nnnn { - \int_gincr:N \g__prg_map_int + \int_gincr:N \g__kernel_prg_map_int \exp_args:NNc \@@_step:NNnnnn \cs_gset_protected:Npn - { __prg_map_ \int_use:N \g__prg_map_int :w } + { @@_map_ \int_use:N \g__kernel_prg_map_int :w } } \cs_new_protected:Npn \fp_step_variable:nnnNn #1#2#3#4#5 { - \int_gincr:N \g__prg_map_int + \int_gincr:N \g__kernel_prg_map_int \exp_args:NNc \@@_step:NNnnnn \cs_gset_protected:Npx - { __prg_map_ \int_use:N \g__prg_map_int :w } + { @@_map_ \int_use:N \g__kernel_prg_map_int :w } {#1} {#2} {#3} { \tl_set:Nn \exp_not:N #4 {##1} @@ -478,7 +482,7 @@ { #1 #2 ##1 {#6} \fp_step_function:nnnN {#3} {#4} {#5} #2 - \__prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__prg_map_int } + \prg_break_point:Nn \scan_stop: { \int_gdecr:N \g__kernel_prg_map_int } } % \end{macrocode} % \end{macro} @@ -637,7 +641,8 @@ \cs_new:Npn \@@_|_o:ww { \@@_&_o:ww \else: } \cs_new:Npn \@@_|_tuple_o:ww { \@@_&_tuple_o:ww \else: } \cs_new:Npn \@@_tuple_|_o:ww #1; #2; { \@@_exp_after_tuple_o:w #1; } - \cs_new:Npn \@@_tuple_|_tuple_o:ww #1; #2; { \@@_exp_after_tuple_o:w #1; } + \cs_new:Npn \@@_tuple_|_tuple_o:ww #1; #2; + { \@@_exp_after_tuple_o:w #1; } \group_end: \cs_new:Npn \@@_and_return:wNw #1; \fi: #2; { \fi: \@@_exp_after_o:w #1; } |