summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
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/texmf-dist/tex/latex
parent5d0b92a508d50347f643c751691ac24c986ca20b (diff)
siunitx update (16jul10)
git-svn-id: svn://tug.org/texlive/trunk@19493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-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
4 files changed, 28 insertions, 5 deletions
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. }