From becffc281239c9dcdc30c0b7a1454efcb16d0f08 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Jul 2010 00:51:43 +0000 Subject: siunitx update (5jul10) git-svn-id: svn://tug.org/texlive/trunk@19254 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 481905 -> 482114 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 39 ++++++++++++--------- .../latex/siunitx/config/siunitx-abbreviations.cfg | 2 +- .../tex/latex/siunitx/config/siunitx-binary.cfg | 2 +- .../tex/latex/siunitx/config/siunitx-version-1.cfg | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 15 ++++---- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 6c8a73efe7e..02ccde8f367 100644 Binary files a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf and b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf differ diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index ad26d43d3c9..643f65308e1 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -439,6 +439,11 @@ This work consists of the file siunitx.dtx % code} %\changes{v2.0i}{2010/06/29}{Correct behaviour of \cs{of} function % so it actually works (bug introduced in v2.0d)} +%\changes{v2.0j}{2010/06/30}{Correct \cs{hartree} unit appearance} +%\changes{v2.0j}{2010/06/30}{Ensure symbols specified in +% \opt{input-symbols} are always printed in math mode} +%\changes{v2.0k}{2010/07/04}{Fix for \pkg{babel} French settings with +% \cs{fg} in tabular material} % %\begin{abstract} % Typesetting values with units requires care to ensure that the @@ -1433,15 +1438,16 @@ This work consists of the file siunitx.dtx % can be used: it will be converted by the package to the appropriate % output marker. Numbers which include an exponent part also require % a marker for the exponent: this again is taken from the range of -% tokens in the \opt{exponent markers} option. +% tokens in the \opt{input-exponent-markers} option. % %\DescribeOption{input-symbols} %\DescribeOption{input-ignore} % As well as \enquote{normal} digits, the package will interpret % symbolic \enquote{numbers} (such as \cs{pi}) correctly if they are -% included in the \opt{input-symbols} list. Tokens given in the -% \opt{input-ignore} list are totally passed over by \pkg{siunitx}: -% they will be removed from the input with no further processing. +% included in the \opt{input-symbols} list. Symbols are always +% printed in math mode. Tokens given in the \opt{input-ignore} list +% are totally passed over by \pkg{siunitx}: they will be removed from +% the input with no further processing. % %\DescribeOption{input-open-uncertainty} %\DescribeOption{input-close-uncertainty} @@ -3969,7 +3975,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2010/06/29} {2.0i} +\ProvidesExplPackage {siunitx} {2010/07/04} {2.0k} {A comprehensive (SI) units package} % \end{macrocode} % @@ -4362,7 +4368,7 @@ This work consists of the file siunitx.dtx %\begin{macro}[TF]{\siunitx_cs_if_tl:N} %\begin{macro}[aux]{\siunitx_cs_if_tl_aux:w} %\begin{macro}{\siunitx_cs_if_macro_p:N} -%\begin{macro}[TF]{\siunitx_cs_if_macro:NT} +%\begin{macro}[TF]{\siunitx_cs_if_macro:N} % This is basically a re-hash of stuff from \pkg{expl3}, but to test for % short macros only. The second test (with the \cs{cs_to_str:N} part) % is checking for LaTeX2e robust commands. @@ -5674,7 +5680,7 @@ This work consists of the file siunitx.dtx % \begin{macrocode} \cs_new_protected:Npn \siunitx_number_in_parse_mantissa:N #1 { \tl_if_in:NnTF \l_siunitx_input_digit_tl {#1} - { \siunitx_number_in_digit:N #1 } + { \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnTF \l_siunitx_input_decimal_tl {#1} { \siunitx_number_in_decimal:N #1 } @@ -5686,7 +5692,7 @@ This work consists of the file siunitx.dtx { \prop_put:Nnn \l_siunitx_number_in_prop { symbolic } { true } - \siunitx_number_in_digit:N #1 + \siunitx_number_in_digit:n { \ensuremath {#1} } } { \tl_if_in:NnF \l_siunitx_input_ignore_tl {#1} @@ -5729,7 +5735,7 @@ This work consists of the file siunitx.dtx % \begin{macrocode} \cs_new_protected:Npn \siunitx_number_in_parse_uncert:N #1 { \tl_if_in:NnTF \l_siunitx_input_digit_tl {#1} - { \siunitx_number_in_digit:N #1 } + { \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnTF \l_siunitx_input_decimal_tl {#1} { @@ -5749,7 +5755,7 @@ This work consists of the file siunitx.dtx { \prop_put:Nnn \l_siunitx_number_in_prop { symbolic } { true } - \siunitx_number_in_digit:N #1 + \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnF \l_siunitx_input_ignore_tl {#1} @@ -5918,13 +5924,13 @@ This work consists of the file siunitx.dtx % \end{macrocode} %\end{macro} % -%\begin{macro}{\siunitx_number_in_digit:N} +%\begin{macro}{\siunitx_number_in_digit:n} % For digits, only in an uncertainty can the value be stored % directly. Otherwise, there is a need to see if the value is non-zero. % This is used to drop leading zeros and to validate any sign (as zero % is unsigned). % \begin{macrocode} -\cs_new_protected:Npn \siunitx_number_in_digit:N #1 { +\cs_new_protected:Npn \siunitx_number_in_digit:n #1 { \bool_set_false:N \l_siunitx_number_in_first_bool \bool_if:NTF \l_siunitx_number_in_uncert_bool { \tl_put_right:Nn \l_siunitx_number_parsed_tl {#1} } @@ -9006,7 +9012,7 @@ This work consists of the file siunitx.dtx % a table cell. % \begin{macrocode} \AtBeginDocument { - \tl_map_function:nN { \bar \color \ng \pm } + \tl_map_function:nN { \bar \color \fg \ng \pm } \siunitx_protect_symbols:N } \cs_new_protected_nopar:Npn \siunitx_protect_symbols:N #1 { @@ -12985,6 +12991,7 @@ This work consists of the file siunitx.dtx \DeclareSIUnit \elementarycharge { \text { \ensuremath { e } } } \group_begin: \char_set_lccode:nn { `\@ } { `\_ } + \char_set_lccode:nn { `\E } { `\E } \char_make_math_subscript:N \@ \tl_to_lowercase:n { \group_end: @@ -13197,7 +13204,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/04} {2.0k} {siunitx: Version 1 settings} % \end{macrocode} % @@ -14187,7 +14194,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/04} {2.0k} {siunitx: Abbreviated units} % \end{macrocode} % @@ -14395,7 +14402,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-binary.cfg} {2010/07/04} {2.0k} {siunitx: Binary units} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg index f59a9d228c5..fd4485dcba0 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2010/07/04} {2.0k} {siunitx: Abbreviated units} \DeclareSIUnit \pA { \pico \ampere } \DeclareSIUnit \nA { \nano \ampere } diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg index e7972e0100c..534898b6478 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-binary.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-binary.cfg} {2010/07/04} {2.0k} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } diff --git a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg index 99865e1e567..bc2f5bff152 100644 --- a/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-version-1.cfg} {2010/06/29} {2.0i} +\ProvidesExplFile {siunitx-version-1.cfg} {2010/07/04} {2.0k} {siunitx: Version 1 settings} \keys_set:nn { siunitx } { load-configurations = { abbreviations , binary } } diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 485272d47c5..1f180944797 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -14,7 +14,7 @@ %% --------------------------------------------------------------- %% \RequirePackage{expl3} -\ProvidesExplPackage {siunitx} {2010/06/29} {2.0i} +\ProvidesExplPackage {siunitx} {2010/07/04} {2.0k} {A comprehensive (SI) units package} \msg_set:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -1036,7 +1036,7 @@ } \cs_new_protected:Npn \siunitx_number_in_parse_mantissa:N #1 { \tl_if_in:NnTF \l_siunitx_input_digit_tl {#1} - { \siunitx_number_in_digit:N #1 } + { \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnTF \l_siunitx_input_decimal_tl {#1} { \siunitx_number_in_decimal:N #1 } @@ -1048,7 +1048,7 @@ { \prop_put:Nnn \l_siunitx_number_in_prop { symbolic } { true } - \siunitx_number_in_digit:N #1 + \siunitx_number_in_digit:n { \ensuremath {#1} } } { \tl_if_in:NnF \l_siunitx_input_ignore_tl {#1} @@ -1083,7 +1083,7 @@ } \cs_new_protected:Npn \siunitx_number_in_parse_uncert:N #1 { \tl_if_in:NnTF \l_siunitx_input_digit_tl {#1} - { \siunitx_number_in_digit:N #1 } + { \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnTF \l_siunitx_input_decimal_tl {#1} { @@ -1103,7 +1103,7 @@ { \prop_put:Nnn \l_siunitx_number_in_prop { symbolic } { true } - \siunitx_number_in_digit:N #1 + \siunitx_number_in_digit:n {#1} } { \tl_if_in:NnF \l_siunitx_input_ignore_tl {#1} @@ -1240,7 +1240,7 @@ \l_siunitx_number_part_decimal_marker_tl {#1} } } -\cs_new_protected:Npn \siunitx_number_in_digit:N #1 { +\cs_new_protected:Npn \siunitx_number_in_digit:n #1 { \bool_set_false:N \l_siunitx_number_in_first_bool \bool_if:NTF \l_siunitx_number_in_uncert_bool { \tl_put_right:Nn \l_siunitx_number_parsed_tl {#1} } @@ -3336,7 +3336,7 @@ } } \AtBeginDocument { - \tl_map_function:nN { \bar \color \ng \pm } + \tl_map_function:nN { \bar \color \fg \ng \pm } \siunitx_protect_symbols:N } \cs_new_protected_nopar:Npn \siunitx_protect_symbols:N #1 { @@ -5825,6 +5825,7 @@ \DeclareSIUnit \elementarycharge { \text { \ensuremath { e } } } \group_begin: \char_set_lccode:nn { `\@ } { `\_ } + \char_set_lccode:nn { `\E } { `\E } \char_make_math_subscript:N \@ \tl_to_lowercase:n { \group_end: -- cgit v1.2.3