summaryrefslogtreecommitdiff
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
parent07971807299d88bdaf939da9bc42f322fad80df8 (diff)
datatool (16aug13)
git-svn-id: svn://tug.org/texlive/trunk@31449 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/datatool/CHANGES13
-rw-r--r--Master/texmf-dist/doc/latex/datatool/README4
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-code.pdfbin909585 -> 909367 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.pdfbin591809 -> 591660 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.tex10
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx71
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins2
-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
10 files changed, 89 insertions, 63 deletions
diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index 65bda9bbd0b..2621cba5d8e 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,16 @@
+v2.16:
+
+ * datatool:
+
+ - Fixed bug in \@dtl@updatekeys that causes an error when the
+ data contains fragile commands.
+
+ * datatool-base:
+
+ - Fixed bug in \@dtl@checknumerical that causes an error when the
+ argument is a command that expands to empty.
+
+
v2.15:
* datagidx:
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index 9c1b881e04d..9e39650fbea 100644
--- a/Master/texmf-dist/doc/latex/datatool/README
+++ b/Master/texmf-dist/doc/latex/datatool/README
@@ -1,6 +1,6 @@
-LaTeX Bundle : datatool v2.15
+LaTeX Bundle : datatool v2.16
-Last Modified : 2013-07-10
+Last Modified : 2013-08-16
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
index fde7720c668..657be69514f 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
index f76bd3eefe8..27c4682aeae 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
index 2caff13201c..fbc7cad8a99 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
@@ -91,11 +91,11 @@
\MakeShortVerb{"}
\DeleteShortVerb{\|}
- \title{User Manual for datatool bundle version~2.15}
+ \title{User Manual for datatool bundle version~2.16}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2013-07-10}
+ \date{2013-08-16}
\maketitle
\pagenumbering{roman}
@@ -110,7 +110,7 @@ The \styfmt{datatool} bundle comes with the following documentation:
\item[\url{datatool-code.pdf}]
Advanced users wishing to know more about the inner workings of
all the packages provided in the \styfmt{datatool} bundle should
- read \qt{Documented Code for datatool v2.15}
+ read \qt{Documented Code for datatool v2.16}
\item[INSTALL] Installation instructions.
@@ -4379,8 +4379,8 @@ the data type for a given key, and uses this to determine whether
an alphabetical or numerical sort is required.
The final argument \meta{handler} is the command used for the
-comparisons. These handlers are described in more detail in
-\autoref{src:dtlcompare} of the documented code. The following
+comparisons. These handlers are described in more detail on
+page~\pageref*{src:dtlcompare} of the documented code (datatool-code.pdf). The following
handlers are provided:
\begin{description}
\item[\ics{dtlcompare}] A case-sensitive comparison.
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx
index ed09b5a23ac..bab6974643b 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -17,7 +17,7 @@
% -author "Nicola Talbot"
% -codetitle ""
% datatool
-% Created on 2013/7/10 13:59
+% Created on 2013/8/16 12:48
%\fi
%\iffalse
%<*package>
@@ -64,7 +64,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{22994}
+\CheckSum{22987}
\RecordChanges
\PageIndex
@@ -77,11 +77,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.15}
+%\title{Documented Code for datatool v2.16}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2013-07-10}
+%\date{2013-08-16}
%\maketitle
%
%\pagenumbering{roman}
@@ -116,7 +116,7 @@ datatool.dtx
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{datatool-base}[2013/08/16 v2.16 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -2266,27 +2266,33 @@ datatool.dtx
% \begin{macrocode}
\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}%
+ }%
+% \end{macrocode}
+%\changes{2.16}{2013-08-16}{Moved empty check}
+% \begin{macrocode}
+ \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
@@ -5701,7 +5707,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2013/07/10 v2.15 (NLCT)]
+\ProvidesPackage{datatool}[2013/08/16 v2.16 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -6745,9 +6751,11 @@ datatool.dtx
% Is the value empty?
%\changes{2.14}{2013-06-28}{expand value before testing if it's
%empty}
+%\changes{2.16}{2013-08-16}{reverted to not expanding value (2.14 change
+%causes an error with fragile commands). Fix now in
+%\cs{@dtl@checknumerical}}
% \begin{macrocode}
- \protected@edef\dtl@tmp{#3}%
- \ifdefempty\dtl@tmp
+ \ifstrempty{#3}%
{%
% \end{macrocode}
% Leave data type as it is
@@ -12140,7 +12148,7 @@ datatool.dtx
%\end{macro}
%
%\begin{macro}{\DTLprotectedsaverawdb}
-% Like \cs{DTLloaddb} but works with fragile contents. If there's a
+% Like \cs{DTLsaverawdb} but works with fragile contents. If there's a
% problem with unwanted line breaks every 80 characters, try loading
% \sty{morewrites} before \sty{datatool}.
%\changes{2.15}{2013-07-10}{new}
@@ -18172,10 +18180,11 @@ datatool.dtx
\dtlgetrow{#1}{\datagidx@count}%
% \end{macrocode}
% Get the label for this row.
+%\changes{??}{??}{Fixed bug in database reference}
% \begin{macrocode}
\dtlgetentryfromcurrentrow
{\datagidx@label}%
- {\dtlcolumnindex{\newterm@database}{Label}}%
+ {\dtlcolumnindex{#1}{Label}}%
% \end{macrocode}
% Write blank location to the auxiliary file but temporarily undefine
% \cs{hypertarget} as it doesn't make sense to have a target here.
@@ -18186,15 +18195,17 @@ datatool.dtx
\egroup
% \end{macrocode}
% Update the "Used" field.
+%\changes{??}{??}{Fixed bug in database reference}
% \begin{macrocode}
\dtlreplaceentryincurrentrow
- {1}{\dtlcolumnindex{\newterm@database}{Used}}%
+ {1}{\dtlcolumnindex{#1}{Used}}%
% \end{macrocode}
% Get the entry for the "FirstId" field and store in \cs{datagidx@id}
+%\changes{??}{??}{Fixed bug in database reference}
% \begin{macrocode}
\dtlgetentryfromcurrentrow
{\datagidx@id}%
- {\dtlcolumnindex{\newterm@database}{FirstId}}%
+ {\dtlcolumnindex{#1}{FirstId}}%
% \end{macrocode}
% If it hasn't been defined set it.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index 4f5658b9eb3..1e77888877b 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.ins
+++ b/Master/texmf-dist/source/latex/datatool/datatool.ins
@@ -1,4 +1,4 @@
-% datatool.ins generated using makedtx version 0.94b 2013/7/10 13:59
+% datatool.ins generated using makedtx version 0.94b 2013/8/16 12:48
\input docstrip
\preamble
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}%
{%
}%
{%