siunitx (2feb22)

git-svn-id: svn://tug.org/texlive/trunk@61858 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 44 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index fe87b241ca4..8a218bd89ce 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.46] - 2022-02-02
+
+### Fixed
+- Spacing around math symbols in text mode (see issue
+  [\#583](https://github.com/josephwright/siunitx/issues/583))
+
 ## [v3.0.45] - 2022-01-27
 
 ### Fixed
@@ -1692,7 +1698,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.45...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.46...HEAD
+[v3.0.46]: https://github.com/josephwright/siunitx/compare/v3.0.45...v3.0.46
 [v3.0.45]: https://github.com/josephwright/siunitx/compare/v3.0.44...v3.0.45
 [v3.0.44]: https://github.com/josephwright/siunitx/compare/v3.0.43...v3.0.44
 [v3.0.43]: https://github.com/josephwright/siunitx/compare/v3.0.42...v3.0.43
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index 85b1e4892db..ecd6faf3e6b 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index c15a2e4192e..c4f79568c01 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
index 337901d47ff..8f1e4bb4677 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
@@ -843,13 +843,22 @@
           \tl_set:Nn \l_@@_tmp_tl {#1}
           \tl_if_empty:NF \l_siunitx_unit_font_tl
             { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
-          \cs_set:Npn \mathord ##1 {##1}
-          \cs_set:Npn \pm { \exp_not:N \textpm }
+          \cs_set:Npn \mathord ##1
+            {
+              \str_case:nnF {##1}
+                {
+                  { \cdot }  { \exp_not:N \textperiodcentered }
+                  { \pm }    { \exp_not:N \textpm }
+                  { \times } { \exp_not:N \texttimes }
+                }
+                {##1}
+            }
+          \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
           \tl_map_inline:nn
             { \mp \ge \le \gg \ll }
             { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
-          \cs_set:Npn \cdot { \exp_not:N \textperiodcentered }
-          \cs_set:Npn \times { \exp_not:N \texttimes }
+          \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
+          \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
           \protected@edef \l_@@_tmp_tl { \l_@@_tmp_tl }
           \@@_text_replace:N \l_@@_tmp_tl
           \@@_text_replace_aux:n { \tl_use:N \l_@@_tmp_tl }
@@ -992,7 +1001,7 @@
 \cs_new_protected:Npn \@@_text_fraction:Nnn #1#2#3
   {
     \ensuremath
-      { 
+      {
         #1
           { \mbox { \@@_text_replace:n {#2} } }
           { \mbox { \@@_text_replace:n {#3} } }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index db79b498a91..e860a803b32 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} {2022-01-27} {3.0.45}
+\ProvidesExplPackage {siunitx} {2022-02-02} {3.0.46}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.tex b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
index f6ad5283457..1c8e8f62ab9 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
@@ -141,7 +141,7 @@ for those people who are interested.
       \begin{minipage}{0.48\linewidth}
         \LaTeXdemo@input
       \end{minipage}%
-      \hfil
+      \hspace{\fill}%
       \begin{minipage}{0.48\linewidth}
         \usebox\LaTeXdemo@box
       \end{minipage}%
@@ -1060,7 +1060,7 @@ alignment in these situations: this is, in effect, a macro version of the
       \multicolumn{2}{c}{\tablenum[table-format = 4.4]{4563.21}}  \\
       \bottomrule
     \end{tabular}
-    \hfil
+    \hspace{\fill}%
     \begin{tabular}{@{}lr@{}}
       \toprule
       Heading & Heading \\
@@ -2649,7 +2649,7 @@ controlled by the \opt{table-align-text-before} and \opt{\ldots-after}
       \NoteMark{d} 88      & \NoteMark{d} 88     \\
     \bottomrule
     \end{tabular}
-    \hfil
+    \hspace{\fill}%
     \sisetup{table-format = 2.4\NoteMark{a}}
     \begin{tabular}{@{}
       S
@@ -2860,7 +2860,7 @@ same value (one of \opt{center}, \opt{right} or \opt{left}).
 \pkg{siunitx} allows the user to switch between the typographic conventions of
 different (geographical) areas by using locales. Currently, the package is
 supplied with configurations for locales \opt{UK}, \opt{US}, \opt{DE}
-(Germany), \opt{FR} (French), \opt{SI} (Slovene) and \opt{ZA} (South Africa). 
+(Germany), \opt{FR} (French), \opt{SI} (Slovene) and \opt{ZA} (South Africa).
 The \opt{locale}
 option is used to switch to a particular locale.
 \begin{LaTeXdemo}
@@ -3440,7 +3440,7 @@ collected, easiest to do using the \pkg{collcell} package.
   \begin{table}
     \caption{Tables where numbers have different units.%
       \label{tab:xmpl:mixed}}
-    \hfil
+    \hspace{\fill}%
     \begin{tabular}
       {
         @{}
@@ -3457,7 +3457,7 @@ collected, easiest to do using the \pkg{collcell} package.
       \mu / \unit{\per\mm}   &  0.532    &   0.894    \\
       \bottomrule
     \end{tabular}
-    \hfil
+    \hspace{\fill}%
     \begin{tabular}
       {
         @{}
@@ -3473,7 +3473,7 @@ collected, easiest to do using the \pkg{collcell} package.
       4.23  & \joule\per\mole \\
       \bottomrule
     \end{tabular}
-    \hfil
+    \hspace{\fill}%
   \end{table}
 \end{LaTeXdemo}
 
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 176ca1d5421..80815547eb8 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} {2022-01-27} {3.0.45}
+\ProvidesExplPackage {siunitx} {2022-02-02} {3.0.46}
   {A comprehensive (SI) units package}
 \msg_new:nnnn { siunitx } { incompatible-package }
   { Package~'#1'~incompatible. }
@@ -3970,13 +3970,22 @@
           \tl_set:Nn \l__siunitx_print_tmp_tl {#1}
           \tl_if_empty:NF \l_siunitx_unit_font_tl
             { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
-          \cs_set:Npn \mathord ##1 {##1}
-          \cs_set:Npn \pm { \exp_not:N \textpm }
+          \cs_set:Npn \mathord ##1
+            {
+              \str_case:nnF {##1}
+                {
+                  { \cdot }  { \exp_not:N \textperiodcentered }
+                  { \pm }    { \exp_not:N \textpm }
+                  { \times } { \exp_not:N \texttimes }
+                }
+                {##1}
+            }
+          \cs_set:Npn \pm { \: \exp_not:N \textpm \: }
           \tl_map_inline:nn
             { \mp \ge \le \gg \ll }
             { \cs_set:Npn ##1 { \exp_not:N \ensuremath { \exp_not:N ##1 } } }
-          \cs_set:Npn \cdot { \exp_not:N \textperiodcentered }
-          \cs_set:Npn \times { \exp_not:N \texttimes }
+          \cs_set:Npn \cdot { \: \exp_not:N \textperiodcentered \: }
+          \cs_set:Npn \times { \: \exp_not:N \texttimes \: }
           \protected@edef \l__siunitx_print_tmp_tl { \l__siunitx_print_tmp_tl }
           \__siunitx_print_text_replace:N \l__siunitx_print_tmp_tl
           \__siunitx_print_text_replace_aux:n { \tl_use:N \l__siunitx_print_tmp_tl }