diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-18 21:31:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-18 21:31:01 +0000 |
commit | 1b2af0c8685288eeeec426e34a0e48297d7cab41 (patch) | |
tree | 18d825a064d955e8d32c53416286d8d30f469fba /Master/texmf-dist/source/latex/siunitx | |
parent | 093fc7a93506a95633bb30462d29fd3805055de6 (diff) |
siunitx (18jan22)
git-svn-id: svn://tug.org/texlive/trunk@61650 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
5 files changed, 24 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx index 8535a74c206..681ad06ee72 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx @@ -107,6 +107,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 , @@ -137,10 +143,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 } { diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx index 8952aabeabd..eaf2caac9b8 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx @@ -118,6 +118,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 \@@_deal_with_utf: { } @@ -230,7 +232,7 @@ % a mode-dependent definition. This doesn't work if the text mode symbol is % bust: the \pkg{fourier} package puts us in that position. % \begin{macrocode} - \@@_if_replace:NnT \ohm { "03A9 } + \@@_if_replace:NnT \ohm { "2126 } { \tl_set:Nx \l_@@_tmpa_tl { @@ -262,7 +264,7 @@ \bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } { \sys_if_engine_xetex_p: } - { \@@_non_latin:n { "03A9 } } + { \@@_non_latin:n { "2126 } } { \exp_not:N \textohm } } \exp_not:N \fi diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx index 677e05f7508..1ac6db55966 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx @@ -2532,6 +2532,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 } } } } % \end{macrocode} @@ -2680,7 +2682,7 @@ % Named derived units: second half of alphabet. % \begin{macrocode} \siunitx_declare_unit:Nn \newton { N } -\siunitx_declare_unit:Nx \ohm { \@@_non_latin:n { "03A9 } } +\siunitx_declare_unit:Nx \ohm { \@@_non_latin:n { "2126 } } \siunitx_declare_unit:Nn \pascal { Pa } \siunitx_declare_unit:Nn \radian { rad } \siunitx_declare_unit:Nn \siemens { S } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 35902e25c77..400f4fa539b 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2022-01-13} {3.0.41} +\ProvidesExplPackage {siunitx} {2022-01-18} {3.0.42} {A comprehensive (SI) units package} % \end{macrocode} % @@ -200,11 +200,12 @@ % \subsection{Option handling} % % \begin{macrocode} -\RequirePackage { l3keys2e } -% \end{macrocode} -% -% \begin{macrocode} -\ProcessKeysOptions { siunitx } +\IfFormatAtLeastTF { 2022-06-01 } + { \ProcessKeyOptions [ siunitx ] } + { + \RequirePackage { l3keys2e } + \ProcessKeysOptions { siunitx } + } % \end{macrocode} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.tex b/Master/texmf-dist/source/latex/siunitx/siunitx.tex index 69f61e8c586..73067969363 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex @@ -2860,7 +2860,8 @@ same value (one of \opt{center}, \opt{right} or \opt{left}). \pkg{siunitx} allows the user to switch between the typographic conventions of different (geographical) areas by using locales. Currently, the package is supplied with configurations for locales \opt{UK}, \opt{US}, \opt{DE} -(Germany), \opt{FR} (French) and \opt{ZA} (South Africa). The \opt{locale} +(Germany), \opt{FR} (French), \opt{SI} (Slovene) and \opt{ZA} (South Africa). +The \opt{locale} option is used to switch to a particular locale. \begin{LaTeXdemo} \qty{1.234}{\metre}\\ |