texlive[62903] Master/texmf-dist: siunitx (4apr22)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 4 22:56:29 CEST 2022
Revision: 62903
http://tug.org/svn/texlive?view=revision&revision=62903
Author: karl
Date: 2022-04-04 22:56:29 +0200 (Mon, 04 Apr 2022)
Log Message:
-----------
siunitx (4apr22)
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-number.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 2022-04-04 20:56:14 UTC (rev 62902)
+++ trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2022-04-04 20:56:29 UTC (rev 62903)
@@ -7,6 +7,14 @@
## [Unreleased]
+## [v3.0.50] - 2022-04-04
+
+### Fixed
+- Spacing of sign when using "output-exponent-marker" (see issue
+ [\#600](https://github.com/josephwright/siunitx/issues/600))
+- Behavior of "minimum-decimal-digits" with uncertainties (see issue
+ [\#601](https://github.com/josephwright/siunitx/issues/601))
+
## [v3.0.49] - 2022-02-15
### Added
@@ -1721,7 +1729,8 @@
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.49...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.50...HEAD
+[v3.0.50]: https://github.com/josephwright/siunitx/compare/v3.0.49...v3.0.50
[v3.0.49]: https://github.com/josephwright/siunitx/compare/v3.0.48...v3.0.49
[v3.0.48]: https://github.com/josephwright/siunitx/compare/v3.0.47...v3.0.48
[v3.0.47]: https://github.com/josephwright/siunitx/compare/v3.0.46...v3.0.47
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-number.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2022-04-04 20:56:14 UTC (rev 62902)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2022-04-04 20:56:29 UTC (rev 62903)
@@ -2112,9 +2112,9 @@
%
% \begin{macro}{\@@_digits:NN}
% \begin{macro}[EXP]{\@@_digits:nnnnnnn}
-% \begin{macro}[EXP]{\@@_digits:Nn}
% \begin{macro}[EXP]{\@@_digits:nn}
-% \begin{macro}[EXP]{\@@_digits_S:n}
+% \begin{macro}[EXP]{\@@_digits_uncert:nnn}
+% \begin{macro}[EXP]{\@@_digits_uncert_S:nn}
% Forcing a minimum number of digits in each part is quite easy. As
% the common case is that we don't do anything here, there is no real need
% to optimise the calculation (normally also numbers have only a few digits).
@@ -2128,31 +2128,37 @@
{
\exp_not:n { {#1} {#2} }
{
- \@@_digits:Nn \l_@@_min_integer_int {#3}
+ \@@_digits:nn \l_@@_min_integer_int {#3}
\exp_not:n {#3}
}
{
\exp_not:n {#4}
- \@@_digits:Nn \l_@@_min_decimal_int {#4}
+ \@@_digits:nn \l_@@_min_decimal_int {#4}
}
- { \tl_if_blank:nF {#5} { \@@_digits_uncert:nn #5 } }
+ { \tl_if_blank:nF {#5} { \@@_digits_uncert:nnn {#4} #5 } }
\exp_not:n { {#6} {#7} }
}
-\cs_new:Npn \@@_digits:Nn #1#2
+\cs_new:Npn \@@_digits:nn #1#2
{
\int_compare:nNnT
{ #1 - \tl_count:n {#2} } > 0
- { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } }
+ { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } }
}
-\cs_new:Npn \@@_digits_uncert:nn #1#2
+\cs_new:Npn \@@_digits_uncert:nnn #1#2#3
{
- { #1 }
- { \use:c { @@_digits_uncert_ #1 :n } {#2} }
+ { #2 }
+ { \use:c { @@_digits_uncert_ #2 :nn } {#1} {#3} }
}
-\cs_new:Npn \@@_digits_uncert_S:n #1
+\cs_new:Npn \@@_digits_uncert_S:nn #1#2
{
- \exp_not:n {#1}
- \@@_digits:Nn \l_@@_min_decimal_int {#1}
+ \exp_not:n {#2}
+ \@@_digits:nn
+ {
+ \int_max:nn
+ { 0 }
+ { \l_@@_min_decimal_int - \tl_count:n {#1} + 1 }
+ }
+ {#2}
}
% \end{macrocode}
% \end{macro}
@@ -3643,25 +3649,25 @@
\exp_not:n {#5}
\exp_not:V \l_@@_exponent_base_tl
^
- { \@@_output_exponent_auxiii:nn {#1} {#2} }
+ { \@@_output_exponent_auxiii:nnn { } {#1} {#2} }
}
\cs_new:Npn \@@_output_exponent_auxii:nnnnn #1#2#3#4#5
{
\exp_not:n {#5}
\exp_not:V \l_@@_output_exp_marker_tl
- \@@_output_exponent_auxiii:nn {#1} {#2}
+ \@@_output_exponent_auxiii:nnn { \mathord } {#1} {#2}
}
-\cs_new:Npn \@@_output_exponent_auxiii:nn #1#2
+\cs_new:Npn \@@_output_exponent_auxiii:nnn #1#2#3
{
- \tl_if_blank:nTF {#1}
+ \tl_if_blank:nTF {#2}
{
\bool_lazy_and:nnT
{ \l_@@_implicit_plus_bool }
- { ! \str_if_eq_p:nn {#2} { 0 } }
- { + }
+ { ! \str_if_eq_p:nn {#3} { 0 } }
+ { #1 + }
}
- { \exp_not:n {#1} }
- \@@_output_digits:nn { integer } {#2}
+ { \exp_not:n {#1#2} }
+ \@@_output_digits:nn { integer } {#3}
}
% \end{macrocode}
% A do-nothing marker used to allow shuffling of the output and so expandable
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2022-04-04 20:56:14 UTC (rev 62902)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2022-04-04 20:56:29 UTC (rev 62903)
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2022-02-15} {3.0.49}
+\ProvidesExplPackage {siunitx} {2022-04-04} {3.0.50}
{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 2022-04-04 20:56:14 UTC (rev 62902)
+++ trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2022-04-04 20:56:29 UTC (rev 62903)
@@ -42,7 +42,7 @@
}%
\endinput
}%
-\ProvidesExplPackage {siunitx} {2022-02-15} {3.0.49}
+\ProvidesExplPackage {siunitx} {2022-04-04} {3.0.50}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -2478,31 +2478,37 @@
{
\exp_not:n { {#1} {#2} }
{
- \__siunitx_number_digits:Nn \l__siunitx_number_min_integer_int {#3}
+ \__siunitx_number_digits:nn \l__siunitx_number_min_integer_int {#3}
\exp_not:n {#3}
}
{
\exp_not:n {#4}
- \__siunitx_number_digits:Nn \l__siunitx_number_min_decimal_int {#4}
+ \__siunitx_number_digits:nn \l__siunitx_number_min_decimal_int {#4}
}
- { \tl_if_blank:nF {#5} { \__siunitx_number_digits_uncert:nn #5 } }
+ { \tl_if_blank:nF {#5} { \__siunitx_number_digits_uncert:nnn {#4} #5 } }
\exp_not:n { {#6} {#7} }
}
-\cs_new:Npn \__siunitx_number_digits:Nn #1#2
+\cs_new:Npn \__siunitx_number_digits:nn #1#2
{
\int_compare:nNnT
{ #1 - \tl_count:n {#2} } > 0
- { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } }
+ { \prg_replicate:nn { #1 - \tl_count:n {#2} } { 0 } }
}
-\cs_new:Npn \__siunitx_number_digits_uncert:nn #1#2
+\cs_new:Npn \__siunitx_number_digits_uncert:nnn #1#2#3
{
- { #1 }
- { \use:c { __siunitx_number_digits_uncert_ #1 :n } {#2} }
+ { #2 }
+ { \use:c { __siunitx_number_digits_uncert_ #2 :nn } {#1} {#3} }
}
-\cs_new:Npn \__siunitx_number_digits_uncert_S:n #1
+\cs_new:Npn \__siunitx_number_digits_uncert_S:nn #1#2
{
- \exp_not:n {#1}
- \__siunitx_number_digits:Nn \l__siunitx_number_min_decimal_int {#1}
+ \exp_not:n {#2}
+ \__siunitx_number_digits:nn
+ {
+ \int_max:nn
+ { 0 }
+ { \l__siunitx_number_min_decimal_int - \tl_count:n {#1} + 1 }
+ }
+ {#2}
}
\cs_new_protected:Npn \__siunitx_number_drop_exponent:NN #1#2
{
@@ -3556,25 +3562,25 @@
\exp_not:n {#5}
\exp_not:V \l__siunitx_number_exponent_base_tl
^
- { \__siunitx_number_output_exponent_auxiii:nn {#1} {#2} }
+ { \__siunitx_number_output_exponent_auxiii:nnn { } {#1} {#2} }
}
\cs_new:Npn \__siunitx_number_output_exponent_auxii:nnnnn #1#2#3#4#5
{
\exp_not:n {#5}
\exp_not:V \l__siunitx_number_output_exp_marker_tl
- \__siunitx_number_output_exponent_auxiii:nn {#1} {#2}
+ \__siunitx_number_output_exponent_auxiii:nnn { \mathord } {#1} {#2}
}
-\cs_new:Npn \__siunitx_number_output_exponent_auxiii:nn #1#2
+\cs_new:Npn \__siunitx_number_output_exponent_auxiii:nnn #1#2#3
{
- \tl_if_blank:nTF {#1}
+ \tl_if_blank:nTF {#2}
{
\bool_lazy_and:nnT
{ \l__siunitx_number_implicit_plus_bool }
- { ! \str_if_eq_p:nn {#2} { 0 } }
- { + }
+ { ! \str_if_eq_p:nn {#3} { 0 } }
+ { #1 + }
}
- { \exp_not:n {#1} }
- \__siunitx_number_output_digits:nn { integer } {#2}
+ { \exp_not:n {#1#2} }
+ \__siunitx_number_output_digits:nn { integer } {#3}
}
\cs_new:Npn \__siunitx_number_output_end: { }
\tl_new:N \l__siunitx_number_valid_tl
More information about the tex-live-commits
mailing list.