From fbd4356a53c1cc18aa1e6ede1091e1de59324b05 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Sep 2015 21:54:45 +0000 Subject: siunitx (14sep15) git-svn-id: svn://tug.org/texlive/trunk@38377 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg | 4 ++-- Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg | 4 ++-- Master/texmf-dist/tex/latex/siunitx/siunitx-version-1.cfg | 4 ++-- Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 9 +++++---- 4 files changed, 11 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/siunitx') diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-abbreviations.cfg index 6505a30090c..d5b1005927a 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/12} {2.6k} +\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/14} {2.6l} {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-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg b/Master/texmf-dist/tex/latex/siunitx/siunitx-binary.cfg index 579caefc986..24e0027f0f1 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/12} {2.6k} +\ProvidesExplFile {siunitx-binary.cfg} {2015/09/14} {2.6l} {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-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of 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 485e0c813c0..211aaa00843 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/12} {2.6k} +\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/14} {2.6l} {siunitx: Version 1 settings} \keys_define:nn { siunitx } { addsign .choice: , @@ -727,7 +727,7 @@ \DeclareSIUnit \yb { \yocto \barn } \NewDocumentCommand \requiresiconfigs { m } { \keys_set:nn { siunitx } { version-1-compatibility } } -%% Copyright (C) 2008-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% 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 5b1e2f478bc..46e40b70622 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} {2015/09/12} {2.6k} +\ProvidesExplPackage {siunitx} {2015/09/14} {2.6l} {A comprehensive (SI) units package} \@ifpackagelater { expl3 } { 2015/09/11 } { } @@ -49,7 +49,7 @@ \cs_new:Npn \__siunitx_tmp:w { } \cs_generate_variant:Nn \clist_map_function:nN { nc } \cs_generate_variant:Nn \tl_if_blank:nTF { V } -\cs_generate_variant:Nn \tl_replace_all:Nnn { No, NV } +\cs_generate_variant:Nn \tl_replace_all:Nnn { No, NV , Nx } \bool_new:N \l__siunitx_tmp_bool \box_new:N \l__siunitx_tmp_box \dim_new:N \l__siunitx_tmp_dim @@ -4867,8 +4867,9 @@ } \cs_new_protected:Npn \__siunitx_unit_format_literal_extras_aux:nN #1#2 { - \tl_replace_all:Nnc \l__siunitx_unit_tl + \tl_replace_all:Nxn \l__siunitx_unit_tl { \char_generate:nn { #1 } { 12 } } + {#2} } \bool_if:nF { @@ -7669,7 +7670,7 @@ { \__siunitx_unit_create_functions: } { \__siunitx_unit_create_empty_functions: } } -%% Copyright (C) 2008-2014 by +%% Copyright (C) 2008-2015 by %% Joseph Wright %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3