From 9181adccf1fab9fe3f83e0ccff2ceeab618f3ac8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 Feb 2020 14:30:18 +0000 Subject: siunitx (23feb20) git-svn-id: svn://tug.org/texlive/trunk@53890 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 640541 -> 640341 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 14 ++++++++++++-- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 12 ++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 8c71ffa425f..e03e55beafb 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.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 7bceb45bf13..bd9895a1134 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -697,6 +697,8 @@ This work consists of the file siunitx.dtx % the kernel)} % \changes{v2.8}{2020/02/20}{Allow \cs{ohm} to appear correctly in PDF % bookmarks} +% \changes{v2.8a}{2020/02/23}{Correct appearance of ohm when +% \pkg{unicode-math} is loaded} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5221,7 +5223,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2020/02/20} {2.8} +\ProvidesExplPackage {siunitx} {2020/02/23} {2.8a} {A comprehensive (SI) units package} % \end{macrocode} % @@ -15373,13 +15375,21 @@ This work consists of the file siunitx.dtx { \AA } { \capitalring { A } } } + \@ifpackageloaded { unicode-math } + { + \exp_args:NNnx + \@@_option_unchanged:Nnn \l_@@_ohm_math_tl + { \text { \ensuremath { \Omega } } } + { \char_generate:nn { "03A9 } { 12 } } + } + { } \@ifpackageloaded { upgreek } { \@@_option_unchanged:Nnn \l_@@_ohm_math_tl { \text { \ensuremath { \Omega } } } { \text { \ensuremath { \Upomega } } } } - { } + { } } } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index ffd847e8bc7..3f031b1b4e0 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -15,7 +15,7 @@ %% \RequirePackage{expl3}[2020/01/12] \RequirePackage{xparse} -\ProvidesExplPackage {siunitx} {2020/02/20} {2.8} +\ProvidesExplPackage {siunitx} {2020/02/23} {2.8a} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2020/01/12 } { } @@ -6869,13 +6869,21 @@ { \AA } { \capitalring { A } } } + \@ifpackageloaded { unicode-math } + { + \exp_args:NNnx + \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl + { \text { \ensuremath { \Omega } } } + { \char_generate:nn { "03A9 } { 12 } } + } + { } \@ifpackageloaded { upgreek } { \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl { \text { \ensuremath { \Omega } } } { \text { \ensuremath { \Upomega } } } } - { } + { } } } \keys_define:nn { siunitx } { -- cgit v1.2.3