summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-09 21:37:06 +0000
committerKarl Berry <karl@freefriends.org>2010-07-09 21:37:06 +0000
commitdeab5d4372d55f8f501872dba6a5a5d8e3b5e67b (patch)
tree9488abd0282d5ae3ef6c579287f81dd3d913120b /Master/texmf-dist/tex/latex
parent358774b44f57eabd62294dec13884e8b7bd2cc1f (diff)
siunitx update (9jul10)
git-svn-id: svn://tug.org/texlive/trunk@19308 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.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.cfg3
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty44
4 files changed, 42 insertions, 9 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 fd4485dcba0..0863c2523f0 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/07/04} {2.0k}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/09} {2.0m}
{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 534898b6478..a26520582f8 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/04} {2.0k}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/07/09} {2.0m}
{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 bc2f5bff152..75457034c09 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/04} {2.0k}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/09} {2.0m}
{siunitx: Version 1 settings}
\keys_set:nn { siunitx }
{ load-configurations = { abbreviations , binary } }
@@ -211,7 +211,6 @@
per-mode = symbol-or-fraction
},
inlinebold .meta:n = { detect-inline-weight = #1 },
- locale .code:n = ,
log .code:n = ,
load .code:n = ,
loctolang .code:n = ,
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 1f180944797..dc8f165b13d 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/04} {2.0k}
+\ProvidesExplPackage {siunitx} {2010/07/09} {2.0m}
{A comprehensive (SI) units package}
\msg_set:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -118,7 +118,6 @@
\siunitx_tmp:w { fixsf }
\siunitx_tmp:w { fraction }
\siunitx_tmp:w { inlinebold }
-\siunitx_tmp:w { locale }
\siunitx_tmp:w { loctolang }
\siunitx_tmp:w { log }
\siunitx_tmp:w { load }
@@ -179,7 +178,7 @@
\siunitx_tmp:w { sign }
\siunitx_tmp:w { slash }
\siunitx_tmp:w { stickyper }
-\siunitx_tmp:w { stricarc }
+\siunitx_tmp:w { strictarc }
\siunitx_tmp:w { tabalign }
\siunitx_tmp:w { tabalignexp }
\siunitx_tmp:w { tabautofit }
@@ -3336,9 +3335,10 @@
}
}
\AtBeginDocument {
- \tl_map_function:nN { \bar \color \fg \ng \pm }
+ \tl_map_function:nN { \bar \color \ng \pm }
\siunitx_protect_symbols:N
}
+\tl_put_right:Nn \document { \siunitx_protect_symbols:N \fg }
\cs_new_protected_nopar:Npn \siunitx_protect_symbols:N #1 {
\cs_if_exist:NT #1
{
@@ -5891,7 +5891,41 @@
{ \msg_warning:nnx { siunitx } { option-not-available } {#1} }
}
}
-
+\keys_define:nn { siunitx } {
+ locale .choice:,
+ locale /
+ DE .meta:n =
+ {
+ exponent-product = \cdot ,
+ inter-unit-separator = { \, } ,
+ output-decimal-marker = { , } ,
+ },
+ locale /
+ FR .meta:n =
+ {
+ exponent-product = \times ,
+ inter-unit-separator = { \, } ,
+ output-decimal-marker = { , } ,
+ },
+ locale /
+ UK .meta:n =
+ {
+ exponent-product = \times ,
+ inter-unit-separator = \, ,
+ output-decimal-marker = . ,
+ },
+ locale /
+ US .meta:n = { locale = UK },
+ locale /
+ USA .meta:n = { locale = UK },
+ locale /
+ ZA .meta:n =
+ {
+ exponent-product = \times ,
+ inter-unit-separator = \cdot ,
+ output-decimal-marker = { , } ,
+ },
+}
\file_if_exist:nT { translator.sty }
{
\RequirePackage { translator }