summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-03 20:49:34 +0000
committerKarl Berry <karl@freefriends.org>2021-11-03 20:49:34 +0000
commitb2997a70d96cebf6373f204a3c91ef4762bfc1cf (patch)
treec5a6f5c19a16ed1df8624ee0602fae84e7e18e12
parent40863ee9fa462d3b0e292387fc2a9d2c2933c78e (diff)
siunitx (3nov21)
git-svn-id: svn://tug.org/texlive/trunk@60936 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md12
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin1516213 -> 1516492 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin638362 -> 638362 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx8
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty7
6 files changed, 21 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index 4db74bbc007..3aebf9976fa 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.35]
+
+### Changed
+- Delay loading of `color` package to `begindocument` hook
+
+### Fixed
+- Text mode replacement of `\mathrm` in super/subscripts (see issue
+ [#556](https://github.com/josephwright/siunitx/issues/556))
+
## [v3.0.34]
### Fixed
@@ -1613,7 +1622,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.34...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.35...HEAD
+[v3.0.35]: https://github.com/josephwright/siunitx/compare/v3.0.34...v3.0.35
[v3.0.34]: https://github.com/josephwright/siunitx/compare/v3.0.33...v3.0.34
[v3.0.33]: https://github.com/josephwright/siunitx/compare/v3.0.32...v3.0.33
[v3.0.32]: https://github.com/josephwright/siunitx/compare/v3.0.31...v3.0.32
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index 5ea13cc569d..64dae8774b0 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index d1dadd2e95d..bb59f341272 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
index 4f107b5cbb5..5bcc08f65b0 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx
@@ -313,9 +313,10 @@
% \end{macrocode}
% \end{macro}
%
-% Color support is always required.
+% Color support is always required; to avoid a potential clash we delay to
+% the start of the document.
% \begin{macrocode}
-\RequirePackage { color }
+\AtBeginDocument { \RequirePackage { color } }
% \end{macrocode}
%
% \begin{macro}{\tl_replace_all:NVn}
@@ -816,7 +817,8 @@
{ \@@_text_replace:Nnnnn #1 }
{
\tl_set:Nn \l_@@_tmp_tl {#1}
- \@@_replace_font:N \l_@@_tmp_tl
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
\cs_set:Npn \mathord ##1 {##1}
\cs_set:Npn \pm { \exp_not:N \textpm }
\tl_map_inline:nn
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index cdf49b261c8..6fd0040427c 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-10-26} {3.0.34}
+\ProvidesExplPackage {siunitx} {2021-11-03} {3.0.35}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index d01d2352ae6..5ec91a8d1c8 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-10-26} {3.0.34}
+\ProvidesExplPackage {siunitx} {2021-11-03} {3.0.35}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -3625,7 +3625,7 @@
}
\RequirePackage { amstext }
\cs_new_eq:NN \__siunitx_print_ams_text:n \text
-\RequirePackage { color }
+\AtBeginDocument { \RequirePackage { color } }
\cs_generate_variant:Nn \tl_replace_all:Nnn { NV }
\tl_new:N \l__siunitx_print_tmp_tl
\tl_new:N \l__siunitx_print_number_mode_tl
@@ -3915,7 +3915,8 @@
{ \__siunitx_print_text_replace:Nnnnn #1 }
{
\tl_set:Nn \l__siunitx_print_tmp_tl {#1}
- \__siunitx_print_replace_font:N \l__siunitx_print_tmp_tl
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
\cs_set:Npn \mathord ##1 {##1}
\cs_set:Npn \pm { \exp_not:N \textpm }
\tl_map_inline:nn