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 | |
parent | 093fc7a93506a95633bb30462d29fd3805055de6 (diff) |
siunitx (18jan22)
git-svn-id: svn://tug.org/texlive/trunk@61650 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 14 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf | bin | 607833 -> 608018 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 638335 -> 638357 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-locale.dtx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 13 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.tex | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 28 |
9 files changed, 59 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index 649008576aa..ddee0243e65 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,17 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.42] - 2022-01-18 + +### Added +- Slovene translations (see pull request + [\#570](https://github.com/josephwright/siunitx/pull/570)) + +### Changed +- Enable new LaTeX option handling if available +- Use U+2126 rather than U+03A9 for `\ohm` in text mode with Unicode + engines + ## [v3.0.41] - 2022-01-13 ### Fixed @@ -1660,7 +1671,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.41...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.42...HEAD +[v3.0.42]: https://github.com/josephwright/siunitx/compare/v3.0.41...v3.0.42 [v3.0.41]: https://github.com/josephwright/siunitx/compare/v3.0.40...v3.0.41 [v3.0.40]: https://github.com/josephwright/siunitx/compare/v3.0.39...v3.0.40 [v3.0.39]: https://github.com/josephwright/siunitx/compare/v3.0.38...v3.0.39 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf Binary files differindex b5922ebc961..bc6e13dedc7 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 266462e8b6f..e5d013218f3 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf 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}\\ 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 } } |