summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/siunitx/siunitx-number.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-01 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2021-06-01 03:00:58 +0000
commit0f69e2fd4a9928663f0cc64b8cac1f0d8baee9d6 (patch)
treec9ab8a25ba9f5a5dcfb4bef6a51aa35fe07834cb /macros/latex/contrib/siunitx/siunitx-number.dtx
parent098258765e1921f3e57f38e424272587103189dd (diff)
CTAN sync 202106010300
Diffstat (limited to 'macros/latex/contrib/siunitx/siunitx-number.dtx')
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx18
1 files changed, 7 insertions, 11 deletions
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index cfbff37d9c..070b9c5e9d 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -3127,13 +3127,9 @@
% \begin{macrocode}
\cs_new:Npn \@@_output_integer:nnn #1#2#3
{
- \bool_lazy_all:nF
- {
- { \str_if_eq_p:nn {#1} { 1 } }
- { \tl_if_blank_p:n {#2} }
- { ! \str_if_eq_p:nn {#3} { 0 } }
- { ! \l_@@_unity_mantissa_bool }
- }
+ \bool_lazy_or:nnT
+ { \l_@@_unity_mantissa_bool }
+ { ! \str_if_eq_p:nn { #1 . #2 } { 1. } }
{ \@@_output_digits:nn { integer } {#1} }
}
\cs_new:Npn \@@_output_decimal:nn #1#2
@@ -3389,10 +3385,9 @@
}
\cs_new:Npn \@@_output_exponent_auxi:nnnn #1#2#3#4
{
- \bool_lazy_and:nnTF
- { \str_if_eq_p:nn {#3} { 1. } }
- { ! \l_@@_unity_mantissa_bool }
- { \exp_not:n {#4} }
+ \bool_lazy_or:nnTF
+ { \l_@@_unity_mantissa_bool }
+ { ! \str_if_eq_p:nn {#3} { 1. } }
{
\bool_if:NTF \l_@@_tight_bool
{ \exp_not:N \mathord }
@@ -3400,6 +3395,7 @@
{ \exp_not:V \l_@@_exponent_product_tl }
\exp_not:n {#4}
}
+ { \exp_not:n {#4} }
\exp_not:V \l_@@_exponent_base_tl
^
{ \@@_output_exponent_auxiii:nn {#1} {#2} }