From 20149d661e5c2763abbd1999e6c76bba077bdb12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 Jun 2014 23:15:16 +0000 Subject: datatool (10jun14) git-svn-id: svn://tug.org/texlive/trunk@34305 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 18 ++++++++ Master/texmf-dist/doc/latex/datatool/README | 4 +- .../doc/latex/datatool/datatool-code.pdf | Bin 918044 -> 922877 bytes .../doc/latex/datatool/datatool-user.pdf | Bin 603313 -> 605320 bytes .../doc/latex/datatool/datatool-user.tex | 46 +++++++++++++++++++-- .../doc/latex/datatool/samples/rawdata3.csv | 3 ++ .../doc/latex/datatool/samples/sample-autokeys.pdf | Bin 0 -> 24927 bytes .../doc/latex/datatool/samples/sample-autokeys.tex | 12 ++++++ .../doc/latex/datatool/samples/sample-barchart.pdf | Bin 35074 -> 35078 bytes .../latex/datatool/samples/sample-datatooltk.pdf | Bin 22860 -> 22872 bytes .../doc/latex/datatool/samples/sample-dict.pdf | Bin 122594 -> 122606 bytes .../latex/datatool/samples/sample-europecv-bib.pdf | Bin 89562 -> 89563 bytes .../doc/latex/datatool/samples/sample-gidx.pdf | Bin 179875 -> 179702 bytes .../doc/latex/datatool/samples/sample-glossary.pdf | Bin 104484 -> 104321 bytes .../doc/latex/datatool/samples/sample-index.pdf | Bin 128783 -> 128798 bytes .../latex/datatool/samples/sample-mail-merge.pdf | Bin 21619 -> 21627 bytes .../doc/latex/datatool/samples/sample-piechart.pdf | Bin 33964 -> 33976 bytes .../doc/latex/datatool/samples/sample-sort.pdf | Bin 61053 -> 61072 bytes .../datatool/samples/sample-student-scores.pdf | Bin 34615 -> 34627 bytes .../latex/datatool/samples/sample-two-per-row.pdf | Bin 31752 -> 31764 bytes 20 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv create mode 100644 Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf create mode 100644 Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex (limited to 'Master/texmf-dist/doc/latex/datatool') 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 Binary files a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf and b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf and b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf differ 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 Binary files /dev/null and b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf differ -- cgit v1.2.3