summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-29 22:36:25 +0000
committerKarl Berry <karl@freefriends.org>2012-08-29 22:36:25 +0000
commit1da4aecdd16183107254061bfb02e5ca6af536ed (patch)
treeff834232f15e2963e93d11d0a705efe547b09b3c
parentd3891f76fe0cbe4265e811457ff3f74487578f65 (diff)
siunitx (29aug12)
git-svn-id: svn://tug.org/texlive/trunk@27548 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin578402 -> 578199 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-abbreviations.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-binary.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/config/siunitx-version-1.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty5
6 files changed, 20 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 5864428046f..4637520326a 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index 782f91b2c46..2393db429a1 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -590,6 +590,8 @@ This work consists of the file siunitx.dtx
%\changes{v2.5e}{2012/06/13}{Fix an internal error in unit expansion,
% introduced in v2.4f}
%\changes{v2.5f}{2012/07/16}{Track changes in \pkg{expl3}}
+%\changes{v2.5h}{2012/08/28}{Alter literal unit test to allow spaces in
+% units to be ignored}
%
%\begin{abstract}
% Physical quantities have both numbers and units, and each physical
@@ -5100,7 +5102,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2012/07/22} {2.5g}
+\ProvidesExplPackage {siunitx} {2012/08/28} {2.5h}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -5166,6 +5168,13 @@ This work consists of the file siunitx.dtx
\cs_generate_variant:Nn \clist_map_function:nN { nc }
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\tl_if_blank:VTF}
+% Needed for the literal test.
+% \begin{macrocode}
+\cs_generate_variant:Nn \tl_if_blank:nTF { V }
+% \end{macrocode}
+% \end{macro}
%
%\begin{macro}{
% \l_@@_tmp_bool ,
@@ -11486,7 +11495,7 @@ This work consists of the file siunitx.dtx
\protected@edef \l_@@_tmpa_tl {#1}
\exp_args:NNNV \group_end:
\tl_set:Nn \l_@@_tmpa_tl \l_@@_tmpa_tl
- \tl_if_empty:NTF \l_@@_tmpa_tl {#3} {#2}
+ \tl_if_blank:VTF \l_@@_tmpa_tl {#3} {#2}
}
\cs_new_protected:Npn \@@_unit_if_literal_aux:N #1 {
\cs_set_eq:NN #1 \prg_do_nothing:
@@ -16472,7 +16481,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2012/07/22} {2.5g}
+\ProvidesExplFile {siunitx-version-1.cfg} {2012/08/28} {2.5h}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -17417,7 +17426,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/07/22} {2.5g}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/08/28} {2.5h}
{siunitx: Abbreviated units}
% \end{macrocode}
%
@@ -17599,7 +17608,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2012/07/22} {2.5g}
+\ProvidesExplFile {siunitx-binary.cfg} {2012/08/28} {2.5h}
{siunitx: Binary units}
% \end{macrocode}
%
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 0e45ed370aa..e62f23bc2bb 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/07/22} {2.5g}
+\ProvidesExplFile {siunitx-abbreviations.cfg} {2012/08/28} {2.5h}
{siunitx: Abbreviated units}
\DeclareSIUnit \A { \ampere }
\DeclareSIUnit \pA { \pico \ampere }
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 2401df00c95..85ecafeed6a 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/07/22} {2.5g}
+\ProvidesExplFile {siunitx-binary.cfg} {2012/08/28} {2.5h}
{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 6880d03e676..db90f559ace 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/07/22} {2.5g}
+\ProvidesExplFile {siunitx-version-1.cfg} {2012/08/28} {2.5h}
{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 fa34d419b17..e2172786212 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} {2012/07/22} {2.5g}
+\ProvidesExplPackage {siunitx} {2012/08/28} {2.5h}
{A comprehensive (SI) units package}
\@ifpackagelater { expl3 } { 2012/07/16 }
{ }
@@ -47,6 +47,7 @@
\RequirePackage{ amstext , array , l3keys2e }
\cs_new:Npn \__siunitx_tmp:w { }
\cs_generate_variant:Nn \clist_map_function:nN { nc }
+\cs_generate_variant:Nn \tl_if_blank:nTF { V }
\bool_new:N \l__siunitx_tmp_bool
\box_new:N \l__siunitx_tmp_box
\dim_new:N \l__siunitx_tmp_dim
@@ -4354,7 +4355,7 @@
\protected@edef \l__siunitx_tmpa_tl {#1}
\exp_args:NNNV \group_end:
\tl_set:Nn \l__siunitx_tmpa_tl \l__siunitx_tmpa_tl
- \tl_if_empty:NTF \l__siunitx_tmpa_tl {#3} {#2}
+ \tl_if_blank:VTF \l__siunitx_tmpa_tl {#3} {#2}
}
\cs_new_protected:Npn \__siunitx_unit_if_literal_aux:N #1 {
\cs_set_eq:NN #1 \prg_do_nothing: