datatool (11jul15)

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

49 files changed, 107 insertions, 575 deletions

diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index cd5ac54b758..311f435b815 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,27 @@
+v2.23:
+
+  * datatool:
+
+    - etex no longer loaded.
+
+    - added \DTLisinlist and \DTLmaketabspace
+
+    - Bug fix (\@dtl@starttrim): fixed issue that caused 
+      loss of group at the start of a line when reading a csv file 
+
+    - Bug fix: unstarred (case-sensitive) version of \DTLsort
+      now correctly uses case-sensitive sort.
+
+    - Bug fix: error in \DTLifSubString
+
+  * person:
+
+    - Bug fix: replaced \ifpersonmale with \ifmale within the
+      definitions of \persongender and \getpersongender
+
+    - Bug fix: replaced \@thisperson with #1 in \ifmale and
+      \iffemale
+
 v2.22:
 
   * datatool-base:
@@ -356,7 +380,7 @@ v2.0 (2009/02/27):
  datatool.sty:
 
  * Rewritten database internal representation to make the code
-   faster (thanks to Morten H\o gholm for the suggestion)
+   faster (thanks to Morten H\o gholm for this)
  * added etex as a required package
  * Database columns can now have an associated header (in addition
    to the key)
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index 4e551211d9d..28ef7ab8756 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.22 
+LaTeX Bundle : datatool v2.23 
 
-Last Modified : 2014-06-10
+Last Modified : 2015-07-11
 
 Author        : Nicola Talbot
 
@@ -106,29 +106,6 @@ person.sty:
 
 *The datatool bundle replaces the csvtools bundle which is now obsolete.*
 
-REQUIRED PACKAGES:
-
-The datatool.sty and datatool-base.sty packages requires the following packages/files:
-
-xkeyval
-ifthen
-xfor
-substr (at least 2009/10/20)
-etex
-etoolbox
-amsmath
-
-The datatool-fp package requires fp.sty
-The datatool-pgfmath package requires pgfmath.sty
-
-The datapie.sty, dataplot.sty and databar.sty packages 
-additionally require the tikz/pgf bundle.
-
-*Remember to refresh TeX's database*
-
-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/license/lppl1.3 for the details of that license.
 
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
index 7ca6fba6710..5a1571a4282 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 db0bb8965f4..fac3cc3d181 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 32208ad80e5..91a26817787 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
@@ -37,7 +37,14 @@
 \doxitem{Counter}{counter}{counters}
 \doxitem{Option}{option}{package options}
 
