From 10521e719d9d01eb2dfcd64efd2fd2ab1b3530ab Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 May 2018 17:56:53 +0000 Subject: datatool (16apr18) git-svn-id: svn://tug.org/texlive/trunk@47543 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 7 ++++ Master/texmf-dist/doc/latex/datatool/README | 4 +- .../doc/latex/datatool/datatool-code.pdf | Bin 1183498 -> 1184311 bytes .../doc/latex/datatool/datatool-user.pdf | Bin 639593 -> 639231 bytes .../doc/latex/datatool/datatool-user.tex | 45 ++++++++++++--------- .../doc/latex/datatool/samples/sample-autokeys.pdf | Bin 24911 -> 24923 bytes .../doc/latex/datatool/samples/sample-barchart.pdf | Bin 35054 -> 35066 bytes .../latex/datatool/samples/sample-datatooltk.pdf | Bin 22848 -> 22860 bytes .../doc/latex/datatool/samples/sample-dict.pdf | Bin 122418 -> 122428 bytes .../latex/datatool/samples/sample-europecv-bib.pdf | Bin 89544 -> 89557 bytes .../doc/latex/datatool/samples/sample-gidx.pdf | Bin 179794 -> 179796 bytes .../doc/latex/datatool/samples/sample-glossary.pdf | Bin 104427 -> 104427 bytes .../doc/latex/datatool/samples/sample-index.pdf | Bin 128777 -> 128788 bytes .../latex/datatool/samples/sample-mail-merge.pdf | Bin 22122 -> 21869 bytes .../doc/latex/datatool/samples/sample-piechart.pdf | Bin 33945 -> 33957 bytes .../doc/latex/datatool/samples/sample-sort.pdf | Bin 89713 -> 89724 bytes .../datatool/samples/sample-student-scores.pdf | Bin 34602 -> 34614 bytes .../latex/datatool/samples/sample-two-per-row.pdf | Bin 31739 -> 31751 bytes 18 files changed, 36 insertions(+), 20 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 065de4e0230..17613fc75c0 100644 --- a/Master/texmf-dist/doc/latex/datatool/CHANGES +++ b/Master/texmf-dist/doc/latex/datatool/CHANGES @@ -1,3 +1,10 @@ +v2.30 + + * datatool.sty + + - bug fix: spurious spaces in \@dtl@lopoff + (used by \DTLloaddb and DTLloadrawdb) + v2.29 * datatool.sty: diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README index 235d519262e..6ab220d637c 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.29 +LaTeX Bundle : datatool v2.30 -Last Modified : 2017-11-12 +Last Modified : 2018-04-16 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 3e675a4d750..b983b74ef2b 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 c30a9d4c59f..c0c2615b5f2 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 15581834dc6..aeefbfea21a 100644 --- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex +++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex @@ -103,11 +103,11 @@ \MakeShortVerb{"} - \title{User Manual for datatool bundle version~2.29} + \title{User Manual for datatool bundle version~2.30} \author{Nicola L.C. Talbot\\ \url{http://www.dickimaw-books.com/}} - \date{2017-11-12} + \date{2018-04-16} \maketitle \pagenumbering{roman} @@ -122,7 +122,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.29} + read \qt{Documented Code for datatool v2.30} \item[INSTALL] Installation instructions. @@ -4102,21 +4102,36 @@ The result is shown in \autoref{tab:dyn}. \end{example} \section{Null Values} +\begin{important} +Note that a null value is not the same as an empty value. Empty +values can be tested using \sty{etoolbox}'s \ics{ifdefempty} or +similar. +\end{important} + If a database is created using \cs{DTLnewdb}, \cs{DTLnewrow} and \cs{DTLnewdbentry} (rather than loading it from an ASCII file), it is possible for some of the entries to have null values when a value is not assigned to a given key for a given row. It's also possible for data fetched from a~SQL database using -\app{datatooltk} to contain null values\footnote{You can also use -the \app{datatooltk} GUI to assign null values.}, but data loaded using +\app{datatooltk} to contain null values, and you can use +the \app{datatooltk} GUI to assign null values, but data loaded using \cs{DTLloaddb} (or \cs{DTLloadrawdb}) will have empty not null -values for any blank cells. - -\begin{important} -Note that a null value is not the same as an empty value. Empty -values can be tested using \sty{etoolbox}'s \ics{ifdefempty} or -similar. -\end{important} +values for any \emph{blank} cells. However, you will get null values when +loading a CSV file if cells are missing (rather than empty). For +example: +\begin{verbatim} +Column 1,Column 2,Column 3 +Foo,Bar +Foo,,Baz +Foo,Bar,Baz +\end{verbatim} +This has an empty cell (the second column in \texttt{Foo,,Baz}) and +a null cell (the third column in \texttt{Foo,Bar}). If the first +row of data was instead +\begin{verbatim} +Foo,Bar, +\end{verbatim} +then the third column is now empty, not null. When you iterate through the database using \cs{DTLforeach} (described in \autoref{sec:dbforeach}), @@ -5449,12 +5464,6 @@ you can just use \cs{input} or you can use: 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 -break every 80 characters when writing to a file, try loading the -\sty{morewrites} package before \sty{datatool}. -\end{important} - Databases saved using \cs{DTLsavetexdb}, \cs{DTLsaverawdb} and \cs{DTLprotectedsaverawdb} can be loaded using \LaTeX's standard \ics{input} command. As from version 2.15, the last line of the diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf index 16939783dfd..669196e6ad4 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf differ 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 1eca8e93e70..9ddc840d062 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 6e52c65c3db..f8bd379e3d1 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 5a6b72c81b0..4fc9f9a5443 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 ec831104578..6030f223fad 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 05f0edfdd0e..858eaf34a46 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 364bade336a..44be4994a97 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 87d9bc84996..f6e1660ee35 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 76ffb5360ea..40bc857d604 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 4d81b41ce27..ae31c92eb77 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 d485331bb66..e3e31bb5152 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 160737dce1f..a5b45bb8c29 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 cefa7f50291..4a7cce8b685 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