datatool (16aug13)

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

1 files changed, 22 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
index ccbc209a9ca..dc786fc4414 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{datatool-base}[2013/08/16 v2.16 (NLCT)]
 \RequirePackage{etoolbox}
 \RequirePackage{amsmath}
 \RequirePackage{xkeyval}
@@ -1246,27 +1246,30 @@
 \newcount\@dtl@datatype
 \newcommand{\@dtl@checknumerical}[1]{%
   \@dtl@numgrpsepfalse
-  \def\@dtl@tmp{#1}%
-  \ifstrempty{#1}%
+  \dtl@ifsingle{#1}%
   {%
-   \@dtl@datatype=0\relax
+    \expandafter\toks@\expandafter{#1}%
+    \edef\@dtl@tmp{\the\toks@}%
   }%
   {%
-   \dtl@ifsingle{#1}%
-   {\expandafter\toks@\expandafter{#1}%
-   \edef\@dtl@tmp{\the\toks@}}%
-   {\def\@dtl@tmp{#1}}%
-   \@dtl@tmpcount=0\relax
-   \@dtl@datatype=0\relax
-   \@dtl@numgrpsepcount=2\relax
-   \@dtl@standardize@currency\@dtl@tmp
-   \ifdefempty{\@dtl@org@currency}%
-   {%
-   }%
-   {%
-     \let\@dtl@currency\@dtl@org@currency
-   }%
-   \expandafter\@dtl@checknumericalstart\@dtl@tmp\@nil\@nil
+    \def\@dtl@tmp{#1}%
+  }%
+  \ifdefempty\@dtl@tmp
+  {%
+    \@dtl@datatype=0\relax
+  }%
+  {%
+    \@dtl@tmpcount=0\relax
+    \@dtl@datatype=0\relax
+    \@dtl@numgrpsepcount=2\relax
+    \@dtl@standardize@currency\@dtl@tmp
+    \ifdefempty{\@dtl@org@currency}%
+    {%
+    }%
+    {%
+      \let\@dtl@currency\@dtl@org@currency
+    }%
+    \expandafter\@dtl@checknumericalstart\@dtl@tmp\@nil\@nil
   }%
   \ifnum\@dtl@numgrpsepcount>-1\relax
     \if@dtl@numgrpsep