From 0568107d401812ecbd0408df595b2706493fdc54 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Nov 2023 21:05:03 +0000 Subject: siunitx (14nov23) git-svn-id: svn://tug.org/texlive/trunk@68844 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 9 ++++++++- .../texmf-dist/doc/latex/siunitx/siunitx-code.pdf | Bin 648032 -> 647774 bytes Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 705592 -> 705523 bytes .../source/latex/siunitx/siunitx-number.dtx | 14 ++++++++++---- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- Master/texmf-dist/source/latex/siunitx/siunitx.tex | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 16 +++++++++++----- 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 554c6ff609c..b113b8d9d32 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.3.9] - 2023-11-14 + +### Fixed +- Rounding of values with no mantissa (see issue + [\#704](https://github.com/josephwright/siunitx/issues/704)) + ## [v3.3.8] - 2023-11-06 ### Deprecated @@ -2043,7 +2049,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.3.8...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.9...HEAD +[v3.3.9]: https://github.com/josephwright/siunitx/compare/v3.3.8...v3.3.9 [v3.3.8]: https://github.com/josephwright/siunitx/compare/v3.3.7...v3.3.8 [v3.3.7]: https://github.com/josephwright/siunitx/compare/v3.3.6...v3.3.7 [v3.3.6]: https://github.com/josephwright/siunitx/compare/v3.3.5...v3.3.6 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf index 71cc89e4789..34e9f85ef31 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 73faebb49ef..9a3994d340c 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx index 04b302cf513..6397e3239f9 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx @@ -2772,10 +2772,16 @@ } \cs_new:Npn \@@_round:nnnnnnn #1#2#3#4#5#6#7 { - \str_if_eq:nnTF {#4} { \empty } - { \use:c { @@_round_ \l_@@_round_mode_tl :nnnnnnn } {#1} {#2} {#3} { } } - { \use:c { @@_round_ \l_@@_round_mode_tl :nnnnnnn } {#1} {#2} {#3} {#4} } - {#5} {#6} {#7} + \tl_if_blank:nTF { #3#4 } + { + \exp_not:n { {#1} {#2} { } { } {#5} {#6} {#7} } + } + { + \str_if_eq:nnTF {#4} { \empty } + { \use:c { @@_round_ \l_@@_round_mode_tl :nnnnnnn } {#1} {#2} {#3} { } } + { \use:c { @@_round_ \l_@@_round_mode_tl :nnnnnnn } {#1} {#2} {#3} {#4} } + {#5} {#6} {#7} + } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index e2870e43e63..e4ba230584b 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-11-06} {3.3.8} +\ProvidesExplPackage {siunitx} {2023-11-14} {3.3.9} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.tex b/Master/texmf-dist/source/latex/siunitx/siunitx.tex index 7b7221f66a4..37da4127519 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex @@ -1046,7 +1046,7 @@ color applied by \pkg{siunitx}. \begin{table} \caption{Detection of surrounding material in an \texttt{S} column.% \label{tab:S:extras}} - \begin{tabular}{@{}S[color = orange]@{}} + \begin{tabular}{@{}S@{}} \toprule {Some Values} \\ \midrule diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 7264dd598b3..d4d3e0000ce 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-06} {3.3.8} +\ProvidesExplPackage {siunitx} {2023-11-14} {3.3.9} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -1350,10 +1350,16 @@ } \cs_new:Npn \__siunitx_number_round:nnnnnnn #1#2#3#4#5#6#7 { - \str_if_eq:nnTF {#4} { \empty } - { \use:c { __siunitx_number_round_ \l__siunitx_number_round_mode_tl :nnnnnnn } {#1} {#2} {#3} { } } - { \use:c { __siunitx_number_round_ \l__siunitx_number_round_mode_tl :nnnnnnn } {#1} {#2} {#3} {#4} } - {#5} {#6} {#7} + \tl_if_blank:nTF { #3#4 } + { + \exp_not:n { {#1} {#2} { } { } {#5} {#6} {#7} } + } + { + \str_if_eq:nnTF {#4} { \empty } + { \use:c { __siunitx_number_round_ \l__siunitx_number_round_mode_tl :nnnnnnn } {#1} {#2} {#3} { } } + { \use:c { __siunitx_number_round_ \l__siunitx_number_round_mode_tl :nnnnnnn } {#1} {#2} {#3} {#4} } + {#5} {#6} {#7} + } } \cs_new:Npn \__siunitx_number_round:nnn #1#2#3 { -- cgit v1.2.3