diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-06 21:59:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-06 21:59:59 +0000 |
commit | 0c1a0cfc9a845a2844c9abf91aa39fec61b3a32a (patch) | |
tree | 8065d91f5121f253e7ff73a59a2b0ff96ee436d1 /Master | |
parent | deca9e355916b23f08e4bbe1cb972adf3658f9ff (diff) |
siunitx (6mar17)
git-svn-id: svn://tug.org/texlive/trunk@43419 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 621861 -> 621831 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 33 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 24 |
6 files changed, 54 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex bdf83dd17d2..9c048f68bcc 100644 --- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf +++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx index 6b34fb184b6..739d35751d2 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -3455,6 +3455,7 @@ This work consists of the file siunitx.dtx % reserved for them. % %\DescribeOption{table-format} +% \changes{v2.7e}{2017/03/06}{Allow \texttt{+} to indicate a sign} % As a short cut for the preceding options, \pkg{siunitx} also % provides the \opt{table-format} option. This can be used to give the % same information about the space to reserve for a number in a @@ -5170,7 +5171,7 @@ This work consists of the file siunitx.dtx % package over time, where this is appropriate. % % \begin{variable}{\l_siunitx_unit_symbolic_seq} -% This sequence contains all of the symbolic \meta{unit} names defined : +% This sequence contains all of the symbolic \meta{unit} names defined: % these will be in the form of control sequences such as |\kilogram|. % The order of the sequence is unimportant. % \end{variable} @@ -5204,7 +5205,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2017/02/19} {2.7d} +\ProvidesExplPackage {siunitx} {2017/03/06} {2.7e} {A comprehensive (SI) units package} % \end{macrocode} % @@ -14329,6 +14330,8 @@ This work consists of the file siunitx.dtx { table-format .code:n = { + \bool_set_eq:NN \l_@@_process_plus_saved_bool \l_@@_process_plus_bool + \bool_set_true:N \l_@@_process_plus_bool \@@_number_in_parse:n {#1} \prop_set_eq:NN \l_@@_table_model_prop \l_@@_number_in_prop \tl_clear:N \l_@@_tmpa_tl @@ -14350,17 +14353,37 @@ This work consists of the file siunitx.dtx \clist_put_right:Nx \l_@@_tmpa_tl { table-figures-uncertainty = \l_@@_tmpb_tl } } + \prop_if_in:NnTF \l_@@_number_in_prop { mantissa-sign } + { + \clist_put_right:Nn \l_@@_tmpa_tl + { table-sign-mantissa =true } + } + { + \clist_put_right:Nn \l_@@_tmpa_tl + { table-sign-mantissa =false } + } \prop_get:NnNT \l_@@_number_in_prop { exponent-integer } \l_@@_tmpb_tl { \clist_put_right:Nx \l_@@_tmpa_tl { table-figures-exponent = \l_@@_tmpb_tl } } + \prop_if_in:NnTF \l_@@_number_in_prop { exponent-sign } + { + \clist_put_right:Nn \l_@@_tmpa_tl + { table-sign-exponent =true } + } + { + \clist_put_right:Nn \l_@@_tmpa_tl + { table-sign-exponent =false } + } \clist_put_right:Nn \l_@@_tmpa_tl { table-number-alignment = center } \keys_set:nV { siunitx } \l_@@_tmpa_tl + \bool_set_eq:NN \l_@@_process_plus_bool \l_@@_process_plus_saved_bool } } +\bool_new:N \l_@@_process_plus_saved_bool % \end{macrocode} % % \begin{macro}{\@@_table_print_S:} @@ -16806,7 +16829,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/06} {2.7e} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17748,7 +17771,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/06} {2.7e} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17930,7 +17953,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-binary.cfg} {2017/03/06} {2.7e} {siunitx: Binary units} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg index 5f1b507d2b8..0d75f9cf30f 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2017/03/06} {2.7e} {siunitx: Abbreviated units} \DeclareSIUnit \A { \ampere } \DeclareSIUnit \pA { \pico \ampere } diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg index 68dbd215652..1fea4f53c13 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-binary.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-binary.cfg} {2017/03/06} {2.7e} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg index 6693efb8119..6344b7853b5 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesExplFile {siunitx-version-1.cfg} {2017/02/19} {2.7d} +\ProvidesExplFile {siunitx-version-1.cfg} {2017/03/06} {2.7e} {siunitx: Version 1 settings} \keys_define:nn { siunitx } { addsign .choice: , diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index 64ad9772292..cec270fad49 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -15,7 +15,7 @@ %% \RequirePackage{expl3}[2015/09/11] \RequirePackage{xparse} -\ProvidesExplPackage {siunitx} {2017/02/19} {2.7d} +\ProvidesExplPackage {siunitx} {2017/03/06} {2.7e} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2015/09/11 } { } @@ -6131,6 +6131,8 @@ { table-format .code:n = { + \bool_set_eq:NN \l__siunitx_process_plus_saved_bool \l__siunitx_process_plus_bool + \bool_set_true:N \l__siunitx_process_plus_bool \__siunitx_number_in_parse:n {#1} \prop_set_eq:NN \l__siunitx_table_model_prop \l__siunitx_number_in_prop \tl_clear:N \l__siunitx_tmpa_tl @@ -6152,17 +6154,37 @@ \clist_put_right:Nx \l__siunitx_tmpa_tl { table-figures-uncertainty = \l__siunitx_tmpb_tl } } + \prop_if_in:NnTF \l__siunitx_number_in_prop { mantissa-sign } + { + \clist_put_right:Nn \l__siunitx_tmpa_tl + { table-sign-mantissa =true } + } + { + \clist_put_right:Nn \l__siunitx_tmpa_tl + { table-sign-mantissa =false } + } \prop_get:NnNT \l__siunitx_number_in_prop { exponent-integer } \l__siunitx_tmpb_tl { \clist_put_right:Nx \l__siunitx_tmpa_tl { table-figures-exponent = \l__siunitx_tmpb_tl } } + \prop_if_in:NnTF \l__siunitx_number_in_prop { exponent-sign } + { + \clist_put_right:Nn \l__siunitx_tmpa_tl + { table-sign-exponent =true } + } + { + \clist_put_right:Nn \l__siunitx_tmpa_tl + { table-sign-exponent =false } + } \clist_put_right:Nn \l__siunitx_tmpa_tl { table-number-alignment = center } \keys_set:nV { siunitx } \l__siunitx_tmpa_tl + \bool_set_eq:NN \l__siunitx_process_plus_bool \l__siunitx_process_plus_saved_bool } } +\bool_new:N \l__siunitx_process_plus_saved_bool \cs_new_protected:Npn \__siunitx_table_print_S: { \bool_if:NTF \l__siunitx_table_collect_pre_bool |