From bb077b85d20ee236d733a6d34ce144bd825fcc26 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 15 Mar 2023 03:01:23 +0000 Subject: CTAN sync 202303150301 --- macros/latex/contrib/siunitx/CHANGELOG.md | 9 +++- macros/latex/contrib/siunitx/siunitx-angle.dtx | 57 ++++++++++++++++++++----- macros/latex/contrib/siunitx/siunitx-code.pdf | Bin 641978 -> 642235 bytes macros/latex/contrib/siunitx/siunitx.dtx | 2 +- macros/latex/contrib/siunitx/siunitx.pdf | Bin 691123 -> 691121 bytes 5 files changed, 56 insertions(+), 12 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 3fef1b87f7..9d37819ad8 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.2.3] - 2023-03-14 + +### Fixed +- Allow for `parse-nmumbers = false` in handling `\ang` (see issues + [\#649](https://github.com/josephwright/siunitx/issues/649)) + ## [v3.2.2] - 2023-03-04 ### Fixed @@ -1876,7 +1882,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.2...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.3...HEAD +[v3.2.3]: https://github.com/josephwright/siunitx/compare/v3.2.2...v3.2.3 [v3.2.2]: https://github.com/josephwright/siunitx/compare/v3.2.1...v3.2.2 [v3.2.1]: https://github.com/josephwright/siunitx/compare/v3.2.0...v3.2.1 [v3.2.0]: https://github.com/josephwright/siunitx/compare/v3.1.11...v3.2.0 diff --git a/macros/latex/contrib/siunitx/siunitx-angle.dtx b/macros/latex/contrib/siunitx/siunitx-angle.dtx index 866fae193f..a2335a2c9b 100644 --- a/macros/latex/contrib/siunitx/siunitx-angle.dtx +++ b/macros/latex/contrib/siunitx/siunitx-angle.dtx @@ -236,7 +236,7 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}{\siunitx_angle:n} +% \begin{macro}{\siunitx_angle:n, \@@_angle:n} % \begin{macro}{\siunitx_angle:nnn} % \begin{macro}{\@@_arc_convert:n} % The first step here is to force format conversion if required. Going to @@ -244,6 +244,21 @@ % repeating calculations mainly for code readability. % \begin{macrocode} \cs_new_protected:Npn \siunitx_angle:n #1 + { + \bool_if:NTF \l_siunitx_number_parse_bool + { \@@_angle:n {#1} } + { + \tl_if_blank:nF {#1} + { + \tl_set:Nn \l_@@_degrees_tl { \ensuremath {#1} } + \@@_arc_print:VVV + \l_@@_degrees_tl + \c_empty_tl + \c_empty_tl + } + } + } +\cs_new_protected:Npn \@@_angle:n #1 { \bool_if:NTF \l_@@_force_arc_bool { \exp_args:Ne \@@_arc_convert:n { \fp_eval:n {#1} } } @@ -260,12 +275,27 @@ } \cs_new_protected:Npn \siunitx_angle:nnn #1#2#3 { - \bool_if:NTF \l_@@_force_decimal_bool + \bool_if:NTF \l_siunitx_number_parse_bool + { + \bool_if:NTF \l_@@_force_decimal_bool + { + \exp_args:Ne \siunitx_angle:n + { \fp_eval:n { #1 + (#2) / 60 + (#3) / 3600 } } + } + { \@@_arc_sign:nnn {#1} {#2} {#3} } + } { - \exp_args:Ne \siunitx_angle:n - { \fp_eval:n { #1 + (#2) / 60 + (#3) / 3600 } } + \tl_set:Nx \l_@@_degrees_tl + { \tl_if_blank:nF {#1} { \exp_not:n { \ensuremath {#1} } } } + \tl_set:Nx \l_@@_minutes_tl + { \tl_if_blank:nF {#2} { \exp_not:n { \ensuremath {#2} } } } + \tl_set:Nx \l_@@_seconds_tl + { \tl_if_blank:nF {#3} { \exp_not:n { \ensuremath {#3} } } } + \@@_arc_print:VVV + \l_@@_degrees_tl + \l_@@_minutes_tl + \l_@@_seconds_tl } - { \@@_arc_sign:nnn {#1} {#2} {#3} } } \cs_new_protected:Npn \@@_arc_convert:n #1 { @@ -439,18 +469,25 @@ { \tl_if_blank:nF {#1} { - \bool_if:NTF \l_@@_astronomy_bool - { \@@_arc_print_auxii:nw {#2} #1 \q_stop } + \bool_if:NTF \l_siunitx_number_parse_bool { - \@@_arc_print_auxv:w #1 \q_stop + \bool_if:NTF \l_@@_astronomy_bool + { \@@_arc_print_auxii:nw {#2} #1 \q_stop } + { + \@@_arc_print_auxv:w #1 \q_stop + \@@_arc_print_auxvi:n {#2} + } + } + { + \siunitx_print_number:n {#1} \@@_arc_print_auxvi:n {#2} } - \tl_if_blank:nF {#3} + \tl_if_blank:nF {#3} { \nobreak \l_@@_separator_tl } - } + } } \cs_generate_variant:Nn \@@_arc_print_auxi:nnn { nV } % \end{macrocode} diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf index b6daad35bc..447e005499 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.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 047da57d55..3242c28007 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-03-04} {3.2.2} +\ProvidesExplPackage {siunitx} {2023-03-14} {3.2.3} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf index aba22033ac..b896144622 100644 Binary files a/macros/latex/contrib/siunitx/siunitx.pdf and b/macros/latex/contrib/siunitx/siunitx.pdf differ -- cgit v1.2.3