siunitx (14sep15)

git-svn-id: svn://tug.org/texlive/trunk@38377 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 21 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index bc47ad43cda..daf6bcd32d6 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 1f659451e52..91f4f8c0614 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -81,7 +81,7 @@ See http://www.latex-project.org/lppl.txt
 
 \endpreamble
 \postamble
-Copyright (C) 2008-2014 by
+Copyright (C) 2008-2015 by
   Joseph Wright <joseph.wright@morningstar2.co.uk>
 
 It may be distributed and/or modified under the conditions of
@@ -639,6 +639,7 @@ This work consists of the file  siunitx.dtx
 % \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}
+% \changes{v2.6l}{2015/09/14}{Fix an internal error}
 %
 %\begin{abstract}
 % Physical quantities have both numbers and units, and each physical
@@ -5162,7 +5163,7 @@ This work consists of the file  siunitx.dtx
 %
 % The usual preliminaries.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2015/09/12} {2.6k}
+\ProvidesExplPackage {siunitx} {2015/09/14} {2.6l}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -5227,7 +5228,7 @@ This work consists of the file  siunitx.dtx
 %    \begin{macrocode}
 \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 }
 %    \end{macrocode}
 %
 %\begin{macro}{
@@ -8817,7 +8818,7 @@ This work consists of the file  siunitx.dtx
 \cs_new_protected:Npn \@@_number_process_round_tidy:n #1
   {
     \bool_if:nTF
-      {  
+      {
            \@@_number_if_zero_p:V \l_@@_round_integer_out_tl
         && \@@_number_if_zero_p:V \l_@@_round_decimal_out_tl
       }
@@ -12351,8 +12352,9 @@ This work consists of the file  siunitx.dtx
   }
 \cs_new_protected:Npn \@@_unit_format_literal_extras_aux:nN #1#2
   {
-    \tl_replace_all:Nnc \l_@@_unit_tl
+    \tl_replace_all:Nxn \l_@@_unit_tl
       { \char_generate:nn { #1 } { 12 } }
+      {#2}
   }
 \bool_if:nF
   {
@@ -16710,7 +16712,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/12} {2.6k}
+\ProvidesExplFile {siunitx-version-1.cfg} {2015/09/14} {2.6l}
   {siunitx: Version 1 settings}
 %    \end{macrocode}
 %
@@ -17652,7 +17654,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/12} {2.6k}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2015/09/14} {2.6l}
   {siunitx: Abbreviated units}
 %    \end{macrocode}
 %
@@ -17834,7 +17836,7 @@ This work consists of the file  siunitx.dtx
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2015/09/12} {2.6k}
+\ProvidesExplFile {siunitx-binary.cfg} {2015/09/14} {2.6l}
   {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 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 <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-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 <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-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 <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 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 <joseph.wright@morningstar2.co.uk>
 %% 
 %% It may be distributed and/or modified under the conditions of