summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
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.pdfbin1515886 -> 1516213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin638356 -> 638362 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx13
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx8
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty17
7 files changed, 37 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index e565a16b503..4db74bbc007 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.0.34]
+
+### Fixed
+- Printing of exponent for complex values when converting to a prefix (see
+ issue [#555](https://github.com/josephwright/siunitx/issues/555))
+
## [v3.0.33]
### Changed
@@ -1607,7 +1613,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.33...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.34...HEAD
+[v3.0.34]: https://github.com/josephwright/siunitx/compare/v3.0.33...v3.0.34
[v3.0.33]: https://github.com/josephwright/siunitx/compare/v3.0.32...v3.0.33
[v3.0.32]: https://github.com/josephwright/siunitx/compare/v3.0.31...v3.0.32
[v3.0.31]: https://github.com/josephwright/siunitx/compare/v3.0.30...v3.0.31
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index c780176578d..5ea13cc569d 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 d6c3830cb53..d1dadd2e95d 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-complex.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx
index a1783bf8c0c..247d9acc0dc 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-complex.dtx
@@ -126,8 +126,9 @@
%
% \subsection{General setup}
%
-% \begin{variable}{\l_@@_tmp_tl}
+% \begin{variable}{\l_@@_tmp_fp, \l_@@_tmp_tl}
% \begin{macrocode}
+\fp_new:N \l_@@_tmp_fp
\tl_new:N \l_@@_tmp_tl
% \end{macrocode}
% \end{variable}
@@ -766,6 +767,8 @@
% }
% \begin{macro}{\@@_format_extract-exponent:N}
% \begin{macro}[EXP]{\@@_extract_exp:nnnnnnn}
+% \begin{macro}{\@@_drop_exp:N}
+% \begin{macro}[EXP]{\@@_drop_exp:nnnnnnnN}
% Formatting units needs to know the settings from the main module, and
% the flow is then much the same as in \pkg{siunitx-compound}. We only
% have to watch the fact there are two numbers to format.
@@ -788,6 +791,8 @@
\siunitx_number_process:NN \l_@@_img_tl \l_@@_img_tl
\fp_set:Nn \l_@@_tmp_fp
{ \exp_after:wN \@@_extract_exp:nnnnnnn \l_@@_img_tl }
+ \@@_drop_exp:N \l_@@_real_tl
+ \@@_drop_exp:N \l_@@_img_tl
\siunitx_unit_format_combine_exponent:nnN {#1}
\l_@@_tmp_fp \l_@@_unit_tl
}
@@ -816,11 +821,17 @@
\siunitx_unit_format:nN {#1} \l_@@_unit_tl
}
\cs_new:Npn \@@_extract_exp:nnnnnnn #1#2#3#4#5#6#7 { #6#7 }
+\cs_new_protected:Npn \@@_drop_exp:N #1
+ { \exp_after:wN \@@_drop_exp:nnnnnnnN #1 #1 }
+\cs_new_protected:Npn \@@_drop_exp:nnnnnnnN #1#2#3#4#5#6#7#8
+ { \tl_set:Nn #8 { {#1} {#2} {#3} {#4} {#5} { } { 0 } } }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{Messages}
%
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
index 4fa17bde89b..8952aabeabd 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
@@ -232,7 +232,7 @@
% \begin{macrocode}
\@@_if_replace:NnT \ohm { "03A9 }
{
- \tl_set:Nx \l_@@_tmp_tl
+ \tl_set:Nx \l_@@_tmpa_tl
{
\cs_if_exist:NTF \upOmega
{ \exp_not:N \upOmega }
@@ -243,7 +243,7 @@
\@ifpackageloaded { fourier }
{
\exp_not:N \ensuremath
- { \exp_not:V \l_@@_tmp_tl }
+ { \exp_not:V \l_@@_tmpa_tl }
}
{
\exp_not:N \ifmmode
@@ -252,10 +252,10 @@
\exp_not:N \text
{
\exp_not:N \ensuremath
- { \exp_not:V \l_@@_tmp_tl }
+ { \exp_not:V \l_@@_tmpa_tl }
}
}
- { \exp_not:V \l_@@_tmp_tl }
+ { \exp_not:V \l_@@_tmpa_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 adb8063b9d1..cdf49b261c8 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-10-15} {3.0.33}
+\ProvidesExplPackage {siunitx} {2021-10-26} {3.0.34}
{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 2b61b73a268..d01d2352ae6 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-10-15} {3.0.33}
+\ProvidesExplPackage {siunitx} {2021-10-26} {3.0.34}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -354,6 +354,7 @@
fill-angle-seconds = false ,
number-angle-product =
}
+\fp_new:N \l__siunitx_complex_tmp_fp
\tl_new:N \l__siunitx_complex_tmp_tl
\tl_new:N \l__siunitx_complex_input_tl
\tl_new:N \l__siunitx_complex_comparator_tl
@@ -782,6 +783,8 @@
\siunitx_number_process:NN \l__siunitx_complex_img_tl \l__siunitx_complex_img_tl
\fp_set:Nn \l__siunitx_complex_tmp_fp
{ \exp_after:wN \__siunitx_complex_extract_exp:nnnnnnn \l__siunitx_complex_img_tl }
+ \__siunitx_complex_drop_exp:N \l__siunitx_complex_real_tl
+ \__siunitx_complex_drop_exp:N \l__siunitx_complex_img_tl
\siunitx_unit_format_combine_exponent:nnN {#1}
\l__siunitx_complex_tmp_fp \l__siunitx_complex_unit_tl
}
@@ -810,6 +813,10 @@
\siunitx_unit_format:nN {#1} \l__siunitx_complex_unit_tl
}
\cs_new:Npn \__siunitx_complex_extract_exp:nnnnnnn #1#2#3#4#5#6#7 { #6#7 }
+\cs_new_protected:Npn \__siunitx_complex_drop_exp:N #1
+ { \exp_after:wN \__siunitx_complex_drop_exp:nnnnnnnN #1 #1 }
+\cs_new_protected:Npn \__siunitx_complex_drop_exp:nnnnnnnN #1#2#3#4#5#6#7#8
+ { \tl_set:Nn #8 { {#1} {#2} {#3} {#4} {#5} { } { 0 } } }
\msg_new:nnnn { siunitx } { invalid-complex-number }
{ Invalid~complex-number~'#1'. }
{
@@ -6386,7 +6393,7 @@
{ \group_end: }
\__siunitx_symbol_if_replace:NnT \ohm { "03A9 }
{
- \tl_set:Nx \l__siunitx_symbol_tmp_tl
+ \tl_set:Nx \l__siunitx_symbol_tmpa_tl
{
\cs_if_exist:NTF \upOmega
{ \exp_not:N \upOmega }
@@ -6397,7 +6404,7 @@
\@ifpackageloaded { fourier }
{
\exp_not:N \ensuremath
- { \exp_not:V \l__siunitx_symbol_tmp_tl }
+ { \exp_not:V \l__siunitx_symbol_tmpa_tl }
}
{
\exp_not:N \ifmmode
@@ -6406,10 +6413,10 @@
\exp_not:N \text
{
\exp_not:N \ensuremath
- { \exp_not:V \l__siunitx_symbol_tmp_tl }
+ { \exp_not:V \l__siunitx_symbol_tmpa_tl }
}
}
- { \exp_not:V \l__siunitx_symbol_tmp_tl }
+ { \exp_not:V \l__siunitx_symbol_tmpa_tl }
\exp_not:N \else
\exp_not:N \text
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 20:43:14 +0000