From bf7a2e16287074d59bd623b138e4a2bcfe1c25d6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Jun 2021 19:55:24 +0000 Subject: siunitx (29jun21) git-svn-id: svn://tug.org/texlive/trunk@59760 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/siunitx/siunitx-command.dtx | 34 +++++++++++----------- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/source/latex/siunitx') diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-command.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-command.dtx index 20574f72523..f12b5382fd4 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-command.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-command.dtx @@ -204,27 +204,11 @@ % Creating document commands is all done by a single function which is % set up using expansion: that way the tests are only run once. Other than % that, this is all just a question of picking up all the various routes. -% Where the \pkg{soulpos} package is loaded \emph{after} \pkg{siunitx}, the -% commands \cs{hl} and \cs{ul} will be created only after the hook is used. -% The \pkg{soul} package creates those using \tn{newcommand}, so we have to -% avoid an issue. % \begin{macrocode} \cs_new_protected:Npn \siunitx_command_create: { \bool_if:NT \l_@@_create_bool - { - \@@_create: - \@ifpackageloaded { soulpos } - { - \@ifpackageloaded { soul } - { } - { - \cs_undefine:N \hl - \cs_undefine:N \ul - } - } - { } - } + { \@@_create: } % \end{macrocode} % At the beginning of table cells and inside \texttt{x}-type expansion, % all symbolic units need to have \emph{some} definition. @@ -234,6 +218,22 @@ \cs_if_free:NT ##1 { \cs_set_protected:Npn ##1 { \ERROR } } } +% \end{macrocode} +% Where the \pkg{soulpos} package is loaded \emph{after} \pkg{siunitx}, the +% commands \cs{hl} and \cs{ul} will be created only after the hook is used. +% The \pkg{soul} package creates those using \tn{newcommand}, so we have to +% avoid an issue. +% \begin{macrocode} + \@ifpackageloaded { soulpos } + { + \@ifpackageloaded { soul } + { } + { + \cs_undefine:N \hl + \cs_undefine:N \ul + } + } + { } } \AtBeginDocument { \siunitx_command_create: } \cs_new_protected:Npn \@@_create: diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 0ee202f15f3..30afff3ae2b 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-06-24} {3.0.16} +\ProvidesExplPackage {siunitx} {2021-06-29} {3.0.17} {A comprehensive (SI) units package} % \end{macrocode} % -- cgit v1.2.3