datatool (28jun13)

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

17 files changed, 92 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index aafffbec6b0..657f9fc5724 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,33 @@
+v2.14:
+
+ * datatool:
+
+  - fixed bug in \@dtl@updatekeys
+    (Bug report: http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=20)
+
+  - fixed \DTLsaverawdb so that it works when there are fragile
+    commands in database entries
+
+
+ * dataplot:
+
+  - refactored \DTLplot to help prevent large data values exceeding
+    TeX's maximum dimensions
+
+  - aded tikz calc library as a requirement
+
+ * datagidx:
+
+  - added 'condition' key to \printterms
+
+  - added \postnewtermhook, \newtermfield, \ifnewtermfield,
+    \datagidxdb
+
+  - fixed bug in 'gloss' style that displayed multiple "see also"
+    lines for entries that have children.
+
+ * Fixed minor typos in user manual
+
 v2.13:
 
  * Added new package `datagidx'
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index b344b39a9bb..f9fa3ee5c74 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.13 
+LaTeX Bundle : datatool v2.14 
 
-Last Modified : 2013-01-15
+Last Modified : 2013-06-28
 
 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 38a648fb1f4..1925afd9794 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
index cc86ab5d26e..ae0e4ce277e 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
index a38dc6c7060..d2cb0a0eb38 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
@@ -82,20 +82,20 @@
 
 \newterm[see={caiman}]{cayman}
 
-
 \begin{document}
 % Some of the commands are too long to produce nicely formatted
 % paragraphs so use ragged-right:
 \raggedright
+\setlength{\parindent}{1em}%
 
 \MakeShortVerb{"}
 \DeleteShortVerb{\|}
 
- \title{User Manual for datatool bundle version~2.13}
+ \title{User Manual for datatool bundle version~2.14}
  \author{Nicola L.C. Talbot\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2013-01-15}
+ \date{2013-06-28}
  \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.13}
+  read \qt{Documented Code for datatool v2.14}
 
   \item[INSTALL] Installation instructions.
 
@@ -2004,8 +2004,8 @@ attempting to use it as such is like trying to fasten a screw
 with a knife instead of a screwdriver: it can be done, but requires
 great care and is more time consuming. Version 2.0 of the
 \sty{datatool} package uses a completely different method of storing
-the data to previous versions.\footnote{Thanks to Morten H\o gholm
-for the suggestion.} As a result, the code is much more efficient,
+the data to previous versions.\footnote{Many thanks to Morten H\o gholm
+for providing the new code.} As a result, the code is much more efficient,
 however, large databases and complex operations will still slow the
 time taken to process your document. Therefore, if you can, it is
 better to do the complex operations using whatever system created
@@ -2017,6 +2017,15 @@ described in \autoref{sec:advanced}, but using \TeX\ is nowhere near
 as efficient as, say, using a SQL database, so don't expect too much
 from this package.
 
+
+I'm working on a Java helper application to accompany \sty{datatool}
+called \app{datatooltk}. The source code is available on GitHub at
+\url{https://github.com/nlct/datatooltk}. I'll upload it to CTAN
+when it's ready for release. The application will allow you to edit
+files saved using \ics{DTLsaverawdb} in a~graphical interface or
+import data from a~SQL database, a~CSV file or a~\sty{probsoln}
+dataset.
+
 \section{Creating a New Database}
 \label{sec:newdb}
 
@@ -5142,7 +5151,7 @@ Gets the value from \cs{dtlcurrentrow} for the column given by
 control sequence.
 
 \begin{definition}[\DescribeMacro{\dtlreplaceentryincurrentrow}]
-\cs{dtlreplaceentryincurrentrow}\meta{new value}\marg{col idx}
+\cs{dtlreplaceentryincurrentrow}\marg{new value}\marg{col idx}
 \end{definition}
 Replaces the value in \cs{dtlcurrentrow} for the column given by
 \meta{col idx} (an integer) with \meta{new value}.
@@ -5170,7 +5179,7 @@ Appends \meta{value} to the current row for column given by
 \meta{key}. (Produces an error if there is already an entry for that
 column in the current row.)
 
-\begin{definition}[\DescribeMacro{\dtlappendentrytocurrentrow}]
+\begin{definition}[\DescribeMacro{\dtlupdateentryincurrentrow}]
 \cs{dtlupdateentryincurrentrow}\marg{key}\marg{value}
 \end{definition}
 Behaves like \cs{dtlappendentrytocurrentrow} if the current row
@@ -6274,6 +6283,14 @@ If \textsf{true}, the columns are balanced. If \textsf{false}, the
 columns aren't balanced. If no value is specified, \textsf{true} is
 assumed.
 
+\item[\csopt{printterms}{condition}] This specifies a boolean
+condition (as used by \ics{DTLforeach}) so you can display only
+those entries where the condition is met. For example, to only
+display entries starting with ``H'' (not including any entry that is
+just the letter ``H'') you can do:
+\begin{verbatim}
+\printterms[condition={\DTLisiopenbetween{\Name}{H}{I}}]
+\end{verbatim}
 \end{description}
 
 \subsection{Index or Glossary Styles}
@@ -7344,12 +7361,12 @@ Suppose you have a file called "groupa.csv" that contains the
 following:
 \DTLnewdb{groupa}\relax
 \DTLnewrow{groupa}\relax
-\DTLnewdbentry{groupa}{Height}{1.55}\relax
-\DTLnewdbentry{groupa}{Weight}{45.4}\relax
-\DTLnewrow{groupa}\relax
 \DTLnewdbentry{groupa}{Height}{1.54}\relax
 \DTLnewdbentry{groupa}{Weight}{48.0}\relax
 \DTLnewrow{groupa}\relax
+\DTLnewdbentry{groupa}{Height}{1.55}\relax
+\DTLnewdbentry{groupa}{Weight}{45.4}\relax
+\DTLnewrow{groupa}\relax
 \DTLnewdbentry{groupa}{Height}{1.56}\relax
 \DTLnewdbentry{groupa}{Weight}{58.0}\relax
 \DTLnewrow{groupa}\relax
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
index 60711b2cfcd..f577cf34278 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
new file mode 100644
index 00000000000..7cf69ccb5bb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.tex b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.tex
new file mode 100644
index 00000000000..dec5f1582bb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.tex
@@ -0,0 +1,19 @@
+% Sample file used with datatooltk
+\documentclass{article}
+
+\usepackage{datatool}
+
+% load database that was either previously saved using
+% \DTLsaverawdb{mydata}{data-raw.dbtex}
+% or created and saved using datatooltk
+
+\input{data-raw.dbtex}
+
+\begin{document}
+
+\DTLdisplaydb{mydata}
+
+% Save to a new file to test \DTLsaverawdb:
+
+\DTLsaverawdb{mydata}{data-raw-saved.dbtex}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
index 90a504b882b..525cbcde12f 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
index eb3c2b9f78f..26100c2a282 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.tex b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.tex
index e5c0d2eafb5..1bc51095389 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.tex
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.tex
@@ -257,7 +257,7 @@
 \DTLgidxSetDefaultDB{glossary}
 
 \newterm[description={sea mammal with flippers that eats fish}]{seal}
-\newterm[description={large seal}]{sea lion}
+\newterm[description={large seal},seealso={seal}]{sea lion}
 
 \newterm{bravo}
 \newterm
@@ -277,9 +277,21 @@
  {bravo}
 
 \newterm
+ [%
+   plural={indices\glsadd{ind-index}},
+   altplural={indexes},
+   text={index\glsadd{ind-index}},
+   description={an alphabetical list of names or subjects with
+   references to their location in the document (pl.\ indices or
+   indexes)}
+ ]
+ {index\glsadd{[glossaryloc]ind-index}}
+
+\newterm
  [% options
    text={glossary\glsadd{ind-glossary}},
    plural={glossaries\glsadd{ind-glossary}},
+   seealso={index}%
  ]%
  {glossary\glsadd{ind-glossary}}
 
@@ -304,17 +316,6 @@
  {glossary\glsadd{[glossaryloc]ind-glossary}}
 
 \newterm
- [%
-   plural={indices\glsadd{ind-index}},
-   altplural={indexes},
-   text={index\glsadd{ind-index}},
-   description={an alphabetical list of names or subjects with
-   references to their location in the document (pl.\ indices or
-   indexes)}
- ]
- {index\glsadd{[glossaryloc]ind-index}}
-
-\newterm
   [% options
    label=pglist,
    % description contains commas so it must be grouped
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
index df054ced862..241bf8295e3 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
index 03e95157250..b1acc29d28d 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
index bbc7a7dfb5f..ffe0f8ad7bc 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
index 99d2c261975..c8b3a8d3ebf 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
index 6e640ed055c..c8edaa3ee32 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
index 2f9b601552d..53785b034ce 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf