summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-16 22:26:24 +0000
committerKarl Berry <karl@freefriends.org>2009-11-16 22:26:24 +0000
commit8756d215090713bf024f0b6f29af03510c1eba59 (patch)
treeecd322776767c0e650fbdff544d08945194080d0 /Master/texmf-dist/source
parentee7b4a2078b6b24ffa5e1053b545eb87ae368726 (diff)
siunitx 1.3d (16nov09)
git-svn-id: svn://tug.org/texlive/trunk@16038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx66
1 files changed, 38 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index daaaaf3edaa..fd91d28abe5 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -3322,7 +3322,7 @@ author.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2009/09/21 v1.3a A comprehensive (SI) units package]
+ [2009/10/24 v1.3d A comprehensive (SI) units package]
% \end{macrocode}
% The package requires \eTeX, so the usual test is made.
% \begin{macrocode}
@@ -4934,17 +4934,27 @@ author.
%\end{macro}
%\begin{macro}{\si@textOmega}
%\begin{macro}{\si@mathsOmega}
+%\begin{macro}{\si@upOmega}
% The various non-Latin symbols need to be handled, and given user interfaces.
% Some definitions are more complex than others; for \si{\ohm}
% things are easy.
% \begin{macrocode}
\si@opt@cmdkeys{textOmega,mathsOmega}
\si@opt@key{mathOmega}{\sisetup{mathsOmega=#1}}
-\newcommand*{\si@mathsOmega}{\text{\ensuremath{\Omega}}}
-\newcommand*{\si@textOmega}{\ensuremath{\Omega}}
+\newcommand*{\si@mathsOmega}{\text{\ensuremath{\si@upOmega}}}
+\newcommand*{\si@textOmega}{\ensuremath{\si@upOmega}}
+\newcommand*\si@upOmega{}
+\AtBeginDocument{
+ \ifdefined\upOmega
+ \let\si@upOmega\upOmega
+ \else
+ \let\si@upOmega\Omega
+ \fi
+}
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\end{macro}
%\changes{v1.0c}{2008/06/25}{Fixed excess loading of maths fonts}
%\begin{macro}{\si@textmu}
%\begin{macro}{\si@mathsmu}
@@ -10733,7 +10743,7 @@ author.
% \begin{macrocode}
\ifx\@empty\si@emulate\@empty\else
\@for\si@tempa:=\si@emulate\do{%
- \si@loademfile{\si@tempa}}
+ \expandafter\si@loademfile\expandafter{\si@tempa}}
\fi
% \end{macrocode}
%\begin{macro}{\si@expanddefault}
@@ -10817,7 +10827,7 @@ author.
% powers.
% \begin{macrocode}
\ProvidesFile{si-prefix.cfg}
- [2009/09/21 v1.3a siunitx: SI Multiple prefixes]
+ [2009/10/24 v1.3d siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
@@ -10921,7 +10931,7 @@ author.
% is an awkward one, but here the UK standard is used.
% \begin{macrocode}
\ProvidesFile{si-named.cfg}
- [2009/09/21 v1.3a siunitx: SI Named units]
+ [2009/10/24 v1.3d siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
@@ -11020,7 +11030,7 @@ author.
% This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
% \begin{macrocode}
\ProvidesFile{si-prefixed.cfg}
- [2009/09/21 v1.3a siunitx: SI Prefixed units]
+ [2009/10/24 v1.3d siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
% \end{macrocode}
%\begin{macro}{\picometre}
@@ -11318,7 +11328,7 @@ author.
% block for the appropriate option. First currents.
% \begin{macrocode}
\ProvidesFile{si-abbr.cfg}
- [2009/09/21 v1.3a siunitx: Abbreviated units]
+ [2009/10/24 v1.3d siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
@@ -11541,7 +11551,7 @@ author.
% These are defined here, although some are in very general use.
% \begin{macrocode}
\ProvidesFile{si-addn.cfg}
- [2009/09/21 v1.3a siunitx: SI Additional units]
+ [2009/10/24 v1.3d siunitx: SI Additional units]
\provideunit{\angstrom}{\si@sym@ringA}
\AtBeginDocument{%
\ifdefined\Saveangstrom
@@ -11596,7 +11606,7 @@ author.
%\begin{macro}{\bel}
% \begin{macrocode}
\ProvidesFile{si-accepted.cfg}
- [2009/09/21 v1.3a siunitx: SI Accepted units]
+ [2009/10/24 v1.3d siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
@@ -11654,7 +11664,7 @@ author.
% for a negative kern does make things a bit complicated.
% \begin{macrocode}
\ProvidesFile{si-physical.cfg}
- [2009/09/21 v1.3a siunitx: SI Physically-measured units]
+ [2009/10/24 v1.3d 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%
@@ -11690,7 +11700,7 @@ author.
% own definitions.
% \begin{macrocode}
\ProvidesFile{si-synchem.cfg}
- [2009/09/21 v1.3a siunitx: Units for synthetic chemists]
+ [2009/10/24 v1.3d siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11711,7 +11721,7 @@ author.
% Some units inspired by \pkg{hepunits}.
% \begin{macrocode}
\ProvidesFile{si-hep.cfg}
- [2009/09/21 v1.3a siunitx: Units for high-energy physics]
+ [2009/10/24 v1.3d siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
% \end{macrocode}
%\begin{macro}{\micron}
@@ -11793,7 +11803,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-astro.cfg}
- [2009/09/21 v1.3a siunitx: Units for astronomy]
+ [2009/10/24 v1.3d siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
% \end{macrocode}
@@ -11808,7 +11818,7 @@ author.
% The unit \cs{gon} is useful here.
% \begin{macrocode}
\ProvidesFile{si-geophys.cfg}
- [2009/09/21 v1.3a siunitx: Units for astronomy]
+ [2009/10/24 v1.3d siunitx: Units for astronomy]
\newunit{\gon}{gon}
% \end{macrocode}
%\end{macro}
@@ -11823,7 +11833,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-chemeng.cfg}
- [2009/09/21 v1.3a siunitx: Units for chemical engineering]
+ [2009/10/24 v1.3d siunitx: Units for chemical engineering]
\newunit{\gmol}{g\text{-}mol}
\newunit{\kgmol}{kg\text{-}mol}
\newunit{\lbmol}{lb\text{-}mol}
@@ -11848,7 +11858,7 @@ author.
% \SIunits. First, the binary prefixes.
% \begin{macrocode}
\ProvidesFile{si-binary.cfg}
- [2009/09/21 v1.3a siunitx: Binary units]
+ [2009/10/24 v1.3d siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
@@ -11891,7 +11901,7 @@ author.
% default values.\footnote{The package author is in the UK.}
% \begin{macrocode}
\ProvidesFile{si-UK.cfg}
- [2009/09/21 v1.3a siunitx: UK locale]
+ [2009/10/24 v1.3d siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11909,7 +11919,7 @@ author.
% The same as for the UK.
% \begin{macrocode}
\ProvidesFile{si-USA.cfg}
- [2009/09/21 v1.3a siunitx: USA locale]
+ [2009/10/24 v1.3d siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11927,7 +11937,7 @@ author.
% Germany, hopefully.
% \begin{macrocode}
\ProvidesFile{si-DE.cfg}
- [2009/09/21 v1.3a siunitx: Germany locale]
+ [2009/10/24 v1.3d siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11945,7 +11955,7 @@ author.
% Design decisions taken from the same section of \SIstyle.
% \begin{macrocode}
\ProvidesFile{si-ZA.cfg}
- [2009/09/21 v1.3a siunitx: South Africa locale]
+ [2009/10/24 v1.3d siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11978,7 +11988,7 @@ author.
% \units for conflicting options, so users probably expect none.
% \begin{macrocode}
\ProvidesFile{si-units.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of units]
+ [2009/10/24 v1.3d siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
@@ -12048,7 +12058,7 @@ author.
% clash.
% \begin{macrocode}
\ProvidesFile{si-unitsdef.cfg}
- [2009/09/21 v1.3a siunitx:
+ [2009/10/24 v1.3d siunitx:
Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
@@ -12497,7 +12507,7 @@ author.
% the macros in \SIstyle as given in the manual for that package.
% \begin{macrocode}
\ProvidesFile{si-sistyle.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of
+ [2009/10/24 v1.3d siunitx: Emulation of
SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
@@ -12681,7 +12691,7 @@ author.
% \SIunits emulation starts in much the same way.
% \begin{macrocode}
\ProvidesFile{si-SIunits.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of
+ [2009/10/24 v1.3d siunitx: Emulation of
SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
@@ -13240,7 +13250,7 @@ author.
% which are not really to be encouraged.
% \begin{macrocode}
\ProvidesFile{si-hepunits.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of
+ [2009/10/24 v1.3d siunitx: Emulation of
hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13395,7 +13405,7 @@ author.
% a little emulation and a few macros needed.
% \begin{macrocode}
\ProvidesFile{si-fancynum.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of
+ [2009/10/24 v1.3d siunitx: Emulation of
fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13457,7 +13467,7 @@ author.
% test is needed.
% \begin{macrocode}
\ProvidesFile{si-fancyunits.cfg}
- [2009/09/21 v1.3a siunitx: Emulation of
+ [2009/10/24 v1.3d siunitx: Emulation of
fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}