siunitx (3may22)

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

6 files changed, 14 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index c0810e829bd..28789f440fc 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 
 ## [Unreleased]
 
+## [v3.1.1] - 2022-05-03
+
+### Changed
+- Allow for _e.g._ `\clist_item:Nn` usage inside `\unit` argument
+
 ## [v3.1.0] - 2022-04-25
 
 ### Added
@@ -1769,7 +1774,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.1.0...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.1.1...HEAD
+[v3.1.1]: https://github.com/josephwright/siunitx/compare/v3.1.0...v3.1.1
 [v3.1.0]: https://github.com/josephwright/siunitx/compare/v3.0.50...v3.1.0
 [v3.0.50]: https://github.com/josephwright/siunitx/compare/v3.0.49...v3.0.50
 [v3.0.49]: https://github.com/josephwright/siunitx/compare/v3.0.48...v3.0.49
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index a91ddf0a367..41fb8e8464e 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 0f234b75d97..126c670133e 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-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
index 7147db42757..6ea4ef12b9e 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
@@ -763,13 +763,16 @@
 %   when parsing there is a need to check if the current unit is built up
 %   from others (symbolic) or is defined in terms of some literals. To do this,
 %   the approach used is to set all of the symbolic unit commands expandable
-%   and to do nothing, with the few special cases handled manually.
+%   and to do nothing, with the few special cases handled manually. We expand
+%   the input here twice: this handles the case where there is a mapping or
+%   similar in |#1| which returns its result in \cs{exp_not:n}.
 %    \begin{macrocode}
 \prg_new_protected_conditional:Npnn \@@_if_symbolic:n #1 { TF }
   {
     \group_begin:
       \bool_set_true:N \l_@@_test_bool
       \protected@edef \l_@@_tmp_tl {#1}
+      \protected@edef \l_@@_tmp_tl { \l_@@_tmp_tl }
     \exp_args:NNV \group_end:
     \tl_if_blank:nTF \l_@@_tmp_tl
       { \prg_return_true: }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index a5219ad957e..49446acfa5a 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-04-25} {3.1.0}
+\ProvidesExplPackage {siunitx} {2022-05-03} {3.1.1}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 96851bb721a..84db69f1966 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-04-25} {3.1.0}
+\ProvidesExplPackage {siunitx} {2022-05-03} {3.1.1}
   {A comprehensive (SI) units package}
 \msg_new:nnnn { siunitx } { incompatible-package }
   { Package~'#1'~incompatible. }
@@ -5619,6 +5619,7 @@
     \group_begin:
       \bool_set_true:N \l__siunitx_unit_test_bool
       \protected@edef \l__siunitx_unit_tmp_tl {#1}
+      \protected@edef \l__siunitx_unit_tmp_tl { \l__siunitx_unit_tmp_tl }
     \exp_args:NNV \group_end:
     \tl_if_blank:nTF \l__siunitx_unit_tmp_tl
       { \prg_return_true: }