diff options
author | Karl Berry <karl@freefriends.org> | 2021-08-21 21:00:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-08-21 21:00:27 +0000 |
commit | e16a075410c784ba789eab80952fd87de907a4a9 (patch) | |
tree | 530b1669ae125790f25dfb33fc671b6ffd1451ed /Master/texmf-dist/tex/latex | |
parent | 675daa21c4f033310c94e1d6ff9f3b06799c8c0c (diff) |
siunitx (22aug21)
git-svn-id: svn://tug.org/texlive/trunk@60295 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 105 |
1 files changed, 59 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 3978b3fe629..eb7bb060a8e 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} {2021-08-16} {3.0.25} +\ProvidesExplPackage {siunitx} {2021-08-21} {3.0.26} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -2936,51 +2936,50 @@ { \exp_not:n { {#1} {#2} } } \cs_new:Npn \__siunitx_number_round_uncertainty:nnn #1#2#3 { - \exp_last_unbraced:Nf \__siunitx_number_round_uncertainty:nnnnn + \exp_args:Nf \__siunitx_number_round_uncertainty:nnnn { - \__siunitx_number_round:fnn - { - \int_eval:n - { \tl_count:n {#3} - \l__siunitx_number_round_precision_int } - } - { } {#3} + \int_eval:n + { \tl_count:n {#3} - \l__siunitx_number_round_precision_int } } {#1} {#2} {#3} } -\cs_new:Npn \__siunitx_number_round_uncertainty:nnnnn #1#2#3#4#5 +\cs_new:Npn \__siunitx_number_round_uncertainty:nnnn #1#2#3#4 { - \exp_args:Nff \__siunitx_number_round_uncertainty_aux:nnnnn - { \int_eval:n { \tl_count:n {#5} - \tl_count:n {#2} } } - {#1} {#2} {#3} {#4} + \exp_last_unbraced:Nf \__siunitx_number_round_uncertainty:nnnnn + { \__siunitx_number_round:nnn {#1} { } {#4} } + {#2} {#3} {#1} } -\cs_new:Npn \__siunitx_number_round_uncertainty_aux:nnnnn #1#2#3#4#5 +\cs_new:Npn \__siunitx_number_round_uncertainty:nnnnn #1#2#3#4#5 { - \exp_args:Nf \__siunitx_number_round_uncertainty_aux:nnnnnn + \tl_if_blank:nTF {#1} { - \prg_replicate:nn - { \int_max:nn { #1 - \tl_count:n {#5} } { 0 } } - { 0 } + \exp_args:Nf \__siunitx_number_round_uncertainty_simple:nnnnn + { + \prg_replicate:nn + { + \int_max:nn + { 0 - ( \tl_count:n {#4} - \tl_count:n {#2} - #5 + 1 ) } + { 0 } + } + { 0 } + } + {#3} {#4} {#2} {#5} } - {#1} {#2} {#3} {#4} {#5} + { \__siunitx_number_round_uncertainty_shift:nnnnn {#3} {#4} {#1} {#2} {#5} } + } -\cs_new:Npn \__siunitx_number_round_uncertainty_aux:nnnnnn #1#2#3#4#5#6 +\cs_new:Npn \__siunitx_number_round_uncertainty_simple:nnnnn #1#2#3#4#5 { - \tl_if_blank:nTF {#3} - { - \__siunitx_number_round:nnn - {#2} - {#5} {#6} - { { S } { #4 #1 } } - } - { - \exp_args:Ne \__siunitx_number_round_uncertainty_shift:nn - { - \__siunitx_number_round:fnn - { \int_eval:n { #2 + 1 } } - {#5} {#6} - } - { { S } { #3 #1 } } - } + \__siunitx_number_round:nnn + {#5} + {#2} {#3} + { { S } { #4 #1 } } + } +\cs_new:Npn \__siunitx_number_round_uncertainty_shift:nnnnn #1#2#3#4#5 + { + \exp_args:Ne \__siunitx_number_round_uncertainty_shift:nn + { \__siunitx_number_round:fnn { \int_eval:n { #5 + 1 } } {#1} {#2} } + {#5} } \cs_new:Npn \__siunitx_number_round_uncertainty_shift:nn #1#2 { \__siunitx_number_round_uncertainty_shift:nnnw #1 {#2} } @@ -2989,24 +2988,38 @@ { #4 \bool_lazy_and:nnTF + { \int_compare_p:nNn {#3} > { \tl_count:n {#1} } } { - \int_compare_p:nNn - { \tl_count:o { \use_ii:nn #3 } } = \l__siunitx_number_round_precision_int - } - { - ! \str_if_eq_p:nn { {#1} {#2} {#3} } { { 10 } { } { { S } { 1 } } } + ! \bool_lazy_and_p:nn + { \str_if_eq_p:Vn \l__siunitx_number_exponent_mode_tl { scientific } } + { \str_if_eq_p:nn { #1.#2 } { 10. } } } { - \use:c - { __siunitx_number_round_ \l__siunitx_number_exponent_mode_tl :nn } - {#1} {#2} - \__siunitx_number_round_places_end:nnn {#3} {#5} {#6} + \exp_args:Nf \__siunitx_number_round_uncertainty_shift_aux:nnnnn + { + \prg_replicate:nn + { + \tl_if_blank:nTF {#2} + { \int_min:nn {#3} { \tl_count:n {#1} - 1 } } + { 0 } + } + { 0 } + } + {#1} {#2} } { \use:c { __siunitx_number_round_uncertainty_ \l__siunitx_number_exponent_mode_tl :nnn } - {#1} {#5} {#6} + {#1} } + {#5} {#6} + } +\cs_new:Npn \__siunitx_number_round_uncertainty_shift_aux:nnnnn #1#2#3#4#5 + { + \use:c + { __siunitx_number_round_ \l__siunitx_number_exponent_mode_tl :nn } + {#2} {#3} + \__siunitx_number_round_places_end:nnn { { S } { 1 #1 } } {#4} {#5} } \cs_new:Npn \__siunitx_number_round_uncertainty_engineering:nnn #1#2#3 { @@ -6046,7 +6059,7 @@ } \AtBeginDocument { - \str_if_eq:eeTF + \str_if_eq:eeT { \exp_not:o { \familydefault } } { \exp_not:n { \sfdefault } } { \keys_set:nn { siunitx } { unit-font-command = \mathsf } } |