From 500adb5fa10a924ea571a0d9d7754ed17dab5dbf Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 5 Jul 2021 03:00:50 +0000 Subject: CTAN sync 202107050300 --- macros/latex/contrib/siunitx/CHANGELOG.md | 9 ++++++++- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 1493737 -> 1493556 bytes macros/latex/contrib/siunitx/siunitx-quantity.dtx | 23 ++++++++++++++++------ macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 635011 -> 635018 bytes 5 files changed, 26 insertions(+), 8 deletions(-) (limited to 'macros/latex/contrib/siunitx') diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 8cd9f6dfee..829db2c92a 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.18] + +### Fixed +- Printing of reciprocal units when `per-mode = symbol` is active + (issue #500) + ## [v3.0.17] ### Fixed @@ -1414,7 +1420,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.0.17...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.18...HEAD +[v3.0.18]: https://github.com/josephwright/siunitx/compare/v3.0.17...v3.0.18 [v3.0.17]: https://github.com/josephwright/siunitx/compare/v3.0.16...v3.0.17 [v3.0.16]: https://github.com/josephwright/siunitx/compare/v3.0.15...v3.0.16 [v3.0.15]: https://github.com/josephwright/siunitx/compare/v3.0.14...v3.0.15 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index a3f4606a73..ed17e84c1c 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-quantity.dtx b/macros/latex/contrib/siunitx/siunitx-quantity.dtx index 353fe94e6e..e4dc93200e 100644 --- a/macros/latex/contrib/siunitx/siunitx-quantity.dtx +++ b/macros/latex/contrib/siunitx/siunitx-quantity.dtx @@ -372,18 +372,29 @@ % } % For printing a single part of a quantity. This is needed for compound % quantities and so is public: that's also the reason for passing both -% argument explicitly. +% argument explicitly. The lazy test here is looking for the case where +% a |1| has been inserted at the start of a format unit \emph{and} we +% have some other number to print: the |1| is then removed and there is +% no space inserted. % \begin{macrocode} \cs_new_protected:Npn \siunitx_quantity_print:nn #1#2 { \siunitx_print_number:n {#1} \tl_if_blank:nF {#2} { - \tl_use:N \l_@@_product_tl - \bool_if:NTF \l_@@_break_bool - { \penalty \binoppenalty } - { \nobreak } - \siunitx_print_unit:n {#2} + \bool_lazy_or:nnTF + { \tl_if_blank_p:n {#1} } + { ! \tl_if_head_eq_charcode_p:nN {#2} { 1 } } + { + \tl_use:N \l_@@_product_tl + \bool_if:NTF \l_@@_break_bool + { \penalty \binoppenalty } + { \nobreak } + \siunitx_print_unit:n {#2} + } + { + \exp_args:No \siunitx_print_unit:n { \use_none:n #2 } + } } } \cs_generate_variant:Nn \siunitx_quantity_print:nn { nV , VV , xV } diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 30afff3ae2..52da6d7b36 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} {2021-06-29} {3.0.17} +\ProvidesExplPackage {siunitx} {2021-07-04} {3.0.18} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index ed08b36163..57e3ffb45e 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ -- cgit v1.2.3