summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/datatool
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-08-16 23:05:39 +0000
committerKarl Berry <karl@freefriends.org>2013-08-16 23:05:39 +0000
commitbf98c9436ac9d7fca5021fc6a7c641bf60ded210 (patch)
tree60c97881e40cc699b3b475a65ad54348cdd735ef /Master/texmf-dist/tex/latex/datatool
parent07971807299d88bdaf939da9bc42f322fad80df8 (diff)
datatool (16aug13)
git-svn-id: svn://tug.org/texlive/trunk@31449 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool')
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datagidx.sty6
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-base.sty41
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool.sty5
3 files changed, 27 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/datagidx.sty b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
index 53c6e35e0dd..6c2ef481bae 100644
--- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
@@ -2837,16 +2837,16 @@
\dtlgetrow{#1}{\datagidx@count}%
\dtlgetentryfromcurrentrow
{\datagidx@label}%
- {\dtlcolumnindex{\newterm@database}{Label}}%
+ {\dtlcolumnindex{#1}{Label}}%
\bgroup
\undef\hypertarget
\datagidx@target{\datagidx@label}{}{}{}%
\egroup
\dtlreplaceentryincurrentrow
- {1}{\dtlcolumnindex{\newterm@database}{Used}}%
+ {1}{\dtlcolumnindex{#1}{Used}}%
\dtlgetentryfromcurrentrow
{\datagidx@id}%
- {\dtlcolumnindex{\newterm@database}{FirstId}}%
+ {\dtlcolumnindex{#1}{FirstId}}%
\DTLifnull\datagidx@id
{%
\dtlappendentrytocurrentrow{FirstId}{\datagidx@formatanchor\datagidx@anchorcount}%
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
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty
index 4764e53d48d..351ae3e2a41 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2013/07/10 v2.15 (NLCT)]
+\ProvidesPackage{datatool}[2013/08/16 v2.16 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -433,8 +433,7 @@
{\noexpand\@dtl@after}{\the\csname dtlkeys@#1\endcsname}%
{\number\dtlcolumnnum}}%
\@dtl@dogetprops
- \protected@edef\dtl@tmp{#3}%
- \ifdefempty\dtl@tmp
+ \ifstrempty{#3}%
{%
}%
{%