diff options
author | Norbert Preining <norbert@preining.info> | 2021-05-26 03:05:34 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-05-26 03:05:34 +0000 |
commit | 8982c52e00ffb3fb5a913fc60913ebd9070f091a (patch) | |
tree | 6a395986e3502fefcf42364f8dd87519b45a2441 /macros/latex/contrib/siunitx/siunitx-number.dtx | |
parent | 07dc96bc3bbd691fc52aca15a172eaf41a89d873 (diff) |
CTAN sync 202105260305
Diffstat (limited to 'macros/latex/contrib/siunitx/siunitx-number.dtx')
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-number.dtx | 96 |
1 files changed, 69 insertions, 27 deletions
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index 67c9580ca6..22fff7cdb9 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -2963,14 +2963,17 @@ % \begin{macro}[rEXP]{\@@_output_decimal_loop:NNNN} % \begin{macro}[rEXP]{\@@_output_integer_first:nnNN} % \begin{macro}[rEXP]{\@@_output_integer_loop:NNNN} -% \begin{macro}[rEXP]{\@@_output_uncertainty:nnn} +% \begin{macro}[rEXP]{\@@_output_uncertainty:nnnn} % \begin{macro}[rEXP]{\@@_output_uncertainty_unaligned:n} -% \begin{macro}[rEXP]{\@@_output_uncert_S:nnnw} +% \begin{macro}[rEXP]{\@@_output_uncert_S:nnnnw} +% \begin{macro}[rEXP]{\@@_output_uncert_S_auxi:nn} +% \begin{macro}[rEXP]{\@@_output_uncert_S_auxii:nnN} +% \begin{macro}[rEXP]{\@@_output_uncert_S_auxiii:nnn} % \begin{macro}[rEXP] -% {\@@_output_uncert_S_aux:nnn, \@@_output_uncert_S_aux:fnn} +% {\@@_output_uncert_S_auxiv:nnn, \@@_output_uncert_S_auxiv:fnn} % \begin{macro}[rEXP] -% {\@@_output_uncert_S:nnnw, \@@_output_uncert_S:fnw} -% \begin{macro}[rEXP]{\@@_output_uncert_S:nnw} +% {\@@_output_uncert_S_auxv:nnnw, \@@_output_uncert_S_auxv:fnnw} +% \begin{macro}[rEXP]{\@@_output_uncert_S_auxvi:nnw} % \begin{macro}[rEXP] % { % \@@_output_uncert_S_compact:nn , @@ -3010,7 +3013,7 @@ \@@_output_sign:nnn {#1} {#2} {#8} \@@_output_integer:nnn {#3} {#4} {#7} \@@_output_decimal:nn {#4} {#8} - \@@_output_uncertainty:nnn {#5} {#4} {#8} + \@@_output_uncertainty:nnnn {#5} {#3} {#4} {#8} \@@_output_exponent:nnnn {#6} {#7} { #3 . #4 } {#8} \@@_output_end: } @@ -3224,41 +3227,77 @@ % digit tokens need to be removed from the start of the uncertainty and % the split result sent to the appropriate auxiliaries. % \begin{macrocode} -\cs_new:Npn \@@_output_uncertainty:nnn #1#2#3 +\cs_new:Npn \@@_output_uncertainty:nnnn #1#2#3#4 { \tl_if_blank:nTF {#1} - { \@@_output_uncertainty_unaligned:n {#3} } + { \@@_output_uncertainty_unaligned:n {#4} } { - \use:c { @@_output_uncert_ \tl_head:n {#1} :nnnw } - {#2} {#3} #1 + \use:c { @@_output_uncert_ \tl_head:n {#1} :nnnnw } + {#2} {#3} {#4} #1 } } \cs_new:Npn \@@_output_uncertainty_unaligned:n #1 { \exp_not:n { #1 #1 #1 #1 } } -\cs_new:Npn \@@_output_uncert_S:nnnw #1#2#3#4 +% \end{macrocode} +% There is a bit more to do here if the uncertainty is purely in the integer +% part and printed separately. We need to pad it by the number of +% non-significant figures, then pass on to allow digit separation. +% \begin{macrocode} +\cs_new:Npn \@@_output_uncert_S:nnnnw #1#2#3#4#5 { \str_if_eq:VnTF \l_@@_uncert_mode_tl { separate } { - \exp_not:n {#2} + \exp_not:n {#3} \@@_output_sign:N \pm - \exp_not:n {#2} - \@@_output_uncert_S_aux:nnn - { \int_eval:n { \tl_count:n {#4} - \tl_count:n {#1} } } - {#4} {#2} + \exp_not:n {#3} + \tl_if_blank:nTF {#2} + { \@@_output_uncert_S_auxi:nnn {#1} {#5} {#3} } + { + \@@_output_uncert_S_auxiv:fnn + { \int_eval:n { \tl_count:n {#5} - \tl_count:n {#2} } } + {#5} {#3} + } } { \exp_not:V \l_@@_uncert_separator_tl \exp_not:V \l_@@_output_uncert_open_tl - \use:c { @@_output_uncert_S_ \l_@@_uncert_mode_tl :nn } {#1} {#4} + \use:c { @@_output_uncert_S_ \l_@@_uncert_mode_tl :nn } {#2} {#5} \exp_not:V \l_@@_output_uncert_close_tl - \@@_output_uncertainty_unaligned:n {#2} + \@@_output_uncertainty_unaligned:n {#3} + } + } +\cs_new:Npn \@@_output_uncert_S_auxi:nnn #1#2#3 + { + \@@_output_uncert_S_auxii:nnN { 0 } {#2} #1 + \q_recursion_tail \q_recursion_stop {#3} + } +\cs_new:Npn \@@_output_uncert_S_auxii:nnN #1#2#3 + { + \quark_if_recursion_tail_stop_do:Nn #3 + { + \exp_args:Nf \@@_output_uncert_S_auxiii:nnn + { \prg_replicate:nn {#1} { 0 } } {#2} } + \str_if_eq:nnTF {#3} { 0 } + { + \exp_args:Nf \@@_output_uncert_S_auxii:nnN + { \int_eval:n { #1 + 1 } } {#2} + } + { \@@_output_uncert_S_auxii:nnN { 0 } {#2} } } -\cs_new:Npn \@@_output_uncert_S_aux:nnn #1#2#3 +\cs_new:Npn \@@_output_uncert_S_auxiii:nnn #1#2#3 + { + \@@_output_uncert_S_auxiv:fnn + { \int_eval:n { \tl_count:n {#2#1} } } {#2#1} {#3} + } +% \end{macrocode} +% All separated uncertainties bring us to here. +% \begin{macrocode} +\cs_new:Npn \@@_output_uncert_S_auxiv:nnn #1#2#3 { \int_compare:nNnTF {#1} > 0 { - \@@_output_uncert_S_aux:fnnw + \@@_output_uncert_S_auxv:fnnw { \int_eval:n { #1 - 1 } } {#3} { } @@ -3274,23 +3313,23 @@ {#3} } } -\cs_generate_variant:Nn \@@_output_uncert_S_aux:nnn { f } -\cs_new:Npn \@@_output_uncert_S_aux:nnnw #1#2#3#4 +\cs_generate_variant:Nn \@@_output_uncert_S_auxiv:nnn { f } +\cs_new:Npn \@@_output_uncert_S_auxv:nnnw #1#2#3#4 { \quark_if_nil:NF #4 { \int_compare:nNnTF {#1} = 0 - { \@@_output_uncert_S_aux:nnw {#3#4} {#2} } + { \@@_output_uncert_S_auxvi:nnw {#3#4} {#2} } { - \@@_output_uncert_S_aux:fnnw + \@@_output_uncert_S_auxv:fnnw { \int_eval:n { #1 - 1 } } {#2} {#3#4} } } } -\cs_generate_variant:Nn \@@_output_uncert_S_aux:nnnw { f } -\cs_new:Npn \@@_output_uncert_S_aux:nnw #1#2#3 \q_nil +\cs_generate_variant:Nn \@@_output_uncert_S_auxv:nnnw { f } +\cs_new:Npn \@@_output_uncert_S_auxvi:nnw #1#2#3 \q_nil { \@@_output_digits:nn { integer } {#1} \@@_output_decimal:nn {#3} {#2} @@ -3312,7 +3351,7 @@ } \cs_new:Npn \@@_output_uncert_S_full:nn #1#2 { - \@@_output_uncert_S_aux:fnn + \@@_output_uncert_S_auxiv:fnn { \int_eval:n { \tl_count:n {#2} - \tl_count:n {#1} } } {#2} { } } @@ -3395,6 +3434,9 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % % \subsection{Miscellaneous tools} % |