diff options
author | Karl Berry <karl@freefriends.org> | 2009-04-02 18:37:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-04-02 18:37:06 +0000 |
commit | 3cb8f358eccf25ab947870c1308dbe55b2fbac5f (patch) | |
tree | b05535799151c49248fa4e9140d7f7350e6758f9 /Master/texmf-dist/tex/latex/siunitx | |
parent | 7191a6160acc88c3b026ce95f07b6ae9ac31c76f (diff) |
siunitx update (1apr09)
git-svn-id: svn://tug.org/texlive/trunk@12602 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx')
25 files changed, 55 insertions, 31 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 cce06739825..624d98076a2 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/03/23 v1.2g siunitx: Germany locale] + [2009/04/01 v1.2i 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 98e71e371cc..407e1e1dda5 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/03/23 v1.2g siunitx: Emulation of + [2009/04/01 v1.2i 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 0819c09a7cd..1c13a1c5537 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/03/23 v1.2g siunitx: UK locale] + [2009/04/01 v1.2i 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 56fbbab3aaf..ec67c52454f 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/03/23 v1.2g siunitx: USA locale] + [2009/04/01 v1.2i 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 6f4c2db0fb6..9d74d5a843d 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/03/23 v1.2g siunitx: South Africa locale] + [2009/04/01 v1.2i 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 d81687e2a79..0fcedb16673 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/03/23 v1.2g siunitx: Abbreviated units] + [2009/04/01 v1.2i 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 dcda1dee264..f59fd22461a 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/03/23 v1.2g siunitx: SI Accepted units] + [2009/04/01 v1.2i 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 35bbe669c47..03f9ac8f83a 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/03/23 v1.2g siunitx: SI Additional units] + [2009/04/01 v1.2i 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 74ff3d18c34..cc3f1307a8c 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} - [2009/03/23 v1.2g siunitx: Units for astronomy] + [2009/04/01 v1.2i 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 745e220e98a..dc126d97690 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/03/23 v1.2g siunitx: Binary units] + [2009/04/01 v1.2i 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 6f1c8c5bfe4..20ab45bfc67 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} - [2009/03/23 v1.2g siunitx: Units for chemical engineering] + [2009/04/01 v1.2i 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 59ea6a55dc8..beb33b211f5 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/03/23 v1.2g siunitx: Emulation of + [2009/04/01 v1.2i 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 36eb6550db3..7c5cb794f2b 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/03/23 v1.2g siunitx: Emulation of + [2009/04/01 v1.2i 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 5c45a0a097e..76450a6290d 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} - [2009/03/23 v1.2g siunitx: Units for astronomy] + [2009/04/01 v1.2i 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 ba2d0cc82f4..d8f4445f377 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/03/23 v1.2g siunitx: Units for high-energy physics] + [2009/04/01 v1.2i 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 2a6eb3d946d..c4982a654c0 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/03/23 v1.2g siunitx: Emulation of + [2009/04/01 v1.2i 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 92781ad50de..3b42515150a 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/03/23 v1.2g siunitx: SI Named units] + [2009/04/01 v1.2i 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 de2bb5d0859..a1a5ccda9a2 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/03/23 v1.2g siunitx: SI Physically-measured units] + [2009/04/01 v1.2i 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 fef79176849..332b149c12a 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/03/23 v1.2g siunitx: SI Multiple prefixes] + [2009/04/01 v1.2i 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 47ac8b56c1d..0bd0bce64da 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/03/23 v1.2g siunitx: SI Prefixed units] + [2009/04/01 v1.2i 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 9130c35236f..d439aab1efe 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/03/23 v1.2g siunitx: Emulation of + [2009/04/01 v1.2i 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 16e6d5521c7..9e4db68f635 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/03/23 v1.2g siunitx: Units for synthetic chemists] + [2009/04/01 v1.2i 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 be63ce87055..621ff9305a0 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/03/23 v1.2g siunitx: Emulation of units] + [2009/04/01 v1.2i 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 95c7cde38c7..46a57591792 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/03/23 v1.2g siunitx: + [2009/04/01 v1.2i 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 6796f123af1..e6c0e2bc07f 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/03/23 v1.2g A comprehensive (SI) units package] + [2009/04/01 v1.2i A comprehensive (SI) units package] \begingroup \@ifundefined{eTeXversion} {\PackageError{siunitx} @@ -267,10 +267,11 @@ mode=maths, repeatunits=true, trapambigerr=true, - trapambigfrac=true} + trapambigfrac=true, + trapambigrange=true} \@for\si@tempa:=obeyall,obeymode,obeyitalic,mode,unitmode,% valuemode,textmode,obeybold,repeatunits,trapambigerr,% - trapambigfrac\do{% + trapambigfrac,trapambigrange\do{% \begingroup \edef\si@tempb{\endgroup \noexpand\si@opt@disablekey{\si@tempa} @@ -870,6 +871,8 @@ \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@boolkey{trapambigrange} +\si@opt@cmdkeys{openrange,closerange} \si@opt@key{locale}{% \si@loc@load{#1}% \si@loc@set{#1}}% @@ -1462,7 +1465,7 @@ \expandafter\si@out@num\expandafter{% \ensuremath{\si@closeerr}}% \ifx\@empty\si@num@ambig\@empty\else - \expandafter\si@out@num\expandafter{\si@num@ambig}% + \si@out@num{\si@num@ambig}% \renewcommand*{\si@num@ambig}{}% \fi \fi @@ -2182,7 +2185,12 @@ \si@unt@numtrue \ifx\@empty\si@unt@unitarg\@empty\else \ifsi@repeatunits - \si@unt@printunit{\si@unt@unitarg}% + \begingroup + \si@out@numfalse + \si@fam@setfalse + \si@fam@set + \si@unt@printunit{\si@unt@unitarg}% + \endgroup \fi \fi} \si@newrobustcmd*{\ang}[2][]{% @@ -3616,10 +3624,23 @@ \ifsi@repeatunits \SI{#2}{#4}% \else + \ifsi@trapambigrange + \ensuremath{\si@openrange}% + \fi \num{#2}% \fi \text{\si@tophrase}% - \SI{#3}{#4}% + \ifsi@repeatunits + \SI{#3}{#4}% + \else + \ifsi@trapambigrange + \num{#3}% + \ensuremath{\si@closerange\si@valuesep}% + \si{#4}% + \else + \SI{#3}{#4}% + \fi + \fi \endgroup } \newcommand*{\si@loc@load}[1]{% @@ -3807,7 +3828,8 @@ angformat=unchanged, astroang=false,%( closeerr=),%( - closefrac=), + closefrac=),%( + closerange=), colour=black, colourall=false, colourneg=false, @@ -3842,6 +3864,7 @@ obeymode=false, openerr=(,%) openfrac=(,%) + openrange=(,% padangle=small, padnumber=lead, per=reciprocal, @@ -3872,6 +3895,7 @@ tophrase=to, trapambigerr=true, trapambigfrac=true, + trapambigrange=true, unitsep=thin, valuesep=thin, xspace=false} |