From c2d6b05265894e1da618ae84cfc98c356b587160 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Apr 2024 20:20:41 +0000 Subject: siunitx (24apr24) git-svn-id: svn://tug.org/texlive/trunk@71066 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md | 9 +- .../texmf-dist/doc/latex/siunitx/siunitx-code.pdf | Bin 645465 -> 645251 bytes Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 703731 -> 703738 bytes .../source/latex/siunitx/siunitx-symbol.dtx | 101 ++++++++++---------- .../source/latex/siunitx/siunitx-unit.dtx | 2 +- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 103 ++++++++++----------- 7 files changed, 109 insertions(+), 108 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md index e469eef743b..97c77dc5bc3 100644 --- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md @@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.3.16] - 2024-04-24 + +### Fixed +- Ensure that mode-dependent symbols respect printing mode (see issue + [\#729](https://github.com/josephwright/siunitx/issues/729)) + ## [v3.3.15] - 2024-04-23 ### Fixed @@ -2098,7 +2104,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.3.15...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.16...HEAD +[v3.3.16]: https://github.com/josephwright/siunitx/compare/v3.3.15...v3.3.16 [v3.3.15]: https://github.com/josephwright/siunitx/compare/v3.3.14...v3.3.15 [v3.3.14]: https://github.com/josephwright/siunitx/compare/v3.3.13...v3.3.14 [v3.3.13]: https://github.com/josephwright/siunitx/compare/v3.3.12...v3.3.13 diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf index 5571b7dbd50..2dc8e65250c 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 9315de39470..3c058ce3faa 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx index 455adb6d59b..ea974318413 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx @@ -161,18 +161,17 @@ { \siunitx_declare_unit:Nen \degree { - \exp_not:N \ifmmode - \@ifpackageloaded { unicode-math } - { \@@_non_latin:n { "00B0 } } - { { } ^ { \exp_not:N \circ } } - \exp_not:N \else - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \@@_non_latin:n { "00B0 } } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \@@_non_latin:n { "00B0 } } + } + { + \@ifpackageloaded { unicode-math } + { \@@_non_latin:n { "00B0 } } + { { } ^ { \exp_not:N \circ } } + } } { quantity-product = { } } } @@ -191,18 +190,17 @@ \group_end: \siunitx_declare_unit:Ne \degreeCelsius { - \exp_not:N \ifmmode - \@ifpackageloaded { unicode-math } - { \@@_non_latin:n { "00B0 } } - { { } ^ { \exp_not:N \circ } } - \exp_not:N \else - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \@@_non_latin:n { "00B0 } } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \@@_non_latin:n { "00B0 } } + } + { + \@ifpackageloaded { unicode-math } + { \@@_non_latin:n { "00B0 } } + { { } ^ { \exp_not:N \circ } } + } C } } @@ -233,34 +231,33 @@ { \exp_not:V \l_@@_tmpa_tl } } { - \exp_not:N \ifmmode - \@ifpackageloaded { fontspec } - { \exp_not:V \l_@@_tmpb_tl } - { - \bool_lazy_or:nnTF - { - \@ifclassloaded { beamer } - \c_true_bool - \c_false_bool - } - { - \@ifpackageloaded { kmath } - \c_true_bool - \c_false_bool - } - { \exp_not:V \l_@@_tmpb_tl } - { \exp_not:V \l_@@_tmpa_tl } - } - \exp_not:N \else - \exp_not:N \text - { - \bool_lazy_or:nnTF - { \sys_if_engine_luatex_p: } - { \sys_if_engine_xetex_p: } - { \@@_non_latin:n { "2126 } } - { \exp_not:N \textohm } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \bool_lazy_or:nnTF + { \sys_if_engine_luatex_p: } + { \sys_if_engine_xetex_p: } + { \@@_non_latin:n { "2126 } } + { \exp_not:N \textohm } + } + { + \@ifpackageloaded { fontspec } + { \exp_not:V \l_@@_tmpb_tl } + { + \bool_lazy_or:nnTF + { + \@ifclassloaded { beamer } + \c_true_bool + \c_false_bool + } + { + \@ifpackageloaded { kmath } + \c_true_bool + \c_false_bool + } + { \exp_not:V \l_@@_tmpb_tl } + { \exp_not:V \l_@@_tmpa_tl } + } + } } } } diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx index a7fd28e8bc0..7faf5740da4 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx @@ -86,7 +86,7 @@ % A small number of \LaTeXe{} math mode commands are assumed to be available % as part of the formatted output. The \cs{mathchoice} command % (normally the \TeX{} primitive) is needed when using different settings -% for inline and siplay |per-mode|. The commands \cs{frac}, \cs{mathrm}, +% for inline and display |per-mode|. The commands \cs{frac}, \cs{mathrm}, % \cs{mbox}, \verb*|\ | and \cs{,} are used by the standard module settings. % For the display of colored (highlighted) and cancelled units, the commands % \cs{textcolor} and \cs{cancel} are assumed to be available. diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 30b2d92366a..6f49440f7c7 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} {2024-04-23} {3.3.15} +\ProvidesExplPackage {siunitx} {2024-04-24} {3.3.16} {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 2fdefa95e04..03e741f3bcf 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -41,7 +41,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2024-04-23} {3.3.15} +\ProvidesExplPackage {siunitx} {2024-04-24} {3.3.16} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -7733,18 +7733,17 @@ { \siunitx_declare_unit:Nen \degree { - \exp_not:N \ifmmode - \@ifpackageloaded { unicode-math } - { \__siunitx_symbol_non_latin:n { "00B0 } } - { { } ^ { \exp_not:N \circ } } - \exp_not:N \else - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \__siunitx_symbol_non_latin:n { "00B0 } } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \__siunitx_symbol_non_latin:n { "00B0 } } + } + { + \@ifpackageloaded { unicode-math } + { \__siunitx_symbol_non_latin:n { "00B0 } } + { { } ^ { \exp_not:N \circ } } + } } { quantity-product = { } } } @@ -7759,18 +7758,17 @@ \group_end: \siunitx_declare_unit:Ne \degreeCelsius { - \exp_not:N \ifmmode - \@ifpackageloaded { unicode-math } - { \__siunitx_symbol_non_latin:n { "00B0 } } - { { } ^ { \exp_not:N \circ } } - \exp_not:N \else - \exp_not:N \text - { - \@ifpackageloaded { inputenc } - { \exp_not:N \textdegree } - { \__siunitx_symbol_non_latin:n { "00B0 } } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \@ifpackageloaded { inputenc } + { \exp_not:N \textdegree } + { \__siunitx_symbol_non_latin:n { "00B0 } } + } + { + \@ifpackageloaded { unicode-math } + { \__siunitx_symbol_non_latin:n { "00B0 } } + { { } ^ { \exp_not:N \circ } } + } C } } @@ -7796,34 +7794,33 @@ { \exp_not:V \l__siunitx_symbol_tmpa_tl } } { - \exp_not:N \ifmmode - \@ifpackageloaded { fontspec } - { \exp_not:V \l__siunitx_symbol_tmpb_tl } - { - \bool_lazy_or:nnTF - { - \@ifclassloaded { beamer } - \c_true_bool - \c_false_bool - } - { - \@ifpackageloaded { kmath } - \c_true_bool - \c_false_bool - } - { \exp_not:V \l__siunitx_symbol_tmpb_tl } - { \exp_not:V \l__siunitx_symbol_tmpa_tl } - } - \exp_not:N \else - \exp_not:N \text - { - \bool_lazy_or:nnTF - { \sys_if_engine_luatex_p: } - { \sys_if_engine_xetex_p: } - { \__siunitx_symbol_non_latin:n { "2126 } } - { \exp_not:N \textohm } - } - \exp_not:N \fi + \exp_not:N \TextOrMath + { + \bool_lazy_or:nnTF + { \sys_if_engine_luatex_p: } + { \sys_if_engine_xetex_p: } + { \__siunitx_symbol_non_latin:n { "2126 } } + { \exp_not:N \textohm } + } + { + \@ifpackageloaded { fontspec } + { \exp_not:V \l__siunitx_symbol_tmpb_tl } + { + \bool_lazy_or:nnTF + { + \@ifclassloaded { beamer } + \c_true_bool + \c_false_bool + } + { + \@ifpackageloaded { kmath } + \c_true_bool + \c_false_bool + } + { \exp_not:V \l__siunitx_symbol_tmpb_tl } + { \exp_not:V \l__siunitx_symbol_tmpa_tl } + } + } } } } -- cgit v1.2.3