summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/siunitx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-13 03:01:24 +0000
committerNorbert Preining <norbert@preining.info>2023-06-13 03:01:24 +0000
commitaf047c6e9cda7dd92590260e413522353215bf2d (patch)
tree41d7a73410e22152d46ea1c37e5c3425c38e4789 /macros/latex/contrib/siunitx
parentc17d6d7111c3e6e6d92d99ba3b5bf8caf4d5b911 (diff)
CTAN sync 202306130301
Diffstat (limited to 'macros/latex/contrib/siunitx')
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md22
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin642810 -> 642873 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-complex.dtx40
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx11
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin691511 -> 691145 bytes
7 files changed, 57 insertions, 20 deletions
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 8f8d0a1972..05f3d28572 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,22 +7,35 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.2.6] - 2023-06-12
+
+### Fixed
+- Printing of symbols explicitly wrapped in `\ensuremath`
+ (see issue
+ [\#656](https://github.com/josephwright/siunitx/issues/656))
+- Printing of magnitudes for polar values when not parsing numbers
+ (see issue
+ [\#658](https://github.com/josephwright/siunitx/issues/658))
+ - Alignment of separated uncertainties in tables
+ (see issue
+ [\#665](https://github.com/josephwright/siunitx/issues/665))
+
## [v3.2.5] - 2023-04-13
### Fixed
-- Use of `\mathsf` for sanserif text documents (see issues
+- Use of `\mathsf` for sanserif text documents (see issue
[\#655](https://github.com/josephwright/siunitx/issues/655))
## [v3.2.4] - 2023-04-04
### Fixed
-- Parsing of 'full' uncertainty parts with leading zeros (see issues
+- Parsing of 'full' uncertainty parts with leading zeros (see issue
[\#652](https://github.com/josephwright/siunitx/issues/652))
## [v3.2.3] - 2023-03-14
### Fixed
-- Allow for `parse-nmumbers = false` in handling `\ang` (see issues
+- Allow for `parse-numbers = false` in handling `\ang` (see issue
[\#649](https://github.com/josephwright/siunitx/issues/649))
## [v3.2.2] - 2023-03-04
@@ -1894,7 +1907,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.5...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.6...HEAD
+[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
[v3.2.3]: https://github.com/josephwright/siunitx/compare/v3.2.2...v3.2.3
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index e757f4d116..6c105fa972 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-complex.dtx b/macros/latex/contrib/siunitx/siunitx-complex.dtx
index fe23598950..21a8fa3be9 100644
--- a/macros/latex/contrib/siunitx/siunitx-complex.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-complex.dtx
@@ -650,7 +650,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_polar:nn #1#2
{
- \siunitx_number_parse:nN {#1} \l_@@_mag_tl
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ { \siunitx_number_parse:nN {#1} \l_@@_mag_tl }
+ { \tl_set:Nn \l_@@_mag_tl { \ensuremath {#1} } }
\group_begin:
\keys_set:nn { siunitx }
{
@@ -693,7 +695,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_complex_number:n #1
{
- \bool_if:NTF \l_@@_force_polar_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_force_polar_bool }
+ { \l_siunitx_number_parse_bool }
{
\use:e
{
@@ -726,7 +730,9 @@
}
\cs_new_protected:Npn \@@_number:nn #1#2
{
- \bool_if:NTF \l_@@_force_cartesian_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_force_cartesian_bool }
+ { \l_siunitx_number_parse_bool }
{
\exp_args:Ne \siunitx_complex_number:n
{ \@@_convert_cartesian:nn {#1} {#2} }
@@ -738,7 +744,9 @@
}
\cs_new_protected:Npn \siunitx_complex_quantity:nn #1#2
{
- \bool_if:NTF \l_@@_force_polar_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_force_polar_bool }
+ { \l_siunitx_number_parse_bool }
{
\use:e
{
@@ -769,7 +777,9 @@
}
\cs_new_protected:Npn \@@_quantity:nnn #1#2#3
{
- \bool_if:NTF \l_@@_force_cartesian_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_force_cartesian_bool }
+ { \l_siunitx_number_parse_bool }
{
\exp_args:Ne \siunitx_complex_quantity:nn
{ \@@_convert_cartesian:nn {#1} {#2} }
@@ -1019,14 +1029,23 @@
\cs_new_protected:Npn \@@_format_polar:n #1
{
\tl_if_blank:nTF {#1}
- { \siunitx_number_process:NN \l_@@_mag_tl \l_@@_mag_tl }
{
- \use:c
- { @@_format_polar_ \l_siunitx_quantity_prefix_mode_tl :n } {#1}
+ \bool_if:NT \l_siunitx_number_parse_bool
+ { \siunitx_number_process:NN \l_@@_mag_tl \l_@@_mag_tl }
+ }
+ {
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ {
+ \use:c
+ { @@_format_polar_ \l_siunitx_quantity_prefix_mode_tl :n } {#1}
+ }
+ { \@@_format_polar_input:n {#1} }
}
\tl_set:Nx \l_@@_tmp_tl
{
- \siunitx_number_output:N \l_@@_mag_tl
+ \bool_if:NTF \l_siunitx_number_parse_bool
+ { \siunitx_number_output:N \l_@@_mag_tl }
+ { \exp_not:V \l_@@_mag_tl }
\exp_not:V \l_@@_symbol_angle_tl
\mathord % TEMP
\exp_not:V \l_@@_angle_tl
@@ -1058,7 +1077,8 @@
}
\cs_new_protected:Npn \@@_format_polar_input:n #1
{
- \siunitx_number_process:NN \l_@@_mag_tl \l_@@_mag_tl
+ \bool_if:NT \l_siunitx_number_parse_bool
+ { \siunitx_number_process:NN \l_@@_mag_tl \l_@@_mag_tl }
\siunitx_unit_format:nN {#1} \l_@@_unit_tl
}
% \end{macrocode}
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 236cbbab80..0e8277cd93 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -865,21 +865,18 @@
{ \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
\cs_set:Npn \mathord ##1
{ \@@_text_replace_first:N ##1 }
- \group_begin:
- \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
+ \group_begin:
\tl_map_inline:nn
{ \mp \approx \sim \ge \le \geq \leq \gg \ll \angle }
{
\cs_set:Npn ##1
{ \exp_not:N \ensuremath { \exp_not:N ##1 } }
}
- \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
\cs_set:Npn \sqrt ##1
{
\exp_not:N \ensuremath
{ \exp_not:N \sqrt { \exp_not:N \text {##1} } }
}
- \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
\protected@edef \l_@@_tmp_tl
{ \exp_after:wN \@@_text_replace_first:N \l_@@_tmp_tl }
\exp_args:NNNV \group_end:
@@ -910,6 +907,12 @@
{ \exp_not:N \@@_text_sub:n }
^
{ \exp_not:N \@@_text_super:n }
+ \exp_not:N \cdot
+ { \exp_not:N \: \exp_not:N \textperiodcentered \exp_not:N \: }
+ \exp_not:N \pm
+ { \exp_not:N \: \exp_not:N \textpm \exp_not:N \: }
+ \exp_not:N \times
+ { \exp_not:N \: \exp_not:N \texttimes \exp_not:N \: }
\exp_not:N \q_recursion_tail
{ ? }
\exp_not:N \q_recursion_stop
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index 4b7cd9ea9f..6e81d1b7c5 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -1513,7 +1513,7 @@
+ \box_wd:N \l_@@_tmp_box
}
{
- \box_use:N \l_@@_uncert_box
+ \hbox_unpack:N \l_@@_uncert_box
\tl_if_blank:nF {#2#5}
{ \siunitx_print_number:n {#4#5} }
\@@_fil:
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 84e10ad678..e8652f875a 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-04-13} {3.2.5}
+\ProvidesExplPackage {siunitx} {2023-06-12} {3.2.6}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 71c7720642..dd90e20a8c 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