diff options
author | Karl Berry <karl@freefriends.org> | 2011-02-05 00:25:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-02-05 00:25:17 +0000 |
commit | f52fabc8a81f45adf6557d5f01aef7fd0f7fb64d (patch) | |
tree | dce571b3b93d6d13a05d2b1ba5161e888848eeda /Master/texmf-dist/tex | |
parent | 5f2b824413a629645d9eff9df514aef4eac21b01 (diff) |
siunix (2feb11)
git-svn-id: svn://tug.org/texlive/trunk@21303 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 22 insertions, 19 deletions
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 69151835276..b143d8b23ac 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} {2011/01/27} {2.1i} +\ProvidesExplFile {siunitx-binary.cfg} {2011/02/01} {2.1j} {siunitx: Binary units} \DeclareBinaryPrefix \kibi { Ki } { 10 } \DeclareBinaryPrefix \mebi { Mi } { 20 } 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 7e482849dbb..3b99f062cc7 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} {2011/01/27} {2.1i} +\ProvidesExplFile {siunitx-version-1.cfg} {2011/02/01} {2.1j} {siunitx: Version 1 settings} \keys_set:nn { siunitx } { load-configurations = { abbreviations , binary } } diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index dff5520937e..c4bbc25cba8 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} -\ProvidesExplPackage {siunitx} {2011/01/27} {2.1i} +\ProvidesExplPackage {siunitx} {2011/02/01} {2.1j} {A comprehensive (SI) units package} \cs_if_exist:NTF \msg_set:nnnn { @@ -4263,22 +4263,25 @@ } } \xetex_if_engine:F { - \AtBeginDocument - { - \@ifpackageloaded { inputenc } - { - \tl_set:Nn \l_siunitx_tmpa_tl { latin1 , latin5 , latin9 } - \clist_if_in:NVF \l_siunitx_tmpa_tl \inputencodingname - { - \cs_set_eq:NN \siunitx_unit_format_literal_extras: - \scan_stop: - } - } - { - \cs_set_eq:NN \siunitx_unit_format_literal_extras: - \scan_stop: - } - } + \luatex_if_engine:F + { + \AtBeginDocument + { + \cs_if_exist:NTF \inputencodingname + { + \tl_set:Nn \l_siunitx_tmpa_tl { latin1 , latin5 , latin9 } + \clist_if_in:NVF \l_siunitx_tmpa_tl \inputencodingname + { + \cs_set_eq:NN \siunitx_unit_format_literal_extras: + \scan_stop: + } + } + { + \cs_set_eq:NN \siunitx_unit_format_literal_extras: + \scan_stop: + } + } + } } \cs_new_protected_nopar:Npn \siunitx_unit_format_power: { \tl_set:Nx \l_siunitx_tmpa_tl |