diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty index 902d147cd3f..57e71f04988 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -63,51 +63,51 @@ \cs_generate_variant:Nn \__str_format_put:nw { o , f } \cs_new:Npn \__str_format_parse:n #1 { - \exp_last_unbraced:Nf \__str_format_parse_i:NN + \exp_last_unbraced:Nf \__str_format_parse_auxi:NN \__str_to_other:n {#1} \s__stop \s__stop {#1} } -\cs_new:Npx \__str_format_parse_i:NN #1#2 +\cs_new:Npx \__str_format_parse_auxi:NN #1#2 { \exp_not:N \__str_if_contains_char:nNTF { < > = ^ } #2 - { \exp_not:N \__str_format_parse_iii:nN { #1 #2 } } + { \exp_not:N \__str_format_parse_auxiii:nN { #1 #2 } } { - \exp_not:N \__str_format_parse_ii:nN + \exp_not:N \__str_format_parse_auxii:nN { \c_catcode_other_space_tl } #1 #2 } } -\cs_new:Npn \__str_format_parse_ii:nN #1#2 +\cs_new:Npn \__str_format_parse_auxii:nN #1#2 { \__str_if_contains_char:nNTF { < > = ^ } #2 - { \__str_format_parse_iii:nN { #1 #2 } } - { \__str_format_parse_iii:nN { #1 ? } #2 } + { \__str_format_parse_auxiii:nN { #1 #2 } } + { \__str_format_parse_auxiii:nN { #1 ? } #2 } } -\cs_new:Npx \__str_format_parse_iii:nN #1#2 +\cs_new:Npx \__str_format_parse_auxiii:nN #1#2 { \exp_not:N \__str_if_contains_char:nNTF { + - \c_catcode_other_space_tl } #2 - { \exp_not:N \__str_format_parse_iv:nwN { #1 #2 } ; } - { \exp_not:N \__str_format_parse_iv:nwN { #1 ? } ; #2 } + { \exp_not:N \__str_format_parse_auxiv:nwN { #1 #2 } ; } + { \exp_not:N \__str_format_parse_auxiv:nwN { #1 ? } ; #2 } } -\cs_new:Npn \__str_format_parse_iv:nwN #1#2; #3 +\cs_new:Npn \__str_format_parse_auxiv:nwN #1#2; #3 { \__str_format_if_digit:NTF #3 - { \__str_format_parse_iv:nwN {#1} #2 #3 ; } - { \__str_format_parse_v:nN { #1 {#2} } #3 } + { \__str_format_parse_auxiv:nwN {#1} #2 #3 ; } + { \__str_format_parse_auxv:nN { #1 {#2} } #3 } } -\cs_new:Npn \__str_format_parse_v:nN #1#2 +\cs_new:Npn \__str_format_parse_auxv:nN #1#2 { \token_if_eq_charcode:NNTF . #2 - { \__str_format_parse_vi:nwN {#1} 0 ; } - { \__str_format_parse_vii:nN { #1 { } } #2 } + { \__str_format_parse_auxvi:nwN {#1} 0 ; } + { \__str_format_parse_auxvii:nN { #1 { } } #2 } } -\cs_new:Npn \__str_format_parse_vi:nwN #1#2; #3 +\cs_new:Npn \__str_format_parse_auxvi:nwN #1#2; #3 { \__str_format_if_digit:NTF #3 - { \__str_format_parse_vi:nwN {#1} #2 #3 ; } - { \__str_format_parse_vii:nN { #1 {#2} } #3 } + { \__str_format_parse_auxvi:nwN {#1} #2 #3 ; } + { \__str_format_parse_auxvii:nN { #1 {#2} } #3 } } -\cs_new:Npn \__str_format_parse_vii:nN #1#2 +\cs_new:Npn \__str_format_parse_auxvii:nN #1#2 { \token_if_eq_meaning:NNTF \s__stop #2 { \__str_format_parse_end:nwn { #1 ? } #2 } @@ -367,12 +367,12 @@ {3} { nan } } { - \exp_last_unbraced:Nf \__str_format_fp_e_ii:wn + \exp_last_unbraced:Nf \__str_format_fp_e_aux:wn \__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2#3 ; { #4 + 1 } {#4} } } - \cs_new:Npn \__str_format_fp_e_ii:wn + \cs_new:Npn \__str_format_fp_e_aux:wn \s__fp \__fp_chk:w #1#2 #3 #4#5#6#7 ; #8 { \__str_format_put:fw { \int_eval:n { #3 - 1 } } @@ -399,14 +399,14 @@ {3} { nan } } { - \exp_last_unbraced:Nf \__str_format_fp_f_ii:wwwn + \exp_last_unbraced:Nf \__str_format_fp_f_aux:wwwn \fp_to_decimal:n { abs ( round ( \s__fp \__fp_chk:w #1#2#3 ; , #4 ) ) } . . ; {#4} } } -\cs_new:Npn \__str_format_fp_f_ii:wwwn #1 . #2 . #3 ; #4 +\cs_new:Npn \__str_format_fp_f_aux:wwwn #1 . #2 . #3 ; #4 { \use:nf { #1 . #2 } @@ -421,13 +421,13 @@ {3} { nan } } { - \exp_last_unbraced:Nf \__str_format_fp_g_ii:wn + \exp_last_unbraced:Nf \__str_format_fp_g_aux:wn \__str_format_fp_round:wn \s__fp \__fp_chk:w #1#2 ; { \int_max:nn {1} {#3} } { \int_max:nn {1} {#3} } } } -\cs_new:Npn \__str_format_fp_g_ii:wn #1; #2 +\cs_new:Npn \__str_format_fp_g_aux:wn #1; #2 { \int_compare:nNnTF { \__fp_exponent:w #1; } < { -3 } { \fp_to_scientific:n } |