summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-16 23:56:24 +0000
committerKarl Berry <karl@freefriends.org>2010-07-16 23:56:24 +0000
commit1fbaeaaff4ab23c93b5b7cc750d3c360ac1341c9 (patch)
tree4235c518a388a9842099384eb4bd7dafecc0b145 /Master
parent5d0b92a508d50347f643c751691ac24c986ca20b (diff)
siunitx update (16jul10)
git-svn-id: svn://tug.org/texlive/trunk@19493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin486789 -> 497672 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx179
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg27
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty2
6 files changed, 200 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index b3b2a4f3093..c5c3e15decd 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 7952e315abe..f8ca85384e5 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -282,6 +282,7 @@ This work consists of the file siunitx.dtx
% micro,
% midrule,
% milli,
+% mm,
% mole,
% num,
% numlist,
@@ -446,6 +447,7 @@ This work consists of the file siunitx.dtx
% \cs{fg} in tabular material}
%\changes{v2.0l}{2010/07/07}{Further adjustments to \pkg{babel} support}
%\changes{v2.0m}{2010/07/09}{Re-introduce \opt{locale} option}
+%\changes{v2.0n}{2010/07/15}{More abbreviated units}
%
%\begin{abstract}
% Typesetting values with units requires care to ensure that the
@@ -2110,6 +2112,7 @@ This work consists of the file siunitx.dtx
% \DescribeNamedUnit{millimetre}{mm} \\
% \DescribeNamedUnit{centimetre}{cm} \\
% \DescribeNamedUnit{decimetre}{dm} \\
+% \DescribeNamedUnit{metre}{m} \\
% \DescribeNamedUnit{kilometre}{km} \\
%
% \midrule
@@ -2129,6 +2132,7 @@ This work consists of the file siunitx.dtx
% \DescribeNamedUnit{nanomole}{nmol} \\
% \DescribeNamedUnit{micromole}{umol} \\
% \DescribeNamedUnit{millimole}{mmol} \\
+% \DescribeNamedUnit{mole}{mol} \\
% \DescribeNamedUnit{kilomole}{kmol} \\
%
% \midrule
@@ -2137,14 +2141,17 @@ This work consists of the file siunitx.dtx
% \DescribeNamedUnit{nanoampere}{nA} \\
% \DescribeNamedUnit{microampere}{uA} \\
% \DescribeNamedUnit{milliampere}{mA} \\
+% \DescribeNamedUnit{ampere}{A} \\
% \DescribeNamedUnit{kiloampere}{kA} \\
%
% \midrule
%
% \DescribeNamedUnit{microlitre}{ul} \\
% \DescribeNamedUnit{millilitre}{ml} \\
+% \DescribeNamedUnit{litre}{l} \\
% \DescribeNamedUnit{microliter}{uL} \\
% \DescribeNamedUnit{milliliter}{mL} \\
+% \DescribeNamedUnit{liter}{L} \\
%
% \midrule
%
@@ -2157,11 +2164,37 @@ This work consists of the file siunitx.dtx
%
% \midrule
%
+% \DescribeNamedUnit{newton}{N} \\
+% \DescribeNamedUnit{millinewton}{mN} \\
+% \DescribeNamedUnit{kilonewton}{kN} \\
+% \DescribeNamedUnit{meganewton}{MN} \\
+%
+% \midrule
+%
+% \DescribeNamedUnit{pascal}{P} \\
+% \DescribeNamedUnit{kilopascal}{kPa} \\
+% \DescribeNamedUnit{megapacal}{MPa} \\
+% \DescribeNamedUnit{gigapascal}{GPa} \\
+%
+% \midrule
+%
+% \DescribeNamedUnit{milliohm}{mohm} \\
+% \DescribeNamedUnit{kilohm}{kohm} \\
+% \DescribeNamedUnit{megohm}{Mohm} \\
+%
+% \midrule
+%
% \DescribeNamedUnit{millivolt}{mV} \\
-% \DescribeNamedUnit{kilovolt}{kV} \\
+% \DescribeNamedUnit{volt}{V} \\
+% \DescribeNamedUnit{kilovolt}{kV} \\
%
% \midrule
%
+% \DescribeNamedUnit{watt}{W} \\
+% \DescribeNamedUnit{milliwatt}{mW} \\
+% \DescribeNamedUnit{kilowatt}{kW} \\
+% \DescribeNamedUnit{megawatt}{MW} \\
+% \DescribeNamedUnit{gigawatt}{GW} \\
% \DescribeNamedUnit{kilojoule}{kJ} \\
% \DescribeNamedUnit{electronvolt}{eV} \\
% \DescribeNamedUnit{millielectronvolt}{meV} \\
@@ -2169,7 +2202,11 @@ This work consists of the file siunitx.dtx
% \DescribeNamedUnit{megaelectronvolt}{MeV} \\
% \DescribeNamedUnit{gigaelectronvolt}{GeV} \\
% \DescribeNamedUnit{teraelectronvolt}{TeV} \\
-% \DescribeNamedUnit{kilowatt hour}{kWh} \\
+% \DescribeNamedUnit{kilowatt hour}{kWh} \\
+%
+% \midrule
+%
+% \DescribeNamedUnit{kelvin}{K} \\
%
% \end{xtabular}
%\end{center}
@@ -3472,6 +3509,53 @@ This work consists of the file siunitx.dtx
% \end{table}
%\end{LaTeXdemo}
%
+%\subsection{Creating a column with numbers and units}
+%
+% Usually, numbers in a table should be given with the units in the
+% column heading. However, there are cases where a series of data are
+% best presented in a table but have different units. There are two
+% ways to do this (\cref{tab:mixed}). The first is to place the units in
+% the first column of the table, which makes sense if there are several
+% related items in the table. The second method is to generate two
+% columns, one for numbers and a second for units, and then to format
+% these to give the visual effect of a single column. The later effect
+% is most appropriate when only one set of numbers are presented in a
+% table.
+%\begin{LaTeXdemo}[code and float]
+% \begin{table}
+% \caption{Tables where numbers have different units}
+% \label{tab:mixed}
+% \hfil
+% \begin{tabular}
+% {
+% >{$}l<{$}
+% S[table-format = 2.3(1)]
+% S[table-format = 3.3(1)]
+% }
+% \toprule
+% & {One} & {Two} \\
+% \midrule
+% a / \si{\angstrom} & 1.234(2) & 5.678(4) \\
+% \beta / \si{\degree} & 90.34(4) & 104.45(5) \\
+% \mu / \si{\per\mm} & 0.532 & 0.894 \\
+% \bottomrule
+% \end{tabular}
+% \hfil
+% \begin{tabular}
+% {S[table-format=1.3]@{\,}s[table-unit-alignment = left]}
+% \toprule
+% \multicolumn{2}{c}{Heading} \\
+% \midrule
+% 1.234 & \metre \\
+% 0.835 & \candela \\
+% 4.23 & \joule\per\mole \\
+% \bottomrule
+% \end{tabular}
+% \hfil
+% \end{table}
+%\end{LaTeXdemo}
+%
+%
%\subsection{Associating a locale with a \pkg{babel} language}
%
% It is possible to instruct the \pkg{babel} package to switch
@@ -4028,7 +4112,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2010/07/09} {2.0m}
+\ProvidesExplPackage {siunitx} {2010/07/15} {2.0n}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -13297,7 +13381,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/15} {2.0n}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -14286,7 +14370,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/15} {2.0n}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -14295,6 +14379,7 @@ This work consists of the file siunitx.dtx
% into related groups, mainly to avoid an overly long list in one
% place.
%
+%\begin{macro}{\A}
%\begin{macro}{\pA}
%\begin{macro}{\nA}
%\begin{macro}{\uA}
@@ -14302,6 +14387,7 @@ This work consists of the file siunitx.dtx
%\begin{macro}{\kA}
% Currents.
% \begin{macrocode}
+\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
\DeclareSIUnit \nA { \nano \ampere }
\DeclareSIUnit \uA { \micro \ampere }
@@ -14313,6 +14399,7 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
%\begin{macro}{\Hz}
%\begin{macro}{\mHz}
%\begin{macro}{\kHz}
@@ -14334,6 +14421,7 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\begin{macro}{\mol}
%\begin{macro}{\fmol}
%\begin{macro}{\pmol}
%\begin{macro}{\nmol}
@@ -14342,6 +14430,7 @@ This work consists of the file siunitx.dtx
%\begin{macro}{\kmol}
% Amounts of substance (moles).
% \begin{macrocode}
+\DeclareSIUnit \mol { \mole }
\DeclareSIUnit \fmol { \femto \mole }
\DeclareSIUnit \pmol { \pico \mole }
\DeclareSIUnit \nmol { \nano \mole }
@@ -14355,23 +14444,31 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\begin{macro}{\V}
%\begin{macro}{\mV}
%\begin{macro}{\kV}
% Potentials.
% \begin{macrocode}
+\DeclareSIUnit \V { \volt }
\DeclareSIUnit \mV { \milli \volt }
\DeclareSIUnit \kV { \kilo \volt }
% \end{macrocode}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\begin{macro}{\l}
%\begin{macro}{\ml}
%\begin{macro}{\ul}
+%\begin{macro}{\L}
%\begin{macro}{\mL}
%\begin{macro}{\uL}
% Volumes.
% \begin{macrocode}
+\DeclareSIUnit \l { \litre }
\DeclareSIUnit \ml { \milli \litre }
\DeclareSIUnit \ul { \micro \litre }
+\DeclareSIUnit \L { \liter }
\DeclareSIUnit \mL { \milli \liter }
\DeclareSIUnit \uL { \micro \liter }
% \end{macrocode}
@@ -14379,6 +14476,8 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
%\begin{macro}{\fg}
%\begin{macro}{\pg}
%\begin{macro}{\ng}
@@ -14406,6 +14505,11 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\begin{macro}{\W}
+%\begin{macro}{\mW}
+%\begin{macro}{\kW}
+%\begin{macro}{\MW}
+%\begin{macro}{\GW}
%\begin{macro}{\kJ}
%\begin{macro}{\eV}
%\begin{macro}{\meV}
@@ -14416,6 +14520,11 @@ This work consists of the file siunitx.dtx
%\begin{macro}{\kWh}
% Energies.
% \begin{macrocode}
+\DeclareSIUnit \W { \watt }
+\DeclareSIUnit \mW { \milli \watt }
+\DeclareSIUnit \kW { \kilo \watt }
+\DeclareSIUnit \MW { \mega \watt }
+\DeclareSIUnit \GW { \giga \watt }
\DeclareSIUnit \kJ { \kilo \joule }
\DeclareSIUnit \eV { \electronvolt }
\DeclareSIUnit \meV { \milli \electronvolt }
@@ -14434,6 +14543,12 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\begin{macro}{\m}
%\begin{macro}{\pm}
%\begin{macro}{\nm}
%\begin{macro}{\um}
@@ -14443,8 +14558,9 @@ This work consists of the file siunitx.dtx
%\begin{macro}{\km}
% Lengths.
% \begin{macrocode}
-\DeclareSIUnit \nm { \nano \metre }
+\DeclareSIUnit \m { \metre }
\DeclareSIUnit \pm { \pico \metre }
+\DeclareSIUnit \nm { \nano \metre }
\DeclareSIUnit \um { \micro \metre }
\DeclareSIUnit \mm { \milli \metre }
\DeclareSIUnit \cm { \centi \metre }
@@ -14458,6 +14574,55 @@ This work consists of the file siunitx.dtx
%\end{macro}
%\end{macro}
%\end{macro}
+%\end{macro}
+%\begin{macro}{\k}
+% Temperatures.
+% \begin{macrocode}
+\DeclareSIUnit \k { \kelvin }
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\N}
+%\begin{macro}{\mN}
+%\begin{macro}{\kN}
+%\begin{macro}{\MN}
+% Forces.
+% \begin{macrocode}
+\DeclareSIUnit \N { \newton }
+\DeclareSIUnit \mN { \milli \newton }
+\DeclareSIUnit \kN { \kilo \newton }
+\DeclareSIUnit \MN { \mega \newton }
+% \end{macrocode}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\begin{macro}{\Pa}
+%\begin{macro}{\kPa}
+%\begin{macro}{\MPa}
+%\begin{macro}{\GPa}
+% Pressures.
+% \begin{macrocode}
+\DeclareSIUnit \Pa { \pascal }
+\DeclareSIUnit \kPa { \kilo \pascal }
+\DeclareSIUnit \MPa { \mega \pascal }
+\DeclareSIUnit \GPa { \giga \pascal }
+% \end{macrocode}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\end{macro}
+%\begin{macro}{\mohm}
+%\begin{macro}{\kohm}
+%\begin{macro}{\Mohm}
+% Resistances.
+% \begin{macrocode}
+\DeclareSIUnit \mohm { \milli \ohm }
+\DeclareSIUnit \kohm { \kilo \ohm }
+\DeclareSIUnit \Mohm { \mega \ohm }
+% \end{macrocode}
+%\end{macro}
+%\end{macro}
+%\end{macro}
%\begin{macro}{\s}
%\begin{macro}{\as}
%\begin{macro}{\fs}
@@ -14494,7 +14659,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/07/15} {2.0n}
{siunitx: Binary units}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
index 0863c2523f0..88c2ca4da80 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -13,8 +13,9 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/15} {2.0n}
{siunitx: Abbreviated units}
+\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
\DeclareSIUnit \nA { \nano \ampere }
\DeclareSIUnit \uA { \micro \ampere }
@@ -26,16 +27,20 @@
\DeclareSIUnit \MHz { \mega \hertz }
\DeclareSIUnit \GHz { \giga \hertz }
\DeclareSIUnit \THz { \tera \hertz }
+\DeclareSIUnit \mol { \mole }
\DeclareSIUnit \fmol { \femto \mole }
\DeclareSIUnit \pmol { \pico \mole }
\DeclareSIUnit \nmol { \nano \mole }
\DeclareSIUnit \umol { \micro \mole }
\DeclareSIUnit \mmol { \milli \mole }
\DeclareSIUnit \kmol { \kilo \mole }
+\DeclareSIUnit \V { \volt }
\DeclareSIUnit \mV { \milli \volt }
\DeclareSIUnit \kV { \kilo \volt }
+\DeclareSIUnit \l { \litre }
\DeclareSIUnit \ml { \milli \litre }
\DeclareSIUnit \ul { \micro \litre }
+\DeclareSIUnit \L { \liter }
\DeclareSIUnit \mL { \milli \liter }
\DeclareSIUnit \uL { \micro \liter }
\DeclareSIUnit \fg { \femto \gram }
@@ -46,6 +51,11 @@
\DeclareSIUnit \g { \gram }
\DeclareSIUnit \kg { \kilo \gram }
\DeclareSIUnit \amu { \atomicmassunit }
+\DeclareSIUnit \W { \watt }
+\DeclareSIUnit \mW { \milli \watt }
+\DeclareSIUnit \kW { \kilo \watt }
+\DeclareSIUnit \MW { \mega \watt }
+\DeclareSIUnit \GW { \giga \watt }
\DeclareSIUnit \kJ { \kilo \joule }
\DeclareSIUnit \eV { \electronvolt }
\DeclareSIUnit \meV { \milli \electronvolt }
@@ -55,13 +65,26 @@
\DeclareSIUnit \TeV { \tera \electronvolt }
\DeclareSIUnitWithOptions \kWh { \kilo \watt \hour }
{ inter-unit-separator = }
-\DeclareSIUnit \nm { \nano \metre }
+\DeclareSIUnit \m { \metre }
\DeclareSIUnit \pm { \pico \metre }
+\DeclareSIUnit \nm { \nano \metre }
\DeclareSIUnit \um { \micro \metre }
\DeclareSIUnit \mm { \milli \metre }
\DeclareSIUnit \cm { \centi \metre }
\DeclareSIUnit \dm { \deci \metre }
\DeclareSIUnit \km { \kilo \metre }
+\DeclareSIUnit \k { \kelvin }
+\DeclareSIUnit \N { \newton }
+\DeclareSIUnit \mN { \milli \newton }
+\DeclareSIUnit \kN { \kilo \newton }
+\DeclareSIUnit \MN { \mega \newton }
+\DeclareSIUnit \Pa { \pascal }
+\DeclareSIUnit \kPa { \kilo \pascal }
+\DeclareSIUnit \MPa { \mega \pascal }
+\DeclareSIUnit \GPa { \giga \pascal }
+\DeclareSIUnit \mohm { \milli \ohm }
+\DeclareSIUnit \kohm { \kilo \ohm }
+\DeclareSIUnit \Mohm { \mega \ohm }
\DeclareSIUnit \s { \second }
\DeclareSIUnit \as { \atto \second }
\DeclareSIUnit \fs { \femto \second }
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
index a26520582f8..11b97a0150f 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-binary.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/07/15} {2.0n}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
index 75457034c09..0eff852f512 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/09} {2.0m}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/15} {2.0n}
{siunitx: Version 1 settings}
\keys_set:nn { siunitx }
{ load-configurations = { abbreviations , binary } }
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index dc8f165b13d..2c0fe3d864e 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,7 +14,7 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{expl3}
-\ProvidesExplPackage {siunitx} {2010/07/09} {2.0m}
+\ProvidesExplPackage {siunitx} {2010/07/15} {2.0n}
{A comprehensive (SI) units package}
\msg_set:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }