From 32c191d57a5b2fbf62d52f9b56dde34ea98be79c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 Apr 2022 20:56:29 +0000 Subject: siunitx (4apr22) git-svn-id: svn://tug.org/texlive/trunk@62903 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 46 ++++++++++++++----------- 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/siunitx') diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index bf0cc10e738..a25a2cbc1d3 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -42,7 +42,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2022-02-15} {3.0.49} +\ProvidesExplPackage {siunitx} {2022-04-04} {3.0.50} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -2478,31 +2478,37 @@ { \exp_not:n { {#1} {#2} } { - \__siunitx_number_digits:Nn \l__siunitx_number_min_integer_int {#3} + \__siunitx_number_digits:nn \l__siunitx_number_min_integer_int {#3} \exp_not:n {#3} } { \exp_not:n {#4} - \__siunitx_number_digits:Nn \l__siunitx_number_min_decimal_int {#4} + \__siunitx_number_digits:nn \l__siunitx_number_min_decimal_int {#4} } - { \tl_if_blank:nF {#5} { \__siunitx_number_digits_uncert:nn #5 } } + { \tl_if_blank:nF {#5} { \__siunitx_number_digits_uncert:nnn {#4} #5 } } \exp_not:n { {#6} {#7} } } -\cs_new:Npn \__siunitx_number_digits:Nn #1#2 +\cs_new:Npn \__siunitx_number_digits:nn #1#2 { \int_compare:nNnT { #1 - \tl_count:n {#2} } > 0 - { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } } + { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } } } -\cs_new:Npn \__siunitx_number_digits_uncert:nn #1#2 +\cs_new:Npn \__siunitx_number_digits_uncert:nnn #1#2#3 { - { #1 } - { \use:c { __siunitx_number_digits_uncert_ #1 :n } {#2} } + { #2 } + { \use:c { __siunitx_number_digits_uncert_ #2 :nn } {#1} {#3} } } -\cs_new:Npn \__siunitx_number_digits_uncert_S:n #1 +\cs_new:Npn \__siunitx_number_digits_uncert_S:nn #1#2 { - \exp_not:n {#1} - \__siunitx_number_digits:Nn \l__siunitx_number_min_decimal_int {#1} + \exp_not:n {#2} + \__siunitx_number_digits:nn + { + \int_max:nn + { 0 } + { \l__siunitx_number_min_decimal_int - \tl_count:n {#1} + 1 } + } + {#2} } \cs_new_protected:Npn \__siunitx_number_drop_exponent:NN #1#2 { @@ -3556,25 +3562,25 @@ \exp_not:n {#5} \exp_not:V \l__siunitx_number_exponent_base_tl ^ - { \__siunitx_number_output_exponent_auxiii:nn {#1} {#2} } + { \__siunitx_number_output_exponent_auxiii:nnn { } {#1} {#2} } } \cs_new:Npn \__siunitx_number_output_exponent_auxii:nnnnn #1#2#3#4#5 { \exp_not:n {#5} \exp_not:V \l__siunitx_number_output_exp_marker_tl - \__siunitx_number_output_exponent_auxiii:nn {#1} {#2} + \__siunitx_number_output_exponent_auxiii:nnn { \mathord } {#1} {#2} } -\cs_new:Npn \__siunitx_number_output_exponent_auxiii:nn #1#2 +\cs_new:Npn \__siunitx_number_output_exponent_auxiii:nnn #1#2#3 { - \tl_if_blank:nTF {#1} + \tl_if_blank:nTF {#2} { \bool_lazy_and:nnT { \l__siunitx_number_implicit_plus_bool } - { ! \str_if_eq_p:nn {#2} { 0 } } - { + } + { ! \str_if_eq_p:nn {#3} { 0 } } + { #1 + } } - { \exp_not:n {#1} } - \__siunitx_number_output_digits:nn { integer } {#2} + { \exp_not:n {#1#2} } + \__siunitx_number_output_digits:nn { integer } {#3} } \cs_new:Npn \__siunitx_number_output_end: { } \tl_new:N \l__siunitx_number_valid_tl -- cgit v1.2.3