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