siunitx update (23jun08)

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

1 files changed, 17 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index f199f396fbe..ebf7bac4239 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -14,11 +14,11 @@
 %%  ----------------------------------------------------------------
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\newcommand*{\si@svn@ver}{v1.0a}
+\newcommand*{\si@svn@ver}{v1.0b}
 \def\si@svn@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
   \newcommand*{\si@svn@version}{%
     #5/#6/#7\space\si@svn@ver\space}}
-\si@svn@id $Id: siunitx.dtx 82 2008-06-20 20:50:03Z joseph $
+\si@svn@id $Id: siunitx.dtx 88 2008-06-23 08:25:52Z joseph $
 \ProvidesPackage{siunitx}
   [\si@svn@version A comprehensive (SI) units package]
 \begingroup
@@ -1934,16 +1934,22 @@
     \advance\si@tempcntb\@ne\relax
   \fi
   \si@switchfalse
+  \advance\si@num@dp\@ne\relax
   \ifnum\si@tempcnta>\si@num@dp\relax
-    \ifnum\si@tempcntb>4\relax
-      \expandafter\expandafter\expandafter\si@switchtrue
-    \fi
+    \advance\si@num@dp\m@ne\relax
   \else
-    \ifnum\si@tempcntb=10\relax
-      \si@tempcntb\z@\relax
-      \expandafter\expandafter\expandafter\si@switchtrue
+    \advance\si@num@dp\m@ne\relax
+    \ifnum\si@tempcnta>\si@num@dp\relax
+      \ifnum\si@tempcntb>4\relax
+        \expandafter\expandafter\expandafter\si@switchtrue
+      \fi
+    \else
+      \ifnum\si@tempcntb=10\relax
+        \si@tempcntb\z@\relax
+        \expandafter\expandafter\expandafter\si@switchtrue
+      \fi
+      \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
     \fi
-    \edef\si@num@postdec{\the\si@tempcntb\si@num@postdec}%
   \fi
   \advance\si@tempcnta\m@ne\relax
   \si@num@rnd}
@@ -2996,7 +3002,7 @@
       \si@tempa
       \si@log@debug{Adding power
         \strip@pt\si@unt@powerdim\space to output stack}%
-      \si@unt@addtostack{power}{^{\num{%
+      \si@unt@addtostack{power}{^{\num[fixdp=false]{%
         \strip@pt\si@unt@powerdim}}}%
     \fi
   \fi
@@ -3130,7 +3136,7 @@
     \fi
     \si@unt@stackvalsep
     \let\si@expbase\si@prefixbase
-    \num{e\the\si@unt@prefixcnt}%
+    \num[fixdp=false]{e\the\si@unt@prefixcnt}%
   \fi}
 \newcommand*{\si@unt@normout}{%
   \si@unt@prefixout