From 05bb4f9ed131a04f54560a856dfbd7bc15981555 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 22 Jul 2023 03:00:59 +0000 Subject: CTAN sync 202307220300 --- macros/latex/contrib/siunitx/CHANGELOG.md | 10 ++++++- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 642873 -> 642405 bytes macros/latex/contrib/siunitx/siunitx-quantity.dtx | 32 ++++++++++++---------- macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 691145 -> 691136 bytes macros/latex/contrib/siunitx/siunitx.tex | 8 +++--- 6 files changed, 32 insertions(+), 20 deletions(-) (limited to 'macros/latex/contrib/siunitx') diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 05f3d28572..a471996dcf 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.2.7] - 2023-07-20 + +### Fixed +- Spacing in quantities when e.g. `exponent-mode = {{\times}}` + is used (see issue + [\#672](https://github.com/josephwright/siunitx/issues/672)) + ## [v3.2.6] - 2023-06-12 ### Fixed @@ -1907,7 +1914,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.2.6...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.7...HEAD +[v3.2.7]: https://github.com/josephwright/siunitx/compare/v3.2.6...v3.2.7 [v3.2.6]: https://github.com/josephwright/siunitx/compare/v3.2.5...v3.2.6 [v3.2.5]: https://github.com/josephwright/siunitx/compare/v3.2.4...v3.2.5 [v3.2.4]: https://github.com/josephwright/siunitx/compare/v3.2.3...v3.2.4 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index 6c105fa972..ad5229ba63 100644 Binary files a/macros/latex/contrib/siunitx/siunitx-code.pdf and b/macros/latex/contrib/siunitx/siunitx-code.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx-quantity.dtx b/macros/latex/contrib/siunitx/siunitx-quantity.dtx index e16f6ffa8b..2b2e783eed 100644 --- a/macros/latex/contrib/siunitx/siunitx-quantity.dtx +++ b/macros/latex/contrib/siunitx/siunitx-quantity.dtx @@ -221,6 +221,7 @@ % \begin{macro}{\@@_parsed_combine-exponent:n, \@@_parsed_combine-exponent:n, \@@_parsed_input:n} % \begin{macro}{\@@_parsed_aux:w} % \begin{macro}{\@@_parsed_aux:nnnw} +% \begin{macro}{\@@_parsed_aux:nnnnw} % \begin{macro}{\@@_parsed_aux:nnnn} % \begin{macro}{\@@_parsed_aux:nnn} % For quantities, there is bit to do to combine things. The first question is @@ -298,34 +299,36 @@ #1 \q_nil #2 \q_nil #3 \q_nil #4 \q_nil #5 \q_nil #6 \q_nil #7 \q_nil #8 \q_nil #9 \q_stop { \@@_parsed_aux:nnnw {#1} {#2#3#4#5} {#6#7#8} #9 \q_stop } -\cs_new_protected:Npn \@@_parsed_aux:nnnw - #1#2#3 #4 \q_nil #5 \q_nil #6 \q_stop - { \@@_parsed_aux:nnnn {#1} {#2} {#3#4} {#5#6} } +\cs_new_protected:Npn \@@_parsed_aux:nnnw #1#2#3 #4 \q_nil + { \@@_parsed_aux:nnnnw {#1} {#2} {#3} {#4} ? } +\cs_new_protected:Npn \@@_parsed_aux:nnnnw + #1#2#3#4 #5 \q_nil #6 \q_stop + { \exp_args:No \@@_parsed_aux:nnnn { \use_none:n #5#6 } {#1} {#2} {#3#4} } \cs_new_protected:Npn \@@_parsed_aux:nnnn #1#2#3#4 { - \tl_if_blank:nTF {#3} - { \siunitx_quantity_print:nV {#1#2#4} \l_@@_unit_tl } + \tl_if_blank:nTF {#4} + { \siunitx_quantity_print:nV {#2#3#1} \l_@@_unit_tl } { \bool_if:NTF \l_@@_uncert_bracket_bool { \siunitx_quantity_print:xV { - \exp_not:n {#1} + \exp_not:n {#2} \exp_not:V \l_@@_bracket_open_tl - \exp_not:n {#2#3} + \exp_not:n {#3#4} \exp_not:V \l_@@_bracket_close_tl - \exp_not:n {#4} + \exp_not:n {#1} } \l_@@_unit_tl } { \bool_if:NTF \l_@@_uncert_repeat_bool { - \tl_if_blank:nTF {#4} - { \@@_parsed_aux:nnn {#1#2} {#3} { } } - { \@@_parsed_aux:nnn {#1#2} {#3} { { } #4 } } + \tl_if_blank:nTF {#1} + { \@@_parsed_aux:nnn {#2#3} {#4} { } } + { \@@_parsed_aux:nnn {#2#3} {#4} { { } #1 } } } - { \siunitx_quantity_print:nV {#1#2#3#4} \l_@@_unit_tl } + { \siunitx_quantity_print:nV {#2#3#4#1} \l_@@_unit_tl } } } } @@ -348,6 +351,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@@_extract_exp:nNN} % \begin{macro}{\@@_extract_exp:nnnnnnnNN} @@ -368,8 +372,8 @@ % % \begin{macro} % { -% \siunitx_quanity_print:nn, \siunitx_quanity_print:nV, -% \siunitx_quanity_print:VV, \siunitx_quanity_print:xV +% \siunitx_quantity_print:nn, \siunitx_quantity_print:nV, +% \siunitx_quantity_print:VV, \siunitx_quantity_print:xV % } % For printing a single part of a quantity. This is needed for compound % quantities and so is public: that's also the reason for passing both diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index e8652f875a..31b3e79181 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -122,7 +122,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2023-06-12} {3.2.6} +\ProvidesExplPackage {siunitx} {2023-07-20} {3.2.7} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index dd90e20a8c..c89c21174a 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex index ad9b137015..c3fad6bbc7 100644 --- a/macros/latex/contrib/siunitx/siunitx.tex +++ b/macros/latex/contrib/siunitx/siunitx.tex @@ -635,9 +635,9 @@ The spelling \enquote{\cs{deka}} is provided for US users as an alternative to Prefix & Command & Symbol & \multicolumn{1}{l@{}}{Power} \\ \midrule \DescribePrefix{quecto} & -30 & - \DescribePrefix{deca} & 1 \\ + \DescribePrefix{deca} & 1 \\ \DescribePrefix{ronto} & -27 & - \DescribePrefix{hecto} & 2 \\ + \DescribePrefix{hecto} & 2 \\ \DescribePrefix{yocto} & -24 & \DescribePrefix{kilo} & 3 \\ \DescribePrefix{atto} & -18 & @@ -1497,7 +1497,7 @@ scientific notation from the input \num[exponent-mode = fixed, fixed-exponent = 0]{1.23e4} \end{LaTeXdemo} \DescribeOption{exponent-thresholds} -When the \opt{exponent-mode} is set to \meta{threshold}, values outside of a +When the \opt{exponent-mode} is set to \opt{threshold}, values outside of a threshold range for the exponent are always printed in scientific form. Within the threshold, they are printed as-given in the input: typically this would be without an exponent. The threshold range itself is controlled by @@ -1524,7 +1524,7 @@ without an exponent. The threshold range itself is controlled by 1 & 1 & 1 \\ 12 & 12 & 12 \\ 123 & 123 & 123 \\ - 1234 & 1234 & 1234 \\ + 1234 & 1234 & 1234 \\ \bottomrule \end{tabular} \end{table} -- cgit v1.2.3