summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-26 00:45:18 +0000
committerKarl Berry <karl@freefriends.org>2008-11-26 00:45:18 +0000
commit9ed8928d8155540f7b2d5d9b6ffd0b01b18a1149 (patch)
tree369f5cef4e974a8cbf8b402ac44152fe5f42499c /Master/texmf-dist/source/latex/siunitx
parentae03987dfdccaa1cb0e2750e31c2b902f4029427 (diff)
siunitx 1.1f (25nov08)
git-svn-id: svn://tug.org/texlive/trunk@11425 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx70
1 files changed, 39 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 6215680d7de..f1879925288 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -1265,8 +1265,8 @@ dcolumn, rccol and numprint packages.
% \unitinfo{millifarad} \\
%
% \tablesubhead{Resistances}
-% \unitinfo{kiloohm} \\
-% \unitinfo{megaohm} \\
+% \unitinfo{kilohm} \\
+% \unitinfo{megohm} \\
% \unitinfo{gigaohm} \\
% \unitinfo{millisiemens} \\
%
@@ -3085,6 +3085,12 @@ author.
% with the unit name ``gram'' and the prefix symbols are used with
% the unit symbol \si{\gram}. For example $\SI{1e-6}{\kilogram} =
% \SI{1}{\milli\gram}$.
+%
+% Three unit-prefix combinations deserve special note. The units
+% hectare, kilohm and megohm elide the additional vowel (these
+% would otherwise be hectoare, kiloohm and megaohm). All other
+% vowel combinations are retained.\footnote{Thanks to Charles
+% Cameron for raising this issue with the package author.}
%
%\subsection{Other units}
% The application of SI units is meant to provide a single set of
@@ -3333,7 +3339,7 @@ author.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{siunitx}
- [2008/11/18 v1.1e A comprehensive (SI) units package]
+ [2008/11/25 v1.1f A comprehensive (SI) units package]
% \end{macrocode}
% The package requires \eTeX, so the usual test is made.
% \begin{macrocode}
@@ -10686,7 +10692,7 @@ author.
% powers.
% \begin{macrocode}
\ProvidesFile{si-prefix.cfg}
- [2008/11/18 v1.1e siunitx: SI Multiple prefixes]
+ [2008/11/25 v1.1f siunitx: SI Multiple prefixes]
\newprefix{\yocto}{-24}{y}
\newprefix{\zepto}{-21}{z}
\newprefix{\atto}{-18}{a}
@@ -10790,7 +10796,7 @@ author.
% is an awkward one, but here the UK standard is used.
% \begin{macrocode}
\ProvidesFile{si-named.cfg}
- [2008/11/18 v1.1e siunitx: SI Named units]
+ [2008/11/25 v1.1f siunitx: SI Named units]
\newunit{\becquerel}{Bq}
\newunit{\coulomb}{C}
\newunit{\farad}{F}
@@ -10886,7 +10892,7 @@ author.
% This requires \file{si-prefix.cfg} and \file{si-named.cfg}.
% \begin{macrocode}
\ProvidesFile{si-prefixed.cfg}
- [2008/11/18 v1.1e siunitx: SI Prefixed units]
+ [2008/11/25 v1.1f siunitx: SI Prefixed units]
\requiresiconfigs{prefix,named,accepted,physical}
% \end{macrocode}
%\begin{macro}{\picometre}
@@ -11028,20 +11034,22 @@ author.
%\end{macro}
%\end{macro}
%\end{macro}
-%\begin{macro}{\kiloohm}
-%\begin{macro}{\megaohm}
+%\begin{macro}{\kilohm}
+%\changes{2008/11/25}{v1.1f}{Renamed from \cs{kiloohm}}
+%\begin{macro}{\megohm}
+%\changes{2008/11/25}{v1.1f}{Renamed from \cs{megaohm}}
%\begin{macro}{\gigaohm}
% For resistance, checks are needed again for the definition of
% \cs{ohm}.
% \begin{macrocode}
\ifsi@old@OHM
- \newunit{\kiloohm}{\kilo\Ohm}
- \newunit{\megaohm}{\mega\Ohm}
+ \newunit{\kilohm}{\kilo\Ohm}
+ \newunit{\megohm}{\mega\Ohm}
\newunit{\gigaohm}{\giga\Ohm}
\else
\ifsi@gensymb\else
- \newunit{\kiloohm}{\kilo\ohm}
- \newunit{\megaohm}{\mega\ohm}
+ \newunit{\kilohm}{\kilo\ohm}
+ \newunit{\megohm}{\mega\ohm}
\newunit{\gigaohm}{\giga\ohm}
\fi
\fi
@@ -11182,7 +11190,7 @@ author.
% block for the appropriate option. First currents.
% \begin{macrocode}
\ProvidesFile{si-abbr.cfg}
- [2008/11/18 v1.1e siunitx: Abbreviated units]
+ [2008/11/25 v1.1f siunitx: Abbreviated units]
\requiresiconfigs{prefix,named,accepted,physical}
\newunit{\pA}{\pico\ampere}
\newunit{\nA}{\nano\ampere}
@@ -11405,7 +11413,7 @@ author.
% These are defined here, although some are in very general use.
% \begin{macrocode}
\ProvidesFile{si-addn.cfg}
- [2008/11/18 v1.1e siunitx: SI Additional units]
+ [2008/11/25 v1.1f siunitx: SI Additional units]
\newunit{\angstrom}{\si@sym@ringA}
\newunit{\are}{a}
\newunit{\hectare}{\hecto\are}
@@ -11455,7 +11463,7 @@ author.
%\begin{macro}{\percent}
% \begin{macrocode}
\ProvidesFile{si-accepted.cfg}
- [2008/11/18 v1.1e siunitx: SI Accepted units]
+ [2008/11/25 v1.1f siunitx: SI Accepted units]
\newunit{\minute}{min}
\newunit{\hour}{h}
\newunit{\Day}{d}
@@ -11504,7 +11512,7 @@ author.
% for a negative kern does make things a bit complicated.
% \begin{macrocode}
\ProvidesFile{si-physical.cfg}
- [2008/11/18 v1.1e siunitx: SI Physically-measured units]
+ [2008/11/25 v1.1f 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%
@@ -11540,7 +11548,7 @@ author.
% own definitions.
% \begin{macrocode}
\ProvidesFile{si-synchem.cfg}
- [2008/11/18 v1.1e siunitx: Units for synthetic chemists]
+ [2008/11/25 v1.1f siunitx: Units for synthetic chemists]
\requiresiconfigs{prefix}
\newunit{\mmHg}{mmHg}
\newunit{\molar}{\mole\per\cubic\deci\metre}
@@ -11561,7 +11569,7 @@ author.
% Some units inspired by \pkg{hepunits}.
% \begin{macrocode}
\ProvidesFile{si-hep.cfg}
- [2008/11/18 v1.1e siunitx: Units for high-energy physics]
+ [2008/11/25 v1.1f siunitx: Units for high-energy physics]
\requiresiconfigs{prefix,named}
% \end{macrocode}
%\begin{macro}{\micron}
@@ -11643,7 +11651,7 @@ author.
% For astronomy, the \cs{parsec} unit is needed.
% \begin{macrocode}
\ProvidesFile{si-astro.cfg}
- [2008/11/18 v1.1e siunitx: Units for astronomy]
+ [2008/11/25 v1.1f siunitx: Units for astronomy]
\newunit{\parsec}{pc}
\newunit{\lightyear}{ly}
% \end{macrocode}
@@ -11666,7 +11674,7 @@ author.
% \SIunits. First, the binary prefixes.
% \begin{macrocode}
\ProvidesFile{si-binary.cfg}
- [2008/11/18 v1.1e siunitx: Binary units]
+ [2008/11/25 v1.1f siunitx: Binary units]
\newprefix[binary]{\kibi}{10}{Ki}
\newprefix[binary]{\mebi}{20}{Mi}
\newprefix[binary]{\gibi}{30}{Gi}
@@ -11709,7 +11717,7 @@ author.
% default values.\footnote{The package author is in the UK.}
% \begin{macrocode}
\ProvidesFile{si-UK.cfg}
- [2008/11/18 v1.1e siunitx: UK locale]
+ [2008/11/25 v1.1f siunitx: UK locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11726,7 +11734,7 @@ author.
% The same as for the UK.
% \begin{macrocode}
\ProvidesFile{si-USA.cfg}
- [2008/11/18 v1.1e siunitx: USA locale]
+ [2008/11/25 v1.1f siunitx: USA locale]
\sisetup{
unitsep=thin,
expproduct=times,
@@ -11743,7 +11751,7 @@ author.
% Germany, hopefully.
% \begin{macrocode}
\ProvidesFile{si-DE.cfg}
- [2008/11/18 v1.1e siunitx: Germany locale]
+ [2008/11/25 v1.1f siunitx: Germany locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11760,7 +11768,7 @@ author.
% Design decisions taken from the same section of \SIstyle.
% \begin{macrocode}
\ProvidesFile{si-ZA.cfg}
- [2008/11/18 v1.1e siunitx: South Africa locale]
+ [2008/11/25 v1.1f siunitx: South Africa locale]
\sisetup{
unitsep=cdot,
valuesep=thin,
@@ -11792,7 +11800,7 @@ author.
% \units for conflicting options, so users probably expect none.
% \begin{macrocode}
\ProvidesFile{si-units.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of units]
+ [2008/11/25 v1.1f siunitx: Emulation of units]
\si@emulating{units}{1998/08/04 v0.9b}
\si@ifloaded{SIunits}
{\si@emclash{units}{SIunits}\endinput}{}
@@ -11862,7 +11870,7 @@ author.
% clash.
% \begin{macrocode}
\ProvidesFile{si-unitsdef.cfg}
- [2008/11/18 v1.1e siunitx:
+ [2008/11/25 v1.1f siunitx:
Emulation of unitsdef]
\si@emulating{unitsdef}{2005/01/04 v0.2}
\si@ifloaded{SIunits}
@@ -12311,7 +12319,7 @@ author.
% the macros in \SIstyle as given in the manual for that package.
% \begin{macrocode}
\ProvidesFile{si-sistyle.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of
+ [2008/11/25 v1.1f siunitx: Emulation of
SIstyle]
\si@emulating{sistyle}{2006/12/20 v2.3}
\sisetup{%
@@ -12495,7 +12503,7 @@ author.
% \SIunits emulation starts in much the same way.
% \begin{macrocode}
\ProvidesFile{si-SIunits.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of
+ [2008/11/25 v1.1f siunitx: Emulation of
SIunits]
\si@emulating{SIunits}{2007/12/02 v1.36}
\sisetup{
@@ -13058,7 +13066,7 @@ author.
% which are not really to be encouraged.
% \begin{macrocode}
\ProvidesFile{si-hepunits.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of
+ [2008/11/25 v1.1f siunitx: Emulation of
hepunits]
\si@emulating{hepunits}{2007/09/27}
\requiresiconfigs{SIunits,accepted,prefix,hep}
@@ -13213,7 +13221,7 @@ author.
% a little emulation and a few macros needed.
% \begin{macrocode}
\ProvidesFile{si-fancynum.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of
+ [2008/11/25 v1.1f siunitx: Emulation of
fancynum]
\si@emulating{fancynum}{2000/08/08 0.92}
\sisetup{decimalsymbol=cdot,digitsep=comma}
@@ -13275,7 +13283,7 @@ author.
% test is needed.
% \begin{macrocode}
\ProvidesFile{si-fancyunits.cfg}
- [2008/11/18 v1.1e siunitx: Emulation of
+ [2008/11/25 v1.1f siunitx: Emulation of
fancyunits]
\si@emulating{fancyunits}{2007/02/01 v1.0.1}
\si@ifloaded{SIunits}