summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-01-26 00:40:19 +0000
committerKarl Berry <karl@freefriends.org>2009-01-26 00:40:19 +0000
commit1efdc9ec61305aff06efb12bd7a3ca012e087bea (patch)
treea4946f89ec53201ac8b8b5869f85e4a55e491732 /Master/texmf-dist/source/latex/siunitx
parentd63d9aa96f223419b04a1a2c85f6cc8c3d10d834 (diff)
siunitx update (25jan09)
git-svn-id: svn://tug.org/texlive/trunk@11979 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx55
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.ins1
2 files changed, 28 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 72ee1a5a1f0..f6248dfe46d 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -1940,7 +1940,7 @@ dcolumn, rccol and numprint packages.
% \num{773322}
%\end{LaTeXexample}
%
-%%\DescribeOption{tophrase}
+%\DescribeOption{tophrase}
% When using the range macros \cs{numrange} and \cs{SIrange}, the phrase
% used for ``to'' is set using the option \opt{tophrase}. This can take
% three pre-defined choices \defaultopt{to}, \opt{dots} and \opt{dash},
@@ -3404,7 +3404,7 @@ author.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2009/01/22 v1.2a A comprehensive (SI) units package]
+ [2009/01/24 v1.2b A comprehensive (SI) units package]
% \end{macrocode}
% The package requires \eTeX, so the usual test is made.
% \begin{macrocode}
@@ -10304,7 +10304,7 @@ author.
}
\si@newrobustcmd*{\SIrange}[4][]{%
\begingroup
- \sisetup{#1}
+ \sisetup{#1}%
\ifsi@repeatunits
\SI{#2}{#4}%
\else
@@ -10837,7 +10837,7 @@ author.
% powers.
% \begin{macrocode}
\ProvidesFile{si-prefix.cfg}
- [2009/01/22 v1.2 siunitx: SI Multiple prefixes]
+ [2009/01/24 v1.2b siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
@@ -10941,7 +10941,7 @@ author.
% is an awkward one, but here the UK standard is used.
% \begin{macrocode}
\ProvidesFile{si-named.cfg}
- [2009/01/22 v1.2 siunitx: SI Named units]
+ [2009/01/24 v1.2b siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
@@ -11037,7 +11037,7 @@ author.
% This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
% \begin{macrocode}
\ProvidesFile{si-prefixed.cfg}
- [2009/01/22 v1.2 siunitx: SI Prefixed units]
+ [2009/01/24 v1.2b siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
% \end{macrocode}
%\begin{macro}{\picometre}
@@ -11335,7 +11335,7 @@ author.
% block for the appropriate option. First currents.
% \begin{macrocode}
\ProvidesFile{si-abbr.cfg}
- [2009/01/22 v1.2 siunitx: Abbreviated units]
+ [2009/01/24 v1.2b siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
@@ -11558,7 +11558,7 @@ author.
% These are defined here, although some are in very general use.
% \begin{macrocode}
\ProvidesFile{si-addn.cfg}
- [2009/01/22 v1.2 siunitx: SI Additional units]
+ [2009/01/24 v1.2b siunitx: SI Additional units]
\newunit{\angstrom}{\si@sym@ringA}
\newunit{\are}{a}
\newunit{\hectare}{\hecto\are}
@@ -11608,7 +11608,7 @@ author.
%\begin{macro}{\percent}
% \begin{macrocode}
\ProvidesFile{si-accepted.cfg}
- [2009/01/22 v1.2 siunitx: SI Accepted units]
+ [2009/01/24 v1.2b siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
@@ -11661,7 +11661,7 @@ author.
% for a negative kern does make things a bit complicated.
% \begin{macrocode}
\ProvidesFile{si-physical.cfg}
- [2009/01/22 v1.2 siunitx: SI Physically-measured units]
+ [2009/01/24 v1.2b 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%
@@ -11697,7 +11697,7 @@ author.
% own definitions.
% \begin{macrocode}
\ProvidesFile{si-synchem.cfg}
- [2009/01/22 v1.2 siunitx: Units for synthetic chemists]
+ [2009/01/24 v1.2b siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11718,7 +11718,7 @@ author.
% Some units inspired by \pkg{hepunits}.
% \begin{macrocode}
\ProvidesFile{si-hep.cfg}
- [2009/01/22 v1.2 siunitx: Units for high-energy physics]
+ [2009/01/24 v1.2b siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
% \end{macrocode}
%\begin{macro}{\micron}
@@ -11800,7 +11800,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-astro.cfg}
- [2009/01/22 v1.2 siunitx: Units for astronomy]
+ [2009/01/24 v1.2b siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
% \end{macrocode}
@@ -11815,7 +11815,7 @@ author.
% The unit \cs{gon} is useful here.
% \begin{macrocode}
\ProvidesFile{si-geophys.cfg}
- [2009/01/22 v1.2 siunitx: Units for astronomy]
+ [2009/01/24 v1.2b siunitx: Units for astronomy]
\newunit{\gon}{gon}
% \end{macrocode}
%\end{macro}
@@ -11836,7 +11836,7 @@ author.
% \SIunits. First, the binary prefixes.
% \begin{macrocode}
\ProvidesFile{si-binary.cfg}
- [2009/01/22 v1.2 siunitx: Binary units]
+ [2009/01/24 v1.2b siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
@@ -11879,7 +11879,7 @@ author.
% default values.\footnote{The package author is in the UK.}
% \begin{macrocode}
\ProvidesFile{si-UK.cfg}
- [2009/01/22 v1.2 siunitx: UK locale]
+ [2009/01/24 v1.2b siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11896,7 +11896,7 @@ author.
% The same as for the UK.
% \begin{macrocode}
\ProvidesFile{si-USA.cfg}
- [2009/01/22 v1.2 siunitx: USA locale]
+ [2009/01/24 v1.2b siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11913,14 +11913,15 @@ author.
% Germany, hopefully.
% \begin{macrocode}
\ProvidesFile{si-DE.cfg}
- [2009/01/22 v1.2 siunitx: Germany locale]
+ [2009/01/24 v1.2b siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
decimalsymbol=comma,
expproduct=cdot,
digitsep=thin,
- sepfour=false}
+ sepfour=false,
+ tophrase={~bis~}}
% \end{macrocode}
%\iffalse
%</DE>
@@ -11930,7 +11931,7 @@ author.
% Design decisions taken from the same section of \SIstyle.
% \begin{macrocode}
\ProvidesFile{si-ZA.cfg}
- [2009/01/22 v1.2 siunitx: South Africa locale]
+ [2009/01/24 v1.2b siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11962,7 +11963,7 @@ author.
% \units for conflicting options, so users probably expect none.
% \begin{macrocode}
\ProvidesFile{si-units.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of units]
+ [2009/01/24 v1.2b siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
@@ -12032,7 +12033,7 @@ author.
% clash.
% \begin{macrocode}
\ProvidesFile{si-unitsdef.cfg}
- [2009/01/22 v1.2 siunitx:
+ [2009/01/24 v1.2b siunitx:
Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
@@ -12481,7 +12482,7 @@ author.
% the macros in \SIstyle as given in the manual for that package.
% \begin{macrocode}
\ProvidesFile{si-sistyle.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of
+ [2009/01/24 v1.2b siunitx: Emulation of
SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
@@ -12665,7 +12666,7 @@ author.
% \SIunits emulation starts in much the same way.
% \begin{macrocode}
\ProvidesFile{si-SIunits.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of
+ [2009/01/24 v1.2b siunitx: Emulation of
SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
@@ -13228,7 +13229,7 @@ author.
% which are not really to be encouraged.
% \begin{macrocode}
\ProvidesFile{si-hepunits.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of
+ [2009/01/24 v1.2b siunitx: Emulation of
hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13383,7 +13384,7 @@ author.
% a little emulation and a few macros needed.
% \begin{macrocode}
\ProvidesFile{si-fancynum.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of
+ [2009/01/24 v1.2b siunitx: Emulation of
fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13445,7 +13446,7 @@ author.
% test is needed.
% \begin{macrocode}
\ProvidesFile{si-fancyunits.cfg}
- [2009/01/22 v1.2 siunitx: Emulation of
+ [2009/01/24 v1.2b siunitx: Emulation of
fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
index 632e2d1bb19..a26e2854605 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins
@@ -72,7 +72,6 @@
\file{\jobname.bib}{\from{\jobname.dtx}{refs}}
}
\endbatchfile
-%%\DescribeOption{tophrase}
\endinput
%%
%% End of file `siunitx.ins'.