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.sty28
1 files changed, 27 insertions, 1 deletions
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,