siunitx (7jun21)

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

4 files changed, 45 insertions, 16 deletions

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx
index cc60aa85e8e..9d0133affba 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-emulation.dtx
@@ -776,6 +776,13 @@
           { quantity-product }
           \l_keys_value_tl
       } ,
+    number-unit-separator .code:n =
+      {
+        \@@_option_deprecated:nnV
+          { number-unit-separator }
+          { quantity-product }
+          \l_keys_value_tl
+      } ,
     prefixes-as-symbols .choice: ,
     prefixes-as-symbols / false . code:n =
       {
@@ -1044,25 +1051,31 @@
   \bar              { bar }
   \barn             { b }
   \bohr
-    { \text { \ensuremath { a } } \char_generate:nn { `\_ } { 8 } { 0 } }
+    {
+      \exp_not:N \text
+        { \exp_not:N \ensuremath { a } } \char_generate:nn { `\_ } { 8 } { 0 }
+    }
   \clight
-    { \text { \ensuremath { c } } \char_generate:nn { `\_ } { 8 } { 0 } }
+    {
+      \exp_not:N \text
+        { \exp_not:N \ensuremath { c } } \char_generate:nn { `\_ } { 8 } { 0 }
+    }
   \electronmass
     {
-      \text { \ensuremath { m } }
+      \exp_not:N \text { \exp_not:N \ensuremath { m } }
       \char_generate:nn { `\_ } { 8 } { \exp_not:N \mathrm { e } }
     }
   \elementarycharge { \text { \ensuremath { e } } }
   \hartree
     {
-      \text { \ensuremath { E } }
+      \exp_not:N \text { \exp_not:N \ensuremath { E } }
       \char_generate:nn { `\_ } { 8 } { \exp_not:N \mathrm { h } }
     }
   \knot             { kn }
   \mmHg             { mmHg }
   \nauticalmile     { M }
   \planckbar
-    { \text { \ensuremath { \exp_not:N \hbar } } }
+    { \exp_not:N \text { \exp_not:N \ensuremath { \exp_not:N \hbar } } }
   \q_recursion_tail { }
   \q_recursion_stop
 \@ifpackageloaded { fontspec }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
index 8ba65fc4175..251d257c4b4 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
@@ -114,12 +114,14 @@
       }
     \cs_new:Npn \@@_non_latin:nnnn #1#2#3#4
       {
+        \@@_deal_with_utf:
         \exp_after:wN \exp_after:wN \exp_after:wN
           \exp_not:N \char_generate:nn {#1} { 13 }
         \exp_after:wN \exp_after:wN \exp_after:wN
           \exp_not:N \char_generate:nn {#2} { 13 }
       }
   }
+\cs_new:Npn \@@_deal_with_utf: { }
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -128,13 +130,17 @@
 %   A test to see if the unit definition which applies is still one we expect:
 %   here that means it is just using a (Unicode) codepoint. The comparison
 %   is string-based as \pkg{unicode-math} (at least) can alter some of them.
+%   Active characters are set to \cs{scan_stop:} so that the code here gives
+%   exactly the tokens (bytes) we want: needed for encodings other than
+%   \textsc{utf}-8.
 %    \begin{macrocode}
 \prg_new_protected_conditional:Npnn \@@_if_replace:Nn #1#2 { T , TF }
   {
     \group_begin:
-      \tl_set:Nx \l_@@_tmpa_tl { \@@_non_latin:n {#2} }
       \protected@edef \l_@@_tmpa_tl
-        { \exp_not:N \mathrm { \l_@@_tmpa_tl } }
+        { \exp_not:N \mathrm { \@@_non_latin:n {#2} } }
+      \int_step_inline:nnn { "80 } { "FF }
+        { \char_set_active_eq:nN {##1} \scan_stop: }
       \keys_set:nn { siunitx } { parse-units = false }
       \siunitx_unit_format:nN {#1} \l_@@_tmpb_tl
       \str_if_eq:VVTF \l_@@_tmpa_tl \l_@@_tmpb_tl
@@ -143,6 +149,7 @@
           \prg_return_true:
         }
         {
+          \show\l_@@_tmpa_tl \show\l_@@_tmpb_tl
           \group_end:
           \prg_return_false:
         }
@@ -178,8 +185,12 @@
           {
             \siunitx_declare_unit:Nxn \degree
               {
-                \siunitx_print_text:n
-                  { \@@_non_latin:n { "00B0 } }
+                \exp_not:N \text
+                  {
+                    \@ifpackageloaded { inputenc }
+                      { \exp_not:N \textdegree }
+                      { \@@_non_latin:n { "00B0 } }
+                  }
               }
               { quantity-product = { } }
          }
@@ -202,8 +213,13 @@
             {
               \siunitx_declare_unit:Nx \degreeCelsius
                 {
-                  \siunitx_print_text:n
-                    { \@@_non_latin:n { "00B0 } } C
+                  \exp_not:N \text
+                    {
+                      \@ifpackageloaded { inputenc }
+                        { \exp_not:N \textdegree }
+                        { \@@_non_latin:n { "00B0 } }
+                    }
+                      C
                 }
            }
         }
@@ -221,7 +237,7 @@
                 { \exp_not:N \upOmega }
                 { \exp_not:N \Omega }
             \exp_not:N \else
-              \siunitx_print_text:n
+              \exp_not:N \text
                 {
                   \bool_lazy_or:nnTF
                     { \sys_if_engine_luatex_p: }
@@ -240,7 +256,7 @@
       {
         \siunitx_declare_prefix:Nnx \micro { -6 }
           {
-            \siunitx_print_text:n
+            \exp_not:N \text
               {
                 \bool_lazy_or:nnTF
                   { \sys_if_engine_luatex_p: }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
index 01f85be7141..3cbfa728fc6 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
@@ -220,7 +220,7 @@
 %
 % \begin{function}{\siunitx_declare_power:NNn}
 %   \begin{syntax}
-%     \cs{siunitx_declare_power:NnN} \meta{pre-power} \meta{post-power} \Arg{value}
+%     \cs{siunitx_declare_power:NNn} \meta{pre-power} \meta{post-power} \Arg{value}
 %   \end{syntax}
 %   Defines \emph{two} symbolic \meta{powers} (which should be control
 %   sequences such as |\squared|) to be converted by the parser to the
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index d6f8821495a..03d06b4cb30 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} {2021-06-04} {3.0.10}
+\ProvidesExplPackage {siunitx} {2021-06-07} {3.0.11}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -246,7 +246,7 @@
   }
 \NewDocumentCommand \DeclareSIPrefix { +m m m }
   {
-    \siunitx_declare_prefix:Nnn #1 {#2} {#3}
+    \siunitx_declare_prefix:Nnn #1 {#3} {#2}
   }
 \NewDocumentCommand \DeclareSIQualifier { +m m }
   {