siunitx update (23feb10)

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

27 files changed, 55 insertions, 60 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index fd222a52056..d4361d5c920 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.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index effa1c64958..96b2cfd1d9b 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -3308,7 +3308,7 @@ author.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2010/02/21 v1.4b A comprehensive (SI) units package]
+  [2010/02/22 v1.4c A comprehensive (SI) units package]
 %    \end{macrocode}
 % The package requires \eTeX, so the usual test is made.
 %    \begin{macrocode}
@@ -5624,6 +5624,7 @@ author.
 %
 %\begin{macro}{\si@fam@detect@default}
 %\changes{v1.4}{2010/01/16}{Detect entire document in non-serif font}
+%\changes{v1.4c}{2010/02/22}{Better testing}
 % Some packages (for example \pkg{cmbright}) and classes
 % (for example \pkg{beamer}) set the default family to be something
 % other than serif family. A one-off detection will make life easier
@@ -5633,11 +5634,8 @@ author.
   \edef\si@tempa{\familydefault}%
   \edef\si@tempb{\sfdefault}%
   \ifx\si@tempa\si@tempb
-    \sisetup
-      {
-        mathsrm = mathsf,
-        textrm  = sffamily
-      }%
+    \@ifpackageloaded{cmbright}{}{\sisetup{ mathsrm = mathsf}}%
+    \sisetup{ textrm = sffamily }%
   \fi
   \edef\si@tempb{\ttdefault}%
   \ifx\si@tempa\si@tempb
@@ -10860,7 +10858,7 @@ author.
 % powers.
 %    \begin{macrocode}
 \ProvidesFile{si-prefix.cfg}
