diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx/siunitx.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 151 |
1 files changed, 76 insertions, 75 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index f50bfbf3400..3635915164c 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -116,7 +116,7 @@ This work consists of the file siunitx.dtx \nopreamble\nopostamble \usedir{doc/latex/siunitx} \generate{ - \file{README.txt}{\from{\jobname.dtx}{readme}} + \file{README.md}{\from{\jobname.dtx}{readme}} } \ifx\fmtname\nameofplainTeX \expandafter\endbatchfile @@ -641,6 +641,8 @@ This work consists of the file siunitx.dtx % \changes{v2.6k}{2015/09/12}{Track \pkg{expl3} changes} % \changes{v2.6l}{2015/09/14}{Fix an internal error} % \changes{v2.6m}{2015/10/15}{Address an issue with \pkg{mwtab}} +% \changes{v2.6n}{2015/12/31}{Improve defintion for degree Celsius} +% \changes{v2.6n}{2015/12/31}{Fix angstrom symbol with \LuaTeX{}} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -3936,8 +3938,8 @@ This work consists of the file siunitx.dtx % math-angstrom & Literal & \verb=\text{\AA}= \\ % math-arcminute & Literal & \verb={}^{\prime}= \\ % math-arcsecond & Literal & \verb={}^{\prime\prime}= \\ -% math-celsius & Literal & \verb={}^{\circ}= \\ -% & & \verb=\kern -\scriptspace \mathrm{C}= \\ +% math-celsius & Literal & +% \verb={}^{\circ}\kern-\scriptspace C= \\ % math-degree & Literal & \verb={}^{\circ}= \\ % math-micro & Literal & \meta{see text} \\ % math-ohm & Literal & \cs{Omega} \\ @@ -3947,7 +3949,7 @@ This work consists of the file siunitx.dtx % text-arcsecond & Literal & % \verb=\ensuremath{{}^{\prime\prime}}= \\ % text-celsius & Literal & \verb=\ensuremath{{}^{\circ}= \\ -% & & \verb=\kern -\scriptspace \text{C}}= \\ +% & & \verb=\kern -\scriptspace C}= \\ % text-degree & Literal & \verb=\ensuremath{{}^{\circ}}= \\ % text-micro & Literal & \meta{see text} \\ % text-ohm & Literal & \verb=\ensuremath{\Omega}= \\ @@ -5164,7 +5166,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2015/10/15} {2.6m} +\ProvidesExplPackage {siunitx} {2015/12/31} {2.6n} {A comprehensive (SI) units package} % \end{macrocode} % @@ -15371,7 +15373,7 @@ This work consists of the file siunitx.dtx math-angstrom = \text { \AA }, math-arcminute = { } ^ { \prime }, math-arcsecond = { } ^ { \prime \prime }, - math-celsius = { } ^ { \circ } \kern - \scriptspace \mathrm { C }, + math-celsius = { } ^ { \circ } \kern - \scriptspace C, math-degree = { } ^ { \circ }, math-micro = \text { \c_@@_mu_tl }, math-ohm = \text { \ensuremath { \c_@@_omega_tl } }, @@ -15407,7 +15409,7 @@ This work consists of the file siunitx.dtx text-arcminute = \ensuremath { { } ^ { \prime } }, text-arcsecond = \ensuremath { { } ^ { \prime \prime } }, text-celsius = - \ensuremath { { } ^ { \circ } \kern - \scriptspace \text { C } }, + \ensuremath { { } ^ { \circ } \kern - \scriptspace C }, text-degree = \ensuremath { { } ^ { \circ } }, text-micro = \c_@@_mu_tl , text-ohm = \ensuremath { \c_@@_omega_tl }, @@ -15482,86 +15484,85 @@ This work consists of the file siunitx.dtx % The single degree Celsius symbol is a compatibility character, and so % the two separate glyphs \enquote{degree} and \enquote{C} are used. % \begin{macrocode} -\bool_if:nT - { - \sys_if_engine_luatex_p: || - \sys_if_engine_xetex_p: - } +\AtBeginDocument { - \AtBeginDocument + \@ifpackageloaded { fontspec } { - \@ifpackageloaded { fontspec } + \int_const:Nn \c_@@_degree_int { 176 } + \@ifpackageloaded { unicode-math } + { \int_const:Nn \c_@@_micro_int { "003BC } } + { \int_const:Nn \c_@@_micro_int { "000B5 } } + \int_const:Nn \c_@@_angstrom_int { "0212B } + \int_const:Nn \c_@@_ohm_int { "003A9 } + \bool_if:NT \c_sys_engine_xetex_bool { - \int_const:Nn \c_@@_degree_int { 176 } - \@ifpackageloaded { unicode-math } - { \int_const:Nn \c_@@_micro_int { "003BC } } - { \int_const:Nn \c_@@_micro_int { "000B5 } } - \int_const:Nn \c_@@_angstrom_int { "0212B } - \int_const:Nn \c_@@_ohm_int { "003A9 } \@@_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 \text { 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 { \c_@@_omega_tl } } } - { \tex_char:D \c_@@_ohm_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 { \c_@@_omega_tl } } } + { \tex_char:D \c_@@_ohm_int } + \bool_if:NT \c_sys_engine_xetex_bool + { \@@_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 \text { 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 { \c_@@_omega_tl } } - { \tex_char:D \c_@@_ohm_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 { \c_@@_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 } } - } - { } + \@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} @@ -16716,7 +16717,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2015/10/15} {2.6m} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/12/31} {2.6n} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17658,7 +17659,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/10/15} {2.6m} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/12/31} {2.6n} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17840,7 +17841,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2015/10/15} {2.6m} +\ProvidesExplFile {siunitx-binary.cfg} {2015/12/31} {2.6n} {siunitx: Binary units} % \end{macrocode} % |