From ea7ab71f9f545e1ba8dadf6812d07bddda555b1e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Dec 2022 21:25:15 +0000 Subject: siunitx (5dec22) git-svn-id: svn://tug.org/texlive/trunk@65207 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 10 +++++++++- .../texmf-dist/doc/latex/siunitx/siunitx-code.pdf | Bin 617721 -> 617754 bytes Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 666266 -> 666266 bytes .../source/latex/siunitx/siunitx-number.dtx | 2 +- .../source/latex/siunitx/siunitx-table.dtx | 16 ++++++++++++++-- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 14 ++++++++++++-- 7 files changed, 37 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index e26a8b74c1a..95c60bb247b 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,11 +7,18 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.1.11] - 2022-12-05 + +### Fixed +- Alignment of exponents without mantissa values (see issue + [\#633](https://github.com/josephwright/siunitx/issues/633)) + ## [v3.1.10] - 2022-11-16 ### Fixed - Rounding to uncertainty in some cases (see issue [\#627](https://github.com/josephwright/siunitx/issues/627)) + ## [v3.1.9] - 2022-10-23 ### Added @@ -1831,7 +1838,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.1.10...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.11...HEAD +[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 [v3.1.9]: https://github.com/josephwright/siunitx/compare/v3.1.8...v3.1.9 [v3.1.8]: https://github.com/josephwright/siunitx/compare/v3.1.7...v3.1.8 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf index a57ecf29bcf..07880f9c2d4 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 9f1a21c58f5..466df8a07cf 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 b88e369c08d..f08a6a8c0f1 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx @@ -3081,7 +3081,7 @@ % \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:nnnnn} +% \begin{macro}[EXP]{\@@_round_uncertainty:nnnnnn} % \begin{macro}[EXP] % { % \@@_round_uncertainty_simple:nnnnnn , diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-table.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-table.dtx index 35dd2161b17..b8f5aea8e3f 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-table.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-table.dtx @@ -1468,7 +1468,9 @@ % \end{macrocode} % Finally, we get to the exponent part: the multiplication symbol is % |#1| and the number itself is |#2|. The code is almost the same as for -% uncertainties, which allows a shared auxiliary to be used. +% uncertainties, which allows a shared auxiliary to be used. As |#3| could +% be entirely empty, there needs to be a bit of work to ensure alignment +% is retained in all cases. % \begin{macrocode} \cs_new_protected:Npn \@@_print_format_auxvii:w #1 \q_nil #2 \q_mark #3 \q_nil #4 \q_stop @@ -1477,7 +1479,17 @@ { \@@_print_format_box:Nn \l_@@_tmp_box { { } #1#2 } \dim_set:Nn \l_@@_tmp_dim { \box_wd:N \l_@@_tmp_box } - \@@_print_format_box:Nn \l_@@_tmp_box { { } #3#4 } + \@@_print_format_box:Nn \l_@@_tmp_box + { + \bool_lazy_and:nnT + { \l_@@_align_exponent_bool } + { \tl_if_blank_p:n {#3} } + { + \@@_print_format_box:Nn \l_@@_tmp_box { { } #1 { } } + \@@_skip:n { \box_wd:N \l_@@_tmp_box } + } + { } #3#4 + } \@@_print_format_after:N \l_@@_align_exponent_bool } } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index d02beaf5739..65004d7eb27 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} {2022-11-16} {3.1.10} +\ProvidesExplPackage {siunitx} {2022-12-05} {3.1.11} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 8ac5f2141ad..1ca8cbb2751 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -42,7 +42,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2022-11-16} {3.1.10} +\ProvidesExplPackage {siunitx} {2022-12-05} {3.1.11} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -5581,7 +5581,17 @@ { \__siunitx_table_print_format_box:Nn \l__siunitx_table_tmp_box { { } #1#2 } \dim_set:Nn \l__siunitx_table_tmp_dim { \box_wd:N \l__siunitx_table_tmp_box } - \__siunitx_table_print_format_box:Nn \l__siunitx_table_tmp_box { { } #3#4 } + \__siunitx_table_print_format_box:Nn \l__siunitx_table_tmp_box + { + \bool_lazy_and:nnT + { \l__siunitx_table_align_exponent_bool } + { \tl_if_blank_p:n {#3} } + { + \__siunitx_table_print_format_box:Nn \l__siunitx_table_tmp_box { { } #1 { } } + \__siunitx_table_skip:n { \box_wd:N \l__siunitx_table_tmp_box } + } + { } #3#4 + } \__siunitx_table_print_format_after:N \l__siunitx_table_align_exponent_bool } } -- cgit v1.2.3