From cf9a1b30d0817d49c7ae25fb6b0d71d53b22d661 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Sep 2015 21:25:14 +0000 Subject: siunitx (12sep15) git-svn-id: svn://tug.org/texlive/trunk@38362 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/siunitx/siunitx.pdf | Bin 613107 -> 612973 bytes Master/texmf-dist/source/latex/siunitx/siunitx.dtx | 92 +++++++++++---------- .../tex/latex/siunitx/siunitx-abbreviations.cfg | 2 +- .../tex/latex/siunitx/siunitx-binary.cfg | 2 +- .../tex/latex/siunitx/siunitx-version-1.cfg | 2 +- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 79 +++++++++--------- 6 files changed, 93 insertions(+), 84 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf index 464cdb8b8a7..bc47ad43cda 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 877c88caf10..1f659451e52 100644 --- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx +++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx @@ -125,7 +125,7 @@ This work consists of the file siunitx.dtx \fi % %<*driver|package> -\RequirePackage{expl3}[2015/03/01] +\RequirePackage{expl3}[2015/09/11] \RequirePackage{xparse} % %<*driver> @@ -638,6 +638,7 @@ This work consists of the file siunitx.dtx % is set} % \changes{v2.6j}{2015/09/01}{Print $\pm$ correctly when % \opt{exponent-to-prefix} is set} +% \changes{v2.6k}{2015/09/12}{Track \pkg{expl3} changes} % %\begin{abstract} % Physical quantities have both numbers and units, and each physical @@ -5161,7 +5162,7 @@ This work consists of the file siunitx.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2015/09/01} {2.6j} +\ProvidesExplPackage {siunitx} {2015/09/12} {2.6k} {A comprehensive (SI) units package} % \end{macrocode} % @@ -5169,7 +5170,7 @@ This work consists of the file siunitx.dtx % This will also trap any problems with \pkg{l3packages} (as the two are now % tied together, version-wise). % \begin{macrocode} -\@ifpackagelater { expl3 } { 2015/03/01 } +\@ifpackagelater { expl3 } { 2015/09/11 } { } { \PackageError { siunitx } { Support~package~expl3~too~old } @@ -5670,7 +5671,7 @@ This work consists of the file siunitx.dtx { \@ifpackageloaded { bidi } { - \xetex_if_engine:T + \sys_if_engine_xetex:T { \cs_set_protected:Npn \@@_ensure_ltr:n #1 { \LRE {#1} } } } { } @@ -12348,13 +12349,16 @@ This work consists of the file siunitx.dtx \@@_unit_format_literal_extras_aux:nN { 197 } \SIUnitSymbolAngstrom } -\cs_new_protected:Npn - \@@_unit_format_literal_extras_aux:nN #1#2 { - \char_set_lccode:nn { `\@ } {#1} - \tl_to_lowercase:n - { \tl_replace_all:NnV \l_@@_unit_tl { @ } #2 } -} -\pdftex_if_engine:T +\cs_new_protected:Npn \@@_unit_format_literal_extras_aux:nN #1#2 + { + \tl_replace_all:Nnc \l_@@_unit_tl + { \char_generate:nn { #1 } { 12 } } + } +\bool_if:nF + { + \sys_if_engine_luatex_p: || + \sys_if_engine_xetex_p: + } { \AtBeginDocument { @@ -15096,7 +15100,8 @@ This work consists of the file siunitx.dtx % % \begin{macro} % { -% \@@_table_print_S_direct_centered: , +% \@@_table_print_S_direct_centered: , +% @@_table_print_S_direct_centered_begin:, % \@@_table_print_S_direct_centered_end: % } % \begin{macro}[aux]{\@@_table_print_S_direct_centered_aux:N} @@ -15105,7 +15110,6 @@ This work consists of the file siunitx.dtx % In that sense this is very similar to the normal method, except that % it will work with non-numerical input. % \begin{macrocode} -\char_set_catcode_active:N \@ \cs_new_protected:Npn \@@_table_print_S_direct_centered: { \cs_set_eq:NN \@@_table_print: @@ -15123,19 +15127,18 @@ This work consists of the file siunitx.dtx } \cs_new_protected:Npn \@@_table_print_S_direct_centered_aux:N #1 { - \char_set_lccode:nn { `\@ } { `#1 } - \char_set_mathcode:nn { `#1 } { 32768 } - \tl_to_lowercase:n { \cs_set:Npn @ } - { + \char_set_active_eq:NN #1 \@@_table_print_S_direct_centered_begin: + \char_set_mathcode:nn { `#1 } { "8000 } + } +\cs_new_protected_nopar:Npn \@@_table_print_S_direct_centered_begin: + { + \c_math_toggle_token + \c_group_end_token + \hbox_set:Nn \l_@@_table_post_box + \c_group_begin_token \c_math_toggle_token - \c_group_end_token - \hbox_set:Nn \l_@@_table_post_box - \c_group_begin_token - \c_math_toggle_token - \l_@@_output_decimal_tl - } + \l_@@_output_decimal_tl } -\char_set_catcode_letter:N \@ \cs_new_protected:Npn \@@_table_print_S_direct_centered_end: { \c_math_toggle_token @@ -15168,7 +15171,8 @@ This work consists of the file siunitx.dtx % % \begin{macro} % { -% \@@_table_print_S_direct_reserved: , +% \@@_table_print_S_direct_reserved: , +% \@@_table_print_S_direct_reserved_begin:, % \@@_table_print_S_direct_reserved_end: % } % \begin{macro}[aux]{\@@_table_print_S_direct_reserved_aux:N} @@ -15177,7 +15181,6 @@ This work consists of the file siunitx.dtx % but needs a bit of measuring. The first box here does need to use % \cs{tex_hill:D} as \texttt{fil} glue will not work. % \begin{macrocode} -\char_set_catcode_active:N \@ \cs_new_protected:Npn \@@_table_print_S_direct_reserved: { \cs_set_eq:NN \@@_table_print: @@ -15221,20 +15224,19 @@ This work consists of the file siunitx.dtx } \cs_new_protected:Npn \@@_table_print_S_direct_reserved_aux:N #1 { - \char_set_lccode:nn { `\@ } { `#1 } - \char_set_mathcode:nn { `#1 } { 32768 } - \tl_to_lowercase:n { \cs_set:Npn @ } - { - \c_math_toggle_token - \c_group_end_token - \hbox_set_to_wd:Nnn \l_@@_table_post_box - { \box_wd:N \l_@@_tmp_box } - \c_group_begin_token - \c_math_toggle_token - \l_@@_output_decimal_tl - } + \char_set_active_eq:NN #1 \@@_table_print_S_direct_reserved_begin: + \char_set_mathcode:nn { `#1 } { "8000 } } -\char_set_catcode_letter:N \@ +\cs_new_protected_nopar:Npn \@@_table_print_S_direct_reserved_begin: + { + \c_math_toggle_token + \c_group_end_token + \hbox_set_to_wd:Nnn \l_@@_table_post_box + { \box_wd:N \l_@@_tmp_box } + \c_group_begin_token + \c_math_toggle_token + \l_@@_output_decimal_tl + } \cs_new_protected:Npn \@@_table_print_S_direct_reserved_end: { \c_math_toggle_token @@ -15474,7 +15476,11 @@ This work consists of the file siunitx.dtx % The single degree Celsius symbol is a compatibility character, and so % the two separate glyphs \enquote{degree} and \enquote{C} are used. % \begin{macrocode} -\pdftex_if_engine:F +\bool_if:nT + { + \sys_if_engine_luatex_p: || + \sys_if_engine_xetex_p: + } { \AtBeginDocument { @@ -16704,7 +16710,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/12} {2.6k} {siunitx: Version 1 settings} % \end{macrocode} % @@ -17646,7 +17652,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/12} {2.6k} {siunitx: Abbreviated units} % \end{macrocode} % @@ -17828,7 +17834,7 @@ This work consists of the file siunitx.dtx % \end{macrocode} % % \begin{macrocode} -\ProvidesExplFile {siunitx-binary.cfg} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-binary.cfg} {2015/09/12} {2.6k} {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 87023acc12d..6505a30090c 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} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/12} {2.6k} {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 513f705b00f..579caefc986 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} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-binary.cfg} {2015/09/12} {2.6k} {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 921abc30b8b..485e0c813c0 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} {2015/09/01} {2.6j} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/12} {2.6k} {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 ee94ee4f21f..5b1e2f478bc 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -13,11 +13,11 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\RequirePackage{expl3}[2015/03/01] +\RequirePackage{expl3}[2015/09/11] \RequirePackage{xparse} -\ProvidesExplPackage {siunitx} {2015/09/01} {2.6j} +\ProvidesExplPackage {siunitx} {2015/09/12} {2.6k} {A comprehensive (SI) units package} -\@ifpackagelater { expl3 } { 2015/03/01 } +\@ifpackagelater { expl3 } { 2015/09/11 } { } { \PackageError { siunitx } { Support~package~expl3~too~old } @@ -361,7 +361,7 @@ { \@ifpackageloaded { bidi } { - \xetex_if_engine:T + \sys_if_engine_xetex:T { \cs_set_protected:Npn \__siunitx_ensure_ltr:n #1 { \LRE {#1} } } } { } @@ -4865,13 +4865,16 @@ \__siunitx_unit_format_literal_extras_aux:nN { 197 } \SIUnitSymbolAngstrom } -\cs_new_protected:Npn - \__siunitx_unit_format_literal_extras_aux:nN #1#2 { - \char_set_lccode:nn { `\@ } {#1} - \tl_to_lowercase:n - { \tl_replace_all:NnV \l__siunitx_unit_tl { @ } #2 } -} -\pdftex_if_engine:T +\cs_new_protected:Npn \__siunitx_unit_format_literal_extras_aux:nN #1#2 + { + \tl_replace_all:Nnc \l__siunitx_unit_tl + { \char_generate:nn { #1 } { 12 } } + } +\bool_if:nF + { + \sys_if_engine_luatex_p: || + \sys_if_engine_xetex_p: + } { \AtBeginDocument { @@ -6676,7 +6679,6 @@ #1 \__siunitx_table_column_end:n { \l__siunitx_table_text_align_skip } } -\char_set_catcode_active:N \@ \cs_new_protected:Npn \__siunitx_table_print_S_direct_centered: { \cs_set_eq:NN \__siunitx_table_print: @@ -6694,19 +6696,18 @@ } \cs_new_protected:Npn \__siunitx_table_print_S_direct_centered_aux:N #1 { - \char_set_lccode:nn { `\@ } { `#1 } - \char_set_mathcode:nn { `#1 } { 32768 } - \tl_to_lowercase:n { \cs_set:Npn @ } - { + \char_set_active_eq:NN #1 \__siunitx_table_print_S_direct_centered_begin: + \char_set_mathcode:nn { `#1 } { "8000 } + } +\cs_new_protected_nopar:Npn \__siunitx_table_print_S_direct_centered_begin: + { + \c_math_toggle_token + \c_group_end_token + \hbox_set:Nn \l__siunitx_table_post_box + \c_group_begin_token \c_math_toggle_token - \c_group_end_token - \hbox_set:Nn \l__siunitx_table_post_box - \c_group_begin_token - \c_math_toggle_token - \l__siunitx_output_decimal_tl - } + \l__siunitx_output_decimal_tl } -\char_set_catcode_letter:N \@ \cs_new_protected:Npn \__siunitx_table_print_S_direct_centered_end: { \c_math_toggle_token @@ -6733,7 +6734,6 @@ \box_use:N \l__siunitx_table_pre_box \box_use:N \l__siunitx_table_post_box } -\char_set_catcode_active:N \@ \cs_new_protected:Npn \__siunitx_table_print_S_direct_reserved: { \cs_set_eq:NN \__siunitx_table_print: @@ -6777,20 +6777,19 @@ } \cs_new_protected:Npn \__siunitx_table_print_S_direct_reserved_aux:N #1 { - \char_set_lccode:nn { `\@ } { `#1 } - \char_set_mathcode:nn { `#1 } { 32768 } - \tl_to_lowercase:n { \cs_set:Npn @ } - { - \c_math_toggle_token - \c_group_end_token - \hbox_set_to_wd:Nnn \l__siunitx_table_post_box - { \box_wd:N \l__siunitx_tmp_box } - \c_group_begin_token - \c_math_toggle_token - \l__siunitx_output_decimal_tl - } + \char_set_active_eq:NN #1 \__siunitx_table_print_S_direct_reserved_begin: + \char_set_mathcode:nn { `#1 } { "8000 } } -\char_set_catcode_letter:N \@ +\cs_new_protected_nopar:Npn \__siunitx_table_print_S_direct_reserved_begin: + { + \c_math_toggle_token + \c_group_end_token + \hbox_set_to_wd:Nnn \l__siunitx_table_post_box + { \box_wd:N \l__siunitx_tmp_box } + \c_group_begin_token + \c_math_toggle_token + \l__siunitx_output_decimal_tl + } \cs_new_protected:Npn \__siunitx_table_print_S_direct_reserved_end: { \c_math_toggle_token @@ -6922,7 +6921,11 @@ \__siunitx_symbol_new:n { Degree } \__siunitx_symbol_new:n { Micro } \__siunitx_symbol_new:n { Ohm } -\pdftex_if_engine:F +\bool_if:nT + { + \sys_if_engine_luatex_p: || + \sys_if_engine_xetex_p: + } { \AtBeginDocument { -- cgit v1.2.3