summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/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/source/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/source/latex/siunitx')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx13
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx48
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx8
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
4 files changed, 27 insertions, 44 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
index 108925d535e..59a6dd8129c 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
@@ -906,16 +906,9 @@
\cs_new_protected:Npn
\@@_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_@@_parsed_tl
- \tl_clear:N \l_@@_flex_tl
- }
- {
- \@@_parse_combine_uncert_auxii:fnnnn
- { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } }
- {#2} {#3} {#6} {#7}
- }
+ \@@_parse_combine_uncert_auxii:fnnnn
+ { \int_eval:n { \tl_count:n {#3} - \tl_count:n {#7} } }
+ {#2} {#3} {#6} {#7}
}
\cs_new_protected:Npn
\@@_parse_combine_uncert_auxii:nnnnn #1
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
index c86d77e9f18..a0c9368b216 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
@@ -117,8 +117,7 @@
\@@_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 \@@_deal_with_utf: { }
@@ -165,34 +164,29 @@
\@@_if_replace:NnT \arcminute { "02B9 }
{
\siunitx_declare_unit:Nn \arcminute
- { \exp_not:N \ensuremath { { } ' } }
+ { \ensuremath { { } ' } }
}
\@@_if_replace:NnT \arcsecond { "02BA }
{
\siunitx_declare_unit:Nn \arcsecond
- { \exp_not:N \ensuremath { { } '' } }
+ { \ensuremath { { } '' } }
}
% \end{macrocode}
-% For |\degree|, direct input works in text mode so there is
-% only a need to tidy up for math mode. If \pkg{fontspec} is loaded then that
-% problem goes away, so nothing needs to be done.
+% For |\degree|, direct input works in text mode so there is only a need to
+% tidy up for math mode.
% \begin{macrocode}
\@@_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 }
- { \@@_non_latin:n { "00B0 } }
- }
+ \@ifpackageloaded { inputenc }
+ { \exp_not:N \textdegree }
+ { \@@_non_latin:n { "00B0 } }
}
- { quantity-product = { } }
- }
+ }
+ { quantity-product = { } }
}
% \end{macrocode}
% For |\degreeCelsius|, much the same to think about but the comparison
@@ -207,20 +201,16 @@
\str_if_eq:VVTF \l_@@_tmpa_tl \l_@@_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 }
- { \@@_non_latin:n { "00B0 } }
- }
- C
+ \@ifpackageloaded { inputenc }
+ { \exp_not:N \textdegree }
+ { \@@_non_latin:n { "00B0 } }
}
- }
+ C
+ }
}
{ \group_end: }
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
index b0602c25433..be3e6eaf613 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
@@ -1351,7 +1351,7 @@
\tl_clear:N \l_@@_separator_tl
}
\cs_new_protected:Npn \@@_format_literal_auxix:nn #1#2
- { \@@_format_literal_auxvi:nN { #1 {#2} } }
+ { \@@_format_literal_auxv:nw { #1 {#2} } }
\use:x
{
\cs_new_protected:Npn \exp_not:N \@@_format_literal_auxx:nw
@@ -2511,7 +2511,8 @@
% \begin{macro}{\@@_non_latin:nnnn}
% A small amount of code to make it convenient to include non-Latin
% characters in units without having to directly include them in the
-% sources directly.
+% sources directly. We only make the first token active as some packages
+% (\foreign{e.g.}~\pkg{kotex}) do this.
% \begin{macrocode}
\bool_lazy_or:nnTF
{ \sys_if_engine_luatex_p: }
@@ -2530,8 +2531,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 }
}
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 7111f983922..8f9b2dab570 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} {2021-07-06} {3.0.19}
+\ProvidesExplPackage {siunitx} {2021-07-20} {3.0.21}
{A comprehensive (SI) units package}
% \end{macrocode}
%