summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-21 20:49:40 +0000
committerKarl Berry <karl@freefriends.org>2023-02-21 20:49:40 +0000
commit90a1734c946907865960714d8473a2ef1ee3c15f (patch)
tree5740b01a2e302398889e263355cd9a54a248c921 /Master/texmf-dist/source
parent888dc65f161a0cd3b37febaa1632e7b24c12c7d4 (diff)
siunitx (21feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66025 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx34
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx12
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
3 files changed, 9 insertions, 39 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
index 007d0b08257..f4d44ea5cc4 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-number.dtx Copyright (C) 2014-2019,2021,2022 Joseph Wright
+% File: siunitx-number.dtx Copyright (C) 2014-2019,2021-2023 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
@@ -3162,9 +3162,6 @@
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnnn}
% \begin{macro}[EXP]{\@@_round_uncertainty_end:nn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnn}
-% \begin{macro}[EXP]{\@@_round_uncertainty_check:nnnw}
-% \begin{macro}[EXP]{\@@_round_uncertainty_check:Nnnnw}
-% \begin{macro}[EXP]{\@@_round_uncertainty_aux:nnn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnn}
% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnn}
% \begin{macro}[EXP]
@@ -3213,35 +3210,11 @@
\cs_new:Npn \@@_round_uncertainty_end:nn #1#2
{ \exp_not:n { {#1} {#2} } }
% \end{macrocode}
-% Before doing any rounding, we need to be sure that the main value has
-% enough significant digits. If not, the result is zero.
-% \begin{macrocode}
-\cs_new:Npn \@@_round_uncertainty:nnn #1#2#3
- {
- \@@_round_uncertainty_check:nnnw {#1} {#2} {#3}
- #1#2 \q_recursion_tail \q_recursion_stop
- }
-\cs_new:Npn \@@_round_uncertainty_check:nnnw #1#2#3#4
- {
- \quark_if_recursion_tail_stop_do:Nn #4 { { 0 } { } { } }
- \int_compare:nNnTF {#4} = 0
- { \@@_round_uncertainty_check:nnnw }
- { \@@_round_uncertainty_check:Nnnnw #4 }
- {#1} {#2} {#3}
- }
-\cs_new:Npn \@@_round_uncertainty_check:Nnnnw #1#2#3#4#5
- \q_recursion_tail \q_recursion_stop
- {
- \int_compare:nNnTF { \tl_count:n {#1#5} } < { \tl_count:n {#4} }
- { { 0 } { } { } }
- { \@@_round_uncertainty_aux:nnn {#2} {#3} {#4} }
- }
-% \end{macrocode}
% Round the uncertainty first: this is needed to get the number of places
% correct. Once that is done, it's just a question of working out the digits
% in the main part.
% \begin{macrocode}
-\cs_new:Npn \@@_round_uncertainty_aux:nnn #1#2#3
+\cs_new:Npn \@@_round_uncertainty:nnn #1#2#3
{
\exp_args:Nf \@@_round_uncertainty:nnnn
{
@@ -3440,9 +3413,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{macro}{\@@_zero_decimal:NN}
% \begin{macro}[EXP]{\@@_zero_decimal:nnnnnnn}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
index 0a7348ee66a..d02eefdf518 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-print.dtx Copyright (C) 2016-2019,2021,2022 Joseph Wright
+% File: siunitx-print.dtx Copyright (C) 2016-2019,2021-2023 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
@@ -860,14 +860,14 @@
\tl_set:Nn \l_@@_tmp_tl {#1}
\tl_if_empty:NF \l_@@_tmp_tl
{
- \tl_if_empty:NF \l_siunitx_unit_font_tl
- { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
- \cs_set:Npn \mathord ##1
- { \@@_text_replace_first:N ##1 }
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
+ \cs_set:Npn \mathord ##1
+ { \@@_text_replace_first:N ##1 }
\group_begin:
\cs_set:Npn \pm { \: \exp_not:N \textpm \: }
\tl_map_inline:nn
- { \mp \ge \le \gg \ll \angle }
+ { \mp \approx \sim \ge \le \geq \leq \gg \ll \angle }
{
\cs_set:Npn ##1
{ \exp_not:N \ensuremath { \exp_not:N ##1 } }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 0ca26ecc411..1d1d08e4574 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2023-01-03} {3.2.0}
+\ProvidesExplPackage {siunitx} {2023-02-21} {3.2.1}
{A comprehensive (SI) units package}
% \end{macrocode}
%