-  [2010/02/21 v1.4b siunitx: SI Multiple prefixes]
+  [2010/02/22 v1.4c siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
@@ -10964,7 +10962,7 @@ author.
 % is an awkward one, but here the UK standard is used.
 %    \begin{macrocode}
 \ProvidesFile{si-named.cfg}
-  [2010/02/21 v1.4b siunitx: SI Named units]
+  [2010/02/22 v1.4c siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
@@ -11063,7 +11061,7 @@ author.
 % This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
 %    \begin{macrocode}
 \ProvidesFile{si-prefixed.cfg}
-  [2010/02/21 v1.4b siunitx: SI Prefixed units]
+  [2010/02/22 v1.4c siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 %    \end{macrocode}
 %\begin{macro}{\picometre}
@@ -11361,7 +11359,7 @@ author.
 % block for the appropriate option.  First currents.
 %    \begin{macrocode}
 \ProvidesFile{si-abbr.cfg}
-  [2010/02/21 v1.4b siunitx: Abbreviated units]
+  [2010/02/22 v1.4c siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
@@ -11584,7 +11582,7 @@ author.
 % These are defined here, although some are in very general use.
 %    \begin{macrocode}
 \ProvidesFile{si-addn.cfg}
-  [2010/02/21 v1.4b siunitx: SI Additional units]
+  [2010/02/22 v1.4c siunitx: SI Additional units]
 \provideunit{\angstrom}{\si@sym@ringA}
 \AtBeginDocument{%
   \ifdefined\Saveangstrom
@@ -11639,7 +11637,7 @@ author.
 %\begin{macro}{\bel}
 %    \begin{macrocode}
 \ProvidesFile{si-accepted.cfg}
-  [2010/02/21 v1.4b siunitx: SI Accepted units]
+  [2010/02/22 v1.4c siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
@@ -11697,7 +11695,7 @@ author.
 % for a negative kern does make things a bit complicated.
 %    \begin{macrocode}
 \ProvidesFile{si-physical.cfg}
-  [2010/02/21 v1.4b siunitx: SI Physically-measured units]
+  [2010/02/22 v1.4c siunitx: SI Physically-measured units]
 \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
 \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
 \newunit{\electronvolt}{e\protect\si@eVspacea V\protect%
@@ -11733,7 +11731,7 @@ author.
 % own definitions.
 %    \begin{macrocode}
 \ProvidesFile{si-synchem.cfg}
-  [2010/02/21 v1.4b siunitx: Units for synthetic chemists]
+  [2010/02/22 v1.4c siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11754,7 +11752,7 @@ author.
 % Some units inspired by \pkg{hepunits}.
 %    \begin{macrocode}
 \ProvidesFile{si-hep.cfg}
-  [2010/02/21 v1.4b siunitx: Units for high-energy physics]
+  [2010/02/22 v1.4c siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 %    \end{macrocode}
 %\begin{macro}{\micron}
@@ -11836,7 +11834,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-astro.cfg}
-  [2010/02/21 v1.4b siunitx: Units for astronomy]
+  [2010/02/22 v1.4c siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %    \end{macrocode}
@@ -11851,7 +11849,7 @@ author.
 % The unit \cs{gon} is useful here.
 %    \begin{macrocode}
 \ProvidesFile{si-geophys.cfg}
-  [2010/02/21 v1.4b siunitx: Units for astronomy]
+  [2010/02/22 v1.4c siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 %    \end{macrocode}
 %\end{macro}
@@ -11866,7 +11864,7 @@ author.
 % For astronomy, the \cs{parsec} unit is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-chemeng.cfg}
-  [2010/02/21 v1.4b siunitx: Units for chemical engineering]
+  [2010/02/22 v1.4c siunitx: Units for chemical engineering]
 \newunit{\gmol}{g\text{-}mol}
 \newunit{\kgmol}{kg\text{-}mol}
 \newunit{\lbmol}{lb\text{-}mol}
@@ -11891,7 +11889,7 @@ author.
 % \SIunits. First, the binary prefixes.
 %    \begin{macrocode}
 \ProvidesFile{si-binary.cfg}
-  [2010/02/21 v1.4b siunitx: Binary units]
+  [2010/02/22 v1.4c siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
@@ -11934,7 +11932,7 @@ author.
 % default values.\footnote{The package author is in the UK.}
 %    \begin{macrocode}
 \ProvidesFile{si-UK.cfg}
-  [2010/02/21 v1.4b siunitx: UK locale]
+  [2010/02/22 v1.4c siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11952,7 +11950,7 @@ author.
 % The same as for the UK.
 %    \begin{macrocode}
 \ProvidesFile{si-USA.cfg}
-  [2010/02/21 v1.4b siunitx: USA locale]
+  [2010/02/22 v1.4c siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
@@ -11970,7 +11968,7 @@ author.
 % Germany, hopefully.
 %    \begin{macrocode}
 \ProvidesFile{si-DE.cfg}
-  [2010/02/21 v1.4b siunitx: Germany locale]
+  [2010/02/22 v1.4c siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -11988,7 +11986,7 @@ author.
 % Design decisions taken from the same section of \SIstyle.
 %    \begin{macrocode}
 \ProvidesFile{si-ZA.cfg}
-  [2010/02/21 v1.4b siunitx: South Africa locale]
+  [2010/02/22 v1.4c siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
@@ -12021,7 +12019,7 @@ author.
 % \units for conflicting options, so users probably expect none.
 %    \begin{macrocode}
 \ProvidesFile{si-units.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of units]
+  [2010/02/22 v1.4c siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
@@ -12091,7 +12089,7 @@ author.
 % clash.
 %    \begin{macrocode}
 \ProvidesFile{si-unitsdef.cfg}
-  [2010/02/21 v1.4b siunitx:
+  [2010/02/22 v1.4c siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
@@ -12540,7 +12538,7 @@ author.
 % the macros in \SIstyle as given in the manual for that package.
 %    \begin{macrocode}
 \ProvidesFile{si-sistyle.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
@@ -12724,7 +12722,7 @@ author.
 % \SIunits emulation starts in much the same way.
 %    \begin{macrocode}
 \ProvidesFile{si-SIunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
@@ -13283,7 +13281,7 @@ author.
 % which are not really to be encouraged.
 %    \begin{macrocode}
 \ProvidesFile{si-hepunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13438,7 +13436,7 @@ author.
 % a little emulation and a few macros needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancynum.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13500,7 +13498,7 @@ author.
 % test is needed.
 %    \begin{macrocode}
 \ProvidesFile{si-fancyunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
index a88a7e09d7a..7c233a15ba3 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-DE.cfg}
-  [2010/02/21 v1.4b siunitx: Germany locale]
+  [2010/02/22 v1.4c siunitx: Germany locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
index 4c9fc41d947..d8d97003060 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-SIunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      SIunits]
 \si@emulating{SIunits}{2007/12/02 v1.36}
 \sisetup{
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
index 08ee3e0ebcf..a750691c66f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-UK.cfg}
-  [2010/02/21 v1.4b siunitx: UK locale]
+  [2010/02/22 v1.4c siunitx: UK locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
index e19d6c4a3e9..2710d1fc42e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-USA.cfg}
-  [2010/02/21 v1.4b siunitx: USA locale]
+  [2010/02/22 v1.4c siunitx: USA locale]
 \sisetup{
   unitsep=thin,
   expproduct=times,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
index 295b76edfee..d61cc8b02a6 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-ZA.cfg}
-  [2010/02/21 v1.4b siunitx: South Africa locale]
+  [2010/02/22 v1.4c siunitx: South Africa locale]
 \sisetup{
   unitsep=cdot,
   valuesep=thin,
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
index 45843f720f7..a4714d6c512 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-abbr.cfg}
-  [2010/02/21 v1.4b siunitx: Abbreviated units]
+  [2010/02/22 v1.4c siunitx: Abbreviated units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\pA}{\pico\ampere}
 \newunit{\nA}{\nano\ampere}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
index 859d079559e..8492a1d6d0f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-accepted.cfg}
-  [2010/02/21 v1.4b siunitx: SI Accepted units]
+  [2010/02/22 v1.4c siunitx: SI Accepted units]
 \newunit{\minute}{min}
 \newunit{\hour}{h}
 \newunit{\Day}{d}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
index 85780203918..12fa08637a4 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-addn.cfg}
-  [2010/02/21 v1.4b siunitx: SI Additional units]
+  [2010/02/22 v1.4c siunitx: SI Additional units]
 \provideunit{\angstrom}{\si@sym@ringA}
 \AtBeginDocument{%
   \ifdefined\Saveangstrom
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
index e5b2f47876c..e5839f65994 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-astro.cfg}
-  [2010/02/21 v1.4b siunitx: Units for astronomy]
+  [2010/02/22 v1.4c siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 %% 
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
index 05a2e7c356c..3feb2cf0443 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-binary.cfg}
-  [2010/02/21 v1.4b siunitx: Binary units]
+  [2010/02/22 v1.4c siunitx: Binary units]
 \newprefix[binary]{\kibi}{10}{Ki}
 \newprefix[binary]{\mebi}{20}{Mi}
 \newprefix[binary]{\gibi}{30}{Gi}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
index bb69508a1c9..620620bc0d9 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-chemeng.cfg}
-  [2010/02/21 v1.4b siunitx: Units for chemical engineering]
+  [2010/02/22 v1.4c siunitx: Units for chemical engineering]
 \newunit{\gmol}{g\text{-}mol}
 \newunit{\kgmol}{kg\text{-}mol}
 \newunit{\lbmol}{lb\text{-}mol}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
index ce515b1ac2e..f7a940ec760 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-fancynum.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      fancynum]
 \si@emulating{fancynum}{2000/08/08 0.92}
 \sisetup{decimalsymbol=cdot,digitsep=comma}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
index c208d99f2a7..25d26baf616 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-fancyunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      fancyunits]
 \si@emulating{fancyunits}{2007/02/01 v1.0.1}
 \si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
index bbe744c2b81..8b62aa11907 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-geophys.cfg}
-  [2010/02/21 v1.4b siunitx: Units for astronomy]
+  [2010/02/22 v1.4c siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 %% 
 %% Copyright (C) 2008-2010 by
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
index 51e9a72669a..63c80359f3a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-hep.cfg}
-  [2010/02/21 v1.4b siunitx: Units for high-energy physics]
+  [2010/02/22 v1.4c siunitx: Units for high-energy physics]
 \requiresiconfigs{prefix,named}
 \provideunit{\micron}{\micro\metre}
 \newunit{\mrad}{\milli\rad}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
index 66174ef7461..b6aa8527901 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-hepunits.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      hepunits]
 \si@emulating{hepunits}{2007/09/27}
 \requiresiconfigs{SIunits,accepted,prefix,hep}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
index f58a08d732a..0469bfd3144 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-named.cfg}
-  [2010/02/21 v1.4b siunitx: SI Named units]
+  [2010/02/22 v1.4c siunitx: SI Named units]
 \newunit{\becquerel}{Bq}
 \newunit{\coulomb}{C}
 \newunit{\farad}{F}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
index 3f6ad072ae5..79da81cf1ad 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-physical.cfg}
-  [2010/02/21 v1.4b siunitx: SI Physically-measured units]
+  [2010/02/22 v1.4c siunitx: SI Physically-measured units]
 \newcommand*{\si@eVspacea}{\text{\kern-\si@eVcorra}}%
 \newcommand*{\si@eVspaceb}{\text{\kern-\si@eVcorrb}}%
 \newunit{\electronvolt}{e\protect\si@eVspacea V\protect%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
index f3eab74ef3b..b006a92d2b2 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-prefix.cfg}
-  [2010/02/21 v1.4b siunitx: SI Multiple prefixes]
+  [2010/02/22 v1.4c siunitx: SI Multiple prefixes]
 \newprefix{\yocto}{-24}{y}
 \newprefix{\zepto}{-21}{z}
 \newprefix{\atto}{-18}{a}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
index aabf5f9c795..a970a3ba2e5 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-prefixed.cfg}
-  [2010/02/21 v1.4b siunitx: SI Prefixed units]
+  [2010/02/22 v1.4c siunitx: SI Prefixed units]
 \requiresiconfigs{prefix,named,accepted,physical}
 \newunit{\picometre}{\pico\metre}
 \newunit{\nanometre}{\nano\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
index 7a29fafc19c..d7bee0542b3 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-sistyle.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of
+  [2010/02/22 v1.4c siunitx: Emulation of
      SIstyle]
 \si@emulating{sistyle}{2006/12/20 v2.3}
 \sisetup{%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
index c53ebc402bb..293072a53ff 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-synchem.cfg}
-  [2010/02/21 v1.4b siunitx: Units for synthetic chemists]
+  [2010/02/22 v1.4c siunitx: Units for synthetic chemists]
 \requiresiconfigs{prefix}
 \newunit{\mmHg}{mmHg}
 \newunit{\molar}{\mole\per\cubic\deci\metre}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
index f61368aa149..f86e99ddd25 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
@@ -15,7 +15,7 @@
 %% 
 \si@ifloaded{units}{\endinput}{}
 \ProvidesFile{si-units.cfg}
-  [2010/02/21 v1.4b siunitx: Emulation of units]
+  [2010/02/22 v1.4c siunitx: Emulation of units]
 \si@emulating{units}{1998/08/04 v0.9b}
 \si@ifloaded{SIunits}
   {\si@emclash{units}{SIunits}\endinput}{}
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
index 4029311a869..eba83cb0606 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
@@ -14,7 +14,7 @@
 %% ---------------------------------------------------------------
 %% 
 \ProvidesFile{si-unitsdef.cfg}
-  [2010/02/21 v1.4b siunitx:
+  [2010/02/22 v1.4c siunitx:
    Emulation of unitsdef]
 \si@emulating{unitsdef}{2005/01/04 v0.2}
 \si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index b0d77450a45..90b94d7132f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2010/02/21 v1.4b A comprehensive (SI) units package]
+  [2010/02/22 v1.4c A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -1095,11 +1095,8 @@
   \edef\si@tempa{\familydefault}%
   \edef\si@tempb{\sfdefault}%
   \ifx\si@tempa\si@tempb
-    \sisetup
-      {
-        mathsrm = mathsf,
-        textrm  = sffamily
-      }%
+    \@ifpackageloaded{cmbright}{}{\sisetup{ mathsrm = mathsf}}%
+    \sisetup{ textrm = sffamily }%
   \fi
   \edef\si@tempb{\ttdefault}%
   \ifx\si@tempa\si@tempb