CTAN sync 202106250302

8 files changed, 54 insertions, 6 deletions

diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index a65179c47f..3d9721549a 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.16]
+
+### Fixed
+- Treatment of spaces before `/` in literal units (issue #495)
+- Printing of `\mathchoice` entries in text mode (issue #497)
+
 ## [v3.0.15]
 
 ### Fixed
@@ -1403,7 +1409,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.15...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.16...HEAD
+[v3.0.16]: https://github.com/josephwright/siunitx/compare/v3.0.15...v3.0.16
 [v3.0.15]: https://github.com/josephwright/siunitx/compare/v3.0.14...v3.0.15
 [v3.0.14]: https://github.com/josephwright/siunitx/compare/v3.0.13...v3.0.14
 [v3.0.13]: https://github.com/josephwright/siunitx/compare/v3.0.12...v3.0.13
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index ab32109002..dd9f899d20 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-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 15d4452055..25acdd306b 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -722,6 +722,8 @@
 % \begin{macro}{\@@_text_replace:n}
 % \begin{macro}{\@@_text_replace:N}
 % \begin{macro}{\@@_text_replace:NNn}
+% \begin{macro}{\@@_text_replace:Nnnn}
+% \begin{macro}{\@@_text_replace_frac:n}
 % \begin{macro}{\@@_text_sub:n, \@@_text_super:n}
 % \begin{macro}{\@@_text_scripts:NnN}
 % \begin{macro}{\@@_text_scripts:}
@@ -763,9 +765,13 @@
 \cs_new_protected:Npn \@@_text_replace:n #1
   {
     \group_begin:
-      \tl_set:Nn \l_@@_tmp_tl {#1}
-      \@@_text_replace:N \l_@@_tmp_tl
-      \tl_use:N \l_@@_tmp_tl
+    \tl_if_head_eq_meaning:nNTF {#1} \mathchoice
+      { \@@_text_replace:Nnnnn #1 }
+      {
+        \tl_set:Nn \l_@@_tmp_tl {#1}
+        \@@_text_replace:N \l_@@_tmp_tl
+        \tl_use:N \l_@@_tmp_tl
+      }
     \group_end:
   }
 \cs_new_protected:Npx \@@_text_replace:N #1
@@ -797,6 +803,27 @@
     \tl_replace_all:Nnn #1 {#2} {#3}
     \@@_text_replace:NNn #1
   }
+\cs_new_protected:Npn \@@_text_replace:Nnnnn #1#2#3#4#5
+  {
+    \ensuremath
+      {
+        \mathchoice
+          { \@@_print_replace_frac:n {#2} }
+          { \@@_print_replace_frac:n {#3} }
+          { \@@_print_replace_frac:n {#4} }
+          { \@@_print_replace_frac:n {#5} }
+      }
+  }
+%    \end{macrocode}
+%   Almost the same as the lead-off but here we need to deal with re-inserting
+%   a text mode shift.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_print_replace_frac:n #1
+  {
+    \exp_args:NnV \tl_if_head_eq_meaning:nNTF {#1} \l_siunitx_unit_fraction_tl
+      { \@@_text_fraction:Nnn #1 }
+      { \mbox { \@@_text_replace:n {#1} } }
+  }
 %    \end{macrocode}
 %   When the \pkg{bidi} package is loaded, we need to make sure
 %   that \cs{text} is doing the correct thing.
@@ -918,6 +945,8 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
 %
 % \subsection{Standard settings for module options}
 %
diff --git a/macros/latex/contrib/siunitx/siunitx-print.pdf b/macros/latex/contrib/siunitx/siunitx-print.pdf
new file mode 100644
index 0000000000..e1a77edadf
--- /dev/null
+++ b/macros/latex/contrib/siunitx/siunitx-print.pdf
diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx
index ab9c30a1c2..b0602c2543 100644
--- a/macros/latex/contrib/siunitx/siunitx-unit.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx
@@ -1190,6 +1190,7 @@
 % \begin{macro}{\@@_format_literal_super:nn, \@@_format_literal_sub:nn}
 % \begin{macro}{\@@_format_literal_add:n}
 % \begin{macro}{\@@_format_literal_auxix:nn}
+% \begin{macro}{\@@_format_literal_auxx:nw}
 % \begin{variable}{\l_@@_separator_tl}
 %   To format literal units, there are two tasks to do. The input is
 %   \texttt{x}-type expanded to force any symbolic units to be converted into
@@ -1285,7 +1286,11 @@
   {
     \tl_if_head_is_N_type:nTF {#2}
       { \@@_format_literal_auxvi:nN }
-      { \@@_format_literal_auxix:nn }
+      {
+        \tl_if_head_is_group:nTF {#2}
+          { \@@_format_literal_auxix:nn }
+          { \@@_format_literal_auxx:nw }
+      }
         {#1} #2 \q_recursion_stop
   }
 \cs_new_protected:Npx \@@_format_literal_auxvi:nN #1#2
@@ -1347,6 +1352,12 @@
   }
 \cs_new_protected:Npn \@@_format_literal_auxix:nn #1#2
   { \@@_format_literal_auxvi:nN { #1 {#2} } }
+\use:x
+  {
+    \cs_new_protected:Npn \exp_not:N \@@_format_literal_auxx:nw
+      ##1 \c_space_tl
+  }
+  { \@@_format_literal_auxv:nw {#1} }
 \tl_new:N \l_@@_separator_tl
 %    \end{macrocode}
 % \end{variable}
@@ -1361,6 +1372,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \subsection{(PDF) String creation}
 %
diff --git a/macros/latex/contrib/siunitx/siunitx-unit.pdf b/macros/latex/contrib/siunitx/siunitx-unit.pdf
new file mode 100644
index 0000000000..0050caf4e5
--- /dev/null
+++ b/macros/latex/contrib/siunitx/siunitx-unit.pdf
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 0827729689..0ee202f15f 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-06-22} {3.0.15}
+\ProvidesExplPackage {siunitx} {2021-06-24} {3.0.16}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 9a8af935cc..aa8161e9dd 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf