texlive[59677] Master/texmf-dist: siunitx (22jun21)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 22 23:09:17 CEST 2021
Revision: 59677
http://tug.org/svn/texlive?view=revision&revision=59677
Author: karl
Date: 2021-06-22 23:09:17 +0200 (Tue, 22 Jun 2021)
Log Message:
-----------
siunitx (22jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-06-22 21:09:17 UTC (rev 59677)
@@ -7,6 +7,14 @@
## [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 @@
### 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
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx 2021-06-22 21:09:17 UTC (rev 59677)
@@ -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 }
{
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2021-06-22 21:09:17 UTC (rev 59677)
@@ -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 }
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx 2021-06-22 21:09:17 UTC (rev 59677)
@@ -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
{
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-06-22 21:09:17 UTC (rev 59677)
@@ -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}
%
Modified: trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-06-22 21:08:59 UTC (rev 59676)
+++ trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-06-22 21:09:17 UTC (rev 59677)
@@ -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
{
More information about the tex-live-commits
mailing list.