From c6d4778f317f035f213344e49aa5afb18d2e2a81 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 30 Sep 2021 20:13:14 +0000
Subject: siunitx (30sep21)

git-svn-id: svn://tug.org/texlive/trunk@60660 c570f23f-e606-0410-a88d-b1316a301751
---
 .../source/latex/siunitx/siunitx-symbol.dtx        | 32 ++++++++++++++--------
 Master/texmf-dist/source/latex/siunitx/siunitx.dtx |  2 +-
 Master/texmf-dist/source/latex/siunitx/siunitx.tex | 16 +++++++++++
 3 files changed, 37 insertions(+), 13 deletions(-)

(limited to 'Master/texmf-dist/source/latex/siunitx')

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
index 1501f334b34..e8519187221 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
@@ -179,12 +179,16 @@
       {
         \siunitx_declare_unit:Nxn \degree
           {
-            \exp_not:N \text
-              {
-                \@ifpackageloaded { inputenc }
-                  { \exp_not:N \textdegree }
-                  { \@@_non_latin:n { "00B0 } }
-              }
+            \exp_not:N \ifmmode
+              { } ^ { \exp_not:N \circ }
+            \exp_not:N \else
+              \exp_not:N \text
+                {
+                  \@ifpackageloaded { inputenc }
+                    { \exp_not:N \textdegree }
+                    { \@@_non_latin:n { "00B0 } }
+                }
+            \exp_not:N \fi
           }
           { quantity-product = { } }
       }
@@ -203,12 +207,16 @@
           \group_end:
           \siunitx_declare_unit:Nx \degreeCelsius
             {
-              \exp_not:N \text
-                {
-                  \@ifpackageloaded { inputenc }
-                    { \exp_not:N \textdegree }
-                    { \@@_non_latin:n { "00B0 } }
-                }
+              \exp_not:N \ifmmode
+                { } ^ { \exp_not:N \circ }
+              \exp_not:N \else
+                \exp_not:N \text
+                  {
+                    \@ifpackageloaded { inputenc }
+                      { \exp_not:N \textdegree }
+                      { \@@_non_latin:n { "00B0 } }
+                  }
+              \exp_not:N \fi
                   C
             }
         }
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 736c737e924..f786828c46f 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-09-22} {3.0.31}
+\ProvidesExplPackage {siunitx} {2021-09-29} {3.0.32}
   {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 d6d300c3998..3ef382d7227 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
@@ -3063,6 +3063,22 @@ When the \pkg{units} package is loaded before \pkg{siunitx}, the command
 
 \section{Hints for using \pkg{siunitx}}
 
+\subsection{Problematic font encodings%
+  \label{sec:hint:encoding}}
+
+The standard settings in \pkg{siunitx} assume that \enquote{sensible} input and
+font encoding values prevail. The input encoding is assumed to be \acro{UTF-8}
+in all cases. With pdf\LaTeX{}, the font encoding should be \texttt{T1},
+whereas for Xe\LaTeX{} and Lua\LaTeX{}, \texttt{TU} (Unicode font encoding) is
+expected.
+
+Some packages, for example \pkg{newtxtext} or \pkg{stix2}, either force
+\texttt{T1} or do not anticipate \texttt{TU} correctly with Xe\LaTeX{} and
+Lua\LaTeX{}. In these cases, the symbols used by \pkg{siunitx} may be
+incorrect. If correcting the font encoding is not possible, you will need to
+re-declare the relevant units using symbol definitions which account for this
+non-standard setup.
+
 \subsection{Adjusting \cs{litre} and \cs{liter}%
   \label{sec:hint:litre}}
 
-- 
cgit v1.2.3