summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-29 19:55:24 +0000
committerKarl Berry <karl@freefriends.org>2021-06-29 19:55:24 +0000
commitbf7a2e16287074d59bd623b138e4a2bcfe1c25d6 (patch)
tree7ff5438f4ab3aa0fdff1a61ff815838604c2e896
parentaf70cd8f8e37de544dc2ea4f05fc755842569c46 (diff)
siunitx (29jun21)
git-svn-id: svn://tug.org/texlive/trunk@59760 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md8
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin1493627 -> 1493737 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin635011 -> 635011 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-command.dtx34
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty26
6 files changed, 37 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index 3d9721549ad..8cd9f6dfeed 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.17]
+
+### Fixed
+- Load order issue with `soulpos` (issue #498)
+
## [v3.0.16]
### Fixed
@@ -1409,7 +1414,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.16...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.17...HEAD
+[v3.0.17]: https://github.com/josephwright/siunitx/compare/v3.0.16...v3.0.17
[v3.0.16]: https://github.com/josephwright/siunitx/compare/v3.0.15...v3.0.16
[v3.0.15]: https://github.com/josephwright/siunitx/compare/v3.0.14...v3.0.15
[v3.0.14]: https://github.com/josephwright/siunitx/compare/v3.0.13...v3.0.14
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index dd9f899d20a..a3f4606a73b 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 aa8161e9dd4..ed08b36163f 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-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}
%
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index 9099b8fc2ea..681d6bf8757 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-06-24} {3.0.16}
+\ProvidesExplPackage {siunitx} {2021-06-29} {3.0.17}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -6396,24 +6396,22 @@
\cs_new_protected:Npn \siunitx_command_create:
{
\bool_if:NT \l__siunitx_command_create_bool
- {
- \__siunitx_command_create:
- \@ifpackageloaded { soulpos }
- {
- \@ifpackageloaded { soul }
- { }
- {
- \cs_undefine:N \hl
- \cs_undefine:N \ul
- }
- }
- { }
- }
+ { \__siunitx_command_create: }
\seq_map_inline:Nn \l_siunitx_unit_symbolic_seq
{
\cs_if_free:NT ##1
{ \cs_set_protected:Npn ##1 { \ERROR } }
}
+ \@ifpackageloaded { soulpos }
+ {
+ \@ifpackageloaded { soul }
+ { }
+ {
+ \cs_undefine:N \hl
+ \cs_undefine:N \ul
+ }
+ }
+ { }
}
\AtBeginDocument { \siunitx_command_create: }
\cs_new_protected:Npn \__siunitx_command_create: