From a08e5c17878c4f89344ca4e2ee48f0c037024d79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Nov 2012 00:19:42 +0000 Subject: siunitx (14nov12) git-svn-id: svn://tug.org/texlive/trunk@28263 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 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 5392e59de24..a29471d3aac 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -135,7 +135,7 @@ This work consists of the file siunitx.dtx \fi % %<*driver|package> -\RequirePackage{expl3} +\RequirePackage{expl3,xparse} % %<*driver> \documentclass[german,french,english,UKenglish]{l3doc} @@ -595,6 +595,9 @@ This work consists of the file siunitx.dtx %\changes{v2.5i}{2012/09/11}{Fix alignment of values without uncertainties in % columns where space is reserved for uncertainties} %\changes{v2.5j}{2012/09/18}{Fix rounding when uncertainties are present} +%\changes{v2.5k}{2012/09/20}{Store fraction function as a macro rather than +% using \cs{let}: fixes a warning with \pkg{amsmath}} +%\changes{v2.5k}{2012/11/13}{Skip spaces correctly after start of document} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -2657,8 +2660,8 @@ This work consists of the file siunitx.dtx % % \midrule % -% \DescribeNamedUnit{newton}{N} \\ % \DescribeNamedUnit{millinewton}{mN} \\ +% \DescribeNamedUnit{newton}{N} \\ % \DescribeNamedUnit{kilonewton}{kN} \\ % \DescribeNamedUnit{meganewton}{MN} \\ % @@ -5105,7 +5108,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2012/09/18} {2.5j} +\ProvidesExplPackage {siunitx} {2012/11/13} {2.5k} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5671,10 +5674,12 @@ This work consists of the file siunitx.dtx } \group_end: } -\tl_put_right:Nn \document { - \@@_set_math_fam:n { sf } - \@@_set_math_fam:n { tt } -} +\tl_put_right:Nn \document + { + \@@_set_math_fam:n { sf } + \@@_set_math_fam:n { tt } + \ignorespaces + } % \end{macrocode} %\end{macro} %\end{macro} @@ -10144,7 +10149,7 @@ This work consists of the file siunitx.dtx % \begin{macrocode} \keys_define:nn { siunitx } { fraction-function .code:n = - { \cs_set_eq:NN \@@_fraction:nn #1 }, + { \cs_set_protected:Npn \@@_fraction:nn {#1} }, output-product .tl_set:N = \l_@@_output_product_tl, output-quotient .tl_set:N = \l_@@_output_quotient_tl, parse-numbers .bool_set:N = \l_@@_number_parse_bool, @@ -13598,7 +13603,7 @@ This work consists of the file siunitx.dtx % A fixed skip of one \texttt{fill}. % \begin{macrocode} \skip_new:N \c_@@_one_fill_skip -\skip_set:Nn \c_@@_one_fill_skip { \c_zero_skip plus 1 fill } +\skip_set:Nn \c_@@_one_fill_skip { \c_zero_dim plus 1 fill } % \end{macrocode} % \end{variable} % @@ -13612,7 +13617,7 @@ This work consists of the file siunitx.dtx { \cs_new_protected:Npn \@@_table_colortbl_correction: { - \skip_horizontal:n { \c_zero_skip plus -0.5 fill } + \skip_horizontal:n { \c_zero_dim plus -0.5 fill } \tex_kern:D \c_zero_skip } } @@ -13712,7 +13717,7 @@ This work consists of the file siunitx.dtx center .code:n = { \skip_set:Nn \l_@@_table_unit_align_skip - { \c_zero_skip plus 0.5 fill } + { \c_zero_dim plus 0.5 fill } }, table-unit-alignment / left .code:n = @@ -13721,7 +13726,7 @@ This work consists of the file siunitx.dtx right .code:n = { \skip_set:Nn \l_@@_table_unit_align_skip - { \c_zero_skip plus 1 fill } + { \c_zero_dim plus 1 fill } } } \keys_set:nn { siunitx } { table-unit-alignment = center } @@ -13884,7 +13889,7 @@ This work consists of the file siunitx.dtx center .code:n = { \skip_set:Nn \l_@@_table_number_align_skip - { \c_zero_skip plus 0.5 fill } + { \c_zero_dim plus 0.5 fill } \cs_set_eq:NN \@@_table_print_S_direct_main: \@@_table_print_S_direct_reserved: \cs_set_eq:NN \@@_table_print_S_parsed: @@ -13894,7 +13899,7 @@ This work consists of the file siunitx.dtx center-decimal-marker .code:n = { \skip_set:Nn \l_@@_table_number_align_skip - { \c_zero_skip plus 0.5 fill } + { \c_zero_dim plus 0.5 fill } \cs_set_eq:NN \@@_table_print_S_direct_main: \@@_table_print_S_direct_centered: \cs_set_eq:NN \@@_table_print_S_parsed: @@ -13913,7 +13918,7 @@ This work consists of the file siunitx.dtx right .code:n = { \skip_set:Nn \l_@@_table_number_align_skip - { \c_zero_skip plus 1 fill } + { \c_zero_dim plus 1 fill } \cs_set_eq:NN \@@_table_print_S_direct_main: \@@_table_print_S_direct_reserved: \cs_set_eq:NN \@@_table_print_S_parsed: @@ -13926,7 +13931,7 @@ This work consists of the file siunitx.dtx center .code:n = { \skip_set:Nn \l_@@_table_text_align_skip - { \c_zero_skip plus 0.5 fill } + { \c_zero_dim plus 0.5 fill } }, table-text-alignment / left .code:n = @@ -13935,7 +13940,7 @@ This work consists of the file siunitx.dtx right .code:n = { \skip_set:Nn \l_@@_table_text_align_skip - { \c_zero_skip plus 1 fill } + { \c_zero_dim plus 1 fill } }, table-comparator .choice:, table-comparator / @@ -14259,7 +14264,7 @@ This work consists of the file siunitx.dtx } } \dim_compare:nNnT - { \box_wd:N \l_@@_table_pre_box } = \c_zero_skip + { \box_wd:N \l_@@_table_pre_box } = \c_zero_dim { \l_@@_table_collect_pre_tl \bool_set_false:N \l_@@_font_set_bool @@ -14446,7 +14451,7 @@ This work consists of the file siunitx.dtx } } \dim_compare:nNnT - { \box_wd:N \l_@@_table_pre_box } = \c_zero_skip + { \box_wd:N \l_@@_table_pre_box } = \c_zero_dim { \l_@@_table_collect_pre_tl \bool_set_false:N \l_@@_font_set_bool @@ -16485,7 +16490,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2012/09/18} {2.5j} +\ProvidesExplFile {siunitx-version-1.cfg} {2012/11/13} {2.5k} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17430,7 +17435,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/09/18} {2.5j} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/11/13} {2.5k} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17612,7 +17617,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2012/09/18} {2.5j} +\ProvidesExplFile {siunitx-binary.cfg} {2012/11/13} {2.5k} {siunitx: Binary units} % \end{macrocode} % -- cgit v1.2.3