datatool 2.02 (13jul09)

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

6 files changed, 29 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index 2e023176171..397e19c756b 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,10 @@
+v2.02 (2009/07/13):
+ * fixed bug caused by undefined \@dtlifhaskey (should be 
+   \@DTLifhaskey)
+ * fixed bug caused by undefined \dtl@getcolumnindex (should
+   be \@dtl@getcolumnindex)
+ * fixed bug in \DTLsavedb that ignores the file name
+
 v2.01 (2009/03/27):
  * fixed bug that ignores descending sort option
 
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index 186bf32e38a..7ae2effb4ae 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.01 (datatool.sty, datapie.sty, dataplot.sty, databar.sty, databib.sty)

+LaTeX Bundle : datatool v2.02 (datatool.sty, datapie.sty, dataplot.sty, databar.sty, databib.sty)

 

-Last Modified : 27 March 2009

+Last Modified : 13th July 2009

 

 Author        : Nicola Talbot

 

diff --git a/Master/texmf-dist/doc/latex/datatool/datatool.pdf b/Master/texmf-dist/doc/latex/datatool/datatool.pdf
index a6d986f67a3..8cdcba6b253 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool.pdf
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx
index 082f774be77..8db14f657ed 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -15,7 +15,7 @@
 %   -doc "manual.tex"
 %   -codetitle "datatool.sty"
 %   datatool
-% Created on 2009/3/27 12:09
+% Created on 2009/7/13 10:04
 %\fi
 %\iffalse
 %<*package>
@@ -80,7 +80,7 @@
 \makeatother
 \RecordChanges
 \PageIndex
-\CheckSum{15417}
+\CheckSum{15418}
 
 \newcommand*{\sty}[1]{\textsf{#1}}
 \newcommand*{\env}[1]{\textsf{#1}}
@@ -173,7 +173,7 @@ options>#2=\textsf{#2}|hyperpage}}
 %\MakeShortVerb{"}
 %\DeleteShortVerb{\|}
 %
-% \title{datatool v 2.01: Databases and data manipulation}
+% \title{datatool v 2.02: Databases and data manipulation}
 % \author{Nicola L.C. Talbot\\[10pt]
 %School of Computing Sciences\\
 %University of East Anglia\\
@@ -181,7 +181,7 @@ options>#2=\textsf{#2}|hyperpage}}
 %NR4 7TJ. United Kingdom.\\
 %\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
 %
-% \date{27th March 2009}
+% \date{13th July 2009}
 % \maketitle
 %\tableofcontents
 %\listofexamples
@@ -7320,7 +7320,7 @@ options>#2=\textsf{#2}|hyperpage}}
 %\subsection{Package Declaration}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2009/03/27 v2.01 (NLCT)]
+\ProvidesPackage{datatool}[2009/07/13 v2.02 (NLCT)]
 %    \end{macrocode}
 % Load required packages:
 %    \begin{macrocode}
@@ -11708,7 +11708,7 @@ options>#2=\textsf{#2}|hyperpage}}
 %    \begin{macrocode}
   \DTLifdbexists{#2}%
   {%
-    \@dtlifhaskey{#2}{#3}%
+    \@DTLifhaskey{#2}{#3}%
     {%
       \@sdtlforcolumn{#1}{#2}{#3}{#4}%
     }%
@@ -12551,12 +12551,12 @@ options>#2=\textsf{#2}|hyperpage}}
 %    \end{macrocode}
 % Is there a column corresponding to this key?
 %    \begin{macrocode}
-      \@dtlifhaskey{\@dtl@thisdb}{#1}%
+      \@DTLifhaskey{\@dtl@thisdb}{#1}%
       {%
 %    \end{macrocode}
 % There exists a column for this key, so get the index:
 %    \begin{macrocode}
-        \dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
+        \@dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
         \dtlcolumnnum=\thiscol\relax
 %    \end{macrocode}
 % Set \cs{dtlcurrentrow} to the current row
@@ -12651,12 +12651,12 @@ options>#2=\textsf{#2}|hyperpage}}
 %    \end{macrocode}
 % Is there a column corresponding to this key?
 %    \begin{macrocode}
-      \@dtlifhaskey{\@dtl@thisdb}{#1}%
+      \@DTLifhaskey{\@dtl@thisdb}{#1}%
       {%
 %    \end{macrocode}
 % There exists a column for this key, so get the index:
 %    \begin{macrocode}
-        \dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
+        \@dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
         \dtlcolumnnum=\thiscol\relax
 %    \end{macrocode}
 % Set \cs{dtlcurrentrow} to the current row
@@ -16208,8 +16208,9 @@ options>#2=\textsf{#2}|hyperpage}}
   {%
 %    \end{macrocode}
 % Open output file
+%\changes{2.02}{2009 July 13}{Fixed bug that didn't set the filename}
 %    \begin{macrocode}
-    \openout\@dtl@write
+    \openout\@dtl@write=#2\relax
 %    \end{macrocode}
 % Initialise header row
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index ca42c27fb47..8dc5e7e9d71 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 2009/3/27 12:09
+% datatool.ins generated using makedtx version 0.94b 2009/7/13 10:04
 \input docstrip
 
 \preamble
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty
index 8127cb80ba8..1d630179591 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}[2009/03/27 v2.01 (NLCT)]
+\ProvidesPackage{datatool}[2009/07/13 v2.02 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{ifthen}
 \RequirePackage{xfor}
@@ -2080,7 +2080,7 @@
 \newcommand{\@dtlforcolumn}[4]{%
   \DTLifdbexists{#2}%
   {%
-    \@dtlifhaskey{#2}{#3}%
+    \@DTLifhaskey{#2}{#3}%
     {%
       \@sdtlforcolumn{#1}{#2}{#3}{#4}%
     }%
@@ -2506,9 +2506,9 @@
     {%
       \dtlrownum=
         \csname dtl@row\romannumeral\dtlforeachlevel\endcsname\relax
-      \@dtlifhaskey{\@dtl@thisdb}{#1}%
+      \@DTLifhaskey{\@dtl@thisdb}{#1}%
       {%
-        \dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
+        \@dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
         \dtlcolumnnum=\thiscol\relax
         \dtlcurrentrow =
           \csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname
@@ -2562,9 +2562,9 @@
     {%
       \dtlrownum=
         \csname dtl@row\romannumeral\dtlforeachlevel\endcsname\relax
-      \@dtlifhaskey{\@dtl@thisdb}{#1}%
+      \@DTLifhaskey{\@dtl@thisdb}{#1}%
       {%
-        \dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
+        \@dtl@getcolumnindex{\thiscol}{\@dtl@thisdb}{#1}\relax
         \dtlcolumnnum=\thiscol\relax
         \dtlcurrentrow =
           \csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname
@@ -4231,7 +4231,7 @@
 \newcommand*{\DTLsavedb}[2]{%
   \DTLifdbexists{#1}%
   {%
-    \openout\@dtl@write
+    \openout\@dtl@write=#2\relax
     \def\@dtl@header{}%
     \dtlforeachkey(\@dtl@key,\@dtl@col,\@dtl@type,\@dtl@head)%
       \in{#1}\do