From 470678475288a244fd8a9af69f9abc9b46b2860f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 22 Feb 2023 03:01:37 +0000 Subject: CTAN sync 202302220301 --- macros/latex/contrib/siunitx/CHANGELOG.md | 12 ++++++++- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 620740 -> 620743 bytes macros/latex/contrib/siunitx/siunitx-number.dtx | 34 ++---------------------- macros/latex/contrib/siunitx/siunitx-print.dtx | 12 ++++----- macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 667977 -> 667978 bytes 6 files changed, 20 insertions(+), 40 deletions(-) (limited to 'macros/latex/contrib/siunitx') diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index e71d02eabb..fe99aadd7a 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.2.1] - 2023-02-21 + +### Fixed + +- Extend list of math mode symbols replaced in text mode (see issue + [\#640](https://github.com/josephwright/siunitx/issues/640)) +- Handling of uncertainty if larger than main value when rounding (see issue + [\#641](https://github.com/josephwright/siunitx/issues/641)) + ## [v3.2.0] - 2023-01-03 ## Added @@ -1857,7 +1866,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.0...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.1...HEAD +[v3.2.1]: https://github.com/josephwright/siunitx/compare/v3.2.0...v3.2.1 [v3.2.0]: https://github.com/josephwright/siunitx/compare/v3.1.11...v3.2.0 [v3.1.11]: https://github.com/josephwright/siunitx/compare/v3.1.10...v3.1.11 [v3.1.10]: https://github.com/josephwright/siunitx/compare/v3.1.9...v3.1.10 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index 4984647c28..7f915ef16f 100644 Binary files a/macros/latex/contrib/siunitx/siunitx-code.pdf and b/macros/latex/contrib/siunitx/siunitx-code.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index 007d0b0825..f4d44ea5cc 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,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/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index 0a7348ee66..d02eefdf51 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 0ca26ecc41..1d1d08e457 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/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} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index 6b7ff0d6ee..ee58cd5ff2 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ -- cgit v1.2.3