texlive[60000] Master/texmf-dist: siunitx (20jul21)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 20 21:44:24 CEST 2021
Revision: 60000
http://tug.org/svn/texlive?view=revision&revision=60000
Author: karl
Date: 2021-07-20 21:44:24 +0200 (Tue, 20 Jul 2021)
Log Message:
-----------
siunitx (20jul21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md 2021-07-20 19:44:24 UTC (rev 60000)
@@ -7,6 +7,20 @@
## [Unreleased]
+## [v3.0.21]
+
+### Fixed
+- Print degree symbol if `fontspec` package is loaded with
+ `no-math` option (issue #505)
+- Handling of 'over-long' separated uncertainties (issue #506)
+- Symbol for arcs in text mode (issue #507)
+
+## [v3.0.20]
+
+### Fixed
+- Interaction with `kotex` (issue #502)
+- Handling of groups in literal units (issue #503)
+
## [v3.0.19]
### Fixed
@@ -1425,7 +1439,9 @@
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.19...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.21...HEAD
+[v3.0.21]: https://github.com/josephwright/siunitx/compare/v3.0.20...v3.0.21
+[v3.0.20]: https://github.com/josephwright/siunitx/compare/v3.0.19...v3.0.20
[v3.0.19]: https://github.com/josephwright/siunitx/compare/v3.0.18...v3.0.19
[v3.0.18]: https://github.com/josephwright/siunitx/compare/v3.0.17...v3.0.18
[v3.0.17]: https://github.com/josephwright/siunitx/compare/v3.0.16...v3.0.17
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx 2021-07-20 19:44:24 UTC (rev 60000)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx 2021-07-20 19:44:24 UTC (rev 60000)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx 2021-07-20 19:44:24 UTC (rev 60000)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/source/latex/siunitx/siunitx.dtx 2021-07-20 19:44:24 UTC (rev 60000)
@@ -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}
%
Modified: trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-07-20 19:44:04 UTC (rev 59999)
+++ trunk/Master/texmf-dist/tex/latex/siunitx/siunitx.sty 2021-07-20 19:44:24 UTC (rev 60000)
@@ -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 }
More information about the tex-live-commits
mailing list.