summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-07 20:15:13 +0000
committerKarl Berry <karl@freefriends.org>2023-10-07 20:15:13 +0000
commitb2afc04099553daa27e39000bb03b93947cda8a5 (patch)
tree38569767eac54b6ce1fb9e50f67c1529b316f86a /Master/texmf-dist
parente577cb21614559514b4fb48bbd0a9f3cbb78b467 (diff)
siunitx (7oct23)
git-svn-id: svn://tug.org/texlive/trunk@68474 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md9
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin647898 -> 647636 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin705591 -> 705592 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-compound.dtx4
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx7
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty10
7 files changed, 20 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index 5d7e746833a..3e9be4b986c 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.7] - 2023-10-07
+
+### Fixed
+- Allow for empty exponent when combining exponents (see issue
+ [\#698](https://github.com/josephwright/siunitx/issues/698))
+
## [v3.3.6] - 2023-09-01
### Fixed
@@ -2019,7 +2025,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.3.6...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.7...HEAD
+[v3.3.7]: https://github.com/josephwright/siunitx/compare/v3.3.6...v3.3.7
[v3.3.6]: https://github.com/josephwright/siunitx/compare/v3.3.5...v3.3.6
[v3.3.5]: https://github.com/josephwright/siunitx/compare/v3.3.4...v3.3.5
[v3.3.4]: https://github.com/josephwright/siunitx/compare/v3.3.3...v3.3.4
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index e6f9a48580e..0e2b1d9aeff 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 84048f928db..59e098502ae 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-compound.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-compound.dtx
index 691ebf86c5a..e6a2b676918 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-compound.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-compound.dtx
@@ -643,7 +643,7 @@
{
drop-exponent = true ,
exponent-mode = fixed ,
- fixed-exponent = #6#7
+ fixed-exponent = #6 0 #7
}
}
% \end{macrocode}
@@ -778,7 +778,7 @@
{ \@@_extract_exp:nnnnnnnN #1 #2 }
\cs_generate_variant:Nn \@@_extract_exp:nN { V }
\cs_new_protected:Npn \@@_extract_exp:nnnnnnnN #1#2#3#4#5#6#7#8
- { \fp_set:Nn #8 {#6#7} }
+ { \fp_set:Nn #8 { #6 0 #7 } }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx
index a89ee786824..d8e71d7f223 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-quantity.dtx
@@ -357,16 +357,17 @@
% \begin{macro}{\@@_extract_exp:nNN, \@@_extract_exp:VNN}
% \begin{macro}{\@@_extract_exp:nnnnnnnNN}
% To extract the exponent part for a combined prefix, we decompose the value
-% and remove it.
+% and remove it. As the exponent part may be entirely empty, we add a filler
+% zero.
% \begin{macrocode}
\cs_new_protected:Npn \@@_extract_exp:nNN #1#2#3
{ \@@_extract_exp:nnnnnnnNN #1 #2 #3 }
\cs_generate_variant:Nn \@@_extract_exp:nNN { V }
\cs_new_protected:Npn \@@_extract_exp:nnnnnnnNN #1#2#3#4#5#6#7#8#9
{
- \fp_set:Nn #8 {#6#7}
+ \fp_set:Nn #8 { #6 0#7 }
\tl_set:Nx #9
- { {#1} {#2} {#3} {#4} {#5} { } { 0 } }
+ { {#1} {#2} {#3} {#4} {#5} { } { } }
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index dee6c486994..88f313ab7ff 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} {2023-09-01} {3.3.6}
+\ProvidesExplPackage {siunitx} {2023-10-07} {3.3.7}
{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 936044ef1f6..a52d783562e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -41,7 +41,7 @@
}%
\endinput
}%
-\ProvidesExplPackage {siunitx} {2023-09-01} {3.3.6}
+\ProvidesExplPackage {siunitx} {2023-10-07} {3.3.7}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -4087,7 +4087,7 @@
{
drop-exponent = true ,
exponent-mode = fixed ,
- fixed-exponent = #6#7
+ fixed-exponent = #6 0 #7
}
}
\cs_new_protected:Npn \__siunitx_compound_parsed:n #1
@@ -4184,7 +4184,7 @@
{ \__siunitx_compound_extract_exp:nnnnnnnN #1 #2 }
\cs_generate_variant:Nn \__siunitx_compound_extract_exp:nN { V }
\cs_new_protected:Npn \__siunitx_compound_extract_exp:nnnnnnnN #1#2#3#4#5#6#7#8
- { \fp_set:Nn #8 {#6#7} }
+ { \fp_set:Nn #8 { #6 0 #7 } }
\cs_new_protected:Npn \siunitx_compound_quantity:nn #1#2
{
\group_begin:
@@ -7600,9 +7600,9 @@
\cs_generate_variant:Nn \__siunitx_quantity_extract_exp:nNN { V }
\cs_new_protected:Npn \__siunitx_quantity_extract_exp:nnnnnnnNN #1#2#3#4#5#6#7#8#9
{
- \fp_set:Nn #8 {#6#7}
+ \fp_set:Nn #8 { #6 0#7 }
\tl_set:Nx #9
- { {#1} {#2} {#3} {#4} {#5} { } { 0 } }
+ { {#1} {#2} {#3} {#4} {#5} { } { } }
}
\cs_new_protected:Npn \siunitx_quantity_print:nn #1#2
{