diff options
author | Norbert Preining <norbert@preining.info> | 2021-10-28 03:01:02 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-10-28 03:01:02 +0000 |
commit | 016f3f774b941f8bae79a383009d4c9521d88b79 (patch) | |
tree | de1a4a6b3383d39032edcf92917cef46d02af5c0 /macros/latex/contrib/siunitx | |
parent | 2bc4c62a1034b71c0ac674ee8eec19b7390d2334 (diff) |
CTAN sync 202110280301
Diffstat (limited to 'macros/latex/contrib/siunitx')
-rw-r--r-- | macros/latex/contrib/siunitx/CHANGELOG.md | 9 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-code.pdf | bin | 1515886 -> 1516213 bytes | |||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-complex.dtx | 13 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-symbol.dtx | 8 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx.pdf | bin | 638356 -> 638362 bytes |
6 files changed, 25 insertions, 7 deletions
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index e565a16b50..4db74bbc00 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex c780176578..5ea13cc569 100644 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ b/macros/latex/contrib/siunitx/siunitx-code.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-complex.dtx b/macros/latex/contrib/siunitx/siunitx-complex.dtx index a1783bf8c0..247d9acc0d 100644 --- a/macros/latex/contrib/siunitx/siunitx-complex.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx-symbol.dtx b/macros/latex/contrib/siunitx/siunitx-symbol.dtx index 4fa17bde89..8952aabeab 100644 --- a/macros/latex/contrib/siunitx/siunitx-symbol.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index adb8063b9d..cdf49b261c 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex d6c3830cb5..d1dadd2e95 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf |