diff options
Diffstat (limited to 'macros/latex/contrib/siunitx/siunitx-print.dtx')
-rw-r--r-- | macros/latex/contrib/siunitx/siunitx-print.dtx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index 4f107b5cbb..5bcc08f65b 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/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 |