From 204bdec8fa8c3e061bdaa8810add163a0c6b0c80 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Mar 2016 21:47:18 +0000 Subject: siunitx (2mar16) git-svn-id: svn://tug.org/texlive/trunk@39922 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 44 ++++++++++++++-------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/source/latex/siunitx') diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index d814079e86e..22907830556 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -648,6 +648,8 @@ This work consists of the file siunitx.dtx % \changes{v2.6p}{2016/01/13}{Allow for reciprocal powers when converting % exponents to prefixes} % \changes{v2.6p}{2016/01/19}{Improve definition for degree Celsius} +% \changes{v2.6q}{2016/03/01}{Correctly select font when document commands are +% used inside table cells in \texttt{S} columns} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5170,7 +5172,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2016/01/19} {2.6p} +\ProvidesExplPackage {siunitx} {2016/03/01} {2.6q} {A comprehensive (SI) units package} % \end{macrocode} % @@ -13399,9 +13401,9 @@ This work consists of the file siunitx.dtx { \newcolumntype {#1} [1] [] { - > { \__siunitx_table_collect_begin:Nn #1 {##1} } + > { \@@_table_collect_begin:Nn #1 {##1} } c - < { \__siunitx_table_print: } + < { \@@_table_print: } } } } @@ -15887,6 +15889,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \num { o m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueF {#1} { \keys_set:nn { siunitx } {#1} } \@@_number_output:n {#2} @@ -15901,6 +15904,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \numlist { o > { \SplitList { ; } } m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueF {#1} { \keys_set:nn { siunitx } {#1} } \@@_list_numbers:n {#2} @@ -15916,6 +15920,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \numrange { o m m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueF {#1} { \keys_set:nn { siunitx } {#1} } \@@_range_numbers:nn {#2} {#3} @@ -15936,6 +15941,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \SIlist { o > { \SplitList { ; } } m m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueTF {#1} { \@@_list_units:nnn {#2} {#3} { } } { @@ -15947,6 +15953,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \SIrange { o m m m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueTF {#1} { \@@_range_unit:nnnn {#4} { } {#2} {#3} } { @@ -15965,6 +15972,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \SI { o m o m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueTF {#1} { \@@_combined:nnnn { } {#2} {#3} {#4} } { @@ -15994,15 +16002,18 @@ This work consists of the file siunitx.dtx % \begin{macrocode} \NewDocumentCommand \tablenum { o m } { \leavevmode - \IfNoValueF {#1} - { \keys_set:nn { siunitx } {#1} } - \bool_if:NTF \l_@@_number_parse_bool - { - \tl_set:Nn \l_@@_table_collect_tl {#2} - \bool_set_false:N \l_@@_table_collect_pre_bool - \@@_table_print_S: - } - { \@@_table_print_S_direct: #2 \@@_table_print: } + \group_begin: + \bool_set_false:N \l_@@_font_set_bool + \IfNoValueF {#1} + { \keys_set:nn { siunitx } {#1} } + \bool_if:NTF \l_@@_number_parse_bool + { + \tl_set:Nn \l_@@_table_collect_tl {#2} + \bool_set_false:N \l_@@_table_collect_pre_bool + \@@_table_print_S: + } + { \@@_table_print_S_direct: #2 \@@_table_print: } + \group_end: } % \end{macrocode} %\end{macro} @@ -16015,6 +16026,7 @@ This work consists of the file siunitx.dtx \NewDocumentCommand \si { o m } { \leavevmode \group_begin: + \bool_set_false:N \l_@@_font_set_bool \IfNoValueTF {#1} { \@@_unit_output:nn {#2} { } } { @@ -16731,7 +16743,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2016/01/19} {2.6p} +\ProvidesExplFile {siunitx-version-1.cfg} {2016/03/01} {2.6q} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17673,7 +17685,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/01/19} {2.6p} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2016/03/01} {2.6q} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17855,7 +17867,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2016/01/19} {2.6p} +\ProvidesExplFile {siunitx-binary.cfg} {2016/03/01} {2.6q} {siunitx: Binary units} % \end{macrocode} % @@ -17931,4 +17943,6 @@ This work consists of the file siunitx.dtx % % \PrintChanges % +% \newpage +% % \PrintIndex -- cgit v1.2.3