diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | bin | 579206 -> 579292 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 149 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/siunitx/siunitx.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 142 |
7 files changed, 154 insertions, 153 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf Binary files differindex 1489e95d474..5f030ac7d53 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 0c6688ae725..25e85700475 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-2012 by +Copyright (C) 2008-2013 by Joseph Wright <joseph.wright@morningstar2.co.uk> It may be distributed and/or modified under the conditions of @@ -606,6 +606,7 @@ This work consists of the file siunitx.dtx % package} %\changes{v2.5n}{2012/12/29}{Fix transmission of grouping information by % \cs{SendSettingsToPgf}} +%\changes{v2.5o}{2013/01/09}{Update internals to track \pkg{expl3} changes} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5116,7 +5117,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2012/12/29} {2.5n} +\ProvidesExplPackage {siunitx} {2013/01/09} {2.5o} {A comprehensive (SI) units package} % \end{macrocode} % @@ -7261,7 +7262,7 @@ This work consists of the file siunitx.dtx { complex-integer } \@@_number_in_complex_aux:nn { mantissa-decimal-marker } { complex-decimal-marker } - \prop_del:Nn \l_@@_number_in_prop { mantissa } + \prop_remove:Nn \l_@@_number_in_prop { mantissa } \prop_put:Nnn \l_@@_number_in_prop { complex } { true } } @@ -7283,13 +7284,13 @@ This work consists of the file siunitx.dtx \prop_if_in:NnTF \l_@@_number_in_prop { complex-sign } { \bool_set_true:N \l_@@_number_in_sign_bool } - { \prop_del:Nn \l_@@_number_in_prop { mantissa } } + { \prop_remove:Nn \l_@@_number_in_prop { mantissa } } } } \cs_new_protected:Npn \@@_number_in_complex_aux:nn #1#2 { \prop_get:NnNT \l_@@_number_in_prop {#1} \l_@@_tmpa_tl { - \prop_del:Nn \l_@@_number_in_prop {#1} + \prop_remove:Nn \l_@@_number_in_prop {#1} \prop_put:NnV \l_@@_number_in_prop {#2} \l_@@_tmpa_tl } } @@ -7528,7 +7529,7 @@ This work consists of the file siunitx.dtx \prop_put:NVV \l_@@_number_in_prop \l_@@_tmpb_tl \l_@@_tmpa_tl } - \prop_del:NV \l_@@_number_in_prop + \prop_remove:NV \l_@@_number_in_prop \l_@@_number_part_sign_tl } } @@ -7560,7 +7561,7 @@ This work consists of the file siunitx.dtx { \prop_if_in:NnF \l_@@_number_in_prop { mantissa } { - \prop_del:Nn \l_@@_number_in_prop { mantissa-sign } + \prop_remove:Nn \l_@@_number_in_prop { mantissa-sign } \prop_put:NnV \l_@@_number_in_prop { complex-sign } \l_@@_tmpa_tl } @@ -7582,9 +7583,9 @@ This work consists of the file siunitx.dtx % part. % \begin{macrocode} \cs_new_protected:Npn \@@_number_in_complex_to_uncert:n #1 { - \prop_del:Nn \l_@@_number_in_prop { complex } - \prop_del:Nn \l_@@_number_in_prop { complex-decimal-marker } - \prop_del:Nn \l_@@_number_in_prop { complex-sign } + \prop_remove:Nn \l_@@_number_in_prop { complex } + \prop_remove:Nn \l_@@_number_in_prop { complex-decimal-marker } + \prop_remove:Nn \l_@@_number_in_prop { complex-sign } \prop_put:Nnn \l_@@_number_in_prop { uncertainty } { true } \prop_get:NnNTF \l_@@_number_in_prop { complex-integer } \l_@@_number_uncert_tl @@ -7599,8 +7600,8 @@ This work consists of the file siunitx.dtx { \@@_number_in_complex_to_uncert_int: } } { \@@_number_in_complex_to_uncert_dec:n {#1} } - \prop_del:Nn \l_@@_number_in_prop { complex-integer } - \prop_del:Nn \l_@@_number_in_prop { complex-decimal } + \prop_remove:Nn \l_@@_number_in_prop { complex-integer } + \prop_remove:Nn \l_@@_number_in_prop { complex-decimal } } % \end{macrocode} % When the input has an integer part to the uncertainty, the @@ -7664,9 +7665,9 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_number_in_complex_to_uncert_pad: { \int_set:Nn \l_@@_number_uncert_length_int - { \tl_length:N \l_@@_tmpa_tl } + { \tl_count:N \l_@@_tmpa_tl } \int_set:Nn \l_@@_number_mantissa_length_int - { \tl_length:N \l_@@_tmpb_tl } + { \tl_count:N \l_@@_tmpb_tl } \int_compare:nNnTF { \l_@@_number_mantissa_length_int } > { \l_@@_number_uncert_length_int } @@ -7906,8 +7907,8 @@ This work consists of the file siunitx.dtx { \bool_if:NT \l_@@_omit_uncert_bool { - \prop_del:Nn \l_@@_number_in_prop { uncertainty } - \prop_del:Nn \l_@@_number_in_prop { mantissa-uncertainty } + \prop_remove:Nn \l_@@_number_in_prop { uncertainty } + \prop_remove:Nn \l_@@_number_in_prop { mantissa-uncertainty } } } { \@@_number_process_round: } @@ -7916,8 +7917,8 @@ This work consists of the file siunitx.dtx \@@_number_process_integer_digits: \bool_if:NT \l_@@_process_drop_exponent_bool { - \prop_del:Nn \l_@@_number_in_prop { exponent } - \prop_del:Nn \l_@@_number_in_prop { exponent-integer } + \prop_remove:Nn \l_@@_number_in_prop { exponent } + \prop_remove:Nn \l_@@_number_in_prop { exponent-integer } } } % \end{macrocode} @@ -7939,10 +7940,10 @@ This work consists of the file siunitx.dtx { \@@_number_process_exponent_aux:n { decimal } } \bool_if:NF \l_@@_tmp_bool { - \prop_del:Nn \l_@@_number_in_prop { exponent } - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { exponent } + \prop_remove:Nn \l_@@_number_in_prop { exponent-integer } - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { exponent-decimal } } } @@ -7978,11 +7979,11 @@ This work consists of the file siunitx.dtx { \@@_number_process_figures_aux:n {#1} } } { - \prop_del:Nn \l_@@_number_in_prop { #1 -sign } + \prop_remove:Nn \l_@@_number_in_prop { #1 -sign } \prop_put:Nnn \l_@@_number_in_prop { #1 -integer } { 0 } - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal } \bool_if:NF \l_@@_process_int_to_dec_bool - { \prop_del:Nn \l_@@_number_in_prop { #1 -decimal-marker } } + { \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal-marker } } } } \cs_new_protected:Npn \@@_number_process_figures_aux:n #1 @@ -8003,7 +8004,7 @@ This work consists of the file siunitx.dtx } { \prop_put:Nnn \l_@@_number_in_prop { #1 -integer } { 0 } - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal } } } \cs_new_protected:Npn \@@_number_process_figures_init:n #1 @@ -8192,7 +8193,7 @@ This work consists of the file siunitx.dtx { \prop_put:NnV \l_@@_number_in_prop { exponent-integer } \l_@@_process_fixed_int - \prop_del:Nn \l_@@_number_in_prop { exponent-sign } + \prop_remove:Nn \l_@@_number_in_prop { exponent-sign } } { \prop_put:Nnx \l_@@_number_in_prop { exponent-integer } @@ -8227,9 +8228,9 @@ This work consists of the file siunitx.dtx { mantissa-integer } {#1} \tl_if_empty:nTF {#2} { - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { mantissa-decimal } - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { mantissa-decimal-marker } } { @@ -8338,7 +8339,7 @@ This work consists of the file siunitx.dtx \int_set:Nn \l_@@_tmp_int { \l_@@_process_integer_min_int - - \tl_length:N \l_@@_tmpa_tl + - \tl_count:N \l_@@_tmpa_tl } \int_compare:nNnT { \l_@@_tmp_int } > { \c_zero } { @@ -8374,9 +8375,9 @@ This work consists of the file siunitx.dtx \prop_if_in:NnF \l_@@_number_in_prop { mantissa-decimal-marker } { - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { mantissa } - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { mantissa-integer } } } @@ -8453,7 +8454,7 @@ This work consists of the file siunitx.dtx } { \int_set:Nn \l_@@_round_int - { \tl_length:N \l_@@_tmpa_tl } + { \tl_count:N \l_@@_tmpa_tl } \@@_number_process_places_aux_ii:n {#1} } } @@ -8517,9 +8518,9 @@ This work consists of the file siunitx.dtx } } } - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal } \bool_if:NF \l_@@_process_int_to_dec_bool - { \prop_del:Nn \l_@@_number_in_prop { #1 -decimal-marker } } + { \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal-marker } } } % \end{macrocode} % For rounding to a fixed number of places, the package finds the @@ -8740,8 +8741,8 @@ This work consists of the file siunitx.dtx \l_@@_round_integer_out_tl \tl_if_empty:NTF \l_@@_round_decimal_out_tl { - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal } - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal-marker } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal-marker } } { \prop_put:NnV \l_@@_number_in_prop { #1 -decimal } @@ -8755,7 +8756,7 @@ This work consists of the file siunitx.dtx \prop_put:Nnn \l_@@_number_in_prop { comparator } { < } \prop_put:Nnn \l_@@_number_in_prop { #4 -integer } {#1} \tl_if_empty:nTF {#2} - { \prop_del:Nn \l_@@_number_in_prop { #4 -decimal } } + { \prop_remove:Nn \l_@@_number_in_prop { #4 -decimal } } { \prop_put:Nnn \l_@@_number_in_prop { #4 -decimal } {#2} } } % \end{macrocode} @@ -8876,8 +8877,8 @@ This work consists of the file siunitx.dtx \prop_put:Nnn \l_@@_number_in_prop { mantissa-integer } {#1} \tl_if_empty:nTF {#2} { - \prop_del:Nn \l_@@_number_in_prop { mantissa-decimal } - \prop_del:Nn \l_@@_number_in_prop + \prop_remove:Nn \l_@@_number_in_prop { mantissa-decimal } + \prop_remove:Nn \l_@@_number_in_prop { mantissa-decimal-marker } } { @@ -8892,9 +8893,9 @@ This work consists of the file siunitx.dtx } \int_compare:nNnTF {#3} = { 0 } { - \prop_del:Nn \l_@@_number_in_prop { exponent } - \prop_del:Nn \l_@@_number_in_prop { exponent-sign } - \prop_del:Nn \l_@@_number_in_prop { exponent-integer } + \prop_remove:Nn \l_@@_number_in_prop { exponent } + \prop_remove:Nn \l_@@_number_in_prop { exponent-sign } + \prop_remove:Nn \l_@@_number_in_prop { exponent-integer } } { \prop_put:Nnn \l_@@_number_in_prop { exponent } { true } @@ -8903,7 +8904,7 @@ This work consists of the file siunitx.dtx \int_set:Nn \l_@@_tmp_int {#3} \prop_put:NnV \l_@@_number_in_prop { exponent-integer } \l_@@_tmp_int - \prop_del:Nn \l_@@_number_in_prop { exponent-sign } + \prop_remove:Nn \l_@@_number_in_prop { exponent-sign } } { \int_set:Nn \l_@@_tmp_int { 0 - (#3) } @@ -9067,7 +9068,7 @@ This work consists of the file siunitx.dtx \l_@@_tmpa_tl \tl_if_eq:NNT \c_@@_plus_tl \l_@@_tmpa_tl { - \prop_del:Nn \l_@@_number_in_prop { #1 -sign } + \prop_remove:Nn \l_@@_number_in_prop { #1 -sign } \prop_put:Nnn \l_@@_number_in_prop { #1 -had-sign } { true } } } @@ -9134,7 +9135,7 @@ This work consists of the file siunitx.dtx \prop_get:NnN \l_@@_number_in_prop { #1 - #2 } \l_@@_tmpa_tl \int_set:cn { l_@@_process_ #2 _int } - { \tl_length:N \l_@@_tmpa_tl } + { \tl_count:N \l_@@_tmpa_tl } } % \end{macrocode} %\end{macro} @@ -9249,8 +9250,8 @@ This work consists of the file siunitx.dtx } \bool_if:NT \l_@@_tmp_bool { - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal } - \prop_del:Nn \l_@@_number_in_prop { #1 -decimal-marker } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal } + \prop_remove:Nn \l_@@_number_in_prop { #1 -decimal-marker } } } } @@ -9274,8 +9275,8 @@ This work consists of the file siunitx.dtx { \tl_put_left:NV \l_@@_tmpa_tl \l_@@_tmpb_tl } \prop_get:NnNT \l_@@_unit_prop { prefix-1 } \l_@@_tmpb_tl { - \prop_del:Nn \l_@@_unit_prop { prefix-1 } - \prop_del:Nn \l_@@_unit_prop { prefix-symbol-1 } + \prop_remove:Nn \l_@@_unit_prop { prefix-1 } + \prop_remove:Nn \l_@@_unit_prop { prefix-symbol-1 } \prop_get:NVN \l_@@_prefix_forward_prop \l_@@_tmpb_tl \l_@@_tmpb_tl \tl_set:Nx \l_@@_tmpa_tl @@ -9284,7 +9285,7 @@ This work consists of the file siunitx.dtx \prop_get:NVNTF \l_@@_prefix_reverse_prop \l_@@_tmpa_tl \l_@@_tmpb_tl { - \prop_del:Nn \l_@@_number_in_prop { exponent } + \prop_remove:Nn \l_@@_number_in_prop { exponent } \use:c { @@_ \exp_after:wN \token_to_str:N \l_@@_tmpb_tl @@ -9488,7 +9489,7 @@ This work consists of the file siunitx.dtx \prop_if_in:NnT \l_@@_number_out_prop { #1 -bracket } { \@@_number_format_brackets_aux:n {#1} - \prop_del:Nn \l_@@_number_out_prop { #1 -bracket } + \prop_remove:Nn \l_@@_number_out_prop { #1 -bracket } } } } @@ -9629,7 +9630,7 @@ This work consists of the file siunitx.dtx { \prop_put:Nnn \l_@@_number_out_prop { result-bracket } { true } - \prop_del:Nn \l_@@_number_out_prop { mantissa-bracket } + \prop_remove:Nn \l_@@_number_out_prop { mantissa-bracket } } \prop_if_in:NnT \l_@@_number_out_prop { comparator } { @@ -9779,7 +9780,7 @@ This work consists of the file siunitx.dtx { \prop_get:NnN \l_@@_number_in_prop { #1 - #2 } \l_@@_tmpa_tl \int_compare:nNnTF - { \tl_length:N \l_@@_tmpa_tl } < \l_@@_group_min_int + { \tl_count:N \l_@@_tmpa_tl } < \l_@@_group_min_int { \@@_number_format_copy:n { #1 - #2 } } { \tl_clear:N \l_@@_tmpb_tl @@ -10113,7 +10114,7 @@ This work consists of the file siunitx.dtx \@@_number_format_uncertainty_joined:n #1 { \prop_get:NnN \l_@@_number_in_prop { #1 -uncertainty } \l_@@_tmpa_tl - \prop_del:Nn \l_@@_number_in_prop { #1 -uncertainty } + \prop_remove:Nn \l_@@_number_in_prop { #1 -uncertainty } \tl_put_left:NV \l_@@_tmpa_tl \l_@@_output_uncert_open_tl \tl_put_left:NV \l_@@_tmpa_tl \l_@@_uncert_sep_tl \tl_put_right:NV \l_@@_tmpa_tl \l_@@_output_uncert_close_tl @@ -10897,7 +10898,7 @@ This work consists of the file siunitx.dtx #1#2#3 { \prop_get:cnN { l_@@_angle_ #1 _prop } { mantissa-sign #3 } \l_@@_tmpa_tl - \prop_del:cn { l_@@_angle_ #1 _prop } { mantissa-sign #3 } + \prop_remove:cn { l_@@_angle_ #1 _prop } { mantissa-sign #3 } \quark_if_no_value:NF \l_@@_tmpa_tl { \prop_put:cnV { l_@@_angle_ #2 _prop } { mantissa-sign #3 } @@ -12580,9 +12581,9 @@ This work consists of the file siunitx.dtx \cs_new_protected:Npn \@@_unit_format_symbol_aux_alt: { \int_compare:nNnTF { \l_@@_unit_int } = { 1 } { - \prop_del:Nn \l_@@_unit_prop { prefix-1 } - \prop_del:Nn \l_@@_unit_prop { prefix-symbol-1 } - \prop_del:Nn \l_@@_unit_prop { prefix-base-1 } + \prop_remove:Nn \l_@@_unit_prop { prefix-1 } + \prop_remove:Nn \l_@@_unit_prop { prefix-symbol-1 } + \prop_remove:Nn \l_@@_unit_prop { prefix-base-1 } \prop_if_empty:NF \l_@@_unit_prop { \msg_error:nn { siunitx } { prefix-only } } } @@ -13009,7 +13010,7 @@ This work consists of the file siunitx.dtx { \bool_set_true:N \l_@@_list_first_bool \tl_clear:N \l_@@_list_current_tl - \int_compare:nNnTF { \tl_length:n {#1} } > \c_two + \int_compare:nNnTF { \tl_count:n {#1} } > \c_two { \tl_map_function:nN {#1} \@@_list_numbers_aux_ii:n \l_@@_list_tl @@ -13017,7 +13018,7 @@ This work consists of the file siunitx.dtx \l_@@_list_current_tl } { - \int_compare:nNnTF { \tl_length:n {#1} } = \c_two + \int_compare:nNnTF { \tl_count:n {#1} } = \c_two { \@@_list_numbers_aux:nn #1 } { \@@_combined_output:n #1 } } @@ -13985,7 +13986,7 @@ This work consists of the file siunitx.dtx table-comparator .choice:, table-comparator / false .code:n = - { \prop_del:Nn \l_@@_table_model_prop { comparator } }, + { \prop_remove:Nn \l_@@_table_model_prop { comparator } }, table-comparator / true .code:n = { \prop_put:Nnn \l_@@_table_model_prop { comparator } { > } }, @@ -13994,16 +13995,16 @@ This work consists of the file siunitx.dtx { \int_compare:nNnTF {#1} = \c_zero { - \prop_del:Nn \l_@@_table_model_prop { mantissa-decimal } - \prop_del:Nn \l_@@_table_model_prop { mantissa-decimal-raw } - \prop_del:Nn \l_@@_table_model_prop + \prop_remove:Nn \l_@@_table_model_prop { mantissa-decimal } + \prop_remove:Nn \l_@@_table_model_prop { mantissa-decimal-raw } + \prop_remove:Nn \l_@@_table_model_prop { mantissa-decimal-marker } \prop_if_in:NnTF \l_@@_table_model_prop { mantissa-integer } { \prop_put:Nnn \l_@@_table_model_prop { mantissa } { true } } - { \prop_del:Nn \l_@@_table_model_prop { mantissa } } + { \prop_remove:Nn \l_@@_table_model_prop { mantissa } } } { \prop_put:Nnx \l_@@_table_model_prop { mantissa-decimal } @@ -14018,7 +14019,7 @@ This work consists of the file siunitx.dtx table-figures-exponent .code:n = { \int_compare:nNnTF {#1} = \c_zero - { \prop_del:Nn \l_@@_table_model_prop { exponent-integer } } + { \prop_remove:Nn \l_@@_table_model_prop { exponent-integer } } { \prop_put:Nnx \l_@@_table_model_prop { exponent-integer } { \prg_replicate:nn {#1} { 8 } } @@ -14029,13 +14030,13 @@ This work consists of the file siunitx.dtx { \int_compare:nNnTF {#1} = \c_zero { - \prop_del:Nn \l_@@_table_model_prop { mantissa-integer } + \prop_remove:Nn \l_@@_table_model_prop { mantissa-integer } \prop_if_in:NnTF \l_@@_table_model_prop { mantissa-decimal } { \prop_put:Nnn \l_@@_table_model_prop { mantissa } { true } } - { \prop_del:Nn \l_@@_table_model_prop { mantissa } } + { \prop_remove:Nn \l_@@_table_model_prop { mantissa } } } { \prop_put:Nnx \l_@@_table_model_prop { mantissa-integer } @@ -14046,7 +14047,7 @@ This work consists of the file siunitx.dtx table-figures-uncertainty .code:n = { \int_compare:nNnTF {#1} = \c_zero - { \prop_del:Nn \l_@@_table_model_prop { mantissa-uncertainty } } + { \prop_remove:Nn \l_@@_table_model_prop { mantissa-uncertainty } } { \prop_put:Nnx \l_@@_table_model_prop { mantissa-uncertainty } { \prg_replicate:nn {#1} { 8 } } @@ -14184,8 +14185,8 @@ This work consists of the file siunitx.dtx { \bool_set_true:N \l_@@_process_fixed_bool \@@_number_process: - \prop_del:Nn \l_@@_number_in_prop { exponent } - \prop_del:Nn \l_@@_number_in_prop { exponent-integer } + \prop_remove:Nn \l_@@_number_in_prop { exponent } + \prop_remove:Nn \l_@@_number_in_prop { exponent-integer } } { \@@_number_process: } \@@_number_format: @@ -16526,7 +16527,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-version-1.cfg} {2013/01/09} {2.5o} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17471,7 +17472,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/01/09} {2.5o} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17653,7 +17654,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-binary.cfg} {2013/01/09} {2.5o} {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 3baec495005..1fc4ad41ea9 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-2012 by +Copyright (C) 2008-2013 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-2012 by +%% Copyright (C) 2008-2013 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of 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 3d27e69d7c4..1d8220690b2 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} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2013/01/09} {2.5o} {siunitx: Abbreviated units} \DeclareSIUnit \A { \ampere } \DeclareSIUnit \pA { \pico \ampere } @@ -102,7 +102,7 @@ \DeclareSIUnit \ns { \nano \second } \DeclareSIUnit \us { \micro \second } \DeclareSIUnit \ms { \milli \second } -%% Copyright (C) 2008-2012 by +%% Copyright (C) 2008-2013 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of 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 d91825da291..31a40a6db5e 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} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-binary.cfg} {2013/01/09} {2.5o} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } @@ -25,7 +25,7 @@ \DeclareBinaryPrefix \yobi { Yi } { 80 } \DeclareSIUnit \bit { bit } \DeclareSIUnit \byte { B } -%% Copyright (C) 2008-2012 by +%% Copyright (C) 2008-2013 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of 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 e85306c45af..d639d36c16e 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} {2012/12/29} {2.5n} +\ProvidesExplFile {siunitx-version-1.cfg} {2013/01/09} {2.5o} {siunitx: Version 1 settings} \keys_define:nn { siunitx } { addsign .choice: , @@ -730,7 +730,7 @@ \DeclareSIUnit \yb { \yocto \barn } \NewDocumentCommand \requiresiconfigs { m } { \keys_set:nn { siunitx } { version-1-compatibility } } -%% Copyright (C) 2008-2012 by +%% Copyright (C) 2008-2013 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index cb00ec3b1bc..0b51638a934 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,xparse} -\ProvidesExplPackage {siunitx} {2012/12/29} {2.5n} +\ProvidesExplPackage {siunitx} {2013/01/09} {2.5o} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2012/11/21 } { } @@ -1348,7 +1348,7 @@ { complex-integer } \__siunitx_number_in_complex_aux:nn { mantissa-decimal-marker } { complex-decimal-marker } - \prop_del:Nn \l__siunitx_number_in_prop { mantissa } + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa } \prop_put:Nnn \l__siunitx_number_in_prop { complex } { true } } @@ -1370,13 +1370,13 @@ \prop_if_in:NnTF \l__siunitx_number_in_prop { complex-sign } { \bool_set_true:N \l__siunitx_number_in_sign_bool } - { \prop_del:Nn \l__siunitx_number_in_prop { mantissa } } + { \prop_remove:Nn \l__siunitx_number_in_prop { mantissa } } } } \cs_new_protected:Npn \__siunitx_number_in_complex_aux:nn #1#2 { \prop_get:NnNT \l__siunitx_number_in_prop {#1} \l__siunitx_tmpa_tl { - \prop_del:Nn \l__siunitx_number_in_prop {#1} + \prop_remove:Nn \l__siunitx_number_in_prop {#1} \prop_put:NnV \l__siunitx_number_in_prop {#2} \l__siunitx_tmpa_tl } } @@ -1544,7 +1544,7 @@ \prop_put:NVV \l__siunitx_number_in_prop \l__siunitx_tmpb_tl \l__siunitx_tmpa_tl } - \prop_del:NV \l__siunitx_number_in_prop + \prop_remove:NV \l__siunitx_number_in_prop \l__siunitx_number_part_sign_tl } } @@ -1576,16 +1576,16 @@ { \prop_if_in:NnF \l__siunitx_number_in_prop { mantissa } { - \prop_del:Nn \l__siunitx_number_in_prop { mantissa-sign } + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-sign } \prop_put:NnV \l__siunitx_number_in_prop { complex-sign } \l__siunitx_tmpa_tl } } } \cs_new_protected:Npn \__siunitx_number_in_complex_to_uncert:n #1 { - \prop_del:Nn \l__siunitx_number_in_prop { complex } - \prop_del:Nn \l__siunitx_number_in_prop { complex-decimal-marker } - \prop_del:Nn \l__siunitx_number_in_prop { complex-sign } + \prop_remove:Nn \l__siunitx_number_in_prop { complex } + \prop_remove:Nn \l__siunitx_number_in_prop { complex-decimal-marker } + \prop_remove:Nn \l__siunitx_number_in_prop { complex-sign } \prop_put:Nnn \l__siunitx_number_in_prop { uncertainty } { true } \prop_get:NnNTF \l__siunitx_number_in_prop { complex-integer } \l__siunitx_number_uncert_tl @@ -1600,8 +1600,8 @@ { \__siunitx_number_in_complex_to_uncert_int: } } { \__siunitx_number_in_complex_to_uncert_dec:n {#1} } - \prop_del:Nn \l__siunitx_number_in_prop { complex-integer } - \prop_del:Nn \l__siunitx_number_in_prop { complex-decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { complex-integer } + \prop_remove:Nn \l__siunitx_number_in_prop { complex-decimal } } \cs_new_protected:Npn \__siunitx_number_in_complex_to_uncert_int: { \prop_get:NnNF \l__siunitx_number_in_prop { complex-decimal } @@ -1648,9 +1648,9 @@ \cs_new_protected:Npn \__siunitx_number_in_complex_to_uncert_pad: { \int_set:Nn \l__siunitx_number_uncert_length_int - { \tl_length:N \l__siunitx_tmpa_tl } + { \tl_count:N \l__siunitx_tmpa_tl } \int_set:Nn \l__siunitx_number_mantissa_length_int - { \tl_length:N \l__siunitx_tmpb_tl } + { \tl_count:N \l__siunitx_tmpb_tl } \int_compare:nNnTF { \l__siunitx_number_mantissa_length_int } > { \l__siunitx_number_uncert_length_int } @@ -1808,8 +1808,8 @@ { \bool_if:NT \l__siunitx_omit_uncert_bool { - \prop_del:Nn \l__siunitx_number_in_prop { uncertainty } - \prop_del:Nn \l__siunitx_number_in_prop { mantissa-uncertainty } + \prop_remove:Nn \l__siunitx_number_in_prop { uncertainty } + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-uncertainty } } } { \__siunitx_number_process_round: } @@ -1818,8 +1818,8 @@ \__siunitx_number_process_integer_digits: \bool_if:NT \l__siunitx_process_drop_exponent_bool { - \prop_del:Nn \l__siunitx_number_in_prop { exponent } - \prop_del:Nn \l__siunitx_number_in_prop { exponent-integer } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-integer } } } \cs_new_protected:Npn \__siunitx_number_process_exponent: { @@ -1833,10 +1833,10 @@ { \__siunitx_number_process_exponent_aux:n { decimal } } \bool_if:NF \l__siunitx_tmp_bool { - \prop_del:Nn \l__siunitx_number_in_prop { exponent } - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { exponent } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-integer } - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-decimal } } } @@ -1858,11 +1858,11 @@ { \__siunitx_number_process_figures_aux:n {#1} } } { - \prop_del:Nn \l__siunitx_number_in_prop { #1 -sign } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -sign } \prop_put:Nnn \l__siunitx_number_in_prop { #1 -integer } { 0 } - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal } \bool_if:NF \l__siunitx_process_int_to_dec_bool - { \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } + { \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } } } \cs_new_protected:Npn \__siunitx_number_process_figures_aux:n #1 @@ -1883,7 +1883,7 @@ } { \prop_put:Nnn \l__siunitx_number_in_prop { #1 -integer } { 0 } - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal } } } \cs_new_protected:Npn \__siunitx_number_process_figures_init:n #1 @@ -2022,7 +2022,7 @@ { \prop_put:NnV \l__siunitx_number_in_prop { exponent-integer } \l__siunitx_process_fixed_int - \prop_del:Nn \l__siunitx_number_in_prop { exponent-sign } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-sign } } { \prop_put:Nnx \l__siunitx_number_in_prop { exponent-integer } @@ -2057,9 +2057,9 @@ { mantissa-integer } {#1} \tl_if_empty:nTF {#2} { - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-decimal } - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-decimal-marker } } { @@ -2153,7 +2153,7 @@ \int_set:Nn \l__siunitx_tmp_int { \l__siunitx_process_integer_min_int - - \tl_length:N \l__siunitx_tmpa_tl + - \tl_count:N \l__siunitx_tmpa_tl } \int_compare:nNnT { \l__siunitx_tmp_int } > { \c_zero } { @@ -2181,9 +2181,9 @@ \prop_if_in:NnF \l__siunitx_number_in_prop { mantissa-decimal-marker } { - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa } - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-integer } } } @@ -2233,7 +2233,7 @@ } { \int_set:Nn \l__siunitx_round_int - { \tl_length:N \l__siunitx_tmpa_tl } + { \tl_count:N \l__siunitx_tmpa_tl } \__siunitx_number_process_places_aux_ii:n {#1} } } @@ -2288,9 +2288,9 @@ } } } - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal } \bool_if:NF \l__siunitx_process_int_to_dec_bool - { \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } + { \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } } \cs_new_protected:Npn \__siunitx_number_process_places_aux_ii:n #1 { @@ -2457,8 +2457,8 @@ \l__siunitx_round_integer_out_tl \tl_if_empty:NTF \l__siunitx_round_decimal_out_tl { - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal } - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } { \prop_put:NnV \l__siunitx_number_in_prop { #1 -decimal } @@ -2472,7 +2472,7 @@ \prop_put:Nnn \l__siunitx_number_in_prop { comparator } { < } \prop_put:Nnn \l__siunitx_number_in_prop { #4 -integer } {#1} \tl_if_empty:nTF {#2} - { \prop_del:Nn \l__siunitx_number_in_prop { #4 -decimal } } + { \prop_remove:Nn \l__siunitx_number_in_prop { #4 -decimal } } { \prop_put:Nnn \l__siunitx_number_in_prop { #4 -decimal } {#2} } } \cs_new_protected:Npn \__siunitx_number_process_scientific: { @@ -2555,8 +2555,8 @@ \prop_put:Nnn \l__siunitx_number_in_prop { mantissa-integer } {#1} \tl_if_empty:nTF {#2} { - \prop_del:Nn \l__siunitx_number_in_prop { mantissa-decimal } - \prop_del:Nn \l__siunitx_number_in_prop + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { mantissa-decimal-marker } } { @@ -2571,9 +2571,9 @@ } \int_compare:nNnTF {#3} = { 0 } { - \prop_del:Nn \l__siunitx_number_in_prop { exponent } - \prop_del:Nn \l__siunitx_number_in_prop { exponent-sign } - \prop_del:Nn \l__siunitx_number_in_prop { exponent-integer } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-sign } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-integer } } { \prop_put:Nnn \l__siunitx_number_in_prop { exponent } { true } @@ -2582,7 +2582,7 @@ \int_set:Nn \l__siunitx_tmp_int {#3} \prop_put:NnV \l__siunitx_number_in_prop { exponent-integer } \l__siunitx_tmp_int - \prop_del:Nn \l__siunitx_number_in_prop { exponent-sign } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-sign } } { \int_set:Nn \l__siunitx_tmp_int { 0 - (#3) } @@ -2719,7 +2719,7 @@ \l__siunitx_tmpa_tl \tl_if_eq:NNT \c__siunitx_plus_tl \l__siunitx_tmpa_tl { - \prop_del:Nn \l__siunitx_number_in_prop { #1 -sign } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -sign } \prop_put:Nnn \l__siunitx_number_in_prop { #1 -had-sign } { true } } } @@ -2767,7 +2767,7 @@ \prop_get:NnN \l__siunitx_number_in_prop { #1 - #2 } \l__siunitx_tmpa_tl \int_set:cn { l__siunitx_process_ #2 _int } - { \tl_length:N \l__siunitx_tmpa_tl } + { \tl_count:N \l__siunitx_tmpa_tl } } \cs_new_protected:Npn \__siunitx_number_process_uncertainty_pad: { \int_while_do:nNnn @@ -2844,8 +2844,8 @@ } \bool_if:NT \l__siunitx_tmp_bool { - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal } - \prop_del:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -decimal-marker } } } } @@ -2860,8 +2860,8 @@ { \tl_put_left:NV \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl } \prop_get:NnNT \l__siunitx_unit_prop { prefix-1 } \l__siunitx_tmpb_tl { - \prop_del:Nn \l__siunitx_unit_prop { prefix-1 } - \prop_del:Nn \l__siunitx_unit_prop { prefix-symbol-1 } + \prop_remove:Nn \l__siunitx_unit_prop { prefix-1 } + \prop_remove:Nn \l__siunitx_unit_prop { prefix-symbol-1 } \prop_get:NVN \l__siunitx_prefix_forward_prop \l__siunitx_tmpb_tl \l__siunitx_tmpb_tl \tl_set:Nx \l__siunitx_tmpa_tl @@ -2870,7 +2870,7 @@ \prop_get:NVNTF \l__siunitx_prefix_reverse_prop \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl { - \prop_del:Nn \l__siunitx_number_in_prop { exponent } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent } \use:c { __siunitx_ \exp_after:wN \token_to_str:N \l__siunitx_tmpb_tl @@ -2996,7 +2996,7 @@ \prop_if_in:NnT \l__siunitx_number_out_prop { #1 -bracket } { \__siunitx_number_format_brackets_aux:n {#1} - \prop_del:Nn \l__siunitx_number_out_prop { #1 -bracket } + \prop_remove:Nn \l__siunitx_number_out_prop { #1 -bracket } } } } @@ -3096,7 +3096,7 @@ { \prop_put:Nnn \l__siunitx_number_out_prop { result-bracket } { true } - \prop_del:Nn \l__siunitx_number_out_prop { mantissa-bracket } + \prop_remove:Nn \l__siunitx_number_out_prop { mantissa-bracket } } \prop_if_in:NnT \l__siunitx_number_out_prop { comparator } { @@ -3209,7 +3209,7 @@ { \prop_get:NnN \l__siunitx_number_in_prop { #1 - #2 } \l__siunitx_tmpa_tl \int_compare:nNnTF - { \tl_length:N \l__siunitx_tmpa_tl } < \l__siunitx_group_min_int + { \tl_count:N \l__siunitx_tmpa_tl } < \l__siunitx_group_min_int { \__siunitx_number_format_copy:n { #1 - #2 } } { \tl_clear:N \l__siunitx_tmpb_tl @@ -3458,7 +3458,7 @@ \__siunitx_number_format_uncertainty_joined:n #1 { \prop_get:NnN \l__siunitx_number_in_prop { #1 -uncertainty } \l__siunitx_tmpa_tl - \prop_del:Nn \l__siunitx_number_in_prop { #1 -uncertainty } + \prop_remove:Nn \l__siunitx_number_in_prop { #1 -uncertainty } \tl_put_left:NV \l__siunitx_tmpa_tl \l__siunitx_output_uncert_open_tl \tl_put_left:NV \l__siunitx_tmpa_tl \l__siunitx_uncert_sep_tl \tl_put_right:NV \l__siunitx_tmpa_tl \l__siunitx_output_uncert_close_tl @@ -3962,7 +3962,7 @@ #1#2#3 { \prop_get:cnN { l__siunitx_angle_ #1 _prop } { mantissa-sign #3 } \l__siunitx_tmpa_tl - \prop_del:cn { l__siunitx_angle_ #1 _prop } { mantissa-sign #3 } + \prop_remove:cn { l__siunitx_angle_ #1 _prop } { mantissa-sign #3 } \quark_if_no_value:NF \l__siunitx_tmpa_tl { \prop_put:cnV { l__siunitx_angle_ #2 _prop } { mantissa-sign #3 } @@ -5063,9 +5063,9 @@ \cs_new_protected:Npn \__siunitx_unit_format_symbol_aux_alt: { \int_compare:nNnTF { \l__siunitx_unit_int } = { 1 } { - \prop_del:Nn \l__siunitx_unit_prop { prefix-1 } - \prop_del:Nn \l__siunitx_unit_prop { prefix-symbol-1 } - \prop_del:Nn \l__siunitx_unit_prop { prefix-base-1 } + \prop_remove:Nn \l__siunitx_unit_prop { prefix-1 } + \prop_remove:Nn \l__siunitx_unit_prop { prefix-symbol-1 } + \prop_remove:Nn \l__siunitx_unit_prop { prefix-base-1 } \prop_if_empty:NF \l__siunitx_unit_prop { \msg_error:nn { siunitx } { prefix-only } } } @@ -5334,7 +5334,7 @@ { \bool_set_true:N \l__siunitx_list_first_bool \tl_clear:N \l__siunitx_list_current_tl - \int_compare:nNnTF { \tl_length:n {#1} } > \c_two + \int_compare:nNnTF { \tl_count:n {#1} } > \c_two { \tl_map_function:nN {#1} \__siunitx_list_numbers_aux_ii:n \l__siunitx_list_tl @@ -5342,7 +5342,7 @@ \l__siunitx_list_current_tl } { - \int_compare:nNnTF { \tl_length:n {#1} } = \c_two + \int_compare:nNnTF { \tl_count:n {#1} } = \c_two { \__siunitx_list_numbers_aux:nn #1 } { \__siunitx_combined_output:n #1 } } @@ -5895,7 +5895,7 @@ table-comparator .choice:, table-comparator / false .code:n = - { \prop_del:Nn \l__siunitx_table_model_prop { comparator } }, + { \prop_remove:Nn \l__siunitx_table_model_prop { comparator } }, table-comparator / true .code:n = { \prop_put:Nnn \l__siunitx_table_model_prop { comparator } { > } }, @@ -5904,16 +5904,16 @@ { \int_compare:nNnTF {#1} = \c_zero { - \prop_del:Nn \l__siunitx_table_model_prop { mantissa-decimal } - \prop_del:Nn \l__siunitx_table_model_prop { mantissa-decimal-raw } - \prop_del:Nn \l__siunitx_table_model_prop + \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-decimal } + \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-decimal-raw } + \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-decimal-marker } \prop_if_in:NnTF \l__siunitx_table_model_prop { mantissa-integer } { \prop_put:Nnn \l__siunitx_table_model_prop { mantissa } { true } } - { \prop_del:Nn \l__siunitx_table_model_prop { mantissa } } + { \prop_remove:Nn \l__siunitx_table_model_prop { mantissa } } } { \prop_put:Nnx \l__siunitx_table_model_prop { mantissa-decimal } @@ -5928,7 +5928,7 @@ table-figures-exponent .code:n = { \int_compare:nNnTF {#1} = \c_zero - { \prop_del:Nn \l__siunitx_table_model_prop { exponent-integer } } + { \prop_remove:Nn \l__siunitx_table_model_prop { exponent-integer } } { \prop_put:Nnx \l__siunitx_table_model_prop { exponent-integer } { \prg_replicate:nn {#1} { 8 } } @@ -5939,13 +5939,13 @@ { \int_compare:nNnTF {#1} = \c_zero { - \prop_del:Nn \l__siunitx_table_model_prop { mantissa-integer } + \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-integer } \prop_if_in:NnTF \l__siunitx_table_model_prop { mantissa-decimal } { \prop_put:Nnn \l__siunitx_table_model_prop { mantissa } { true } } - { \prop_del:Nn \l__siunitx_table_model_prop { mantissa } } + { \prop_remove:Nn \l__siunitx_table_model_prop { mantissa } } } { \prop_put:Nnx \l__siunitx_table_model_prop { mantissa-integer } @@ -5956,7 +5956,7 @@ table-figures-uncertainty .code:n = { \int_compare:nNnTF {#1} = \c_zero - { \prop_del:Nn \l__siunitx_table_model_prop { mantissa-uncertainty } } + { \prop_remove:Nn \l__siunitx_table_model_prop { mantissa-uncertainty } } { \prop_put:Nnx \l__siunitx_table_model_prop { mantissa-uncertainty } { \prg_replicate:nn {#1} { 8 } } @@ -6056,8 +6056,8 @@ { \bool_set_true:N \l__siunitx_process_fixed_bool \__siunitx_number_process: - \prop_del:Nn \l__siunitx_number_in_prop { exponent } - \prop_del:Nn \l__siunitx_number_in_prop { exponent-integer } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent } + \prop_remove:Nn \l__siunitx_number_in_prop { exponent-integer } } { \__siunitx_number_process: } \__siunitx_number_format: @@ -7544,7 +7544,7 @@ { \__siunitx_unit_create_empty_functions: } } \ProcessKeysOptions { siunitx } -%% Copyright (C) 2008-2012 by +%% Copyright (C) 2008-2013 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of |