summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-24 20:20:41 +0000
committerKarl Berry <karl@freefriends.org>2024-04-24 20:20:41 +0000
commitc2d6b05265894e1da618ae84cfc98c356b587160 (patch)
tree3bd84457ef6b2b43bfbabebcccb575454838de0a /Master/texmf-dist/source/latex
parentcb73611e2934dbe2cdd34bcf5b8d2dcc4b2fdeec (diff)
siunitx (24apr24)
git-svn-id: svn://tug.org/texlive/trunk@71066 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-symbol.dtx101
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-unit.dtx2
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx2
3 files changed, 51 insertions, 54 deletions
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}
%