summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/siunitx/siunitx.sty')
-rw-r--r--Master/texmf-dist/tex/latex/siunitx/siunitx.sty22
1 files changed, 18 insertions, 4 deletions
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}