diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-25 21:22:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-25 21:22:29 +0000 |
commit | eb05b6438f547df7326c8911102b05429c523be9 (patch) | |
tree | 80f5c9ed6e066905e5db4cc53a27d52df8376401 /Master/texmf-dist/tex/latex/siunitx/siunitx.sty | |
parent | 487c93c1527571a5df64b2f12eda05457da672d9 (diff) |
siunitx (25jan24)
git-svn-id: svn://tug.org/texlive/trunk@69590 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index d4d3e0000ce..5d3147837f7 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -41,7 +41,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2023-11-14} {3.3.9} +\ProvidesExplPackage {siunitx} {2024-01-25} {3.3.10} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -1229,22 +1229,27 @@ } \cs_new:Npn \__siunitx_number_exponent_threshold:nnnnnnn #1#2#3#4#5#6#7 { - \__siunitx_number_exponent_threshold:en + \__siunitx_number_exponent_threshold:e { \__siunitx_number_exponent_scientific:nnnnnnn {#1} {#2} {#3} {#4} {#5} {#6} {#7} } - { {#1} {#2} {#3} {#4} {#5} {#6} {#7} } } -\cs_new:Npn \__siunitx_number_exponent_threshold:nn #1#2 - { \__siunitx_number_exponent_threshold:nnnnnnnn #1 {#2} } -\cs_generate_variant:Nn \__siunitx_number_exponent_threshold:nn { e } -\cs_new:Npn \__siunitx_number_exponent_threshold:nnnnnnnn #1#2#3#4#5#6#7#8 +\cs_new:Npn \__siunitx_number_exponent_threshold:n #1 + { \__siunitx_number_exponent_threshold_aux:nnnnnnn #1 } +\cs_generate_variant:Nn \__siunitx_number_exponent_threshold:n { e } +\cs_new:Npn \__siunitx_number_exponent_threshold_aux:nnnnnnn #1#2#3#4#5#6#7 { \bool_lazy_and:nnTF { \int_compare_p:nNn {#6#7} > \l__siunitx_number_lower_threshold_int } { \int_compare_p:nNn {#6#7} < \l__siunitx_number_upper_threshold_int } - { \exp_not:n {#8} } + { + \exp_not:n { {#1} {#2} } + \__siunitx_number_exponent_shift:nnn { -#6#7 } {#3} {#4} + \__siunitx_number_exponent_uncert:n {#5} + { } + { 0 } + } { \exp_not:n { {#1} {#2} {#3} {#4} {#5} {#6} {#7} } } } \cs_new_protected:Npn \__siunitx_number_digits:NN #1#2 @@ -2240,7 +2245,7 @@ { \tl_if_blank:nTF {#1} { \use:n } - { \mathord } + { \exp_not:N \mathord } { \exp_not:n {#2} } } \cs_new:Npn @@ -2585,7 +2590,7 @@ { \exp_not:n {#2} \bool_if:NTF \l__siunitx_number_tight_bool - { \mathord } + { \exp_not:N \mathord } { \use:n } { \exp_not:n { \pm } } \exp_not:n {#2} @@ -4733,7 +4738,10 @@ } \RequirePackage { amstext } \cs_new_eq:NN \__siunitx_print_ams_text:n \text -\AtBeginDocument { \RequirePackage { color } } +\cs_if_exist:NTF \hook_gput_code:nnn + { \hook_gput_code:nnn { begindocument / before } { siunitx } } + { \AtBeginDocument } + { \RequirePackage { color } } \cs_generate_variant:Nn \tl_replace_all:Nnn { NV } \tl_new:N \l__siunitx_print_tmp_tl \tl_new:N \l__siunitx_print_number_mode_tl |