summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-01 17:56:53 +0000
committerKarl Berry <karl@freefriends.org>2018-05-01 17:56:53 +0000
commit10521e719d9d01eb2dfcd64efd2fd2ab1b3530ab (patch)
treecadf5cf787ea8a5075ead161fd472733138b5afb /Master
parentf882dc54c2866df66c9e8238a865713c78f27f7b (diff)
datatool (16apr18)
git-svn-id: svn://tug.org/texlive/trunk@47543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/datatool/CHANGES7
-rw-r--r--Master/texmf-dist/doc/latex/datatool/README4
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-code.pdfbin1183498 -> 1184311 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.pdfbin639593 -> 639231 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.tex45
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdfbin24911 -> 24923 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdfbin35054 -> 35066 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdfbin22848 -> 22860 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdfbin122418 -> 122428 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdfbin89544 -> 89557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdfbin179794 -> 179796 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdfbin104427 -> 104427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdfbin128777 -> 128788 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdfbin22122 -> 21869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdfbin33945 -> 33957 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdfbin89713 -> 89724 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdfbin34602 -> 34614 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdfbin31739 -> 31751 bytes
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx61
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databar.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databib.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datagidx.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datapie.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/dataplot.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-base.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-fp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool.sty20
-rw-r--r--Master/texmf-dist/tex/latex/datatool/person.sty4
30 files changed, 97 insertions, 80 deletions
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
--- a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
Binary files 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
--- 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
Binary files differ
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx
index f6691483ac1..a95ce9f9c1f 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -1,6 +1,11 @@
%\iffalse
% datatool.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
+% -codetitle ""
+% -setambles "databib\.bst=>\nopreamble\nopostamble"
+% -doc "datatool-manual.tex"
+% -macrocode "databib\.bst"
+% -comment "databib\.bst"
% -src "datatool-base.sty\Z=>datatool-base.sty"
% -src "datatool-fp.sty\Z=>datatool-fp.sty"
% -src "datatool-pgfmath.sty\Z=>datatool-pgfmath.sty"
@@ -13,13 +18,8 @@
% -src "person.sty\Z=>person.sty"
% -src "databib.bst\Z=>databib.bst"
% -author "Nicola Talbot"
-% -comment "databib\.bst"
-% -doc "datatool-manual.tex"
-% -codetitle ""
-% -setambles "databib\.bst=>\nopreamble\nopostamble"
-% -macrocode "databib\.bst"
% datatool
-% Created on 2017/11/12 15:47
+% Created on 2018/4/16 11:49
%\fi
%\iffalse
%<*package>
@@ -42,7 +42,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2017 Nicola Talbot, all rights reserved.
+% Copyright (C) 2018 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -68,7 +68,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{23959}
+\CheckSum{23963}
\RecordChanges
\PageIndex
@@ -81,11 +81,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.29}
+%\title{Documented Code for datatool v2.30}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2017-11-12}
+%\date{2018-04-16}
%\maketitle
%
%\pagenumbering{roman}
@@ -121,7 +121,7 @@ datatool.dtx
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-base}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6008,7 +6008,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{fp} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-fp}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6297,7 +6297,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{pgfmath} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6638,7 +6638,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -6731,6 +6731,7 @@ datatool.dtx
% \cs{@dtl@lopoff}\meta{first element}\meta{sep}\meta{rest of list}\cs{to}\meta{cmd1}\meta{cmd2}
%\end{definition}
%for the current separator and delimiter.
+%\changes{2.30}{2018-04-16}{removed spurious spaces}
% \begin{macrocode}
\edef\@dtl@construct@lopoff#1#2{%
\noexpand\long
@@ -6748,8 +6749,8 @@ datatool.dtx
{\noexpand\@dtl@lop@ff#1{}##2\noexpand\to##3##4\relax}%
{%
\noexpand\dtl@ifsingle{##1}%
- {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}
- {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}%
}%
\noexpand\fi
}%
@@ -7043,7 +7044,7 @@ datatool.dtx
%
%\begin{macro}{\DTLgnewdb}
%\begin{definition}
-% \cs{DTLnewdb}\marg{db name}
+% \cs{DTLgnewdb}\marg{db name}
%\end{definition}
%\changes{2.13}{2013-01-15}{new}
% Initialises a database called \meta{name}. (Global version.)
@@ -7212,7 +7213,7 @@ datatool.dtx
%\begin{definition}
% \cs{@DTLnewrow}\marg{db name}
%\end{definition}
-% Add a new row to named database. (Checks for the existance
+% Add a new row to named database. (Checks for the existence
% of the database.)
%\changes{2.13}{2013-01-15}{fixed typo in \cs{PackageError}}
% \begin{macrocode}
@@ -13612,15 +13613,15 @@ datatool.dtx
\begingroup
\catcode\endlinechar=\active%
\global\read#1 to #2%
- \endgroup
+ \endgroup%
% \end{macrocode}
%If empty the row starts with a comment
% \begin{macrocode}
- \ifx#2\empty
- \else
+ \ifx#2\empty%
+ \else%
\expandafter\@dtl@stripeol#2%
- \let#2\@dtl@strippedline
- \fi
+ \let#2\@dtl@strippedline%
+ \fi%
}
% \end{macrocode}
%\end{macro}
@@ -13761,7 +13762,7 @@ datatool.dtx
% \end{macrocode}
% Read a line from the file and store in \cs{@dtl@line}
% \begin{macrocode}
- \@dtl@doreadline\@dtl@read\@dtl@line
+ \@dtl@doreadline\@dtl@read\@dtl@line
% \end{macrocode}
% If this is a blank row, set repeat condition to true
% \begin{macrocode}
@@ -14232,7 +14233,7 @@ datatool.dtx
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datagidx}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -20282,7 +20283,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{databib}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -23205,7 +23206,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{databar}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -24512,7 +24513,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datapie}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -25314,7 +25315,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{dataplot}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Required packages
% \begin{macrocode}
@@ -26936,7 +26937,7 @@ east,southeast,south,southwest,west,northwest}[northeast]{%
% Package identification:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{person}[2018/04/16 v2.30 (NLCT)]
% \end{macrocode}
% Requires the \sty{ifthen} package.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index c0563f7e9c1..2420ca733c1 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.ins
+++ b/Master/texmf-dist/source/latex/datatool/datatool.ins
@@ -1,10 +1,10 @@
-% datatool.ins generated using makedtx version 1.2 2017/11/12 15:47
+% datatool.ins generated using makedtx version 1.2 2018/4/16 11:49
\input docstrip
\preamble
datatool.dtx
- Copyright 2017 Nicola Talbot
+ Copyright 2018 Nicola Talbot
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index 9a87841acb5..c4fc87c5885 100644
--- a/Master/texmf-dist/tex/latex/datatool/databar.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databar.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databar.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{databar}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{dataplot}
\newif\ifDTLcolorbarchart
diff --git a/Master/texmf-dist/tex/latex/datatool/databib.sty b/Master/texmf-dist/tex/latex/datatool/databib.sty
index 7383f02f3e3..7566095f896 100644
--- a/Master/texmf-dist/tex/latex/datatool/databib.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databib.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databib.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{databib}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{datatool}
\newcommand*{\dtlbib@style}{plain}
\define@choicekey{databib.sty}{style}{plain,abbrv,alpha}{%
diff --git a/Master/texmf-dist/tex/latex/datatool/datagidx.sty b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
index d551c9eec11..26788602407 100644
--- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datagidx.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datagidx}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{datatool}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty
index 46891f689e5..890ebc158b8 100644
--- a/Master/texmf-dist/tex/latex/datatool/datapie.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datapie.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datapie.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datapie}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\newif\ifDTLcolorpiechart
\DTLcolorpiecharttrue
diff --git a/Master/texmf-dist/tex/latex/datatool/dataplot.sty b/Master/texmf-dist/tex/latex/datatool/dataplot.sty
index a549087f53f..e5c00a27a6b 100644
--- a/Master/texmf-dist/tex/latex/datatool/dataplot.sty
+++ b/Master/texmf-dist/tex/latex/datatool/dataplot.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `dataplot.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{dataplot}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{tikz}
\RequirePackage{datatool}
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
index a487ef0b315..3ac36bf6f15 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-base.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-base}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 932b82c89cf..83bf3e9db8f 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-fp.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-fp}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{fp}
\RequirePackage{datatool-base}
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
index b803279b4ca..8c73becaebd 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-pgfmath.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{pgfrcs,pgfkeys,pgfmath}
\ProcessOptionsX
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty
index 6069e3ef6aa..b5ee1db93af 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{datatool}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -84,8 +84,8 @@
{\noexpand\@dtl@lop@ff#1{}##2\noexpand\to##3##4\relax}%
{%
\noexpand\dtl@ifsingle{##1}%
- {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}
- {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}%
}%
\noexpand\fi
}%
@@ -3100,12 +3100,12 @@
\begingroup
\catcode\endlinechar=\active%
\global\read#1 to #2%
- \endgroup
- \ifx#2\empty
- \else
+ \endgroup%
+ \ifx#2\empty%
+ \else%
\expandafter\@dtl@stripeol#2%
- \let#2\@dtl@strippedline
- \fi
+ \let#2\@dtl@strippedline%
+ \fi%
}
\begingroup
\catcode\endlinechar=\active%
@@ -3147,7 +3147,7 @@
\@dtl@conditionfalse
\ifeof\@dtl@read
\else
- \@dtl@doreadline\@dtl@read\@dtl@line
+ \@dtl@doreadline\@dtl@read\@dtl@line
\ifdefempty{\@dtl@line}%
{%
\@dtl@conditiontrue
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index 292938d0f99..b21bd8c6c47 100644
--- a/Master/texmf-dist/tex/latex/datatool/person.sty
+++ b/Master/texmf-dist/tex/latex/datatool/person.sty
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `person.sty,package')
%%
%% datatool.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2018 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2017/11/12 v2.29 (NLCT)]
+\ProvidesPackage{person}[2018/04/16 v2.30 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}