-\newcommand*{\desctr}[1]{\ctrfmt{#1}\DescribeCounter{#1}}
+\newcommand*{\desctr}[1]{\DescribeCounter{#1}\ctrfmt{#1}}
+
+\newrobustcmd{\dbs}{\texttt{\string\\}}
+
+\newcommand{\idbs}{%
+ \dbs\index{\string\\\actualchar\dbs\encapchar usage}%
+}
+
 
  %bibliography database
 \DTLnewdb{docbib}
@@ -91,11 +98,11 @@
 \MakeShortVerb{"}
 \DeleteShortVerb{\|}
 
- \title{User Manual for datatool bundle version~2.22}
+ \title{User Manual for datatool bundle version~2.23}
  \author{Nicola L.C. Talbot\\
 \url{http://www.dickimaw-books.com/}}
 
- \date{2014-06-10}
+ \date{2015-07-11}
  \maketitle
 
 \pagenumbering{roman}
@@ -110,7 +117,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.22}
+  read \qt{Documented Code for datatool v2.23}
 
   \item[INSTALL] Installation instructions.
 
@@ -1325,6 +1332,12 @@ The remarks about \cs{DTLifStartsWith} also apply to
 \cs{DTLisPrefix}. This command performs a case sensitive
 match.
 
+\begin{definition}[\DescribeMacro{\DTLisinlist}]%
+\cs{DTLisinlist}\marg{element}\marg{list}
+\end{definition}
+This checks if \meta{element} is in \meta{list}. (Internally uses
+\cs{DTLifinlist}.)
+
 \chapter{Fixed Point Arithmetic}
 \label{sec:fp}
 
@@ -2323,6 +2336,14 @@ to a tab separator using the command:
 \begin{definition}[\DescribeMacro{\DTLsettabseparator}]%
 \cs{DTLsettabseparator}
 \end{definition}
+Note that this command changes the category code of the tab
+character to~12 (other). If, after you have loaded your data, you want to
+reset the tab category code to~10 (space), you can use:
+\begin{definition}[\DescribeMacro{\DTLmaketabspace}]%
+\cs{DTLmaketabspace}
+\end{definition}
+Don't use this command before you load any tab-separated data.
+
 To set the separator to a character other than a tab, you need to use
 \begin{definition}[\DescribeMacro{\DTLsetseparator}]%
 \cs{DTLsetseparator}\marg{character}
@@ -2332,8 +2353,8 @@ The delimiter can be changed using
 \cs{DTLsetdelimiter}\marg{character}
 \end{definition}
 \begin{important}
-Note that spaces count in the default \TeX\ manner (unless you
-specify a whitespace character as the delimiter).
+Note that spaces count in the usual \TeX\ manner and won't be
+trimmed from either side of the separators.
 \end{important}
 
 For example, suppose you have a file called \texttt{mydata.csv}
@@ -2951,7 +2972,7 @@ you can then display the database in a table as follows:
 \bfseries Score (\%)%
 \DTLforeach{scores}{%
 \firstname=FirstName,\surname=Surname,\score=Score}{%
-\\
+\\% start new row
 \firstname & \surname & \score}
 \end{tabular}
 \end{table}
@@ -2960,6 +2981,13 @@ This produces \autoref{tab:scores}. (Note that since I didn't
 need the student registration number, I didn't bother to 
 assign a command to the key "StudentNo".)
 
+\begin{important}
+Note that the new row command \idbs\ has been placed at the
+start of the final argument in the above example. This is necessary
+as placing it at the end of the argument will cause an unwanted row
+at the end of the table. This is a feature of the loop mechanism.
+\end{important}
+
 \begin{table}[htbp]
 \caption[Student scores (displaying a database in a 
 table)]{Student scores}\label{tab:scores}
@@ -3794,9 +3822,17 @@ 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.
-(Note that a null value is not the same as an empty value. Empty
+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
+\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.)
+similar.
+\end{important}
 
 When you iterate through the database using \cs{DTLforeach}
 (described in \autoref{sec:dbforeach}), 
@@ -3818,8 +3854,7 @@ This is the null value for a number.
 \cs{DTLifnull}\marg{cmd}\marg{true part}\marg{false part}
 \end{definition}
 This checks if \meta{cmd} is null where \meta{cmd} is a control
-sequence, 
-if it is, then \meta{true part}
+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.
 
@@ -3830,7 +3865,7 @@ 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}
+\begin{example}{Null vs Empty Values}{ex:null}
 Consider the following (which creates a database called "emailDB"):
 \begin{verbatim}
 \DTLnewdb{emailDB}
@@ -3859,7 +3894,8 @@ Consider the following (which creates a database called "emailDB"):
 In the above example, the first row of the database contains
 an entry with the key "Email2", but the second row doesn't.
 Whereas the second row contains an entry with the key "RegNum",
-but the first row doesn't.
+but the first row doesn't. That is, this database has two null (not
+empty) values.
 
 The following code puts the information in a \env{tabular} 
 environment:
@@ -3961,7 +3997,7 @@ Surname,FirstName,RegNum,Email1,Email2
 \end{ttfamily}\par\vskip\baselineskip\noindent
 and you load the data from this file using \cs{DTLloaddb}
 (defined in \autoref{sec:loaddb}). Now the
-database has no null values, but has an empty value for the
+database has \emph{no null values}, but has an \emph{empty} value for the
 key "RegNum" on the first row of the database, and an empty
 value for the key "Email2" on the second row of the database.
 Now, the following code
@@ -3992,6 +4028,11 @@ produces:\par\vskip\baselineskip\noindent
 =Surname,\emailI=Email1,\emailII=Email2,\regnum=RegNum}{\relax
 \\\firstname & \surname & \emailI & \DTLifnull{\emailII}{}{\emailII} & \DTLifnull{\regnum}{}{\regnum}}\relax
 \end{tabular}
+
+Now the missing entries are simply blank instead of containing
+\emph{Missing}. This is because they're empty not null. In this
+case, you may prefer to use \cs{DTLifnullorempty} instead of
+\cs{DTLifnull}.
 \end{example}
 
 \section{Editing Database Rows}
@@ -7121,17 +7162,17 @@ commands defined in this section. You will also need to have the
 \sty{pgf}/\sty{tikz} packages installed. The \sty{datapie} package 
 may be given the following options:
 \begin{description}
-\item[{\pkgopt[datapie]{color}}] Colour option (default).
-\item[{\pkgopt[datapie]{gray}}] Grey scale option.
-\item[{\pkgopt[datapie]{rotateinner}}] 
+\item[{\pkgopt{color}}] Colour option (default).
+\item[{\pkgopt{gray}}] Grey scale option.
+\item[{\pkgopt{rotateinner}}] 
 Rotate inner labels so that they are aligned
 with the pie chart radial axis.
-\item[{\pkgopt[datapie]{norotateinner}}] 
+\item[{\pkgopt{norotateinner}}] 
 Don't rotate inner labels (default).
-\item[{\pkgopt[datapie]{rotateouter}}] 
+\item[{\pkgopt{rotateouter}}] 
 Rotate outer labels so that they are aligned
 with the pie chart radial axis.
-\item[{\pkgopt[datapie]{norotateouter}}] 
+\item[{\pkgopt{norotateouter}}] 
 Don't rotate outer labels (default).
 \end{description}
 
@@ -7168,26 +7209,26 @@ is 2cm.
 \item[\csopt{DTLpiechart}{innerratio}] 
 The distance from the centre of the
 pie chart to the point where the inner labels are placed is given
-by this value multiplied by the ratio. The default value is 0.5. 
+by this value multiplied by the radius. The default value is 0.5. 
 
 \item[\csopt{DTLpiechart}{outerratio}]
 The distance from the centre of the
 pie chart to the point where the outer labels are placed is given
-by this value multiplied by the ratio. The default value is 1.25.
+by this value multiplied by the radius. The default value is 1.25.
 
 \item[\csopt{DTLpiechart}{cutawayratio}]
 The distance from the centre of the pie chart
 to the point of cutaway segments is given by this value multiplied
-by the ratio. The default value is 0.2.
+by the radius. The default value is 0.2.
 
 \item[\csopt{DTLpiechart}{inneroffset}] 
 This is the absolute distance from the centre
 of the pie chart to the point where the inner labels are placed.
 You should use only one or other of \csopt{DTLpiechart}{innerratio}
 and \csopt{DTLpiechart}{inneroffset}, not both. If you also want to 
-specify the radius, you must use \csopt{DTLpiechart}{ratio}
+specify the radius, you must use \csopt{DTLpiechart}{radius}
 before \csopt{DTLpiechart}{inneroffset}. If omitted, the inner 
-offset is obtained from the ratio multiplied by the 
+offset is obtained from the radius multiplied by the 
 \csopt{DTLpiechart}{innerratio} value.
 
 \item[\csopt{DTLpiechart}{outeroffset}] 
@@ -7195,9 +7236,9 @@ This is the absolute distance from the centre
 of the pie chart to the point where the outer labels are placed.
 You should use only one or other of \csopt{DTLpiechart}{outerratio} 
 and \csopt{DTLpiechart}{outeroffset}, not both. If you also want to 
-specify the radius, you must use \csopt{DTLpiechart}{ratio}
+specify the radius, you must use \csopt{DTLpiechart}{radius}
 before \csopt{DTLpiechart}{outeroffset}. If omitted, the outer 
-offset is obtained from the ratio multiplied by the 
+offset is obtained from the radius multiplied by the 
 \csopt{DTLpiechart}{outerratio} value.
 
 \item[\csopt{DTLpiechart}{cutawayoffset}] 
@@ -7237,7 +7278,7 @@ so it can only take the values "true" and "false". If the value is
 omitted "true" is assumed. If true, the inner labels are rotated 
 along the spokes of the pie chart, otherwise the inner labels are not 
 rotated.  There are analogous package options 
-\pkgopt[datapie]{rotateinner} and \pkgopt[datapie]{norotateinner}.
+\pkgopt{rotateinner} and \pkgopt{norotateinner}.
 
 \item[\csopt{DTLpiechart}{rotateouter}] 
 This is a boolean setting, so it can only take
@@ -7245,7 +7286,7 @@ the values "true" and "false". If the value is omitted "true" is
 assumed. If true, the outer labels are rotated along the spokes of
 the pie chart, otherwise the outer labels are not rotated.
 There are analogous package options 
-\pkgopt[datapie]{rotateouter} and \pkgopt[datapie]{norotateouter}.
+\pkgopt{rotateouter} and \pkgopt{norotateouter}.
 
 \end{description}
 
@@ -7520,7 +7561,7 @@ appropriate for apples and green is appropriate for pears, blue
 doesn't really correspond to lemons or limes.
 
 \begin{definition}[\DescribeMacro{\DTLdopiesegmentcolor}]%
-\cs{DTLdopiesegmentcolor}\meta{n}
+\cs{DTLdopiesegmentcolor}\marg{n}
 \end{definition}
 This sets the current text colour to that of the \meta{n}th
 segment.
@@ -8468,15 +8509,15 @@ direction.)
 
 The \sty{databar} package options are as follows:
 \begin{description}
-\item[{\pkgopt[databar]{color}}] Created coloured bar charts 
+\item[{\pkgopt{color}}] Created coloured bar charts 
 (default).
 
-\item[{\pkgopt[databar]{gray}}] Created grey scale bar charts.
+\item[{\pkgopt{gray}}] Created grey scale bar charts.
 
-\item[{\pkgopt[databar]{vertical}}] Created vertical bar charts
+\item[{\pkgopt{vertical}}] Created vertical bar charts
 (default).
 
-\item[{\pkgopt[databar]{horizontal}}] Created horizontal bar charts.
+\item[{\pkgopt{horizontal}}] Created horizontal bar charts.
 \end{description}
 
 
@@ -8706,9 +8747,9 @@ horizontal bars.
 \cs{DTLbarXlabelalign}
 \end{definition}
 This specifies the text alignment of the lower bar labels. This
-defaults to "left,rotate=-90" if you use the \pkgopt[databar]{vertical}
+defaults to "left,rotate=-90" if you use the \pkgopt{vertical}
 package option or the \csopt{DTLbarchart}{verticalbars} setting,
-and defaults to "right" if you use the \pkgopt[databar]{horizontal}
+and defaults to "right" if you use the \pkgopt{horizontal}
 package option or the \csopt{DTLbarchart}{verticalbars}"=false"
 setting.
 
@@ -9480,7 +9521,7 @@ before the month name in the bibliography file, e.g.\
 
 \item Once I have loaded and sorted my database, I can then
 display it using \cs{DTLbibliography}. This uses the style
-given by the \sty{databib} \pkgopt[databib]{style} package option,
+given by the \sty{databib} \pkgopt{style} package option,
 or the \cs{DTLbibliographystyle} command, both of which are
 described in \autoref{sec:bibstyle}.
 
@@ -9519,7 +9560,7 @@ document as follows:
 \section{Changing the bibliography style}
 \label{sec:bibstyle}
 The style of the bibliography produced using \cs{DTLbibliography} 
-depends on the \pkgopt[databib]{style}
+depends on the \pkgopt{style}
 package option, or can be set using
 \begin{definition}[\DescribeMacro{\DTLbibliographystyle}]%
 \cs{DTLbibliographystyle}\marg{style}
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/data-raw-psaved.dbtex b/Master/texmf-dist/doc/latex/datatool/samples/data-raw-psaved.dbtex
deleted file mode 100644
index 24c32fd469c..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/data-raw-psaved.dbtex
+++ /dev/null
@@ -1,33 +0,0 @@
-\DTLifdbexists{mydata}%
-{\PackageError{datatool}{Database `mydata' 
-already exists}{}%
-\aftergroup\endinput}{}% 
-\bgroup\makeatletter
-\dtl@message{Reconstructing database 
-`mydata'}%
-\expandafter\global\expandafter
-\newtoks\csname dtlkeys@mydata\endcsname
-\expandafter\global
- \csname dtlkeys@mydata\endcsname={%
-\db@plist@elt@w \db@col@id@w 1\db@col@id@end@ \db@key@id@w Incubation Temperature\db@key@id@end@ \db@type@id@w 1\db@type@id@end@ \db@header@id@w Incubation Temperature\db@header@id@end@ \db@col@id@w 1\db@col@id@end@ \db@plist@elt@end@ \db@plist@elt@w \db@col@id@w 2\db@col@id@end@ \db@key@id@w Incubation Time\db@key@id@end@ \db@type@id@w 1\db@type@id@end@ \db@header@id@w Incubation Time\db@header@id@end@ \db@col@id@w 2\db@col@id@end@ \db@plist@elt@end@ \db@plist@elt@w \db@col@id@w 3\db@col@id@end@ \db@key@id@w Time to Growth\db@key@id@end@ \db@type@id@w 1\db@type@id@end@ \db@header@id@w Time to Growth\db@header@id@end@ \db@col@id@w 3\db@col@id@end@ \db@plist@elt@end@ }
-\expandafter\global\expandafter
-\newtoks\csname dtldb@mydata\endcsname
-\expandafter\global
-\csname dtldb@mydata\endcsname={%
-\db@row@elt@w \db@row@id@w 1\db@row@id@end@ \db@col@id@w 1\db@col@id@end@ \db@col@elt@w 40\db@col@elt@end@ \db@col@id@w 1\db@col@id@end@ \db@col@id@w 2\db@col@id@end@ \db@col@elt@w 120\db@col@elt@end@ \db@col@id@w 2\db@col@id@end@ \db@col@id@w 3\db@col@id@end@ \db@col@elt@w 40\db@col@elt@end@ \db@col@id@w 3\db@col@id@end@ \db@row@id@w 1\db@row@id@end@ \db@row@elt@end@ \db@row@elt@w \db@row@id@w 2\db@row@id@end@ \db@col@id@w 1\db@col@id@end@ \db@col@elt@w 40\db@col@elt@end@ \db@col@id@w 1\db@col@id@end@ \db@col@id@w 2\db@col@id@end@ \db@col@elt@w 90\db@col@elt@end@ \db@col@id@w 2\db@col@id@end@ \db@col@id@w 3\db@col@id@end@ \db@col@elt@w 60\db@col@elt@end@ \db@col@id@w 3\db@col@id@end@ \db@row@id@w 2\db@row@id@end@ \db@row@elt@end@ \db@row@elt@w \db@row@id@w 3\db@row@id@end@ \db@col@id@w 1\db@col@id@end@ \db@col@elt@w 35\db@col@elt@end@ \db@col@id@w 1\db@col@id@end@ \db@col@id@w 2\db@col@id@end@ \db@col@elt@w 180\db@col@elt@end@ \db@col@id@w 2\db@col@id@end@ \db@col@id@w 3\db@col@id@end@ \db@col@elt@w 20\db@col@elt@end@ \db@col@id@w 3\db@col@id@end@ \db@row@id@w 3\db@row@id@end@ \db@row@elt@end@ \db@row@elt@w \db@row@id@w 4\db@row@id@end@ \db@col@id@w 1\db@col@id@end@ \db@col@elt@w 55\db@col@elt@end@ \db@col@id@w 1\db@col@id@end@ \db@col@id@w 2\db@col@id@end@ \db@col@elt@w 190\db@col@elt@end@ \db@col@id@w 2\db@col@id@end@ \db@col@id@w 3\db@col@id@end@ \db@col@elt@w 40\db@col@elt@end@ \db@col@id@w 3\db@col@id@end@ \db@row@id@w 4\db@row@id@end@ \db@row@elt@end@ }
-\expandafter\global
- \expandafter\newcount\csname dtlrows@mydata\endcsname
-\expandafter\global
- \csname dtlrows@mydata\endcsname=4\relax
-\expandafter\global
- \expandafter\newcount\csname dtlcols@mydata\endcsname
-\expandafter\global
- \csname dtlcols@mydata\endcsname=3\relax
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Temperature\endcsname{1}% 
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Time\endcsname{2}% 
-\expandafter
- \gdef\csname dtl@ci@mydata@Time to Growth\endcsname{3}% 
-\egroup
-\def\dtllastloadeddb{mydata}
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/data-raw-saved.dbtex b/Master/texmf-dist/doc/latex/datatool/samples/data-raw-saved.dbtex
deleted file mode 100644
index c4eca6df538..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/data-raw-saved.dbtex
+++ /dev/null
@@ -1,167 +0,0 @@
-\DTLifdbexists{mydata}%
-{\PackageError{datatool}{Database `mydata' 
-already exists}{}%
-\aftergroup\endinput}{}% 
-\bgroup\makeatletter
-\dtl@message{Reconstructing database
-`mydata'}%
-\expandafter\global\expandafter
-\newtoks\csname dtlkeys@mydata\endcsname
-\expandafter\global
- \csname dtlkeys@mydata\endcsname={%
-%
-\db@plist@elt@w %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@key@id@w Incubation Temperature%
-\db@key@id@end@ %
-\db@type@id@w 1%
-\db@type@id@end@ %
-\db@header@id@w Incubation Temperature%
-\db@header@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@plist@elt@end@ %
-\db@plist@elt@w %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@key@id@w Incubation Time%
-\db@key@id@end@ %
-\db@type@id@w 1%
-\db@type@id@end@ %
-\db@header@id@w Incubation Time%
-\db@header@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@plist@elt@end@ %
-\db@plist@elt@w %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@key@id@w Time to Growth%
-\db@key@id@end@ %
-\db@type@id@w 1%
-\db@type@id@end@ %
-\db@header@id@w Time to Growth%
-\db@header@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@plist@elt@end@ 
-}%
-\expandafter\global\expandafter
-\newtoks\csname dtldb@mydata\endcsname
-\expandafter\global
-\csname dtldb@mydata\endcsname={%
-%
-\db@row@elt@w %
-\db@row@id@w 1%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 120%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 1%
-\db@row@id@end@ %
-\db@row@elt@end@ %
-\db@row@elt@w %
-\db@row@id@w 2%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 90%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 60%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 2%
-\db@row@id@end@ %
-\db@row@elt@end@ %
-\db@row@elt@w %
-\db@row@id@w 3%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 35%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 180%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 20%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 3%
-\db@row@id@end@ %
-\db@row@elt@end@ %
-\db@row@elt@w %
-\db@row@id@w 4%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 55%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 190%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 4%
-\db@row@id@end@ %
-\db@row@elt@end@ 
-}%
-\expandafter\global
- \expandafter\newcount\csname dtlrows@mydata\endcsname
-\expandafter\global
- \csname dtlrows@mydata\endcsname=4\relax
-\expandafter\global
- \expandafter\newcount\csname dtlcols@mydata\endcsname
-\expandafter\global
- \csname dtlcols@mydata\endcsname=3\relax
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Temperature\endcsname{1}% 
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Time\endcsname{2}% 
-\expandafter
- \gdef\csname dtl@ci@mydata@Time to Growth\endcsname{3}% 
-\egroup
-\def\dtllastloadeddb{mydata}
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/data.csv b/Master/texmf-dist/doc/latex/datatool/samples/data.csv
deleted file mode 100644
index d04c806f912..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/data.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Incubation Temperature,Incubation Time,Time to Growth
-40,120,40
-40,90,60
-35,180,20
-55,190,40
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/data2.csv b/Master/texmf-dist/doc/latex/datatool/samples/data2.csv
deleted file mode 100644
index 5225a7b75e1..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/data2.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-40,120,40
-40,90,60
-35,180,20
-55,190,40
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/exp25a.csv b/Master/texmf-dist/doc/latex/datatool/samples/exp25a.csv
deleted file mode 100644
index 66f1ccbff1b..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/exp25a.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-Time,Log Count
-0,3.75
-23,3.9
-45,4.0
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/exp25b.csv b/Master/texmf-dist/doc/latex/datatool/samples/exp25b.csv
deleted file mode 100644
index 58e1061e732..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/exp25b.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-Time,Log Count
-0,3.6
-60,3.8
-120,4.0
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/exp30a.csv b/Master/texmf-dist/doc/latex/datatool/samples/exp30a.csv
deleted file mode 100644
index bac369ecea7..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/exp30a.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-Time,Log Count
-0,3.73
-23,3.67
-60,4.9
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/fruit.csv b/Master/texmf-dist/doc/latex/datatool/samples/fruit.csv
deleted file mode 100644
index 9bc12a154c6..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/fruit.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-Name,Value
-"Apples",30
-"Pears",25
-"lemons,limes",40.5
-"Peaches",34.5
-"Cherries",20
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/groupa.csv b/Master/texmf-dist/doc/latex/datatool/samples/groupa.csv
deleted file mode 100644
index a64f6560704..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/groupa.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-Height,Weight
-1.54,48.0
-1.55,45.4
-1.56,58.0
-1.56,50.2
-1.57,46.0
-1.58,48.3
-1.59,56.5
-1.59,58.1
-1.60,60.9
-1.62,56.3
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/groupb.csv b/Master/texmf-dist/doc/latex/datatool/samples/groupb.csv
deleted file mode 100644
index 6a6304f2e5c..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/groupb.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-Height,Weight
-1.54,48.4
-1.54,42.0
-1.55,64.0
-1.56,58.2
-1.56,49.0
-1.57,40.3
-1.58,51.5
-1.58,63.1
-1.59,74.9
-1.59,59.3
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/index.csv b/Master/texmf-dist/doc/latex/datatool/samples/index.csv
deleted file mode 100644
index 87317a48c82..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/index.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-File,Temperature,NaCl,pH
-exp25a.csv,25,4.7,0.5
-exp25b.csv,25,4.8,1.5
-exp30a.csv,30,5.12,4.5
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/mydata.csv b/Master/texmf-dist/doc/latex/datatool/samples/mydata.csv
deleted file mode 100644
index 69a0717c169..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/mydata.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-FirstName,Surname,Score
-Jane,Brown,75
-John,"Smith, Jr",68
-Z\"oe,Adams,52
-Andy,Brown,42
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/mynewdata.csv b/Master/texmf-dist/doc/latex/datatool/samples/mynewdata.csv
deleted file mode 100644
index 51d773964cf..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/mynewdata.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Product","Quantity","Price","Description"
-Book,3,\$10.99,An interesting book\DTLpar(or so I thought!)
-DVD,1,\$12.55,A bit boring
-CD,2,\$5.99,My favourite!
-Tape,0,\$2.00,
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/onecol.csv b/Master/texmf-dist/doc/latex/datatool/samples/onecol.csv
deleted file mode 100644
index ecaff40a380..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/onecol.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Column
-A
-B
-C
-D
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/plotdata.csv b/Master/texmf-dist/doc/latex/datatool/samples/plotdata.csv
deleted file mode 100644
index 2823355ba51..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/plotdata.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-x,y
-0,0
-1,1
-2,0.5
-1.5,0.3
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/polygon.csv b/Master/texmf-dist/doc/latex/datatool/samples/polygon.csv
deleted file mode 100644
index 326dfd5f1be..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/polygon.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-x,y
-0.5,3
-2,1
-5,1.2
-6.5,4
-2.3,5
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/profits.csv b/Master/texmf-dist/doc/latex/datatool/samples/profits.csv
deleted file mode 100644
index 474c1dd41a3..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/profits.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Year,Profit
-2000,"\pounds  2,525"
-2001,"\pounds  3,752"
-2002,"-\pounds  1,520"
-2003,"\pounds  1,270"
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/rawdata.csv b/Master/texmf-dist/doc/latex/datatool/samples/rawdata.csv
deleted file mode 100644
index e5d0235539c..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/rawdata.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Product,Cost,Comments
-Fruit & Veg,£0.50,Contains special characters # { } ^ _ ~ % manœuvre
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/rawdata2.csv b/Master/texmf-dist/doc/latex/datatool/samples/rawdata2.csv
deleted file mode 100644
index 3c93ef607b7..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/rawdata2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Fruit & Veg,£0.50
-Cake & Biscuits,£0.80
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys-data.csv
index 3272841e387..3272841e387 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/rawdata3.csv
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys-data.csv
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 c11dc191e5f..ad495330892 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
+++ 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
index 48df7a814fb..30e36a121f1 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.tex
@@ -4,7 +4,7 @@
 \usepackage{datatool}
 
 \begin{document}
-\DTLloadrawdb[autokeys]{data}{rawdata3.csv}
+\DTLloadrawdb[autokeys]{data}{sample-autokeys-data.csv}
 
 \DTLdisplaydb{data}
 
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 08aaf9dbe91..aaf21393f64 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 f866d058548..3f82014ed9c 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 e8b6521595d..533efaba595 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 9fe0a63135d..45461691083 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 8b59b712a32..a1d0cbdd44f 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 2fe5fb0c6d3..c2c7ed49280 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 831c1695e0d..21697f30670 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 a5296a0191b..57406d47eab 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 d43eb8defee..f431b620aaf 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 28fee46c6ea..1cf45c10e0e 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 ca3fd9277fe..b73bfa7ef1f 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 b8a6000b12a..5492735022c 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
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample3.csv b/Master/texmf-dist/doc/latex/datatool/samples/sample3.csv
deleted file mode 100644
index 69fd4c6c5a2..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample3.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-File,Caption
-circle.png,A Circle
-rectangle.png,A Rectangle
-triangle.png,A Triangle
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample4.csv b/Master/texmf-dist/doc/latex/datatool/samples/sample4.csv
deleted file mode 100644
index 6a6b89984be..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample4.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Name,Assignment 1,Assignment 2,Total
-A. Smith,80,70,150
-B. Jones,60,80,140
-J. Doe,85,75,160
-,75,75,150
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/scores2.csv b/Master/texmf-dist/doc/latex/datatool/samples/scores2.csv
deleted file mode 100644
index 4ef8fd6f50b..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/scores2.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-FirstName,Surname,StudentNo,Score
-John,"Smith, Jr",102689,68
-Jane,Brown,102647,75
-Andy,Brown,103569,42
-Z\"oe,Adams,105987,52
-Roger,Brady,106872,58
-Clare,Verdon,104356,45
-Henk,\switchargs{Mere}{van der },106789,71
-Jos,\switchargs{Mere}{de la },104256,58
-
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/semesterscores.csv b/Master/texmf-dist/doc/latex/datatool/samples/semesterscores.csv
deleted file mode 100644
index 059653cca47..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/semesterscores.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-FirstName,Surname,StudentNumber,Assignment 1,Assignment 2,Assignment 3
-John,"Smith, Jr",102689,68,57,72
-Jane,Brown,102647,75,84,80
-Andy,Brown,103569,42,52,54
-Z\"oe,Adams,105987,52,48,57
-Roger,Brady,106872,58,60,62
-Clare,Vernon,104356,45,50,48
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/students.csv b/Master/texmf-dist/doc/latex/datatool/samples/students.csv
deleted file mode 100644
index a97af0e0532..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/students.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-FirstName,Surname,StudentNumber,Gender,Parent
-John,"Smith, Jr",102689,M,Mr and Mrs Smith
-Jane,Brown,102647,F,Ms Brown
-Andy,Brown,103569,male,Mr Brown and Miss Sepia
-Z\"oe,Adams,105987,f,Mr and Mrs Adams
-Roger,Brady,106872,m,Mrs Brady
-Clare,Vernon,104356,female,Mr Vernon
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/studentscores.csv b/Master/texmf-dist/doc/latex/datatool/samples/studentscores.csv
deleted file mode 100644
index bbc0b6fe009..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/studentscores.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-FirstName,Surname,StudentNumber,Score
-John,"Smith, Jr",102689,68
-Jane,Brown,102647,75
-Andy,Brown,103569,42
-Z\"oe,Adams,105987,52
-Roger,Brady,106872,58
-Clare,Vernon,104356,45
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/test-export-from-calc.csv b/Master/texmf-dist/doc/latex/datatool/samples/test-export-from-calc.csv
deleted file mode 100644
index 9b925647d0b..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/test-export-from-calc.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"Header 1","Header 2"
-"Some text","Some “quoted text”"
-"More text","More ""quoted text"""
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/test-missing-some-headers.csv b/Master/texmf-dist/doc/latex/datatool/samples/test-missing-some-headers.csv
deleted file mode 100644
index ace933f2d08..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/test-missing-some-headers.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Header A,Header B,,Header C,,Header D
-1,2,3,4,5,6
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/test-rawtex.dbtex b/Master/texmf-dist/doc/latex/datatool/samples/test-rawtex.dbtex
deleted file mode 100644
index 06ef7022ac4..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/test-rawtex.dbtex
+++ /dev/null
@@ -1,167 +0,0 @@
-% saved by datatooltk Sun Mar 10 15:36:03 2013
-\DTLifdbexists{mydata}%
-{\PackageError{datatool}{Database `mydata'
-already exists}{}%
-\aftergroup\endinput}{}%
-\bgroup\makeatletter
-\dtl@message{Reconstructing database
-`mydata'}%
-\expandafter\global\expandafter
-\newtoks\csname dtlkeys@mydata\endcsname
-\expandafter\global
- \csname dtlkeys@mydata\endcsname={%
-%
-\db@plist@elt@w %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@key@id@w temperature%
-\db@key@id@end@ %
-\db@type@id@w 2%
-\db@type@id@end@ %
-\db@header@id@w Incubation Temperature%
-\db@header@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@plist@elt@end@
-\db@plist@elt@w %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@key@id@w time%
-\db@key@id@end@ %
-\db@type@id@w 1%
-\db@type@id@end@ %
-\db@header@id@w Incubation Time%
-\db@header@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@plist@elt@end@
-\db@plist@elt@w %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@key@id@w T2G%
-\db@key@id@end@ %
-\db@type@id@w 1%
-\db@type@id@end@ %
-\db@header@id@w Time to Growth%
-\db@header@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@plist@elt@end@
-}%
-\expandafter\global\expandafter
-\newtoks\csname dtldb@mydata\endcsname
-\expandafter\global
-\csname dtldb@mydata\endcsname={%
-%
-\db@row@elt@w %
-\db@row@id@w 1%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 120%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 1%
-\db@row@id@end@ %
-\db@row@elt@end@
-\db@row@elt@w %
-\db@row@id@w 2%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 90%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 60%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 2%
-\db@row@id@end@ %
-\db@row@elt@end@
-\db@row@elt@w %
-\db@row@id@w 3%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 35%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 180%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 20%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 3%
-\db@row@id@end@ %
-\db@row@elt@end@
-\db@row@elt@w %
-\db@row@id@w 4%
-\db@row@id@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@elt@w 55%
-\db@col@elt@end@ %
-\db@col@id@w 1%
-\db@col@id@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@elt@w 190%
-\db@col@elt@end@ %
-\db@col@id@w 2%
-\db@col@id@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@col@elt@w 40%
-\db@col@elt@end@ %
-\db@col@id@w 3%
-\db@col@id@end@ %
-\db@row@id@w 4%
-\db@row@id@end@ %
-\db@row@elt@end@
-}%
-\expandafter\global
- \expandafter\newcount\csname dtlrows@mydata\endcsname
-\expandafter\global
- \csname dtlrows@mydata\endcsname=4\relax
-\expandafter\global
- \expandafter\newcount\csname dtlcols@mydata\endcsname
-\expandafter\global
- \csname dtlcols@mydata\endcsname=3\relax
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Temperature\endcsname{1}%
-\expandafter
- \gdef\csname dtl@ci@mydata@Incubation Time\endcsname{2}%
-\expandafter
- \gdef\csname dtl@ci@mydata@Time to Growth\endcsname{3}%
-\egroup
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/test-scores.csv b/Master/texmf-dist/doc/latex/datatool/samples/test-scores.csv
deleted file mode 100644
index ebdf3168aee..00000000000
--- a/Master/texmf-dist/doc/latex/datatool/samples/test-scores.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-FirstName,Surname,StudentNo,Assignment1,Assignment2
-John,"Smith, Jr",102689,68,60
-Jane,Brown,102647,75,80
-Andy,Brown,103569,42,50
-Z\"oe,Adams,105987,52,61
-Roger,Brady,106872,58,56
-%Clare,Verdon,104356,45,50
-Henk,\switchargs{Mere}{van der },106789,71,80
-Jos,\switchargs{Mere}{de la },104256,58,60
-