From ffd93a6c1bfb4edf3ba8d165d5f976166fd0dec6 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 14 Oct 2008 00:16:08 +0000
Subject: siunitx update (13oct08)

git-svn-id: svn://tug.org/texlive/trunk@10967 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')

diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index a02960a930e..f99fb1053d3 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{siunitx}
-  [2008/09/28 v1.1a A comprehensive (SI) units package]
+  [2008/10/13 v1.1b A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -3317,6 +3317,11 @@
   \renewcommand*{\si@tempa}{#1}%
   \expandafter\ifx
     \csname si@unt@lastadd\si@unt@checkstack\endcsname\si@tempa
+      \renewcommand*{\si@tempa}{prefix}%
+      \expandafter\ifx\csname si@unt@lastadd\si@unt@checkstack
+        \endcsname\si@tempa
+        \si@log@warn{Two prefixes found: only first printed}%
+      \fi
     \expandafter\@gobbletwo
   \else
     \expandafter\si@unt@preplussp
@@ -3522,7 +3527,9 @@
 \newunit{\ampere}{A}
 \newunit{\kelvin}{K}
 \newunit{\candela}{cd}
-\newpower{\Square}{2}
+\AtBeginDocument{
+  \@ifundefined{Square}{%
+    \newpower{\Square}{2}}{}}
 \newpower{\ssquare}{2}
 \newpower[post]{\squared}{2}
 \newpower{\cubic}{3}
-- 
cgit v1.2.3

