siunitx 1.2 (22jan09)

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

24 files changed, 73 insertions, 24 deletions

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 8890a37b38a..06f0d249d8c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-DE.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-DE.cfg}
-  [2008/12/22 v1.1j siunitx: Germany locale]
+  [2009/01/22 v1.2 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 d968c3209f7..ca0fb18f699 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-SIunits.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-SIunits.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of
+  [2009/01/22 v1.2 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 37ab4c8450b..c263bf74245 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-UK.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-UK.cfg}
-  [2008/12/22 v1.1j siunitx: UK locale]
+  [2009/01/22 v1.2 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 9c3ab903fd6..2d43cf8eeaf 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-USA.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-USA.cfg}
-  [2008/12/22 v1.1j siunitx: USA locale]
+  [2009/01/22 v1.2 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 7085d972a7a..a335f373e73 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-ZA.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-ZA.cfg}
-  [2008/12/22 v1.1j siunitx: South Africa locale]
+  [2009/01/22 v1.2 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 9f94721a70a..98c7ee843ea 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-abbr.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-abbr.cfg}
-  [2008/12/22 v1.1j siunitx: Abbreviated units]
+  [2009/01/22 v1.2 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 fd56e05411d..f510fded67d 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-accepted.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-accepted.cfg}
-  [2008/12/22 v1.1j siunitx: SI Accepted units]
+  [2009/01/22 v1.2 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 f7424cd0670..8e9c27050d5 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-addn.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-addn.cfg}
-  [2008/12/22 v1.1j siunitx: SI Additional units]
+  [2009/01/22 v1.2 siunitx: SI Additional units]
 \newunit{\angstrom}{\si@sym@ringA}
 \newunit{\are}{a}
 \newunit{\hectare}{\hecto\are}
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 69efb9b0763..07a63411448 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-astro.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-astro.cfg}
-  [2008/12/22 v1.1j siunitx: Units for astronomy]
+  [2009/01/22 v1.2 siunitx: Units for astronomy]
 \newunit{\parsec}{pc}
 \newunit{\lightyear}{ly}
 \endinput
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 f69e3660e53..26457bb49a1 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-binary.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-binary.cfg}
-  [2008/12/22 v1.1j siunitx: Binary units]
+  [2009/01/22 v1.2 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-fancynum.cfg b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
index 69ade44554a..11456bdfd43 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancynum.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-fancynum.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of
+  [2009/01/22 v1.2 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 407f8c7d196..ef3e5248165 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-fancyunits.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-fancyunits.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of
+  [2009/01/22 v1.2 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 fda72c3db07..62fbb6e4a0c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-geophys.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-geophys.cfg}
-  [2008/12/22 v1.1j siunitx: Units for astronomy]
+  [2009/01/22 v1.2 siunitx: Units for astronomy]
 \newunit{\gon}{gon}
 \endinput
 %%
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 83415e7c4ef..744943153e7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hep.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-hep.cfg}
-  [2008/12/22 v1.1j siunitx: Units for high-energy physics]
+  [2009/01/22 v1.2 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 8479aa54bb9..13a538e1875 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-hepunits.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-hepunits.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of
+  [2009/01/22 v1.2 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 c1401e476f0..69cbf2f8c5a 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-named.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-named.cfg}
-  [2008/12/22 v1.1j siunitx: SI Named units]
+  [2009/01/22 v1.2 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 66cc46da186..91ecc689ae0 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-physical.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-physical.cfg}
-  [2008/12/22 v1.1j siunitx: SI Physically-measured units]
+  [2009/01/22 v1.2 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 b3d5c4565d5..bcdb29d7b87 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefix.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-prefix.cfg}
-  [2008/12/22 v1.1j siunitx: SI Multiple prefixes]
+  [2009/01/22 v1.2 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 44f718d80db..159c7fdfa23 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-prefixed.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-prefixed.cfg}
-  [2008/12/22 v1.1j siunitx: SI Prefixed units]
+  [2009/01/22 v1.2 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 ada4040ccc5..34c5d23c926 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-sistyle.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-sistyle.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of
+  [2009/01/22 v1.2 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 35b2d2ce3df..3d31f02f2ae 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-synchem.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-synchem.cfg}
-  [2008/12/22 v1.1j siunitx: Units for synthetic chemists]
+  [2009/01/22 v1.2 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 0b3b90eca6d..b0e63cc29f7 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-units.cfg
@@ -13,9 +13,10 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \si@ifloaded{units}{\endinput}{}
 \ProvidesFile{si-units.cfg}
-  [2008/12/22 v1.1j siunitx: Emulation of units]
+  [2009/01/22 v1.2 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 5a352cc3cf6..64fad5583f2 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/si-unitsdef.cfg
@@ -13,8 +13,9 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \ProvidesFile{si-unitsdef.cfg}
-  [2008/12/22 v1.1j siunitx:
+  [2009/01/22 v1.2 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 a00e3428c57..af1f1f74431 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -13,9 +13,10 @@
 %%  See http://www.latex-project.org/lppl.txt
 %%  ----------------------------------------------------------------
 %% 
+%%\DescribeOption{tophrase}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/12/22 v1.1j A comprehensive (SI) units package]
+  [2008/01/22 v1.2 A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -868,6 +869,7 @@
 \newlength\si@eVcorrb
 \si@opt@key{eVcorra}{\setlength\si@eVcorra{#1}}
 \si@opt@key{eVcorrb}{\setlength\si@eVcorrb{#1}}
+\si@opt@xchoicekey{tophrase}{to,dots,ndash,dash}{to}
 \si@opt@key{locale}{%
   \si@loc@load{#1}%
   \si@loc@set{#1}}%
@@ -942,6 +944,9 @@
 \newcommand*{\si@fix@ten}{10}
 \newcommand*{\si@fix@slash}{/}
 \newcommand*{\si@fix@none}{}
+\newcommand*{\si@fix@to}{ to }
+\newcommand*{\si@fix@dash}{--}
+\newcommand*{\si@fix@dots}{\,\dots\,}
 \newcommand*{\si@symbol}[1]{%
   \expandafter\protected\expandafter\def
     \csname si@sym@#1\endcsname{%
@@ -3586,6 +3591,26 @@
   {#1}{#2}}
 \newcommand*{\tothe@opt@si}{post}
 \newcommand*{\raiseto@opt@si}{}
+\si@newrobustcmd*{\numrange}[3][]{%
+  \begingroup
+    \sisetup{#1}%
+    \num{#2}%
+    \text{\si@tophrase}%
+    \num{#3}%
+  \endgroup
+}
+\si@newrobustcmd*{\SIrange}[4][]{%
+  \begingroup
+    \sisetup{#1}
+    \ifsi@repeatunits
+      \SI{#2}{#4}%
+    \else
+      \num{#2}%
+    \fi
+    \text{\si@tophrase}%
+    \SI{#3}{#4}%
+  \endgroup
+}
 \newcommand*{\si@loc@load}[1]{%
   \let\si@loc@sisetup\sisetup
   \renewcommand*{\sisetup}[1]{%
@@ -3832,6 +3857,7 @@
   textsf=sffamily,
   texttt=ttfamily,
   tightpm=false,
+  tophrase=to,
   trapambigerr=true,
   trapambigfrac=true,
   unitsep=thin,