summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-20 19:44:24 +0000
committerKarl Berry <karl@freefriends.org>2021-07-20 19:44:24 +0000
commit07ec69b604e0c1a737d5471382a5f874feaab7c3 (patch)
treeffdfa3b662f0e8b822745f46d427791e117e5858 /Master/texmf-dist/tex/latex/siunitx
parent5f2d9fa75323d09bc44900bfc55695056bd46c88 (diff)
siunitx (20jul21)
git-svn-id: svn://tug.org/texlive/trunk@60000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty63
1 files changed, 23 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 79af4630af0..03d48ee1604 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} {2021-07-06} {3.0.19}
+\ProvidesExplPackage {siunitx} {2021-07-20} {3.0.21}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -1641,16 +1641,9 @@
\cs_new_protected:Npn
\__siunitx_number_parse_combine_uncert_auxi:nnnnnnnn #1#2#3#4#5#6#7#8
{
- \int_compare:nNnTF { \tl_count:n {#6} } > { \tl_count:n {#2} }
- {
- \tl_clear:N \l__siunitx_number_parsed_tl
- \tl_clear:N \l__siunitx_number_flex_tl
- }
- {
- \__siunitx_number_parse_combine_uncert_auxii:fnnnn
- { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } }
- {#2} {#3} {#6} {#7}
- }
+ \__siunitx_number_parse_combine_uncert_auxii:fnnnn
+ { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } }
+ {#2} {#3} {#6} {#7}
}
\cs_new_protected:Npn
\__siunitx_number_parse_combine_uncert_auxii:nnnnn #1
@@ -5077,7 +5070,7 @@
\tl_clear:N \l__siunitx_unit_separator_tl
}
\cs_new_protected:Npn \__siunitx_unit_format_literal_auxix:nn #1#2
- { \__siunitx_unit_format_literal_auxvi:nN { #1 {#2} } }
+ { \__siunitx_unit_format_literal_auxv:nw { #1 {#2} } }
\use:x
{
\cs_new_protected:Npn \exp_not:N \__siunitx_unit_format_literal_auxx:nw
@@ -5769,8 +5762,7 @@
{
\exp_after:wN \exp_after:wN \exp_after:wN
\exp_not:N \char_generate:nn {#1} { 13 }
- \exp_after:wN \exp_after:wN \exp_after:wN
- \exp_not:N \char_generate:nn {#2} { 13 }
+ \char_generate:nn {#2} { 12 }
}
}
\siunitx_declare_unit:Nn \kilogram { \kilo \gram }
@@ -6118,8 +6110,7 @@
\__siunitx_symbol_deal_with_utf:
\exp_after:wN \exp_after:wN \exp_after:wN
\exp_not:N \char_generate:nn {#1} { 13 }
- \exp_after:wN \exp_after:wN \exp_after:wN
- \exp_not:N \char_generate:nn {#2} { 13 }
+ \char_generate:nn {#2} { 12 }
}
}
\cs_new:Npn \__siunitx_symbol_deal_with_utf: { }
@@ -6147,29 +6138,25 @@
\__siunitx_symbol_if_replace:NnT \arcminute { "02B9 }
{
\siunitx_declare_unit:Nn \arcminute
- { \exp_not:N \ensuremath { { } ' } }
+ { \ensuremath { { } ' } }
}
\__siunitx_symbol_if_replace:NnT \arcsecond { "02BA }
{
\siunitx_declare_unit:Nn \arcsecond
- { \exp_not:N \ensuremath { { } '' } }
+ { \ensuremath { { } '' } }
}
\__siunitx_symbol_if_replace:NnT \degree { "00B0 }
{
- \@ifpackageloaded { fontspec }
- { }
+ \siunitx_declare_unit:Nxn \degree
{
- \siunitx_declare_unit:Nxn \degree
+ \exp_not:N \text
{
- \exp_not:N \text
- {
- \@ifpackageloaded { inputenc }
- { \exp_not:N \textdegree }
- { \__siunitx_symbol_non_latin:n { "00B0 } }
- }
+ \@ifpackageloaded { inputenc }
+ { \exp_not:N \textdegree }
+ { \__siunitx_symbol_non_latin:n { "00B0 } }
}
- { quantity-product = { } }
- }
+ }
+ { quantity-product = { } }
}
\group_begin:
\tl_set:Nx \l__siunitx_symbol_tmpa_tl { \__siunitx_symbol_non_latin:n { "00B0 } C }
@@ -6180,20 +6167,16 @@
\str_if_eq:VVTF \l__siunitx_symbol_tmpa_tl \l__siunitx_symbol_tmpb_tl
{
\group_end:
- \@ifpackageloaded { fontspec }
- { }
+ \siunitx_declare_unit:Nx \degreeCelsius
{
- \siunitx_declare_unit:Nx \degreeCelsius
+ \exp_not:N \text
{
- \exp_not:N \text
- {
- \@ifpackageloaded { inputenc }
- { \exp_not:N \textdegree }
- { \__siunitx_symbol_non_latin:n { "00B0 } }
- }
- C
+ \@ifpackageloaded { inputenc }
+ { \exp_not:N \textdegree }
+ { \__siunitx_symbol_non_latin:n { "00B0 } }
}
- }
+ C
+ }
}
{ \group_end: }
\__siunitx_symbol_if_replace:NnT \ohm { "03A9 }