diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf | bin | 1174016 -> 0 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 640745 -> 640541 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 292 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 206 |
4 files changed, 114 insertions, 384 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf Binary files differdeleted file mode 100644 index 17ca614c6c3..00000000000 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex affca61c32c..8c71ffa425f 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index bca4b099efd..7bceb45bf13 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -691,6 +691,12 @@ This work consists of the file siunitx.dtx % angles} % \changes{v2.7t}{2019/10/10}{Fix \opt{round-half} when \opt{even} at zero precision} % \changes{v2.7u}{2020/01/15}{Modified internals to track \pkg{expl3} changes} +% \changes{v2.7v}{2020/02/17}{Fix appearance of superscript decimals with +% comma decimal marker} +% \changes{v2.8}{2020/02/20}{Use companion font symbols (now always loaded by +% the kernel)} +% \changes{v2.8}{2020/02/20}{Allow \cs{ohm} to appear correctly in PDF +% bookmarks} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -3972,19 +3978,18 @@ This work consists of the file siunitx.dtx % math-arcminute & Literal & \verb={}^{\prime}= \\ % math-arcsecond & Literal & \verb={}^{\prime\prime}= \\ % math-celsius & Literal & \meta{see text} \\ -% math-degree & Literal & \verb={}^{\circ}= \\ -% math-micro & Literal & \meta{see text} \\ -% math-ohm & Literal & \cs{Omega} \\ +% math-degree & Literal & \verb=\text{\textdegree}= \\ +% math-micro & Literal & \verb=\text{\textmu}= \\ +% math-ohm & Literal & \verb=\text{\ensuremath{\Omega}}= \\ % redefine-symbols & Switch & true \\ % text-angstrom & Literal & \cs{AA} \\ % text-arcminute & Literal & \verb=\ensuremath{{}^{\prime}}= \\ % text-arcsecond & Literal & % \verb=\ensuremath{{}^{\prime\prime}}= \\ -% text-celsius & Literal & \verb=\ensuremath{{}^{\circ}}= \\ -% & & \verb=\kern -\scriptspace C= \\ -% text-degree & Literal & \verb=\ensuremath{{}^{\circ}}= \\ -% text-micro & Literal & \meta{see text} \\ -% text-ohm & Literal & \verb=\ensuremath{\Omega}= \\ +% text-celsius & Literal & \verb=\textdegree C= \\ +% text-degree & Literal & \verb=\textdegree= \\ +% text-micro & Literal & \verb=\textmu= \\ +% text-ohm & Literal & \verb=\textohm= \\ % \bottomrule % \end{tabular} %\end{table} @@ -4004,11 +4009,6 @@ This work consists of the file siunitx.dtx % the macro name easier!).\footnote{The function % \cs{SIUnitSymbolAngstrom} uses the name without accents.} % -% \changes{v2.4a}{2011/12/04}{Use UTF-8 symbols with \XeTeX{} and \LuaTeX{} -% if \pkg{fontspec} is loaded} -% When using \XeTeX{} or \LuaTeX{}, if \pkg{fontspec} is loaded these options -% are redefined to use UTF-8 characters directly. -% %\subsection{Other options} % %\DescribeOption{locale} @@ -5221,7 +5221,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2020/01/15} {2.7u} +\ProvidesExplPackage {siunitx} {2020/02/20} {2.8} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5331,78 +5331,13 @@ This work consists of the file siunitx.dtx %\end{macro} %\end{macro} % -% Some of the \texttt{TS1} encoding is needed to provide symbols in -% text mode. If the user has not loaded the encoding themselves, it is -% done here. +% Ensure that the companion font is loaded. % \begin{macrocode} \AtBeginDocument { \cs_if_free:cT { T@TS1 } - { - \DeclareFontEncoding { TS1 } { } { } - \DeclareFontSubstitution { TS1 } { cmr } { m } { n } - } -} -% \end{macrocode} -% -%\begin{macro}{ -% \c_@@_minus_tl , -% \c_@@_minus_int -%} -% To allow the correct symbol to appear in text mode: this is the same -% as \cs{textminus} from \pkg{textcomp}. If \pkg{fontspec} is loaded -% then the real character can be used unless there's a good reason -% to suspect -% \begin{macrocode} -\DeclareTextSymbolDefault \c_@@_minus_tl { TS1 } -\DeclareTextSymbol \c_@@_minus_tl { TS1 } { 61 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \@ifpackageloaded { eulervm } - { } - { - \int_const:Nn \c_@@_minus_int { 8722 } - \tl_set:Nn \c_@@_minus_tl - { \tex_char:D \c_@@_minus_int } - } - } - { } -} -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{ -% \c_@@_mu_tl , -% \c_@@_mu_int -%} -% The lack of an upright mu has to be sorted out. The same consideration -% for \pkg{fontspec} as above. -% \begin{macrocode} -\DeclareTextSymbol \c_@@_mu_tl { TS1 } { 181 } -\DeclareTextSymbolDefault \c_@@_mu_tl { TS1 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c_@@_mu_int { 181 } - \tl_set:Nn \c_@@_mu_tl { \tex_char:D \c_@@_mu_int } - } - { } -} -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\g_@@_omega_tl} -% Some package redefine \cs{Omega} to be slanted and move the original -% symbol to \cs{upOmega}. This is handled here. -% \begin{macrocode} -\tl_new:N \g_@@_omega_tl -\tl_gset:Nn \g_@@_omega_tl { \Omega } -\AtBeginDocument { - \cs_if_exist:NT \upOmega - { \tl_set:Nn \g_@@_omega_tl { \upOmega } } + { \RequirePackage { textcomp } } } % \end{macrocode} -%\end{macro} % % \begin{macro} % { @@ -5716,7 +5651,6 @@ This work consists of the file siunitx.dtx \@@_option_unchanged:Nnn \l_@@_qualifier_mode_tl { subscript } { brackets } \keys_set:nn { siunitx } { mode = text } - \tl_set:Nn \c_@@_minus_tl { \HCode { &\#x2212; } } } { } } @@ -6513,7 +6447,7 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_print_text: { \tl_replace_all:Nnn \l_@@_print_arg_tl { - } - { \c_@@_minus_tl } + { \textminus } \@@_print_text_aux: \tl_replace_all:Nnn \l_@@_print_arg_tl { \mp } { \ensuremath { \mp } } @@ -6607,7 +6541,7 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_print_text_super:n #1 { \tl_set:Nn \l_@@_tmpa_tl {#1} \tl_replace_all:Nnn \l_@@_tmpa_tl { - } - { \c_@@_minus_tl } + { \textminus } \tl_set:Nx \l_@@_tmpa_tl { \exp_not:N \ensuremath @@ -8512,7 +8446,7 @@ This work consists of the file siunitx.dtx \l_@@_process_integer_min_int - \tl_count:N \l_@@_tmpa_tl } - \int_compare:nNnT \l_@@_tmp_int > 0 + \int_compare:nNnT \l_@@_tmp_int > 0 { \tl_set:Nx \l_@@_tmpa_tl { @@ -12462,6 +12396,7 @@ This work consists of the file siunitx.dtx % \@@_unit_format_power_aux: , % \@@_unit_format_power_aux:n , % \@@_unit_format_power_aux:nn , +% \@@_unit_format_power_aux:w , % \@@_unit_format_power_brackets: , % \@@_unit_format_power_per: , % \@@_unit_format_power_repeat: @@ -12505,7 +12440,10 @@ This work consists of the file siunitx.dtx \exp_not:N \PrintSuperscript { \@@_unit_format_power_aux:n - { \exp_not:V \l_@@_tmpa_tl } + { + \exp_after:wN \@@_unit_format_power:w + \l_@@_tmpa_tl . . \q_stop + } } } } @@ -12521,10 +12459,19 @@ This work consists of the file siunitx.dtx { \tl_set:Nn \l_@@_tmpa_tl {#2} \tl_replace_all:Nnn \l_@@_tmpa_tl { - } - { \text { \c_@@_minus_tl } } + { \text { \textminus } } \@@_print:nV {#1} \l_@@_tmpa_tl } } +\cs_new:Npn \@@_unit_format_power:w #1 . #2 . #3 \q_stop + { + \exp_not:n {#1} + \tl_if_blank:nF {#2} + { + \exp_not:V \l_@@_output_decimal_tl + \exp_not:n {#2} + } + } % \end{macrocode} % A check is made for a qualifier with a space, which needs brackets % if there is also a power. @@ -15403,44 +15350,34 @@ This work consists of the file siunitx.dtx { \bool_if:NT \l_@@_redefine_symbols_bool { - \@ifpackageloaded { textcomp } + \@ifpackageloaded { fourier } { - \@@_option_unchanged:Nnn \l_@@_degree_math_tl - { { } ^ { \circ } } - { \text { \textdegree } } - \@@_option_unchanged:Nnn \l_@@_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \textdegree } - \@ifpackageloaded { mathptmx } - { } - { - \@@_option_unchanged:Nnn \l_@@_micro_text_tl - { \c_@@_mu_tl } - { \textmu } - \@ifpackageloaded { fourier } - { } - { - \@@_option_unchanged:Nnn \l_@@_ohm_text_tl - { \ensuremath { \g_@@_omega_tl } } - { \textohm } - } - } - \str_if_eq:VnT \encodingdefault { OT1 } - { - \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl - { \text { \AA } } - { \text { \capitalring { A } } } - \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl - { \AA } - { \capitalring { A } } - } + \@@_option_unchanged:Nnn \l_@@_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l_@@_ohm_math_tl } } } + } + { } + \@ifpackageloaded { mathptmx } + { + \@@_option_unchanged:Nnn \l_@@_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l_@@_ohm_math_tl } } } } { } + \str_if_eq:VnT \encodingdefault { OT1 } + { + \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl + { \text { \AA } } + { \text { \capitalring { A } } } + \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl + { \AA } + { \capitalring { A } } + } \@ifpackageloaded { upgreek } { \@@_option_unchanged:Nnn \l_@@_ohm_math_tl - { \text { \ensuremath { \g_@@_omega_tl } } } - { \Upomega } + { \text { \ensuremath { \Omega } } } + { \text { \ensuremath { \Upomega } } } } { } } @@ -15474,10 +15411,10 @@ This work consists of the file siunitx.dtx math-angstrom = \text { \AA }, math-arcminute = { } ^ { \prime }, math-arcsecond = { } ^ { \prime \prime }, - math-celsius = { } ^ { \circ } \kern - \scriptspace \@@_unit_mathrm:n { C } , - math-degree = { } ^ { \circ }, - math-micro = \text { \c_@@_mu_tl }, - math-ohm = \text { \ensuremath { \g_@@_omega_tl } }, + math-celsius = \text { \textdegree } \@@_unit_mathrm:n { C } , + math-degree = \text { \textdegree }, + math-micro = \text { \textmu }, + math-ohm = \text { \ensuremath { \Omega } }, } % \end{macrocode} %\end{macro} @@ -15509,11 +15446,10 @@ This work consists of the file siunitx.dtx text-angstrom = \AA, text-arcminute = \ensuremath { { } ^ { \prime } }, text-arcsecond = \ensuremath { { } ^ { \prime \prime } }, - text-celsius = - \ensuremath { { } ^ { \circ } } \kern -\scriptspace C , - text-degree = \ensuremath { { } ^ { \circ } }, - text-micro = \c_@@_mu_tl , - text-ohm = \ensuremath { \g_@@_omega_tl }, + text-celsius = \text { \textdegree } C, + text-degree = \text { \textdegree }, + text-micro = \textmu , + text-ohm = \textohm } % \end{macrocode} %\end{macro} @@ -15569,104 +15505,6 @@ This work consists of the file siunitx.dtx %\end{macro} %\end{macro} % -% \begin{variable} -% { -% \c_@@_degree_int , -% \c_@@_micro_int , -% \c_@@_angstrom_int , -% \c_@@_ohm_int , -% \c_@@_arcminute_int, -% \c_@@_arcsecond_int -% } -% For UTF-8 engines, it may be possible to use better symbols than those set -% up as standard. Unicode normalises both the ohm and {\aa}ngstr{\"{o}}m -% symbols to the appropriate letters, so these are used directly. -% Technically, we should hae a different slot for micro than for a mu, but -% for the broadest compatibility we go with the latter. -% The single degree Celsius symbol is a compatibility character, and so -% the two separate glyphs \enquote{degree} and \enquote{C} are used. -% \begin{macrocode} -\AtBeginDocument - { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c_@@_degree_int { 176 } - \int_const:Nn \c_@@_micro_int { "000B5 } - \int_const:Nn \c_@@_angstrom_int { "0212B } - \int_const:Nn \c_@@_ohm_int { "003A9 } - \sys_if_engine_xetex:T - { - \@@_option_unchanged:Nnn \l_@@_angstrom_math_tl - { \text { \AA } } - { \tex_char:D \c_@@_angstrom_int } - } - \@@_option_unchanged:Nnn \l_@@_celsius_math_tl - { { } ^ { \circ } \kern - \scriptspace C } - { - \tex_char:D \c_@@_degree_int - C - } - \@@_option_unchanged:Nnn \l_@@_degree_math_tl - { { } ^ { \circ } } - { \tex_char:D \c_@@_degree_int } - \@@_option_unchanged:Nnn \l_@@_micro_math_tl - { \text { \c_@@_mu_tl } } - { \tex_char:D \c_@@_micro_int } - \@@_option_unchanged:Nnn \l_@@_ohm_math_tl - { \text { \ensuremath { \g_@@_omega_tl } } } - { \tex_char:D \c_@@_ohm_int } - \sys_if_engine_xetex:T - { - \@@_option_unchanged:Nnn \l_@@_angstrom_text_tl - { \AA } - { \tex_char:D \c_@@_angstrom_int } - } - \@@_option_unchanged:Nnn \l_@@_celsius_text_tl - { - \ensuremath - { { } ^ { \circ } \kern - \scriptspace C } - } - { - \tex_char:D \c_@@_degree_int - C - } - \@@_option_unchanged:Nnn \l_@@_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \tex_char:D \c_@@_degree_int } - \@@_option_unchanged:Nnn \l_@@_micro_text_tl - { \c_@@_mu_tl } - { \tex_char:D \c_@@_micro_int } - \@@_option_unchanged:Nnn \l_@@_ohm_text_tl - { \ensuremath { \g_@@_omega_tl } } - { \tex_char:D \c_@@_ohm_int } - } - { } -% \end{macrocode} -% Slightly more specialised: these only work in math mode with -% \pkg{unicode-math}. -% \begin{macrocode} - \@ifpackageloaded { unicode-math } - { - \int_const:Nn \c_@@_arcminute_int { 8242 } - \int_const:Nn \c_@@_arcsecond_int { 8243 } - \@@_option_unchanged:Nnn \l_@@_arcminute_math_tl - { { } ^ { \prime } } - { \ensuremath { \tex_char:D \c_@@_arcminute_int } } - \@@_option_unchanged:Nnn \l_@@_arcsecond_math_tl - { { } ^ { \prime \prime } } - { \ensuremath { \tex_char:D \c_@@_arcsecond_int } } - \@@_option_unchanged:Nnn \l_@@_arcminute_text_tl - { \ensuremath { { } ^ { \prime } } } - { \ensuremath { \tex_char:D \c_@@_arcminute_int } } - \@@_option_unchanged:Nnn \l_@@_arcsecond_text_tl - { \ensuremath { { } ^ { \prime \prime } } } - { \ensuremath { \tex_char:D \c_@@_arcsecond_int } } - } - { } - } -% \end{macrocode} -% \end{variable} -% %\subsection{Working with other packages} % %\begin{macro}{\l_@@_pgf_link_clist} @@ -16191,7 +16029,7 @@ This work consists of the file siunitx.dtx \cs_set:Npn \SIUnitSymbolCelsius { \textcelsius } \cs_set:Npn \SIUnitSymbolDegree { \textdegree } \cs_set:Npn \SIUnitSymbolMicro { \textmu } - \cs_set:Npn \SIUnitSymbolOhm { [ohm] } + \cs_set:Npn \SIUnitSymbolOhm { \textohm } } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 704f67ec8bf..ffd847e8bc7 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/01/15} {2.7u} +\ProvidesExplPackage {siunitx} {2020/02/20} {2.8} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2020/01/12 } { } @@ -69,41 +69,7 @@ \bool_new:N \l__siunitx_error_bool \AtBeginDocument { \cs_if_free:cT { T@TS1 } - { - \DeclareFontEncoding { TS1 } { } { } - \DeclareFontSubstitution { TS1 } { cmr } { m } { n } - } -} -\DeclareTextSymbolDefault \c__siunitx_minus_tl { TS1 } -\DeclareTextSymbol \c__siunitx_minus_tl { TS1 } { 61 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \@ifpackageloaded { eulervm } - { } - { - \int_const:Nn \c__siunitx_minus_int { 8722 } - \tl_set:Nn \c__siunitx_minus_tl - { \tex_char:D \c__siunitx_minus_int } - } - } - { } -} -\DeclareTextSymbol \c__siunitx_mu_tl { TS1 } { 181 } -\DeclareTextSymbolDefault \c__siunitx_mu_tl { TS1 } -\AtBeginDocument { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c__siunitx_mu_int { 181 } - \tl_set:Nn \c__siunitx_mu_tl { \tex_char:D \c__siunitx_mu_int } - } - { } -} -\tl_new:N \g__siunitx_omega_tl -\tl_gset:Nn \g__siunitx_omega_tl { \Omega } -\AtBeginDocument { - \cs_if_exist:NT \upOmega - { \tl_set:Nn \g__siunitx_omega_tl { \upOmega } } + { \RequirePackage { textcomp } } } \cs_new_protected:Npn \__siunitx_tl_put_left_math:Nn #1#2 { \tl_put_left:Nn #1 { \ensuremath {#2} } } @@ -354,7 +320,6 @@ \__siunitx_option_unchanged:Nnn \l__siunitx_qualifier_mode_tl { subscript } { brackets } \keys_set:nn { siunitx } { mode = text } - \tl_set:Nn \c__siunitx_minus_tl { \HCode { &\#x2212; } } } { } } @@ -836,7 +801,7 @@ \cs_new_protected:Npn \__siunitx_print_text: { \tl_replace_all:Nnn \l__siunitx_print_arg_tl { - } - { \c__siunitx_minus_tl } + { \textminus } \__siunitx_print_text_aux: \tl_replace_all:Nnn \l__siunitx_print_arg_tl { \mp } { \ensuremath { \mp } } @@ -911,7 +876,7 @@ \cs_new_protected:Npn \__siunitx_print_text_super:n #1 { \tl_set:Nn \l__siunitx_tmpa_tl {#1} \tl_replace_all:Nnn \l__siunitx_tmpa_tl { - } - { \c__siunitx_minus_tl } + { \textminus } \tl_set:Nx \l__siunitx_tmpa_tl { \exp_not:N \ensuremath @@ -4939,7 +4904,10 @@ \exp_not:N \PrintSuperscript { \__siunitx_unit_format_power_aux:n - { \exp_not:V \l__siunitx_tmpa_tl } + { + \exp_after:wN \__siunitx_unit_format_power:w + \l__siunitx_tmpa_tl . . \q_stop + } } } } @@ -4955,10 +4923,19 @@ { \tl_set:Nn \l__siunitx_tmpa_tl {#2} \tl_replace_all:Nnn \l__siunitx_tmpa_tl { - } - { \text { \c__siunitx_minus_tl } } + { \text { \textminus } } \__siunitx_print:nV {#1} \l__siunitx_tmpa_tl } } +\cs_new:Npn \__siunitx_unit_format_power:w #1 . #2 . #3 \q_stop + { + \exp_not:n {#1} + \tl_if_blank:nF {#2} + { + \exp_not:V \l__siunitx_output_decimal_tl + \exp_not:n {#2} + } + } \cs_new_protected:Npn \__siunitx_unit_format_power_brackets: { \tl_set:Nx \l__siunitx_tmpb_tl { bracket- \int_use:N \l__siunitx_unit_int } @@ -6869,44 +6846,34 @@ { \bool_if:NT \l__siunitx_redefine_symbols_bool { - \@ifpackageloaded { textcomp } + \@ifpackageloaded { fourier } { - \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl - { { } ^ { \circ } } - { \text { \textdegree } } - \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \textdegree } - \@ifpackageloaded { mathptmx } - { } - { - \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl - { \c__siunitx_mu_tl } - { \textmu } - \@ifpackageloaded { fourier } - { } - { - \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl - { \ensuremath { \g__siunitx_omega_tl } } - { \textohm } - } - } - \str_if_eq:VnT \encodingdefault { OT1 } - { - \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl - { \text { \AA } } - { \text { \capitalring { A } } } - \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl - { \AA } - { \capitalring { A } } - } + \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l__siunitx_ohm_math_tl } } } } { } + \@ifpackageloaded { mathptmx } + { + \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl + { \textohm } + { \text { \ensuremath { \l__siunitx_ohm_math_tl } } } + } + { } + \str_if_eq:VnT \encodingdefault { OT1 } + { + \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl + { \text { \AA } } + { \text { \capitalring { A } } } + \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl + { \AA } + { \capitalring { A } } + } \@ifpackageloaded { upgreek } { \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl - { \text { \ensuremath { \g__siunitx_omega_tl } } } - { \Upomega } + { \text { \ensuremath { \Omega } } } + { \text { \ensuremath { \Upomega } } } } { } } @@ -6924,10 +6891,10 @@ math-angstrom = \text { \AA }, math-arcminute = { } ^ { \prime }, math-arcsecond = { } ^ { \prime \prime }, - math-celsius = { } ^ { \circ } \kern - \scriptspace \__siunitx_unit_mathrm:n { C } , - math-degree = { } ^ { \circ }, - math-micro = \text { \c__siunitx_mu_tl }, - math-ohm = \text { \ensuremath { \g__siunitx_omega_tl } }, + math-celsius = \text { \textdegree } \__siunitx_unit_mathrm:n { C } , + math-degree = \text { \textdegree }, + math-micro = \text { \textmu }, + math-ohm = \text { \ensuremath { \Omega } }, } \keys_define:nn { siunitx } { text-angstrom .tl_set:N = \l__siunitx_angstrom_text_tl, @@ -6942,11 +6909,10 @@ text-angstrom = \AA, text-arcminute = \ensuremath { { } ^ { \prime } }, text-arcsecond = \ensuremath { { } ^ { \prime \prime } }, - text-celsius = - \ensuremath { { } ^ { \circ } } \kern -\scriptspace C , - text-degree = \ensuremath { { } ^ { \circ } }, - text-micro = \c__siunitx_mu_tl , - text-ohm = \ensuremath { \g__siunitx_omega_tl }, + text-celsius = \text { \textdegree } C, + text-degree = \text { \textdegree }, + text-micro = \textmu , + text-ohm = \textohm } \cs_new_protected:Npn \__siunitx_symbol_new:n #1 { @@ -6969,80 +6935,6 @@ \__siunitx_symbol_new:n { Degree } \__siunitx_symbol_new:n { Micro } \__siunitx_symbol_new:n { Ohm } -\AtBeginDocument - { - \@ifpackageloaded { fontspec } - { - \int_const:Nn \c__siunitx_degree_int { 176 } - \int_const:Nn \c__siunitx_micro_int { "000B5 } - \int_const:Nn \c__siunitx_angstrom_int { "0212B } - \int_const:Nn \c__siunitx_ohm_int { "003A9 } - \sys_if_engine_xetex:T - { - \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl - { \text { \AA } } - { \tex_char:D \c__siunitx_angstrom_int } - } - \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_math_tl - { { } ^ { \circ } \kern - \scriptspace C } - { - \tex_char:D \c__siunitx_degree_int - C - } - \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl - { { } ^ { \circ } } - { \tex_char:D \c__siunitx_degree_int } - \__siunitx_option_unchanged:Nnn \l__siunitx_micro_math_tl - { \text { \c__siunitx_mu_tl } } - { \tex_char:D \c__siunitx_micro_int } - \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl - { \text { \ensuremath { \g__siunitx_omega_tl } } } - { \tex_char:D \c__siunitx_ohm_int } - \sys_if_engine_xetex:T - { - \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl - { \AA } - { \tex_char:D \c__siunitx_angstrom_int } - } - \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_text_tl - { - \ensuremath - { { } ^ { \circ } \kern - \scriptspace C } - } - { - \tex_char:D \c__siunitx_degree_int - C - } - \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl - { \ensuremath { { } ^ { \circ } } } - { \tex_char:D \c__siunitx_degree_int } - \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl - { \c__siunitx_mu_tl } - { \tex_char:D \c__siunitx_micro_int } - \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl - { \ensuremath { \g__siunitx_omega_tl } } - { \tex_char:D \c__siunitx_ohm_int } - } - { } - \@ifpackageloaded { unicode-math } - { - \int_const:Nn \c__siunitx_arcminute_int { 8242 } - \int_const:Nn \c__siunitx_arcsecond_int { 8243 } - \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_math_tl - { { } ^ { \prime } } - { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } } - \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_math_tl - { { } ^ { \prime \prime } } - { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } } - \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_text_tl - { \ensuremath { { } ^ { \prime } } } - { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } } - \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_text_tl - { \ensuremath { { } ^ { \prime \prime } } } - { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } } - } - { } - } \clist_new:N \l__siunitx_pgf_link_clist \cs_new_protected:Npn \__siunitx_pgf_link: { \clist_clear:N \l__siunitx_pgf_link_clist @@ -7418,7 +7310,7 @@ \cs_set:Npn \SIUnitSymbolCelsius { \textcelsius } \cs_set:Npn \SIUnitSymbolDegree { \textdegree } \cs_set:Npn \SIUnitSymbolMicro { \textmu } - \cs_set:Npn \SIUnitSymbolOhm { [ohm] } + \cs_set:Npn \SIUnitSymbolOhm { \textohm } } \DeclareExpandableDocumentCommand \numInBookmark { o m } {#2} \DeclareExpandableDocumentCommand \numrangeInBookmark { o m m } |