From 7510bbe123bccd0e2f7b6465aff51717dd3cbec7 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 31 Dec 2009 01:25:13 +0000
Subject: siunitx 1.3g (26dec09)

git-svn-id: svn://tug.org/texlive/trunk@16535 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/siunitx/siunitx.sty | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 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 ead736111c9..80e5028ee35 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}
-  [2009/12/16 v1.3f A comprehensive (SI) units package]
+  [2009/12/25 v1.3g A comprehensive (SI) units package]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{siunitx}
@@ -2573,6 +2573,11 @@
   \fi
   \si@tab@next}
 \newcommand*{\si@tab@othertok}[1]{%
+  \si@tab@ifonechar{#1}
+    {\si@tab@othertok@aux{#1}}
+    {\si@tab@othertok@aux{{#1}}}%
+}
+\newcommand*{\si@tab@othertok@aux}[1]{%
   \si@log@debug{Found other cell contents `\unexpanded{#1}'}%
   \ifsi@switch
     \si@log@debug{Adding to post-numeral part}%
@@ -2597,13 +2602,22 @@
 \newcommand*{\si@tab@exptest}[1]{%
   \edef\si@tempa{\si@tab@meaning{#1}}%
   \ifx\si@tempa\si@tab@macro
+    \expandafter\si@tab@exptest@aux
+  \else
+    \expandafter\si@tab@othertok
+  \fi
+  {#1}%
+}
+\newcommand*{\si@tab@exptest@aux}[1]{%
+  \ifcsname\expandafter\@gobble\string#1 \endcsname
+    \si@tab@othertok{#1}%
+  \else
     \si@log@debug{Expanding cell contents `\unexpanded{#1}'}%
     \the\si@tab@pretoks
     \si@tab@pretoks{}%
     \protected@edef\si@tab@next{\noexpand\si@tab@gettok@S#1}%
-  \else
-    \si@tab@othertok{#1}%
-  \fi}
+  \fi
+}
 \newcommand*{\si@tab@meaning}[1]{%
   \expandafter\si@tab@strip\meaning#1:->:->\@empty}
 \def\si@tab@strip#1:->#2:->#3\@empty{#1}
-- 
cgit v1.2.3

