diff options
author | Norbert Preining <norbert@preining.info> | 2021-06-23 03:01:05 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-06-23 03:01:05 +0000 |
commit | a809a190ff669feb11cb64db915b763abd0bed81 (patch) | |
tree | 6794c6d439e4e4afe002c5230493427c330b959e /macros/latex/contrib/siunitx | |
parent | 2a49c67eee870febe71143a093f3c304e0033153 (diff) |
CTAN sync 202106230301
Diffstat (limited to 'macros/latex/contrib/siunitx')
-rw-r--r-- | macros/latex/contrib/siunitx/CHANGELOG.md | 11 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-code.pdf | bin | 1489673 -> 1490365 bytes | |||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-complex.dtx | 17 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-number.dtx | 8 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-symbol.dtx | 24 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.pdf | bin | 635013 -> 635011 bytes |
7 files changed, 46 insertions, 16 deletions
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 1266b1623b..a65179c47f 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,14 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.15] + +### Fixed +- Bracketing of complex quantities (issue #491) +- Printing of `\ohm` with `fontspec` (issue #492) +- Suppress printing implicit plus for zero exponents (issue #493) +- Engineering exponents with some exponent values (issue #494) + ## [v3.0.14] ### Changed @@ -1395,7 +1403,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.14...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.15...HEAD +[v3.0.15]: https://github.com/josephwright/siunitx/compare/v3.0.14...v3.0.15 [v3.0.14]: https://github.com/josephwright/siunitx/compare/v3.0.13...v3.0.14 [v3.0.13]: https://github.com/josephwright/siunitx/compare/v3.0.12...v3.0.13 [v3.0.12]: https://github.com/josephwright/siunitx/compare/v3.0.11...v3.0.12 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex ff484ac37d..ab32109002 100644 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ b/macros/latex/contrib/siunitx/siunitx-code.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-complex.dtx b/macros/latex/contrib/siunitx/siunitx-complex.dtx index ca4262bdce..a1783bf8c0 100644 --- a/macros/latex/contrib/siunitx/siunitx-complex.dtx +++ b/macros/latex/contrib/siunitx/siunitx-complex.dtx @@ -648,9 +648,20 @@ \exp_after:wN \@@_extract_exponent:w \l_@@_tmp_tl \q_stop \tl_set:Nx \l_@@_tmp_tl { - \bool_lazy_and:nnTF - { \l_siunitx_number_bracket_ambiguous_bool } - { ! \tl_if_empty_p:N \l_@@_exp_tl } + \bool_lazy_or:nnTF + { + \bool_lazy_and_p:nn + { \l_siunitx_number_bracket_ambiguous_bool } + { ! \tl_if_empty_p:N \l_@@_exp_tl } + } + { + ! \bool_lazy_any_p:n + { + { \tl_if_blank_p:n {#1} } + { \tl_if_empty_p:N \l_@@_real_tl } + { \tl_if_empty_p:N \l_@@_img_tl } + } + } { \@@_format_bracket:n } { \use:n } { diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index 737b503b37..108925d535 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -2023,7 +2023,7 @@ { \exp_not:n { #1 00 } } { } { \@@_exponent_engineering_uncert:nn {#3} { 00 } } } - {\@@_exponent_engineering:nnNw {#1} {#3} #2 \q_stop } + { \@@_exponent_engineering:nnNw {#1} {#3} #2 \q_stop } \@@_exponent_finalise:n { #4 - 2 } } \cs_new:Npn \@@_exponent_engineering:nnNw #1#2#3#4 \q_stop @@ -2031,7 +2031,7 @@ \tl_if_blank:nTF {#4} { { \exp_not:n { #1#3 0 } } { } - { { \@@_exponent_engineering_uncert:nn {#2} { 0 } } } + { \@@_exponent_engineering_uncert:nn {#2} { 0 } } } { { \exp_not:n {#1#3} \exp_not:o { \tl_head:w #4 \q_stop } } @@ -3419,7 +3419,9 @@ { \tl_if_blank:nTF {#1} { - \bool_if:NT \l_@@_implicit_plus_bool + \bool_lazy_and:nnT + { \l_@@_implicit_plus_bool } + { ! \str_if_eq_p:nn {#2} { 0 } } { \@@_output_sign:N + } } { \@@_output_sign:N #1 } diff --git a/macros/latex/contrib/siunitx/siunitx-symbol.dtx b/macros/latex/contrib/siunitx/siunitx-symbol.dtx index 40b461bd84..c86d77e9f1 100644 --- a/macros/latex/contrib/siunitx/siunitx-symbol.dtx +++ b/macros/latex/contrib/siunitx/siunitx-symbol.dtx @@ -230,22 +230,30 @@ % \begin{macrocode} \@@_if_replace:NnT \ohm { "03A9 } { + \tl_set:Nx \l_@@_tmp_tl + { + \cs_if_exist:NTF \upOmega + { \exp_not:N \upOmega } + { \exp_not:N \Omega } + } \siunitx_declare_unit:Nx \ohm { \@ifpackageloaded { fourier } { \exp_not:N \ensuremath - { - \cs_if_exist:NTF \upOmega - { \exp_not:N \upOmega } - { \exp_not:N \Omega } - } + { \exp_not:V \l_@@_tmp_tl } } { \exp_not:N \ifmmode - \cs_if_exist:NTF \upOmega - { \exp_not:N \upOmega } - { \exp_not:N \Omega } + \@ifpackageloaded { fontspec } + { + \exp_not:N \text + { + \exp_not:N \ensuremath + { \exp_not:V \l_@@_tmp_tl } + } + } + { \exp_not:V \l_@@_tmp_tl } \exp_not:N \else \exp_not:N \text { diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 75c494abb4..0827729689 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-17} {3.0.14} +\ProvidesExplPackage {siunitx} {2021-06-22} {3.0.15} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex 02d552c6ad..9a8af935cc 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf |