summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/config
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-29 15:51:55 +0000
committerKarl Berry <karl@freefriends.org>2010-05-29 15:51:55 +0000
commit6a97bb6a82e6de5116bcddc5702e6bbbcd7ac24c (patch)
tree50c4d12fded00c3cbdb78db2f5c594dd7c12fad4 /Master/texmf-dist/tex/latex/siunitx/config
parentf0729600155900a5daf4683836c310f43b613d3d (diff)
siunitx 2.0a (28may10)
git-svn-id: svn://tug.org/texlive/trunk@18587 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.cfg2
-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.cfg79
3 files changed, 58 insertions, 25 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 d4d787aeb34..cfa9241cd4d 100644
--- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
+++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/05/23} {2.0}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/05/28} {2.0a}
{siunitx: Abbreviated units}
\DeclareSIUnit \pA { \pico \ampere }
\DeclareSIUnit \nA { \nano \ampere }
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 32707c3458b..3db2a7eb0dd 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/05/23} {2.0}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/05/28} {2.0a}
{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 c7129987c98..790ecfc3f67 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/05/23} {2.0}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/05/28} {2.0a}
{siunitx: Version 1 settings}
\keys_set:nn { siunitx } { load-configurations = abbreviations }
\keys_define:nn { siunitx } {
@@ -29,39 +29,41 @@
allowoptargs .default:n = { true },
allowzeroexp .meta:n = { retain-zero-exponent = #1 },
allowzeroexp .default:n = { true },
- angelsep .choice: ,
- angelsep /
+ alsoload .code:n = ,
+ angformat .code:n = ,
+ anglesep .choice: ,
+ anglesep /
cdot .meta:n =
{ arc-separator = { } \cdot { } },
- angelsep /
+ anglesep /
comma .meta:n = { arc-separator = { {,} } },
- angelsep /
+ anglesep /
fullstop .meta:n = { arc-separator = { { . } } },
- angelsep /
+ anglesep /
med .meta:n = { arc-separator = \: },
- angelsep /
+ anglesep /
medium .meta:n = { arc-separator = \: },
- angelsep /
+ anglesep /
none .meta:n = { arc-separator = },
- angelsep /
+ anglesep /
period .meta:n = { arc-separator = { { . } } },
- angelsep /
+ anglesep /
space .meta:n = { arc-separator = \text { ~ } },
- angelsep /
+ anglesep /
stop .meta:n = { arc-separator = { { . } } },
- angelsep /
+ anglesep /
thick .meta:n = { arc-separator = \; },
- angelsep /
+ anglesep /
thin .meta:n = { arc-separator = \, },
- angelsep /
+ anglesep /
tightcdot .meta:n =
{ arc-separator = \bgroup \cdot \egroup },
- angelsep /
+ anglesep /
tighttimes .meta:n =
{ arc-separator = \bgroup \times \egroup },
- angelsep /
+ anglesep /
times .meta:n = { arc-separator = \times },
- angelsep /
+ anglesep /
unknown .meta:n = { arc-separator = #1 },
astroang .meta:n =
{ angle-symbol-over-decimal = #1 },
@@ -209,8 +211,8 @@
mathrm .meta:x =
{ math-rm = \exp_not:c {#1} },
mathsOmega .meta:n = { math-ohm = #1 },
- mathscelsius .meta:n = { math-celsius . = #1 },
- mathsdegree .meta:n = { math-degree . = #1 },
+ mathscelsius .meta:n = { math-celsius = #1 },
+ mathsdegree .meta:n = { math-degree = #1 },
mathsecond .meta:n = { math-arcsecond = #1 },
mathsf .meta:x =
{ math-sf = \exp_not:c {#1} },
@@ -244,7 +246,7 @@
obeybold .meta:n = { detect-weight = #1 },
obeybold .default:n = { true },
obeyitalic .meta:n = { detect-italic = #1 },
- opbeyitalic .default:n = { true },
+ obeyitalic .default:n = { true },
obeymode .meta:n = { detect-mode = #1 },
obeymode .default:n = { true },
openerr .meta:n = { open-bracket = #1 },
@@ -562,9 +564,24 @@
xspace .meta:n = { use-xspace = #1 },
xpace .default:n = { true }
}
-\cs_set_eq:NN \newunit \DeclareSIUnit
-\cs_set_eq:NN \renewunit \DeclareSIUnit
-\cs_set_eq:NN \provideunit \DeclareSIUnit
+\keys_define:nn { siunitx } {
+ unknown .code:n =
+ {
+ \msg_error:nnx { siunitx } { unknown-option }
+ { \exp_not:V \l_keys_key_tl }
+ }
+}
+\keys_set:nn { siunitx } {
+ 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_set_eq:NN \renewunit \newunit
+\cs_set_eq:NN \provideunit \newunit
\NewDocumentCommand \newpower { o m m } {
\IfNoValueTF {#1}
{ \DeclareSIPrePower #2 {#3} }
@@ -638,6 +655,22 @@
\DeclareSIUnit \Molar { \textsc { m } }
\DeclareSIUnit \torr { Torr }
\DeclareSIUnit \gon { gon }
+\DeclareSIUnit \micron { \micro \metre }
+\DeclareSIUnit \mrad { \milli \rad }
+\DeclareSIUnit \gauss { G }
+\DeclareSIUnit \eVperc { \eV \per \clight }
+\DeclareSIUnit \nanobarn { \nano \barn }
+\DeclareSIUnit \picobarn { \pico \barn }
+\DeclareSIUnit \femtobarn { \femto \barn }
+\DeclareSIUnit \attobarn { \atto \barn }
+\DeclareSIUnit \zeptobarn { \zepto \barn }
+\DeclareSIUnit \yoctobarn { \yocto \barn }
+\DeclareSIUnit \nb { \nano \barn }
+\DeclareSIUnit \pb { \pico \barn }
+\DeclareSIUnit \fb { \femto \barn }
+\DeclareSIUnit \ab { \atto \barn }
+\DeclareSIUnit \zb { \zepto \barn }
+\DeclareSIUnit \yb { \yocto \barn }
%%
%% Copyright (C) 2008-2010 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>