diff options
author | Karl Berry <karl@freefriends.org> | 2012-01-08 23:49:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-01-08 23:49:02 +0000 |
commit | 9eec072cfc5363883f184a6e11318fb15250022c (patch) | |
tree | 292b740072dbb6cd480a7d2edcc366f92a95d96d /Master/texmf-dist/source | |
parent | 94249602eec639469e2a964a821eaf4e04ccf322 (diff) |
siunitx
git-svn-id: svn://tug.org/texlive/trunk@25053 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 83 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.ins | 4 |
2 files changed, 46 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 9bcd9e1fc9d..6dfd474631c 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -88,7 +88,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2008-2011 by +Copyright (C) 2008-2012 by Joseph Wright <joseph.wright@morningstar2.co.uk> It may be distributed and/or modified under the conditions of @@ -556,6 +556,8 @@ This work consists of the file siunitx.dtx % numbers in tables} %\changes{v2.4f}{2011/12/23}{Fix bug with detection of bold font in table % cells} +%\changes{v2.4g}{2012/01/06}{Update internals to match changes in \pkg{expl3} +% which caused issues with some tokens in numerical arguments} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -893,7 +895,6 @@ This work consists of the file siunitx.dtx % Brochure~\cite{SI:2.1}. %\begin{table} % \caption{SI base units.} -% \tracingall % \label{tab:unit:base} % \centering % \begin{tabular}{lll} @@ -5010,7 +5011,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2011/12/24} {2.4f} +\ProvidesExplPackage {siunitx} {2012/01/06} {2.4g} {A comprehensive (SI) units package} % \end{macrocode} % @@ -6655,42 +6656,46 @@ This work consists of the file siunitx.dtx } } \cs_generate_variant:Nn \siunitx_number_in_parse:n { V } -\cs_new_protected:Npn \siunitx_number_in_parse_aux:n #1 { - \tl_set_rescan:Nnx \l_siunitx_number_arg_tl - { +\cs_new_protected:Npn \siunitx_number_in_parse_aux:n #1 + { + \group_begin: \siunitx_number_in_protect: - \char_set_catcode_ignore:N \~ - \char_set_catcode_other:N \, - \char_set_catcode_other:N \. \cs_set_eq:NN \, \prg_do_nothing: - } - {#1} - \siunitx_number_in_sign_replace:N \l_siunitx_number_arg_tl - \siunitx_number_in_parse_relation:N \l_siunitx_number_arg_tl - \tl_map_function:NN \l_siunitx_number_arg_tl - \siunitx_number_in_parse_loop:N - \tl_if_empty:NF \l_siunitx_number_parsed_tl - { - \bool_if:NTF \l_siunitx_number_in_uncert_bool - { \siunitx_error:nx { invalid-number } {#1} } + \tl_set_rescan:Nnx \l_siunitx_number_arg_tl { - \prop_put:NVn \l_siunitx_number_in_prop - \l_siunitx_number_part_tl { true } - \bool_if:NTF \l_siunitx_number_in_decimal_bool - { - \prop_put:NVV \l_siunitx_number_in_prop - \l_siunitx_number_part_decimal_tl - \l_siunitx_number_parsed_tl - } - { - \prop_put:NVV \l_siunitx_number_in_prop - \l_siunitx_number_part_integer_tl - \l_siunitx_number_parsed_tl - } - } - } - \siunitx_number_in_check:n {#1} -} + \char_set_catcode_ignore:N \~ + \char_set_catcode_other:N \, + \char_set_catcode_other:N \. + } + {#1} + \exp_args:NNNV \group_end: + \tl_set:Nn \l_siunitx_number_arg_tl \l_siunitx_number_arg_tl + \siunitx_number_in_sign_replace:N \l_siunitx_number_arg_tl + \siunitx_number_in_parse_relation:N \l_siunitx_number_arg_tl + \tl_map_function:NN \l_siunitx_number_arg_tl + \siunitx_number_in_parse_loop:N + \tl_if_empty:NF \l_siunitx_number_parsed_tl + { + \bool_if:NTF \l_siunitx_number_in_uncert_bool + { \siunitx_error:nx { invalid-number } {#1} } + { + \prop_put:NVn \l_siunitx_number_in_prop + \l_siunitx_number_part_tl { true } + \bool_if:NTF \l_siunitx_number_in_decimal_bool + { + \prop_put:NVV \l_siunitx_number_in_prop + \l_siunitx_number_part_decimal_tl + \l_siunitx_number_parsed_tl + } + { + \prop_put:NVV \l_siunitx_number_in_prop + \l_siunitx_number_part_integer_tl + \l_siunitx_number_parsed_tl + } + } + } + \siunitx_number_in_check:n {#1} + } % \end{macrocode} %\end{macro} %\end{macro} @@ -16235,7 +16240,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2011/12/24} {2.4f} +\ProvidesExplFile {siunitx-version-1.cfg} {2012/01/06} {2.4g} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17180,7 +17185,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2011/12/24} {2.4f} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/01/06} {2.4g} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17362,7 +17367,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2011/12/24} {2.4f} +\ProvidesExplFile {siunitx-binary.cfg} {2012/01/06} {2.4g} {siunitx: Binary units} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.ins b/Master/texmf-dist/source/latex/siunitx/siunitx.ins index a57f66aca5a..3010645a30b 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.ins +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.ins @@ -27,7 +27,7 @@ See http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2008-2011 by +Copyright (C) 2008-2012 by Joseph Wright <joseph.wright@morningstar2.co.uk> It may be distributed and/or modified under the conditions of @@ -56,7 +56,7 @@ This work consists of the file siunitx.dtx \file{siunitx-version-1.cfg}{\from{\jobname.dtx}{config,version-1}} } \endbatchfile -%% Copyright (C) 2008-2011 by +%% Copyright (C) 2008-2012 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of |