summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-08 22:51:45 +0000
committerKarl Berry <karl@freefriends.org>2010-10-08 22:51:45 +0000
commit642d21e6f53417257b6ff173b9216d3862139fe1 (patch)
treedb0b44efe973fbb5981ce516349b282b1c4a5a5c
parent7630bab035bc1c8d13162f185645f97fad1020be (diff)
siunitx update (6oct10)
git-svn-id: svn://tug.org/texlive/trunk@20024 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin500983 -> 501107 bytes
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx14
-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.sty3
5 files changed, 13 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index c0e84a00f95..212e2474568 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 d9007fb230c..e43b91a1b16 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -472,6 +472,8 @@ This work consists of the file siunitx.dtx
% updates}
%\changes{v2.0w}{2010/09/29}{Deal with internal function used by
% REV\TeX\ in tables}
+%\changes{v2.0x}{2010/10/05}{Fix bug when detecting single prefixes
+% and converting prefixes to numbers}
%
%\begin{abstract}
% Typesetting values with units requires care to ensure that the
@@ -1008,8 +1010,9 @@ This work consists of the file siunitx.dtx
% input given. As part of this, stand-alone unit prefixes can be used
% with the \cs{si} macro
%\begin{LaTeXdemo}
-% \si{\kilo} \\
-% \si{\micro}
+% \si{\kilo} \\
+% \si{\micro} \\
+% \si[prefixes-as-symbols = false]{\kilo}
%\end{LaTeXdemo}
% However, the package only allows a single prefix to be used in this
% way: multiple prefixes will give an error, as will trying to give
@@ -4165,7 +4168,7 @@ This work consists of the file siunitx.dtx
%
% The usual preliminaries.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2010/09/29} {2.0w}
+\ProvidesExplPackage {siunitx} {2010/10/05} {2.0x}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -10262,6 +10265,7 @@ This work consists of the file siunitx.dtx
\intexpr_compare:nNnTF { \l_siunitx_unit_int } = { 1 }
{
\prop_del:Nn \l_siunitx_unit_prop { prefix-1 }
+ \prop_del:Nn \l_siunitx_unit_prop { prefix-base-1 }
\prop_if_empty:NF \l_siunitx_unit_prop
{ \msg_error:nn { siunitx } { prefix-only } }
}
@@ -13472,7 +13476,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-version-1.cfg} {2010/09/29} {2.0w}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/10/05} {2.0x}
{siunitx: Version 1 settings}
% \end{macrocode}
%
@@ -14752,7 +14756,7 @@ This work consists of the file siunitx.dtx
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplFile {siunitx-binary.cfg} {2010/09/29} {2.0w}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/10/05} {2.0x}
{siunitx: Binary units}
% \end{macrocode}
%
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 425303fb4c0..57f6dc79a35 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} {2010/09/29} {2.0w}
+\ProvidesExplFile {siunitx-binary.cfg} {2010/10/05} {2.0x}
{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 761b01efc93..3092ab4f472 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} {2010/09/29} {2.0w}
+\ProvidesExplFile {siunitx-version-1.cfg} {2010/10/05} {2.0x}
{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 b0d61a1cc08..fc1d9e7ed63 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} {2010/09/29} {2.0w}
+\ProvidesExplPackage {siunitx} {2010/10/05} {2.0x}
{A comprehensive (SI) units package}
\msg_set:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -4043,6 +4043,7 @@
\intexpr_compare:nNnTF { \l_siunitx_unit_int } = { 1 }
{
\prop_del:Nn \l_siunitx_unit_prop { prefix-1 }
+ \prop_del:Nn \l_siunitx_unit_prop { prefix-base-1 }
\prop_if_empty:NF \l_siunitx_unit_prop
{ \msg_error:nn { siunitx } { prefix-only } }
}