diff options
author | Karl Berry <karl@freefriends.org> | 2021-11-03 20:49:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-11-03 20:49:34 +0000 |
commit | b2997a70d96cebf6373f204a3c91ef4762bfc1cf (patch) | |
tree | c5a6f5c19a16ed1df8624ee0602fae84e7e18e12 /Master/texmf-dist/source/latex/siunitx | |
parent | 40863ee9fa462d3b0e292387fc2a9d2c2933c78e (diff) |
siunitx (3nov21)
git-svn-id: svn://tug.org/texlive/trunk@60936 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx-print.dtx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 |
2 files changed, 6 insertions, 4 deletions
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} % |