diff options
author | Karl Berry <karl@freefriends.org> | 2012-12-31 00:35:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-12-31 00:35:01 +0000 |
commit | 029245013285076f78d908a0ceba9d27ab0685f5 (patch) | |
tree | 0ca7734e95e00f8bc14ec7f6da85f54fd7f7f6fd /Master/texmf-dist/source/latex/siunitx | |
parent | 7aad1ee836e1ca9bb9e25019232c492beb35155b (diff) |
siunitx (30dec12)
git-svn-id: svn://tug.org/texlive/trunk@28664 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 3c1925a113b..0c6688ae725 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -604,6 +604,8 @@ This work consists of the file siunitx.dtx %\changes{v2.5m}{2012/11/27}{Load \opt{binary-units} only if requested} %\changes{v2.5m}{2012/11/27}{Allow for right-to-left mode with \pkg{bidi} % package} +%\changes{v2.5n}{2012/12/29}{Fix transmission of grouping information by +% \cs{SendSettingsToPgf}} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -3765,9 +3767,9 @@ This work consists of the file siunitx.dtx % s[table-unit-alignment = left] % } % \toprule -% {Left-aligned} & +% {Right-aligned} & % {Centred text} & -% {Right-aligned} \\ +% {Left-aligned} \\ % \midrule % \metre\per\second & \metre\per\second & \metre\per\second \\ % \kilogram & \kilogram & \kilogram \\ @@ -5114,7 +5116,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2012/11/27} {2.5m} +\ProvidesExplPackage {siunitx} {2012/12/29} {2.5n} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5125,10 +5127,10 @@ This work consists of the file siunitx.dtx \@ifpackagelater { expl3 } { 2012/11/21 } { } { - \PackageError { siunitx } { Support~package~expl3~too~old. } + \PackageError { siunitx } { Support~package~expl3~too~old } { You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~ - 'l3packages'.\\ + 'l3packages'.\MessageBreak Loading~siunitx~will~abort! } \tex_endinput:D @@ -6420,6 +6422,8 @@ This work consists of the file siunitx.dtx % \@@_print_text_super:n %} %\begin{macro}[aux]{\@@_print_text_sub_super:n} +% \begin{macro}[aux]{\@@_print_text_sub_peek:} +% \begin{macro}[aux]{\@@_peek_true:, \@@_peek_false:} % The appropriate macros for sub- and superscript in text mode ensure % the appearance is the same as math mode. The search and replace % code for superscripts deals with the case where a literal number has @@ -6435,18 +6439,27 @@ This work consists of the file siunitx.dtx { \sb { \text {#1} } \sp { \text {##1} } - } + } } - \cs_set_eq:NN \l__peek_search_token \@@_print_text_super:n - \cs_set:Npn \__peek_true:w + \cs_set_protected_nopar:Npn \@@_peek_true: { - \tex_afterassignment:D \__peek_true_aux:w - \cs_set_eq:NN \__peek_tmp:w + \tex_afterassignment:D \@@_print_text_sub_super:n + \cs_set_eq:NN \@@_tmp:w } - \cs_set:Npn \__peek_true_aux:w { \@@_print_text_sub_super:n } - \cs_set:Npn \__peek_false:w { \ensuremath { \sb { \text {#1} } } } - \peek_after:Nw \__peek_execute_branches_meaning: + \cs_set_protected_nopar:Npn \@@_peek_false: + { \ensuremath { \sb { \text {#1} } } } + \peek_after:Nw \@@_print_text_sub_peek: } +\cs_new_protected:Npn \@@_print_text_sub_peek: + { + \if_meaning:w \l_peek_token \@@_print_text_super:n + \exp_after:wN \@@_peek_true: + \else: + \exp_after:wN \@@_peek_false: + \fi: + } +\cs_new_protected_nopar:Npn \@@_peek_true: { } +\cs_new_protected_nopar:Npn \@@_peek_false: { } \cs_new_protected:Npn \@@_print_text_sub_super:n { } \cs_new_protected:Npn \@@_print_text_super:n #1 { \tl_set:Nn \l_@@_tmpa_tl {#1} @@ -6462,6 +6475,8 @@ This work consists of the file siunitx.dtx % \end{macrocode} %\end{macro} %\end{macro} +% \end{macro} +% \end{macro} % %\begin{macro}{ % \PrintSubscript , @@ -15393,8 +15408,10 @@ This work consists of the file siunitx.dtx } \clist_put_right:Nx \l_@@_pgf_link_clist { set~thousands~separator = { \exp_not:V \l_@@_group_sep_tl } } - \clist_put_right:Nn \l_@@_pgf_link_clist - { min~exponent~for~1000~sep = \int_use:N \l_@@_group_min_int } + \clist_put_right:Nx \l_@@_pgf_link_clist + { + min~exponent~for~1000~sep = \int_eval:n { \l_@@_group_min_int - \c_one } + } \bool_if:nF { \l_@@_group_decimal_bool || @@ -15422,15 +15439,12 @@ This work consists of the file siunitx.dtx \clist_put_right:Nn \l_@@_pgf_link_clist { showpos = false } } - \group_begin: - \cs_set:Npx \@@_tmp:w + \use:x { - \group_end: \exp_not:N \pgfqkeys { /pgf/number~format } { \exp_not:V \l_@@_pgf_link_clist } } - \@@_tmp:w } % \end{macrocode} %\end{macro} @@ -16512,7 +16526,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2012/11/27} {2.5m} +\ProvidesExplFile {siunitx-version-1.cfg} {2012/12/29} {2.5n} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17457,7 +17471,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/11/27} {2.5m} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/12/29} {2.5n} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17639,7 +17653,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2012/11/27} {2.5m} +\ProvidesExplFile {siunitx-binary.cfg} {2012/12/29} {2.5n} {siunitx: Binary units} % \end{macrocode} % @@ -17715,4 +17729,4 @@ This work consists of the file siunitx.dtx % % \PrintChanges % -% \PrintIndex
\ No newline at end of file +% \PrintIndex |