From 6b2af6c8872b046b9483c1d4d0f4486b75ec3386 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Jan 2010 23:38:28 +0000 Subject: siunitx update (16jan10) git-svn-id: svn://tug.org/texlive/trunk@16747 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 701725 -> 434952 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 97 ++++++++++++--------- Master/texmf-dist/source/latex/siunitx/siunitx.ins | 4 +- .../texmf-dist/tex/latex/siunitx/config/si-DE.cfg | 4 +- .../tex/latex/siunitx/config/si-SIunits.cfg | 4 +- .../texmf-dist/tex/latex/siunitx/config/si-UK.cfg | 4 +- .../texmf-dist/tex/latex/siunitx/config/si-USA.cfg | 4 +- .../texmf-dist/tex/latex/siunitx/config/si-ZA.cfg | 4 +- .../tex/latex/siunitx/config/si-abbr.cfg | 4 +- .../tex/latex/siunitx/config/si-accepted.cfg | 4 +- .../tex/latex/siunitx/config/si-addn.cfg | 4 +- .../tex/latex/siunitx/config/si-astro.cfg | 4 +- .../tex/latex/siunitx/config/si-binary.cfg | 4 +- .../tex/latex/siunitx/config/si-chemeng.cfg | 4 +- .../tex/latex/siunitx/config/si-fancynum.cfg | 4 +- .../tex/latex/siunitx/config/si-fancyunits.cfg | 4 +- .../tex/latex/siunitx/config/si-geophys.cfg | 4 +- .../texmf-dist/tex/latex/siunitx/config/si-hep.cfg | 4 +- .../tex/latex/siunitx/config/si-hepunits.cfg | 4 +- .../tex/latex/siunitx/config/si-named.cfg | 4 +- .../tex/latex/siunitx/config/si-physical.cfg | 4 +- .../tex/latex/siunitx/config/si-prefix.cfg | 4 +- .../tex/latex/siunitx/config/si-prefixed.cfg | 4 +- .../tex/latex/siunitx/config/si-sistyle.cfg | 4 +- .../tex/latex/siunitx/config/si-synchem.cfg | 4 +- .../tex/latex/siunitx/config/si-units.cfg | 4 +- .../tex/latex/siunitx/config/si-unitsdef.cfg | 4 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 24 ++++- 28 files changed, 129 insertions(+), 92 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 56753e536b7..4822657efa9 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 4d189b18bbe..9530459da64 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -58,7 +58,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2008-2009 by +Copyright (C) 2008-2010 by Joseph Wright It may be distributed and/or modified under the conditions of @@ -2724,20 +2724,6 @@ This work consists of the file siunitx.dtx % \num[numaddn=\numpi,mode=text]{4\numpi e-7} %\end{LaTeXexample} % -%\subsection{Entire document in sans serif font} -% If your entire document is not in a Roman font, using -% the font detection system is not the most efficient method -% for setting the \currpkg output. Instead, the \opt{mathrm} -% and \opt{textrm} package options can be redefined. -%\begin{LaTeXexample} -% \sffamily -% Some text \\ -% \sisetup{obeyfamily=false,mathrm=mathsf,textrm=sffamily} -% \num{1e2} \\ -% \SI{3}{\newton} -% \[ \SI{4e5}{\pascal} \] -%\end{LaTeXexample} -% %\subsection{Effects of emulation} % The package has been designed so that almost everything can be set % using the options. In the emulation code, some internal macros are @@ -3322,7 +3308,7 @@ author. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{siunitx} - [2009/12/25 v1.3g A comprehensive (SI) units package] + [2010/01/16 v1.4 A comprehensive (SI) units package] % \end{macrocode} % The package requires \eTeX, so the usual test is made. % \begin{macrocode} @@ -5635,6 +5621,37 @@ author. % \end{macrocode} %\end{macro} %\end{macro} +% +%\begin{macro}{\si@fam@detect@default} +%\changes{v1.4}{2010/01/16}{Detect entire document in non-serif font} +% 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 +% all round. +% \begin{macrocode} +\newcommand*\si@fam@detect@default{% + \edef\si@tempa{\familydefault}% + \edef\si@tempb{\sfdefault}% + \ifx\si@tempa\si@tempb + \sisetup + { + mathsrm = mathsf, + textrm = sffamily + }% + \fi + \edef\si@tempb{\ttdefault}% + \ifx\si@tempa\si@tempb + \sisetup + { + mathsrm = mathtt, + textrm = ttfamily + }% + \fi +} +\AtBeginDocument{\si@fam@detect@default} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\si@fam@ifbtext} %\begin{macro}{\si@fam@ifbmaths} %\darg{code} @@ -10847,7 +10864,7 @@ author. % powers. % \begin{macrocode} \ProvidesFile{si-prefix.cfg} - [2009/12/25 v1.3g siunitx: SI Multiple prefixes] + [2010/01/16 v1.4 siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -10951,7 +10968,7 @@ author. % is an awkward one, but here the UK standard is used. % \begin{macrocode} \ProvidesFile{si-named.cfg} - [2009/12/25 v1.3g siunitx: SI Named units] + [2010/01/16 v1.4 siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -11050,7 +11067,7 @@ author. % This requires \file{si-prefix.cfg} and \file{si-named.cfg}. % \begin{macrocode} \ProvidesFile{si-prefixed.cfg} - [2009/12/25 v1.3g siunitx: SI Prefixed units] + [2010/01/16 v1.4 siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} % \end{macrocode} %\begin{macro}{\picometre} @@ -11348,7 +11365,7 @@ author. % block for the appropriate option. First currents. % \begin{macrocode} \ProvidesFile{si-abbr.cfg} - [2009/12/25 v1.3g siunitx: Abbreviated units] + [2010/01/16 v1.4 siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -11571,7 +11588,7 @@ author. % These are defined here, although some are in very general use. % \begin{macrocode} \ProvidesFile{si-addn.cfg} - [2009/12/25 v1.3g siunitx: SI Additional units] + [2010/01/16 v1.4 siunitx: SI Additional units] \provideunit{\angstrom}{\si@sym@ringA} \AtBeginDocument{% \ifdefined\Saveangstrom @@ -11626,7 +11643,7 @@ author. %\begin{macro}{\bel} % \begin{macrocode} \ProvidesFile{si-accepted.cfg} - [2009/12/25 v1.3g siunitx: SI Accepted units] + [2010/01/16 v1.4 siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -11684,7 +11701,7 @@ author. % for a negative kern does make things a bit complicated. % \begin{macrocode} \ProvidesFile{si-physical.cfg} - [2009/12/25 v1.3g siunitx: SI Physically-measured units] + [2010/01/16 v1.4 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% @@ -11720,7 +11737,7 @@ author. % own definitions. % \begin{macrocode} \ProvidesFile{si-synchem.cfg} - [2009/12/25 v1.3g siunitx: Units for synthetic chemists] + [2010/01/16 v1.4 siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -11741,7 +11758,7 @@ author. % Some units inspired by \pkg{hepunits}. % \begin{macrocode} \ProvidesFile{si-hep.cfg} - [2009/12/25 v1.3g siunitx: Units for high-energy physics] + [2010/01/16 v1.4 siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} % \end{macrocode} %\begin{macro}{\micron} @@ -11823,7 +11840,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-astro.cfg} - [2009/12/25 v1.3g siunitx: Units for astronomy] + [2010/01/16 v1.4 siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} % \end{macrocode} @@ -11838,7 +11855,7 @@ author. % The unit \cs{gon} is useful here. % \begin{macrocode} \ProvidesFile{si-geophys.cfg} - [2009/12/25 v1.3g siunitx: Units for astronomy] + [2010/01/16 v1.4 siunitx: Units for astronomy] \newunit{\gon}{gon} % \end{macrocode} %\end{macro} @@ -11853,7 +11870,7 @@ author. % For astronomy, the \cs{parsec} unit is needed. % \begin{macrocode} \ProvidesFile{si-chemeng.cfg} - [2009/12/25 v1.3g siunitx: Units for chemical engineering] + [2010/01/16 v1.4 siunitx: Units for chemical engineering] \newunit{\gmol}{g\text{-}mol} \newunit{\kgmol}{kg\text{-}mol} \newunit{\lbmol}{lb\text{-}mol} @@ -11878,7 +11895,7 @@ author. % \SIunits. First, the binary prefixes. % \begin{macrocode} \ProvidesFile{si-binary.cfg} - [2009/12/25 v1.3g siunitx: Binary units] + [2010/01/16 v1.4 siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} @@ -11921,7 +11938,7 @@ author. % default values.\footnote{The package author is in the UK.} % \begin{macrocode} \ProvidesFile{si-UK.cfg} - [2009/12/25 v1.3g siunitx: UK locale] + [2010/01/16 v1.4 siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11939,7 +11956,7 @@ author. % The same as for the UK. % \begin{macrocode} \ProvidesFile{si-USA.cfg} - [2009/12/25 v1.3g siunitx: USA locale] + [2010/01/16 v1.4 siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -11957,7 +11974,7 @@ author. % Germany, hopefully. % \begin{macrocode} \ProvidesFile{si-DE.cfg} - [2009/12/25 v1.3g siunitx: Germany locale] + [2010/01/16 v1.4 siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -11975,7 +11992,7 @@ author. % Design decisions taken from the same section of \SIstyle. % \begin{macrocode} \ProvidesFile{si-ZA.cfg} - [2009/12/25 v1.3g siunitx: South Africa locale] + [2010/01/16 v1.4 siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -12008,7 +12025,7 @@ author. % \units for conflicting options, so users probably expect none. % \begin{macrocode} \ProvidesFile{si-units.cfg} - [2009/12/25 v1.3g siunitx: Emulation of units] + [2010/01/16 v1.4 siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} @@ -12078,7 +12095,7 @@ author. % clash. % \begin{macrocode} \ProvidesFile{si-unitsdef.cfg} - [2009/12/25 v1.3g siunitx: + [2010/01/16 v1.4 siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} @@ -12527,7 +12544,7 @@ author. % the macros in \SIstyle as given in the manual for that package. % \begin{macrocode} \ProvidesFile{si-sistyle.cfg} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% @@ -12711,7 +12728,7 @@ author. % \SIunits emulation starts in much the same way. % \begin{macrocode} \ProvidesFile{si-SIunits.cfg} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ @@ -13270,7 +13287,7 @@ author. % which are not really to be encouraged. % \begin{macrocode} \ProvidesFile{si-hepunits.cfg} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} @@ -13425,7 +13442,7 @@ author. % a little emulation and a few macros needed. % \begin{macrocode} \ProvidesFile{si-fancynum.cfg} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} @@ -13487,7 +13504,7 @@ author. % test is needed. % \begin{macrocode} \ProvidesFile{si-fancyunits.cfg} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of fancyunits] \si@emulating{fancyunits}{2007/02/01 v1.0.1} \si@ifloaded{SIunits} diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins index 8009614e15b..7b9ed834e45 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins @@ -28,7 +28,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2008-2009 by +Copyright (C) 2008-2010 by Joseph Wright It may be distributed and/or modified under the conditions of @@ -85,7 +85,7 @@ This work consists of the file siunitx.dtx } \endbatchfile %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 428a37c899f..1bd473ec8b1 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} - [2009/12/25 v1.3g siunitx: Germany locale] + [2010/01/16 v1.4 siunitx: Germany locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -24,7 +24,7 @@ sepfour=false, tophrase={ bis }} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 6f22b1b36ad..bee9e0e1c30 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} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of SIunits] \si@emulating{SIunits}{2007/12/02 v1.36} \sisetup{ @@ -321,7 +321,7 @@ {\si@log@inf{SIunits config file loaded}} {\si@log@inf{SIunits config file not found}} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 d84bebf340d..d28793ba700 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} - [2009/12/25 v1.3g siunitx: UK locale] + [2010/01/16 v1.4 siunitx: UK locale] \sisetup{ unitsep=thin, expproduct=times, @@ -24,7 +24,7 @@ sepfour=false, tophrase=to} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 f695d8d431b..c0170a69393 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} - [2009/12/25 v1.3g siunitx: USA locale] + [2010/01/16 v1.4 siunitx: USA locale] \sisetup{ unitsep=thin, expproduct=times, @@ -24,7 +24,7 @@ sepfour=false, tophrase=to} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 193fe2820be..f6340c81982 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} - [2009/12/25 v1.3g siunitx: South Africa locale] + [2010/01/16 v1.4 siunitx: South Africa locale] \sisetup{ unitsep=cdot, valuesep=thin, @@ -24,7 +24,7 @@ sepfour=false, tophrase=to} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 e954098cc7e..37ca31d080f 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} - [2009/12/25 v1.3g siunitx: Abbreviated units] + [2010/01/16 v1.4 siunitx: Abbreviated units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\pA}{\pico\ampere} \newunit{\nA}{\nano\ampere} @@ -73,7 +73,7 @@ \newunit{\mics}{\micro\second} \newunit{\ms}{\milli\second} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 b9aff0acfcd..51cde529593 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} - [2009/12/25 v1.3g siunitx: SI Accepted units] + [2010/01/16 v1.4 siunitx: SI Accepted units] \newunit{\minute}{min} \newunit{\hour}{h} \newunit{\Day}{d} @@ -39,7 +39,7 @@ \newunit{\bel}{B} \newunit{\percent}{\char37} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 bd678c878ce..f3a07969251 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} - [2009/12/25 v1.3g siunitx: SI Additional units] + [2010/01/16 v1.4 siunitx: SI Additional units] \provideunit{\angstrom}{\si@sym@ringA} \AtBeginDocument{% \ifdefined\Saveangstrom @@ -34,7 +34,7 @@ \newunit{\rad}{rad} \provideunit{\rem}{rem} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 8be97c4ac18..4eeff9a82ee 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg @@ -14,11 +14,11 @@ %% --------------------------------------------------------------- %% \ProvidesFile{si-astro.cfg} - [2009/12/25 v1.3g siunitx: Units for astronomy] + [2010/01/16 v1.4 siunitx: Units for astronomy] \newunit{\parsec}{pc} \newunit{\lightyear}{ly} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 951178ec64b..c57be868b42 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} - [2009/12/25 v1.3g siunitx: Binary units] + [2010/01/16 v1.4 siunitx: Binary units] \newprefix[binary]{\kibi}{10}{Ki} \newprefix[binary]{\mebi}{20}{Mi} \newprefix[binary]{\gibi}{30}{Gi} @@ -26,7 +26,7 @@ \newunit{\bit}{bit} \newunit{\byte}{B} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 bb21a410309..f1dfb0d5036 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-chemeng.cfg @@ -14,12 +14,12 @@ %% --------------------------------------------------------------- %% \ProvidesFile{si-chemeng.cfg} - [2009/12/25 v1.3g siunitx: Units for chemical engineering] + [2010/01/16 v1.4 siunitx: Units for chemical engineering] \newunit{\gmol}{g\text{-}mol} \newunit{\kgmol}{kg\text{-}mol} \newunit{\lbmol}{lb\text{-}mol} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 424f8a2915e..a54434316c3 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} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of fancynum] \si@emulating{fancynum}{2000/08/08 0.92} \sisetup{decimalsymbol=cdot,digitsep=comma} @@ -44,7 +44,7 @@ \sisetup{digitsep=none} \fi %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 5d75a80b3ec..397d465bce8 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} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of fancyunits] \si@emulating{fancyunits}{2007/02/01 v1.0.1} \si@ifloaded{SIunits} @@ -102,7 +102,7 @@ \si@siu@newunit{Squaremetre}{kilogram} \si@siu@newunit[cubic]{Squaremetre}{second} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 cba00e673c7..be4f6e5cbf6 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg @@ -14,10 +14,10 @@ %% --------------------------------------------------------------- %% \ProvidesFile{si-geophys.cfg} - [2009/12/25 v1.3g siunitx: Units for astronomy] + [2010/01/16 v1.4 siunitx: Units for astronomy] \newunit{\gon}{gon} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 afdc8ffd52b..651d4df2a21 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} - [2009/12/25 v1.3g siunitx: Units for high-energy physics] + [2010/01/16 v1.4 siunitx: Units for high-energy physics] \requiresiconfigs{prefix,named} \provideunit{\micron}{\micro\metre} \newunit{\mrad}{\milli\rad} @@ -34,7 +34,7 @@ \provideunit{\zb}{\zepto\barn} \provideunit{\yb}{\yocto\barn} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 120e4001513..f9874dab49b 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} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of hepunits] \si@emulating{hepunits}{2007/09/27} \requiresiconfigs{SIunits,accepted,prefix,hep} @@ -67,7 +67,7 @@ \newunit[per=slash,eVcorrb=0.6ex]{\TeVovercsq} {\tera\electronvolt\per\Square\clight} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 3e4da3cf2ba..a9101a7de0d 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} - [2009/12/25 v1.3g siunitx: SI Named units] + [2010/01/16 v1.4 siunitx: SI Named units] \newunit{\becquerel}{Bq} \newunit{\coulomb}{C} \newunit{\farad}{F} @@ -52,7 +52,7 @@ \newunit{\radian}{rad} \newunit{\steradian}{sr} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 7bacddfcd0f..2cef2be804c 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} - [2009/12/25 v1.3g siunitx: SI Physically-measured units] + [2010/01/16 v1.4 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% @@ -22,7 +22,7 @@ \newunit{\atomicmass}{u} \newunit{\atomicmassunit}{u} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 f4f1dc1de24..e1ed34f5d33 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} - [2009/12/25 v1.3g siunitx: SI Multiple prefixes] + [2010/01/16 v1.4 siunitx: SI Multiple prefixes] \newprefix{\yocto}{-24}{y} \newprefix{\zepto}{-21}{z} \newprefix{\atto}{-18}{a} @@ -45,7 +45,7 @@ \newunit{\gram}{g} \renewunit{\kilogram}{\kilo\gram} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 a0f5046c12a..313a4ea9dab 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} - [2009/12/25 v1.3g siunitx: SI Prefixed units] + [2010/01/16 v1.4 siunitx: SI Prefixed units] \requiresiconfigs{prefix,named,accepted,physical} \newunit{\picometre}{\pico\metre} \newunit{\nanometre}{\nano\metre} @@ -101,7 +101,7 @@ \newunit{\megabecquerel}{\mega\becquerel} \newunit{\millisievert}{\milli\sievert} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 4d87fa3dbad..77ca5fb0e6e 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} - [2009/12/25 v1.3g siunitx: Emulation of + [2010/01/16 v1.4 siunitx: Emulation of SIstyle] \si@emulating{sistyle}{2006/12/20 v2.3} \sisetup{% @@ -83,7 +83,7 @@ \fi \addtolocale{#1}{#2}} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 ba57ff61c24..95387b76915 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} - [2009/12/25 v1.3g siunitx: Units for synthetic chemists] + [2010/01/16 v1.4 siunitx: Units for synthetic chemists] \requiresiconfigs{prefix} \newunit{\mmHg}{mmHg} \newunit{\molar}{\mole\per\cubic\deci\metre} @@ -22,7 +22,7 @@ \newunit{\torr}{Torr} \newunit{\dalton}{Da} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 8e4a311027e..413a002bb7f 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} - [2009/12/25 v1.3g siunitx: Emulation of units] + [2010/01/16 v1.4 siunitx: Emulation of units] \si@emulating{units}{1998/08/04 v0.9b} \si@ifloaded{SIunits} {\si@emclash{units}{SIunits}\endinput}{} @@ -49,7 +49,7 @@ \si@frac{#2}{#3} \endgroup} %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 894b4360585..b16ec6d8953 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} - [2009/12/25 v1.3g siunitx: + [2010/01/16 v1.4 siunitx: Emulation of unitsdef] \si@emulating{unitsdef}{2005/01/04 v0.2} \si@ifloaded{SIunits} @@ -229,7 +229,7 @@ {\si@log@inf{unitsdef config file not found}} \fi %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 80e5028ee35..f40b590df1a 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} - [2009/12/25 v1.3g A comprehensive (SI) units package] + [2010/01/16 v1.4 A comprehensive (SI) units package] \begingroup \@ifundefined{eTeXversion} {\PackageError{siunitx} @@ -1091,6 +1091,26 @@ \si@log@inf{\string\mathtt not found}% \global\chardef\si@fam@tt=99\relax \fi} +\newcommand*\si@fam@detect@default{% + \edef\si@tempa{\familydefault}% + \edef\si@tempb{\sfdefault}% + \ifx\si@tempa\si@tempb + \sisetup + { + mathsrm = mathsf, + textrm = sffamily + }% + \fi + \edef\si@tempb{\ttdefault}% + \ifx\si@tempa\si@tempb + \sisetup + { + mathsrm = mathtt, + textrm = ttfamily + }% + \fi +} +\AtBeginDocument{\si@fam@detect@default} \newcommand*{\si@fam@ifbtext}[1]{% \if b\expandafter\@car\f@series\@nil #1\fi} @@ -3957,7 +3977,7 @@ {} \si@catcodes %% -%% Copyright (C) 2008-2009 by +%% Copyright (C) 2008-2010 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3