diff options
author | Karl Berry <karl@freefriends.org> | 2021-06-22 21:09:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-06-22 21:09:17 +0000 |
commit | 4eabd917e9bbaa92f941cae342a676cc0f7ec5ea (patch) | |
tree | dec6a99bcdcdff96952a545213f97cf24f450fa8 /Master | |
parent | 15916837cb7d1e611738688cf132d91977ae99fb (diff) |
siunitx (22jun21)
git-svn-id: svn://tug.org/texlive/trunk@59677 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 11 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf | bin | 1489673 -> 1490365 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 635013 -> 635011 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx | 17 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx | 24 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 51 |
8 files changed, 82 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 1266b1623bb..a65179c47f4 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf Binary files differindex ff484ac37da..ab32109002b 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 02d552c6adc..9a8af935cc7 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx index ca4262bdce7..a1783bf8c0c 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx index 737b503b374..108925d535e 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx index 40b461bd84d..c86d77e9f18 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 75c494abb4a..0827729689f 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} {2021-06-17} {3.0.14} +\ProvidesExplPackage {siunitx} {2021-06-22} {3.0.15} {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 d9bb92ea9cc..c19d68ab47f 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} {2021-06-17} {3.0.14} +\ProvidesExplPackage {siunitx} {2021-06-22} {3.0.15} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -677,9 +677,20 @@ \exp_after:wN \__siunitx_complex_extract_exponent:w \l__siunitx_complex_tmp_tl \q_stop \tl_set:Nx \l__siunitx_complex_tmp_tl { - \bool_lazy_and:nnTF - { \l_siunitx_number_bracket_ambiguous_bool } - { ! \tl_if_empty_p:N \l__siunitx_complex_exp_tl } + \bool_lazy_or:nnTF + { + \bool_lazy_and_p:nn + { \l_siunitx_number_bracket_ambiguous_bool } + { ! \tl_if_empty_p:N \l__siunitx_complex_exp_tl } + } + { + ! \bool_lazy_any_p:n + { + { \tl_if_blank_p:n {#1} } + { \tl_if_empty_p:N \l__siunitx_complex_real_tl } + { \tl_if_empty_p:N \l__siunitx_complex_img_tl } + } + } { \__siunitx_complex_format_bracket:n } { \use:n } { @@ -2382,7 +2393,7 @@ { \exp_not:n { #1 00 } } { } { \__siunitx_number_exponent_engineering_uncert:nn {#3} { 00 } } } - {\__siunitx_number_exponent_engineering:nnNw {#1} {#3} #2 \q_stop } + { \__siunitx_number_exponent_engineering:nnNw {#1} {#3} #2 \q_stop } \__siunitx_number_exponent_finalise:n { #4 - 2 } } \cs_new:Npn \__siunitx_number_exponent_engineering:nnNw #1#2#3#4 \q_stop @@ -2390,7 +2401,7 @@ \tl_if_blank:nTF {#4} { { \exp_not:n { #1#3 0 } } { } - { { \__siunitx_number_exponent_engineering_uncert:nn {#2} { 0 } } } + { \__siunitx_number_exponent_engineering_uncert:nn {#2} { 0 } } } { { \exp_not:n {#1#3} \exp_not:o { \tl_head:w #4 \q_stop } } @@ -3366,7 +3377,9 @@ { \tl_if_blank:nTF {#1} { - \bool_if:NT \l__siunitx_number_implicit_plus_bool + \bool_lazy_and:nnT + { \l__siunitx_number_implicit_plus_bool } + { ! \str_if_eq_p:nn {#2} { 0 } } { \__siunitx_number_output_sign:N + } } { \__siunitx_number_output_sign:N #1 } @@ -6146,22 +6159,30 @@ { \group_end: } \__siunitx_symbol_if_replace:NnT \ohm { "03A9 } { + \tl_set:Nx \l__siunitx_symbol_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__siunitx_symbol_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__siunitx_symbol_tmp_tl } + } + } + { \exp_not:V \l__siunitx_symbol_tmp_tl } \exp_not:N \else \exp_not:N \text { |