From 9db9f51504ab58472a6c8bb27fc8f7ab2aee9e93 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 1 Oct 2014 21:35:33 +0000
Subject: siunitx (1oct14)

git-svn-id: svn://tug.org/texlive/trunk@35296 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 346035b7884..55e06117e6a 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -617,6 +617,8 @@ This work consists of the file  siunitx.dtx
 %   is detected}
 % \changes{v2.6b}{2014/09/27}{Extend range of font shapes which can be
 %   detected}
+% \changes{v2.6c}{2014/10/01}{Fix use of \cs{micro} when \pkg{fontspec}
+%   is loaded but \pkg{unicode-math} is not}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -5143,7 +5145,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2014/09/27} {2.6b}
+\ProvidesExplPackage {siunitx} {2014/10/01} {2.6c}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -15420,7 +15422,9 @@ This work consists of the file  siunitx.dtx
         \@ifpackageloaded { fontspec }
           {
             \int_const:Nn \c_@@_degree_int    { 176 }
-            \int_const:Nn \c_@@_micro_int     { "003BC }
+            \@ifpackageloaded { unicode-math }
+              { \int_const:Nn \c_@@_micro_int { "003BC } }
+              { \int_const:Nn \c_@@_micro_int { "000B5 } }
             \int_const:Nn \c_@@_angstrom_int  { "0212B }
             \int_const:Nn \c_@@_ohm_int       { "003A9 }
             \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl
@@ -16638,7 +16642,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2014/09/27} {2.6b}
+\ProvidesExplFile {siunitx-version-1.cfg} {2014/10/01} {2.6c}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -17580,7 +17584,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/09/27} {2.6b}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2014/10/01} {2.6c}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17762,7 +17766,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2014/09/27} {2.6b}
+\ProvidesExplFile {siunitx-binary.cfg} {2014/10/01} {2.6c}
   {siunitx: Binary units}
 %    \end{macrocode}
 %
-- 
cgit v1.2.3

