datatool (10jun14)

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

20 files changed, 78 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index ff065adeb16..cd5ac54b758 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,21 @@
+v2.22:
+
+  * datatool-base:
+
+   - Bug fix: removed \@dtl@choptrailingzeroes from
+     \@dtl@decimaltolocalefrac (interfering with \DTLround)
+
+  * datatool:
+
+   - added "autokeys" option to \DTLloaddb and \DTLloadrawdb
+
+  * databib:
+
+   - new commands: \DTLbibfieldlet, \DTLformatthisbibentry,
+     \DTLpcite, \DTLcustombibitem, \DTLformatbooktitle
+
+
+
 v2.21:
 
   * datatool:
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index df1c3a5b00b..4e551211d9d 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.21 
+LaTeX Bundle : datatool v2.22 
 
-Last Modified : 2014-03-08
+Last Modified : 2014-06-10
 
 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 7c25b37d2b8..7ca6fba6710 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 65f3f640479..db0bb8965f4 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 25ab4e4d173..32208ad80e5 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.21}
+ \title{User Manual for datatool bundle version~2.22}
  \author{Nicola L.C. Talbot\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2014-03-08}
+ \date{2014-06-10}
  \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.21}
+  read \qt{Documented Code for datatool v2.22}
 
   \item[INSTALL] Installation instructions.
 
@@ -2290,6 +2290,15 @@ For example:
 \DTLloaddb[noheader,keys={Temperature,Time,T2G}]{data}{data.csv}
 \end{verbatim}
 
+\item[\csopt{DTLloaddb}{autokeys}] This is a boolean option that
+will automatically assign default keys (\cs{dtldefaultkey}\meta{n},
+as above) for all columns, regardless of whether the file has a
+header row. If true, this option overrides the
+\csopt{DTLloaddb}{keys} option. You may want to use this if you have
+a header row with many fields containing active characters but you
+only want to use commands like \cs{DTLdisplaydb}. (In which case,
+you may want to consider using \cs{DTLloadrawdb} to load the data.)
+
 \item[\csopt{DTLloaddb}{headers}] This is a comma-separated list of 
 headers. If not supplied, the header will be the same as that given
 in the header row, or the key if there is no header row. Note that
@@ -9644,6 +9653,16 @@ However, if there are only two author or editor names,
 \DescribeMacro{\DTLtwoand}\cs{DTLtwoand}
 is used instead of \cs{DTLandlast}.
 
+\DescribeMacro\DTLbibitem
+The command \cs{DTLbibitem} is used at the start of each
+bibliography item. It uses \cs{bibitem} to provide a marker, 
+such as [1], and writes the citation information to the
+\texttt{.aux} file.
+
+\DescribeMacro\DTLmbibitem
+The command \cs{DTLmbibitem} is analogous to \cs{DTLbibitem} but is
+for use with \cs{DTLmbibliography}.
+
 \DescribeMacro{\DTLendbibitem}
 The command \cs{DTLendbibitem} is a hook provided to add 
 additional information at the end of each bibliography item.
@@ -9816,6 +9835,12 @@ where \meta{field label} may be one of: "Address", "Author",
 "Title", "Type", "Volume", "Year", "ISBN", "DOI", "PubMed",
 "Abstract" or "Url".
 
+Alternatively, you can assign the value of a field to a control
+sequence \meta{cs} using:
+\begin{definition}[\DescribeMacro\DTLbibfieldlet]
+\cs{DTLbibfieldlet}\marg{cs}\marg{field label}
+\end{definition}
+
 You can determine if a field exists for a given entry using
 \begin{definition}[\DescribeMacro{\DTLifbibfieldexists}]%
 \cs{DTLifbibfieldexists}\marg{field label}\marg{true part}\marg{false
@@ -9847,6 +9872,21 @@ by the bibliography style. There is also a~version for use with
 \begin{definition}[\DescribeMacro{\gDTLformatbibentry}]%
 \cs{gDTLformatbibentry}
 \end{definition}
+It's also possible to use \cs{DTLformatbibentry} for a specific key,
+rather than using it within \ics{DTLforeachbibentry} using:
+\begin{definition}
+\cs{DTLformatthisbibentry}\marg{db}\marg{cite key}
+\end{definition}
+where \meta{db} is the database name and \meta{cite key} is the
+citation label. Note that none of these three commands use
+\cs{bibitem}. You can manually insert \cs{bibitem}\marg{cite key}
+in front of the command, or you can use:
+\begin{definition}
+\cs{DTLcustombibitem}\marg{marker code}\marg{ref text}\marg{cite key}
+\end{definition} 
+This is like \cs{bibitem}\oarg{text}\marg{cite key} except that it uses
+\meta{marker code} instead of \cs{item}\oarg{text} and it uses
+\meta{ref text} instead of \verb|\the\value{\@listctr}|.
 
 \begin{definition}[\DescribeMacro{\DTLcomputewidestbibentry}]%
 \cs{DTLcomputewidestbibentry}\marg{conditions}\marg{db 
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv b/Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv
new file mode 100644
index 00000000000..3272841e387
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv
@@ -0,0 +1,3 @@
+Product,Price ($)
+Fruit & Veg,0.50
+Cake & Biscuits,0.80
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
new file mode 100644
index 00000000000..c11dc191e5f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex
new file mode 100644
index 00000000000..48df7a814fb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex
@@ -0,0 +1,12 @@
+\documentclass{article}
+
+\usepackage{color}
+\usepackage{datatool}
+
+\begin{document}
+\DTLloadrawdb[autokeys]{data}{rawdata3.csv}
+
+\DTLdisplaydb{data}
+
+
+\end{document}
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 32105fbb3df..08aaf9dbe91 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
index 4a1f512a56b..f866d058548 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
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 73c3569c736..e8b6521595d 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-europecv-bib.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
index 63ad2749252..9fe0a63135d 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.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 63df880b647..8b59b712a32 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-glossary.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
index d9fc71b212b..2fe5fb0c6d3 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 47f289c4994..831c1695e0d 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 3f5eb9cde7f..a5296a0191b 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 0d57d1b5653..d43eb8defee 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-sort.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
index 9491afb760f..28fee46c6ea 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.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 536af516690..ca3fd9277fe 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 85a9334a3b7..b8a6000b12a 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