summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/config
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-13 23:04:19 +0000
committerKarl Berry <karl@freefriends.org>2011-04-13 23:04:19 +0000
commit6470270a312bdbe3f58c8c38d6816a070353f45a (patch)
treeb7b32517524a951306cd07bf851e749f05aad6b8 /Master/texmf-dist/tex/latex/siunitx/config
parentfd7e3be3872bf1a2c79d93843ba6f38549740093 (diff)
siunitx 2.2 (13apr11)
git-svn-id: svn://tug.org/texlive/trunk@22076 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/config')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg9
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg5
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg89
3 files changed, 46 insertions, 57 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 12c6de9e954..8a41d284d25 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -35,6 +35,9 @@
\DeclareSIUnit \mmol { \milli \mole }
\DeclareSIUnit \kmol { \kilo \mole }
\DeclareSIUnit \V { \volt }
+\DeclareSIUnit \pV { \pico \volt }
+\DeclareSIUnit \nV { \nano \volt }
+\DeclareSIUnit \uV { \micro \volt }
\DeclareSIUnit \mV { \milli \volt }
\DeclareSIUnit \kV { \kilo \volt }
\DeclareSIUnit \l { \litre }
@@ -64,8 +67,7 @@
\DeclareSIUnit \MeV { \mega \electronvolt }
\DeclareSIUnit \GeV { \giga \electronvolt }
\DeclareSIUnit \TeV { \tera \electronvolt }
-\DeclareSIUnitWithOptions \kWh { \kilo \watt \hour }
- { inter-unit-separator = }
+\DeclareSIUnit [ inter-unit-product = ] \kWh { \kilo \watt \hour }
\DeclareSIUnit \m { \metre }
\DeclareSIUnit \pm { \pico \metre }
\DeclareSIUnit \nm { \nano \metre }
@@ -93,7 +95,6 @@
\DeclareSIUnit \ns { \nano \second }
\DeclareSIUnit \us { \micro \second }
\DeclareSIUnit \ms { \milli \second }
-%%
%% Copyright (C) 2008-2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
@@ -101,9 +102,7 @@
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
%% http://www.latex-project.org/lppl.txt
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
%%
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 21745c20815..1454b87328f 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} {2011/04/04} {2.1p}
+\ProvidesExplFile {siunitx-binary.cfg} {2011/04/13} {2.2}
{siunitx: Binary units}
\DeclareBinaryPrefix \kibi { Ki } { 10 }
\DeclareBinaryPrefix \mebi { Mi } { 20 }
@@ -25,7 +25,6 @@
\DeclareBinaryPrefix \yobi { Yi } { 80 }
\DeclareSIUnit \bit { bit }
\DeclareSIUnit \byte { B }
-%%
%% Copyright (C) 2008-2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
@@ -33,9 +32,7 @@
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
%% http://www.latex-project.org/lppl.txt
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
%%
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 01b5b852b83..2fea1ee48d2 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} {2011/04/04} {2.1p}
+\ProvidesExplFile {siunitx-version-1.cfg} {2011/04/13} {2.2}
{siunitx: Version 1 settings}
\keys_set:nn { siunitx }
{ load-configurations = { abbreviations , binary } }
@@ -519,52 +519,52 @@
unitsep .choice: ,
unitsep /
cdot .meta:n =
- { inter-unit-separator = { } \cdot { } },
+ { inter-unit-product = { } \cdot { } },
unitsep /
- comma .meta:n = { inter-unit-separator = { {,} } },
+ comma .meta:n = { inter-unit-product = { {,} } },
unitsep /
- fullstop .meta:n = { inter-unit-separator = { { . } } },
+ fullstop .meta:n = { inter-unit-product = { { . } } },
unitsep /
- med .meta:n = { inter-unit-separator = \: },
+ med .meta:n = { inter-unit-product = \: },
unitsep /
- medium .meta:n = { inter-unit-separator = \: },
+ medium .meta:n = { inter-unit-product = \: },
unitsep /
- none .meta:n = { inter-unit-separator = },
+ none .meta:n = { inter-unit-product = },
unitsep /
- period .meta:n = { inter-unit-separator = { { . } } },
+ period .meta:n = { inter-unit-product = { { . } } },
unitsep /
- space .meta:n = { inter-unit-separator = \text { ~ } },
+ space .meta:n = { inter-unit-product = \text { ~ } },
unitsep /
- stop .meta:n = { inter-unit-separator = { { . } } },
+ stop .meta:n = { inter-unit-product = { { . } } },
unitsep /
- thick .meta:n = { inter-unit-separator = \; },
+ thick .meta:n = { inter-unit-product = \; },
unitsep /
- thin .meta:n = { inter-unit-separator = \, },
+ thin .meta:n = { inter-unit-product = \, },
unitsep /
tightcdot .meta:n =
- { inter-unit-separator = \bgroup \cdot \egroup },
+ { inter-unit-product = \bgroup \cdot \egroup },
unitsep /
tighttimes .meta:n =
- { inter-unit-separator = \bgroup \times \egroup },
+ { inter-unit-product = \bgroup \times \egroup },
unitsep /
- times .meta:n = { inter-unit-separator = \times },
+ times .meta:n = { inter-unit-product = \times },
unitsep /
- unknown .meta:n = { inter-unit-separator = #1 },
+ unknown .meta:n = { inter-unit-product = #1 },
unitspace .choice: ,
unitspace /
- med .meta:n = { inter-unit-separator = \: },
+ med .meta:n = { inter-unit-product = \: },
unitspace /
- medium .meta:n = { inter-unit-separator = \: },
+ medium .meta:n = { inter-unit-product = \: },
unitspace /
- none .meta:n = { inter-unit-separator = },
+ none .meta:n = { inter-unit-product = },
unitspace /
- space .meta:n = { inter-unit-separator = \text { ~ } },
+ space .meta:n = { inter-unit-product = \text { ~ } },
unitspace /
- thick .meta:n = { inter-unit-separator = \; },
+ thick .meta:n = { inter-unit-product = \; },
unitspace /
- thin .meta:n = { inter-unit-separator = \, },
+ thin .meta:n = { inter-unit-product = \, },
unitspace /
- unknown .meta:n = { inter-unit-separator = #1 },
+ unknown .meta:n = { inter-unit-product = #1 },
valuecolor .meta:n = { number-color = #1 },
valuecolour .meta:n = { number-color = #1 },
valuemathrm .meta:x =
@@ -583,37 +583,37 @@
valuesep .choice: ,
valuesep /
cdot .meta:n =
- { number-unit-separator = { } \cdot { } },
+ { number-unit-product = { } \cdot { } },
valuesep /
- comma .meta:n = { number-unit-separator = { {,} } },
+ comma .meta:n = { number-unit-product = { {,} } },
valuesep /
- fullstop .meta:n = { number-unit-separator = { { . } } },
+ fullstop .meta:n = { number-unit-product = { { . } } },
valuesep /
- med .meta:n = { number-unit-separator = \: },
+ med .meta:n = { number-unit-product = \: },
valuesep /
- medium .meta:n = { number-unit-separator = \: },
+ medium .meta:n = { number-unit-product = \: },
valuesep /
- none .meta:n = { number-unit-separator = },
+ none .meta:n = { number-unit-product = },
valuesep /
- period .meta:n = { number-unit-separator = { { . } } },
+ period .meta:n = { number-unit-product = { { . } } },
valuesep /
- space .meta:n = { number-unit-separator = \text { ~ } },
+ space .meta:n = { number-unit-product = \text { ~ } },
valuesep /
- stop .meta:n = { number-unit-separator = { { . } } },
+ stop .meta:n = { number-unit-product = { { . } } },
valuesep /
- thick .meta:n = { number-unit-separator = \; },
+ thick .meta:n = { number-unit-product = \; },
valuesep /
- thin .meta:n = { number-unit-separator = \, },
+ thin .meta:n = { number-unit-product = \, },
valuesep /
tightcdot .meta:n =
- { number-unit-separator = \bgroup \cdot \egroup },
+ { number-unit-product = \bgroup \cdot \egroup },
valuesep /
tighttimes .meta:n =
- { number-unit-separator = \bgroup \times \egroup },
+ { number-unit-product = \bgroup \times \egroup },
valuesep /
- times .meta:n = { number-unit-separator = \times },
+ times .meta:n = { number-unit-product = \times },
valuesep /
- unknown .meta:n = { number-unit-separator = #1 },
+ unknown .meta:n = { number-unit-product = #1 },
xspace .meta:n = { use-xspace = #1 },
xspace .default:n = { true },
}
@@ -628,13 +628,9 @@
free-standing-units = true ,
mode = math ,
}
-\NewDocumentCommand \newunit { o m m } {
- \IfNoValueTF {#1}
- { \siunitx_declare_unit:Nnn #2 {#3} { } }
- { \siunitx_declare_unit:Nnn #2 {#3} {#1} }
-}
-\cs_new_eq:NN \renewunit \newunit
-\cs_new_eq:NN \provideunit \newunit
+\cs_new_eq:NN \newunit \DeclareSIUnit
+\cs_new_eq:NN \renewunit \DeclareSIUnit
+\cs_new_eq:NN \provideunit \DeclareSIUnit
\NewDocumentCommand \newpower { o m m } {
\IfNoValueTF {#1}
{ \DeclareSIPrePower #2 {#3} }
@@ -742,7 +738,6 @@
\str_if_eq:nnT {#1} { synchem }
{ \keys_set:nn { siunitx } { load-configurations = chemistry } }
}
-%%
%% Copyright (C) 2008-2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
@@ -750,9 +745,7 @@
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
%% http://www.latex-project.org/lppl.txt
-%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
%%