diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-04 20:12:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-04 20:12:17 +0000 |
commit | 9fd8dbbf46c600b2dd7cbf52301aa86acfeffc86 (patch) | |
tree | f38283bd5733ee300e9a0152b0667442dd58106e /Master/texmf-dist/tex/latex | |
parent | 223b4f3317b36773937aa82b8ad3f4344cb38696 (diff) |
siunitx (4apr23)
git-svn-id: svn://tug.org/texlive/trunk@66761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 81 |
1 files changed, 54 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 2a998acf188..6ecc46054e1 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} {2023-03-14} {3.2.3} +\ProvidesExplPackage {siunitx} {2023-04-04} {3.2.4} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -1696,18 +1696,18 @@ inter-unit-product = \, , output-decimal-marker = { , } } , - locale / PL .meta:n = - { - exponent-product = \cdot , - inter-unit-product = \cdot , - output-decimal-marker = { , } - } , locale / FR .meta:n = { exponent-product = \times , inter-unit-product = \, , output-decimal-marker = { , } } , + locale / PL .meta:n = + { + exponent-product = \cdot , + inter-unit-product = \cdot , + output-decimal-marker = { , } + } , locale / SI .meta:n = { exponent-product = \times , @@ -1737,17 +1737,17 @@ { \RequirePackage { translations } \DeclareTranslation { Catalan } { and } { i } - \DeclareTranslation { Slovene } { and } { in } \DeclareTranslation { Portuguese } { and } { e } + \DeclareTranslation { Slovene } { and } { in } + \DeclareTranslation { Brazilian } { to~(numerical~range) } { a } \DeclareTranslation { Catalan } { to~(numerical~range) } { a } \DeclareTranslation { English } { to~(numerical~range) } { to } \DeclareTranslation { French } { to~(numerical~range) } { à } \DeclareTranslation { German } { to~(numerical~range) } { bis } \DeclareTranslation { Polish } { to~(numerical~range) } { do } + \DeclareTranslation { Portuguese } { to~(numerical~range) } { a } \DeclareTranslation { Slovene } { to~(numerical~range) } { do } \DeclareTranslation { Spanish } { to~(numerical~range) } { a } - \DeclareTranslation { Brazilian } { to~(numerical~range) } { a } - \DeclareTranslation { Portuguese } { to~(numerical~range) } { a } \keys_set:nn { siunitx } { list-final-separator = @@ -1773,6 +1773,7 @@ \cs_generate_variant:Nn \tl_if_blank:nTF { f } \cs_generate_variant:Nn \tl_if_blank_p:n { f } \cs_generate_variant:Nn \tl_if_in:NnTF { NV } +\cs_generate_variant:Nn \tl_if_in:nnTF { nV } \cs_generate_variant:Nn \tl_remove_all:Nn { NV } \cs_generate_variant:Nn \tl_replace_all:Nnn { NnV } \tl_new:N \l__siunitx_number_tmp_tl @@ -2402,29 +2403,55 @@ \int_compare:nNnTF { \tl_count:N \l__siunitx_number_partial_tl } > { \tl_count:n {#2} } { \__siunitx_number_parse_loop_break:w } - { \__siunitx_number_parse_uncert_marker:nw {#3} } + { \__siunitx_number_parse_uncert_marker:nnnw {#1} {#2} {#3} } } -\cs_new_protected:Npn \__siunitx_number_parse_uncert_marker:nw - #1#2 \q_recursion_tail \q_recursion_stop +\cs_new_protected:Npn \__siunitx_number_parse_uncert_marker:nnnw + #1#2#3#4 \q_recursion_tail \q_recursion_stop { - \int_compare:nNnTF - { \tl_count:n {#2} - 1 } = { \tl_count:n {#1} } + \tl_if_in:nVTF {#4} \l__siunitx_number_input_uncert_close_tl { - \str_if_eq:eeTF - { \exp_not:V \l__siunitx_number_uncert_tl } - { \prg_replicate:nn { \tl_count:N \l__siunitx_number_partial_tl } { 0 } } - { \__siunitx_number_parse_uncert:NNN \c_false_bool } - { \__siunitx_number_parse_uncert:NNN \c_true_bool } - \__siunitx_number_parse_uncert_auxii:N + \exp_after:wN \__siunitx_number_parse_uncert_marker:Nnnn + \l__siunitx_number_input_uncert_close_tl + {#1} {#2} {#3} } - { \exp_after:wN \__siunitx_number_parse_uncert_extend:nnn \l__siunitx_number_parsed_tl } - #2 \q_recursion_tail \q_recursion_stop + { \__siunitx_number_parse_loop_break:w } + #4 \q_recursion_tail \q_recursion_stop } -\cs_new_protected:Npn \__siunitx_number_parse_uncert_extend:nnn #1#2#3 +\cs_new_protected:Npn \__siunitx_number_parse_uncert_marker:Nnnn + #1#2#3#4 + { + \cs_set_protected:Npn \__siunitx_number_parse_uncert_marker:w ##1 #1 + { \__siunitx_number_parse_uncert_marker:nnnnN {#2} {#3} {#4} {##1} #1 } + \__siunitx_number_parse_uncert_marker:w + } +\cs_new_protected:Npn \__siunitx_number_parse_uncert_marker:w { } +\cs_new_protected:Npn \__siunitx_number_parse_uncert_marker:nnnnN #1#2#3#4#5 { - \tl_set:Nn \l__siunitx_number_parsed_tl { {#1} {#2} { #3 0 } } - \__siunitx_number_parse_uncert:NNN \c_true_bool - \__siunitx_number_parse_uncert_auxii:N + \tl_set:Nx \l__siunitx_number_parsed_tl + { + {#1} + {#2} + { + #3 + \prg_replicate:nn + { + \int_max:nn + { 0 } + { \tl_count:n {#4} - \tl_count:n {#3} } + } + { 0 } + } + } + \tl_if_empty:NTF \l__siunitx_number_partial_tl + { + \__siunitx_number_parse_uncert:NNN \c_false_bool + \__siunitx_number_parse_uncert_auxii:N + } + { + \__siunitx_number_parse_uncert:NNN \c_true_bool + \__siunitx_number_parse_uncert_auxii:N + } + #4#5 } \cs_new_protected:Npn \__siunitx_number_parse_uncert_after:N #1 { |