summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx/siunitx.dtx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx58
1 files changed, 28 insertions, 30 deletions
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}