From 5b1c9fe4a8686f1d474467ad220e0714515d2a73 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Feb 2014 23:45:48 +0000 Subject: datatool (3feb14) git-svn-id: svn://tug.org/texlive/trunk@32860 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 12 ++++++ Master/texmf-dist/doc/latex/datatool/README | 8 ++-- .../doc/latex/datatool/datatool-code.pdf | Bin 908802 -> 913625 bytes .../doc/latex/datatool/datatool-user.pdf | Bin 600057 -> 601441 bytes .../doc/latex/datatool/datatool-user.tex | 43 +++++++++++++++++---- .../doc/latex/datatool/samples/sample-barchart.pdf | Bin 35074 -> 35074 bytes .../latex/datatool/samples/sample-datatooltk.pdf | Bin 22860 -> 22860 bytes .../doc/latex/datatool/samples/sample-dict.pdf | Bin 122594 -> 122594 bytes .../doc/latex/datatool/samples/sample-gidx.pdf | Bin 180116 -> 180122 bytes .../doc/latex/datatool/samples/sample-glossary.pdf | Bin 104736 -> 104729 bytes .../doc/latex/datatool/samples/sample-index.pdf | Bin 128783 -> 128783 bytes .../latex/datatool/samples/sample-mail-merge.pdf | Bin 21642 -> 21885 bytes .../doc/latex/datatool/samples/sample-piechart.pdf | Bin 33964 -> 33964 bytes .../doc/latex/datatool/samples/sample-sort.pdf | Bin 61053 -> 61053 bytes .../datatool/samples/sample-student-scores.pdf | Bin 34615 -> 34615 bytes .../latex/datatool/samples/sample-two-per-row.pdf | Bin 31752 -> 31752 bytes 16 files changed, 53 insertions(+), 10 deletions(-) (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 175bfb35174..ef25ed86ad0 100644 --- a/Master/texmf-dist/doc/latex/datatool/CHANGES +++ b/Master/texmf-dist/doc/latex/datatool/CHANGES @@ -1,3 +1,15 @@ +v2.20: + + * datatool: + + - added \DTLloaddbtex + + - added \DTLifnullorempty + + - added \DTLassignfirstmatch and \xDTLassignfirstmatch + + - Fixed bug in \DTLforeach* (\@dtl@dbname undefined) + v2.19: * datatool: diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README index 9f93eadae57..283cdcb7a0f 100644 --- a/Master/texmf-dist/doc/latex/datatool/README +++ b/Master/texmf-dist/doc/latex/datatool/README @@ -1,9 +1,11 @@ -LaTeX Bundle : datatool v2.19 +LaTeX Bundle : datatool v2.20 -Last Modified : 2014-01-17 +Last Modified : 2014-02-03 Author : Nicola Talbot +Package FAQ : http://www.dickimaw-books.com/faqs/datatoolfaq.html + This bundle consists of the packages: datatool.sty, datatool-base.sty, datatool-fp.sty, datatool-pgfmath.sty, databar.sty, databib.sty, datapie.sty dataplot.sty, datagidx.sty @@ -128,7 +130,7 @@ The package and documentation source code is also supplied as a dtx and ins file located in texmf/source. This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license. +See http://www.ctan.org/license/lppl1.3 for the details of that license. http://www.dickimaw-books.com/ diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf index a0192a52006..9d28367745b 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 a1941a87ab8..9833f3266f6 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 372ca7d0299..db2f306c297 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.19} + \title{User Manual for datatool bundle version~2.20} \author{Nicola L.C. Talbot\\ \url{http://www.dickimaw-books.com/}} - \date{2014-01-17} + \date{2014-02-03} \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.19} + read \qt{Documented Code for datatool v2.20} \item[INSTALL] Installation instructions. @@ -2227,7 +2227,7 @@ parse files that have newline characters within entries. The \app{datatooltk} application (see page~\pageref{datatooltk}) can parse them, so if you have multilined entries in a CSV file, you can convert it to \sty{datatool}'s internal database format using -\app{datatooltk} and the input it using \ics{input}. See the +\app{datatooltk} and the input it using \ics{input} or \ics{DTLloaddbtex}. See the \app{datatooltk} documentation for further details. \end{important} @@ -2498,7 +2498,7 @@ of key=value pairs. The following keys are available: \item[contcaption] The continuation caption. -\item[shortcaption] The caption to be used in the list of figures. +\item[shortcaption] The caption to be used in the list of tables. \item[label] The label for this table. @@ -3801,11 +3801,19 @@ This is the null value for a number. \begin{definition}[\DescribeMacro{\DTLifnull}]% \cs{DTLifnull}\marg{cmd}\marg{true part}\marg{false part} \end{definition} -This checks if \meta{cmd} is null where \meta{cmd} is a command name, +This checks if \meta{cmd} is null where \meta{cmd} is a control +sequence, if it is, then \meta{true part} is done, otherwise \meta{false part} is done. This macro is illustrated in \autoref{ex:null} below. +\begin{definition}[\DescribeMacro{\DTLifnullorempty}] +\cs{DTLifnullorempty}\marg{cmd}\marg{true part}\marg{false part} +\end{definition} +This checks if \meta{cmd} is null or empty, where \meta{cmd} is a +control sequence. If it is it does \meta{true part}, otherwise +\meta{false part}. + \begin{example}{Null Values}{ex:null} Consider the following (which creates a database called "emailDB"): \begin{verbatim} @@ -4863,7 +4871,14 @@ any use: \begin{definition}[\DescribeMacro{\DTLprotectedsaverawdb}]% \cs{DTLprotectedsaverawdb}\marg{db name}\marg{filename} \end{definition} -instead. +instead. The \app{datatooltk} application +can read and write this raw format. To load a file in this format +you can just use \cs{input} or you can use: +\begin{definition} +\cs{DTLloaddbtex}\marg{cs}\marg{file} +\end{definition} +This checks for the file's existence and assigns the database name to the +control sequence \meta{cs}. \begin{important} If you find a~problem caused by \TeX's automatic insertion of a line @@ -5068,6 +5083,20 @@ This (globally) assigns the list of commands in \meta{assign list} for row \meta{row idx} in database \meta{db name}, where \meta{assign list} has the same format as in \ics{DTLforeach}. +\begin{definition} +\cs{DTLassignfirstmatch}\marg{db name}\marg{col key}\marg{value}\marg{assign list} +\end{definition} +This is similar to \cs{DTLassign} except that it applies to the +first row in the given database where the column identified by the +label \meta{col key} has the given value. Note that no expansion is +performed in the match. The value must be an exact match. + +\begin{definition} +\cs{xDTLassignfirstmatch}\marg{db name}\marg{col key}\marg{value}\marg{assign list} +\end{definition} +This is like \cs{DTLassignfirstmatch} but performs a~\emph{one-level} +expansion on \meta{value}. + Two rows can be swapped using: \begin{definition}[\DescribeMacro{\DTLswaprows}]% \cs{DTLswaprows}\marg{db name}\marg{row1 index}\marg{row2 index} 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 17044288c1b..b150c9f9fef 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 393b0bd3cf5..0758d182ba8 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 684937017cf..160f341c484 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-gidx.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf index d2d1b4fe58a..74bef9cc213 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 701f67fc3c8..1efa20caaa6 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 a9bbadda262..1fd01ce35b8 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 d37597a1005..18c7c59c940 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 59a472f70e2..92223a3d67d 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 4d8764d920e..06ddbdc1fe2 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 80681527934..0ac59407a3e 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 5a91c1b86b7..0832275c680 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