summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-18 21:31:01 +0000
committerKarl Berry <karl@freefriends.org>2022-01-18 21:31:01 +0000
commit1b2af0c8685288eeeec426e34a0e48297d7cab41 (patch)
tree18d825a064d955e8d32c53416286d8d30f469fba /Master/texmf-dist/tex/latex/siunitx/siunitx.sty
parent093fc7a93506a95633bb30462d29fd3805055de6 (diff)
siunitx (18jan22)
git-svn-id: svn://tug.org/texlive/trunk@61650 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty28
1 files changed, 22 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index da49504b01f..943ac90cb4c 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -42,7 +42,7 @@
}%
\endinput
}%
-\ProvidesExplPackage {siunitx} {2022-01-13} {3.0.41}
+\ProvidesExplPackage {siunitx} {2022-01-18} {3.0.42}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -1433,6 +1433,12 @@
inter-unit-product = \, ,
output-decimal-marker = { , }
} ,
+ locale / SI .meta:n =
+ {
+ exponent-product = \times ,
+ inter-unit-product = \, ,
+ output-decimal-marker = { , }
+ } ,
locale / UK .meta:n =
{
exponent-product = \times ,
@@ -1456,10 +1462,12 @@
{
\RequirePackage { translations }
\DeclareTranslation { Catalan } { and } { i }
+ \DeclareTranslation { Slovene } { and } { in }
\DeclareTranslation { Catalan } { to~(numerical~range) } { a }
\DeclareTranslation { English } { to~(numerical~range) } { to }
\DeclareTranslation { French } { to~(numerical~range) } { à }
\DeclareTranslation { German } { to~(numerical~range) } { bis }
+ \DeclareTranslation { Slovene } { to~(numerical~range) } { do }
\DeclareTranslation { Spanish } { to~(numerical~range) } { a }
\keys_set:nn { siunitx }
{
@@ -6020,6 +6028,8 @@
\exp_after:wN \exp_after:wN \exp_after:wN
\exp_not:N \char_generate:nn {#1} { 13 }
\char_generate:nn {#2} { 12 }
+ \tl_if_blank:nF {#3}
+ { \char_generate:nn {#3} { 12 } }
}
}
\siunitx_declare_unit:Nn \kilogram { \kilo \gram }
@@ -6064,7 +6074,7 @@
\siunitx_declare_unit:Nn \lumen { lm }
\siunitx_declare_unit:Nn \lux { lx }
\siunitx_declare_unit:Nn \newton { N }
-\siunitx_declare_unit:Nx \ohm { \__siunitx_unit_non_latin:n { "03A9 } }
+\siunitx_declare_unit:Nx \ohm { \__siunitx_unit_non_latin:n { "2126 } }
\siunitx_declare_unit:Nn \pascal { Pa }
\siunitx_declare_unit:Nn \radian { rad }
\siunitx_declare_unit:Nn \siemens { S }
@@ -6375,6 +6385,8 @@
\exp_after:wN \exp_after:wN \exp_after:wN
\exp_not:N \char_generate:nn {#1} { 13 }
\char_generate:nn {#2} { 12 }
+ \tl_if_blank:nF {#3}
+ { \char_generate:nn {#3} { 12 } }
}
}
\cs_new:Npn \__siunitx_symbol_deal_with_utf: { }
@@ -6455,7 +6467,7 @@
}
}
{ \group_end: }
- \__siunitx_symbol_if_replace:NnT \ohm { "03A9 }
+ \__siunitx_symbol_if_replace:NnT \ohm { "2126 }
{
\tl_set:Nx \l__siunitx_symbol_tmpa_tl
{
@@ -6487,7 +6499,7 @@
\bool_lazy_or:nnTF
{ \sys_if_engine_luatex_p: }
{ \sys_if_engine_xetex_p: }
- { \__siunitx_symbol_non_latin:n { "03A9 } }
+ { \__siunitx_symbol_non_latin:n { "2126 } }
{ \exp_not:N \textohm }
}
\exp_not:N \fi
@@ -7360,8 +7372,12 @@
{
table-column-type = S
}
-\RequirePackage { l3keys2e }
-\ProcessKeysOptions { siunitx }
+\IfFormatAtLeastTF { 2022-06-01 }
+ { \ProcessKeyOptions [ siunitx ] }
+ {
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { siunitx }
+ }
\IfFormatAtLeastTF { 2020-10-01 }
{ }
{ \RequirePackage { xparse } }