diff options
author | Karl Berry <karl@freefriends.org> | 2018-05-10 21:34:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-05-10 21:34:16 +0000 |
commit | d404f60db070829b863601a0c3380fede121558b (patch) | |
tree | 2d11d54caf81a204c501bd5329874e29a997145a /Master/texmf-dist/tex/latex/siunitx | |
parent | 1e941a63fd1db755b05fc97d3c82111d7505343f (diff) |
siunitx (10may18)
git-svn-id: svn://tug.org/texlive/trunk@47663 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx')
-rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index d8b44abeff2..7e3b2d0e247 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} {2018-05-02} {2.7o} +\ProvidesExplPackage {siunitx} {2018-05-10} {2.7p} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2015/11/15 } { } @@ -5613,10 +5613,11 @@ \bool_new:N \l__siunitx_table_math_bool \bool_new:N \l__siunitx_table_collect_pre_bool \bool_new:N \l__siunitx_table_collect_post_bool -\cs_new_protected:Npn \__siunitx_table_collect_begin:Nn #1#2 { - \keys_set:nn { siunitx } {#2} - \use:c { __siunitx_table_collect_begin_ #1 : } -} +\cs_new_protected:Npn \__siunitx_table_collect_begin:Nn #1#2 + { + \keys_set:nn { siunitx } {#2} + \use_i:nn { \use:c { __siunitx_table_collect_begin_ #1 : } } + } \cs_new_protected:Npn \__siunitx_table_collect_begin_s: { \cs_set_eq:NN \__siunitx_table_collect_token:N \__siunitx_table_collect_token_s:N @@ -5632,7 +5633,7 @@ \__siunitx_detect_font: \bool_if:NTF \l__siunitx_number_parse_bool { \__siunitx_table_collect_get: } - { \__siunitx_table_print_S_direct:N } + { \__siunitx_table_print_S_direct: } } \cs_new_protected:Npn \__siunitx_table_collect_braced:n #1 { } \cs_new_protected:Npn \__siunitx_table_collect_expand:N #1 { @@ -5686,19 +5687,14 @@ } } } -\cs_new_protected:Npn \__siunitx_table_collect_get: { - \cs_set_eq:NN \__siunitx_table_collect_next: - \__siunitx_table_collect_get: - \cs_set:Npn \__peek_execute_branches: - { - \if_catcode:w \exp_not:N \l_peek_token \c_group_begin_token - \exp_after:wN \__siunitx_table_collect_braced:n - \else: - \exp_after:wN \__siunitx_table_collect_not_braced:N - \fi: - } - \peek_after:Nw \__peek_ignore_spaces_execute_branches: -} +\cs_new_protected:Npn \__siunitx_table_collect_get: + { + \cs_set_eq:NN \__siunitx_table_collect_next: + \__siunitx_table_collect_get: + \peek_catcode_ignore_spaces:NTF \c_group_begin_token + { \__siunitx_table_collect_braced:n } + { \__siunitx_table_collect_not_braced:N } + } \cs_new_protected:Npn \__siunitx_table_collect_init: { \tl_clear:N \l__siunitx_table_collect_tl \tl_clear:N \l__siunitx_table_collect_pre_tl @@ -6705,19 +6701,11 @@ - \box_wd:N \l__siunitx_tmp_box } } -\cs_new_protected:Npn \__siunitx_table_print_S_direct:N #1 +\cs_new_protected:Npn \__siunitx_table_print_S_direct: { - #1 - \cs_set:Npn \__peek_execute_branches: - { - \if_catcode:w \exp_not:N \l_peek_token \c_group_begin_token - \exp_after:wN \__siunitx_table_print_S_direct_text:n - \else: - \m@th - \exp_after:wN \__siunitx_table_print_S_direct_main: - \fi: - } - \peek_after:Nw \__peek_ignore_spaces_execute_branches: + \peek_catcode_ignore_spaces:NTF \c_group_begin_token + { \__siunitx_table_print_S_direct_text:n } + { \__siunitx_table_print_S_direct_main: } } \cs_new_protected:Npn \__siunitx_table_print_S_direct_text:n #1 { |