summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/siunitx/siunitx-number.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-01-26 03:00:51 +0000
committerNorbert Preining <norbert@preining.info>2024-01-26 03:00:51 +0000
commit2eae12e56ca15396e8ff63b3a9b0d450d675dc5e (patch)
tree7e6e61de2a219478694da749de27e15fe7c69ac8 /macros/latex/contrib/siunitx/siunitx-number.dtx
parent768d5db2700eb846ed6616dc4839993f193b22cd (diff)
CTAN sync 202401260300
Diffstat (limited to 'macros/latex/contrib/siunitx/siunitx-number.dtx')
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx32
1 files changed, 18 insertions, 14 deletions
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 6397e3239f..19e2c32e9b 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-number.dtx Copyright (C) 2014-2019,2021-2023 Joseph Wright
+% File: siunitx-number.dtx Copyright (C) 2014-2019,2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -2273,9 +2273,9 @@
% \begin{macro}[EXP]{\@@_exponent_engineering:nnNw}
% \begin{macro}[EXP]{\@@_exponent_engineering_uncert:nn}
% \begin{macro}[EXP]{\@@_exponent_engineering_uncert_S:nnn}
-% \begin{macro}[EXP]{\@@_exponent_threshold:nnnnnnn}
-% \begin{macro}[EXP]{\@@_exponent_threshold:nn, \@@_exponent_threshold:en}
-% \begin{macro}[EXP]{\@@_exponent_threshold:nnnnnnnn}
+% \begin{macro}[EXP]
+% {\@@_exponent_threshold:nnnnnnn, \@@_exponent_threshold_aux:nnnnnnn}
+% \begin{macro}[EXP]{\@@_exponent_threshold:n, \@@_exponent_threshold:e}
% Manipulating an exponent is done using a single expansion function
% \emph{unless} dealing with engineering-style output. The latter is easier
% to handle by first converting to scientific output, then post-processing.
@@ -2582,22 +2582,27 @@
% \begin{macrocode}
\cs_new:Npn \@@_exponent_threshold:nnnnnnn #1#2#3#4#5#6#7
{
- \@@_exponent_threshold:en
+ \@@_exponent_threshold:e
{
\@@_exponent_scientific:nnnnnnn
{#1} {#2} {#3} {#4} {#5} {#6} {#7}
}
- { {#1} {#2} {#3} {#4} {#5} {#6} {#7} }
}
-\cs_new:Npn \@@_exponent_threshold:nn #1#2
- { \@@_exponent_threshold:nnnnnnnn #1 {#2} }
-\cs_generate_variant:Nn \@@_exponent_threshold:nn { e }
-\cs_new:Npn \@@_exponent_threshold:nnnnnnnn #1#2#3#4#5#6#7#8
+\cs_new:Npn \@@_exponent_threshold:n #1
+ { \@@_exponent_threshold_aux:nnnnnnn #1 }
+\cs_generate_variant:Nn \@@_exponent_threshold:n { e }
+\cs_new:Npn \@@_exponent_threshold_aux:nnnnnnn #1#2#3#4#5#6#7
{
\bool_lazy_and:nnTF
{ \int_compare_p:nNn {#6#7} > \l_@@_lower_threshold_int }
{ \int_compare_p:nNn {#6#7} < \l_@@_upper_threshold_int }
- { \exp_not:n {#8} }
+ {
+ \exp_not:n { {#1} {#2} }
+ \@@_exponent_shift:nnn { -#6#7 } {#3} {#4}
+ \@@_exponent_uncert:n {#5}
+ { }
+ { 0 }
+ }
{ \exp_not:n { {#1} {#2} {#3} {#4} {#5} {#6} {#7} } }
}
% \end{macrocode}
@@ -2623,7 +2628,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\@@_digits:NN}
% \begin{macro}[EXP]{\@@_digits:nnnnnnn}
@@ -4117,7 +4121,7 @@
{
\tl_if_blank:nTF {#1}
{ \use:n }
- { \mathord }
+ { \exp_not:N \mathord }
{ \exp_not:n {#2} }
}
\cs_new:Npn
@@ -4520,7 +4524,7 @@
{
\exp_not:n {#2}
\bool_if:NTF \l_@@_tight_bool
- { \mathord }
+ { \exp_not:N \mathord }
{ \use:n }
{ \exp_not:n { \pm } }
\exp_not:n {#2}