datatool (10nov17)

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

10 files changed, 195 insertions, 73 deletions

diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index 4ac4e031e06..4747467b428 100644
--- a/Master/texmf-dist/tex/latex/datatool/databar.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databar.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `databar.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{databar}[2017/11/10 v2.28 (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 528f05adbdd..aef44e924d3 100644
--- a/Master/texmf-dist/tex/latex/datatool/databib.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databib.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `databib.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{databib}[2017/11/10 v2.28 (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 8818f59428e..6c61620a65e 100644
--- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datagidx.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datagidx}[2017/11/10 v2.28 (NLCT)]
 \RequirePackage{datatool}
 \RequirePackage{etoolbox}
 \RequirePackage{xkeyval}
@@ -406,6 +406,9 @@
     \@datagidx@warntrue
   \fi
 }
+\define@choicekey{datatool.sty}{utf8}{true,false}[true]{%
+  \setbool{@dtl@utf8}{#1}%
+}
 \define@key{datagidx.sty}{columns}%
 {%
   \DTLgidxSetColumns{#1}%
@@ -1906,11 +1909,15 @@
 \define@key{newgloss}{postheading}{%
   \renewcommand*{\datagidx@postheading}{#1}%
 }
+\newif\ifdatagidxbalance
+\datagidxbalancetrue
 \define@choicekey{newgloss}{balance}[\val\nr]{true,false}[true]{%
  \ifcase\nr\relax
    \renewcommand*{\datagidx@multicols}{multicols}%
+   \datagidxbalancetrue
  \or
    \renewcommand*{\datagidx@multicols}{multicols*}%
+   \datagidxbalancefalse
  \fi
 }
 \define@key{newgloss}{sort}{\renewcommand*{\datagidx@sort}{#1}}
@@ -2180,19 +2187,51 @@
   \def\Psi{Psi}%
   \def\Omega{Omega}%
 }
+\newcommand{\datagidxextendedtoascii}{%
+  \def\AE{AE}%
+  \def\ae{ae}%
+  \def\OE{OE}%
+  \def\oe{oe}%
+  \def\AA{AA}%
+  \def\aa{aa}%
+  \def\L{L}%
+  \def\l{l}%
+  \def\O{O}%
+  \def\o{o}%
+  \def\SS{SS}%
+  \def\ss{ss}%
+  \def\th{th}%
+  \def\TH{TH}%
+  \def\dh{dh}%
+  \def\DH{DH}%
+}
+\newcommand*{\datagidxconvertchars}{%
+  \let~\space
+  \ifdef\andname
+  {%
+    \let\&\andname
+  }%
+  {%
+    \def\&{\expandafter\@gobble\string\&}%
+  }%
+  \def\_{\string_}%
+  \def\${\string$}%
+  \def\#{\expandafter\@gobble\string\#}%
+  \def\%{\expandafter\@gobble\string\%}%
+  \def\{{\expandafter\@gobble\string\{}%
+  \def\}{\expandafter\@gobble\string\}}%
+}
 \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
  \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
  \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
  \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
  \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
  \def\IeC##1{\@gobbletwo##1}%
 }
-\ifdef\newterm
-{%
-}%
-{%
-  \newcommand{\newterm}{\datagidx@newterm}
-}
+\providecommand{\newterm}{\datagidx@newterm}
 \@onlypreamble\newterm
 \newcommand{\datagidx@setfieldvalues}[2]{%
  \def\newterm@name{#2}%
@@ -2232,14 +2271,7 @@
    \let\textsl\DTLgidxNoFormat
    \let\emph\DTLgidxNoFormat
    \let\textsuperscript\DTLgidxNoFormat
-   \let~\space
-   \ifdef\andname
-   {%
-     \let\&\andname
-   }%
-   {%
-     \def\&{and}%
-   }%
+  \datagidxconvertchars
    \let\ensuremath\DTLgidxNoFormat
    \let\DTLgidxParen\@gobble
    \let\DTLgidxName\@secondoftwo
@@ -2249,6 +2281,7 @@
    \let\DTLgidxParticle\datagidx@bothoftwo
    \datagidxwordifygreek
    \datagidxstripaccents
+   \datagidxextendedtoascii
    \newtermlabelhook
    \protected@xdef\newterm@label{\newterm@label}%
    \let\DTLgidxName\datagidx@person
@@ -3013,6 +3046,37 @@
 }
 \newcommand*{\printterms@condition}{\boolean{true}}
 \define@key{printterms}{condition}{\renewcommand*{\printterms@condition}{#1}}
+\newcommand{\printtermsstartpar}{\par}
+\newcommand*{\printterms@setupmulticol}{%
+ \ifdefempty\datagidx@postheading
+ {%
+   \edef\datagidx@prestart{%
+    \noexpand\datagidx@heading{\noexpand\datagidx@title}%
+    \noexpand\begin{\datagidx@multicols}{\datagidx@columns}%
+   }%
+ }%
+ {%
+   \edef\datagidx@prestart{%
+    \noexpand\datagidx@heading{\noexpand\datagidx@title}%
+    \noexpand\begin{\datagidx@multicols}{\datagidx@columns}%
+    [\noexpand\datagidx@postheading]%
+   }%
+ }%
+ \edef\datagidx@postend{%
+  \noexpand\end{\datagidx@multicols}%
+ }%
+}
+\newcommand*{\printterms@setuptwocol}{%
+ \def\datagidx@prestart{%
+   \twocolumn[\datagidx@heading{\datagidx@title}%
+   \datagidx@postheading]}%
+ \if@twocolumn
+   \def\datagidx@postend{}%
+ \else
+   \def\datagidx@postend{\printtermsrestoreonecolumn}%
+ \fi
+}
+\newcommand{\printtermsrestoreonecolumn}{\onecolumn}
 \newcommand{\printterms}[1][]{%
 \bgroup
   \let\newterm@database\datagidx@defaultdatabase
@@ -3051,12 +3115,15 @@
     \edef\dtl@do@setkeys{\noexpand\setkeys{newgloss}{\expandonce\newterm@styles}}%
     \dtl@do@setkeys
     \ifnum\datagidx@columns>1\relax
-       \edef\datagidx@prestart{%
-        \noexpand\begin{\datagidx@multicols}{\datagidx@columns}%
-       }%
-       \edef\datagidx@postend{%
-        \noexpand\end{\datagidx@multicols}%
-       }%
+       \ifnum\datagidx@columns=2\relax
+        \ifdatagidxbalance
+          \printterms@setupmulticol
+        \else
+          \printterms@setuptwocol
+        \fi
+       \else
+          \printterms@setupmulticol
+       \fi
     \else
        \def\datagidx@prestart{}%
        \def\datagidx@postend{}%
@@ -3065,10 +3132,13 @@
     \csuse{datagidxshowgroups\datagidx@showgroups}%
     \datagidxsetstyle{\datagidx@style}%
     \def\datagidx@labellist{}%
-    \datagidx@heading{\datagidx@title}%
-    \datagidx@postheading
+    \ifnum\datagidx@columns=1\relax
+      \datagidx@heading{\datagidx@title}%
+      \datagidx@postheading
+    \fi
     \datagidx@do@sort
     \datagidx@prestart
+    \printtermsstartpar
     \datagidxstart
     \let\DTLgidxName\datagidx@invert
     \let\DTLgidxPlace\datagidx@invert
diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty
index 59bd0ac835f..29947301e0f 100644
--- a/Master/texmf-dist/tex/latex/datatool/datapie.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datapie.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datapie.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datapie}[2017/11/10 v2.28 (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 eaa2d1b8ab8..e4946d3b55f 100644
--- a/Master/texmf-dist/tex/latex/datatool/dataplot.sty
+++ b/Master/texmf-dist/tex/latex/datatool/dataplot.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `dataplot.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{dataplot}[2017/11/10 v2.28 (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 8ab7d44a1a4..81c32e0cb7b 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datatool-base.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datatool-base}[2017/11/10 v2.28 (NLCT)]
 \RequirePackage{etoolbox}
 \RequirePackage{amsmath}
 \RequirePackage{xkeyval}
@@ -363,17 +363,52 @@
 }
 \newif\if@dtl@insertdone
 \newcount\dtl@sortresult
-\newcommand{\toks@gput@right@cx}[2]{%
-  \def\@toks@name{#1}%
+\newcommand*{\DTLlistformatsep}{, }
+\newcommand*{\DTLlistformatoxford}{}
+\ifdef\andname
+{\newcommand*{\DTLandname}{\andname}}
+{\newcommand*{\DTLandname}{\&}}
+\newcommand*{\DTLlistformatlastsep}{ \DTLandname\space}
+\newcommand*{\DTLlistformatitem}[1]{#1}
+\newcommand*{\@dtl@formatlist@handler}[1]{%
+  \@dtl@formatlist@itemsep
+  \@dtl@formatlist@lastitem
+  \renewcommand{\@dtl@formatlist@lastitem}{%
+    \renewcommand{\@dtl@formatlist@itemsep}{%
+      \DTLlistformatsep
+      \renewcommand*{\@dtl@formatlist@prelastitemsep}{%
+        \DTLlistformatoxford}}%
+    \renewcommand{\@dtl@formatlist@prelastitem}{%
+      \@dtl@formatlist@prelastitemsep
+       \DTLlistformatlastsep}%
+    \DTLlistformatitem{#1}%
+  }%
+}%
+\newrobustcmd*{\DTLformatlist}{%
+ \@ifstar{\s@dtlformatlist}{\@dtlformatlist}%
+}
+\newcommand*{\s@dtlformatlist}[1]{%
+  \def\@dtl@formatlist@itemsep{}%
+  \def\@dtl@formatlist@lastitem{}%
+  \def\@dtl@formatlist@prelastitem{}%
+  \def\@dtl@formatlist@prelastitemsep{}%
+  \@for\@dtl@formatlist@item:=#1\do{%
+    \expandafter\@dtl@formatlist@handler\expandafter{\@dtl@formatlist@item}%
+  }%
+  \@dtl@formatlist@prelastitem\@dtl@formatlist@lastitem
+}
+\newcommand*{\@dtlformatlist}[1]{{\s@dtlformatlist{#1}}}
+\newcommand{\@dtl@toks@gput@right@cx}[2]{%
+  \def\@dtl@toks@name{#1}%
   \edef\@dtl@stuff{#2}%
-  \global\csname\@toks@name\endcsname\expandafter
+  \global\csname\@dtl@toks@name\endcsname\expandafter
     \expandafter\expandafter{\expandafter\the
-    \csname\expandafter\@toks@name\expandafter\endcsname\@dtl@stuff}%
+    \csname\expandafter\@dtl@toks@name\expandafter\endcsname\@dtl@stuff}%
 }
-\newcommand{\toks@gconcat@middle@cx}[4]{%
-  \def\@toks@name{#1}%
+\newcommand{\@dtl@toks@gconcat@middle@cx}[4]{%
+  \def\@dtl@toks@name{#1}%
   \edef\@dtl@stuff{#3}%
-  \global\csname\@toks@name\endcsname\expandafter\expandafter
+  \global\csname\@dtl@toks@name\endcsname\expandafter\expandafter
     \expandafter\expandafter\expandafter
     \expandafter\expandafter{\expandafter\expandafter\expandafter
     \the\expandafter\expandafter\expandafter#2%
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 665b0cb2f90..6358eaf4f41 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datatool-fp.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datatool-fp}[2017/11/10 v2.28 (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 2c46893738e..a5cd567b589 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datatool-pgfmath.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2017/11/10 v2.28 (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 688f37a7312..ea7835d4dcb 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `datatool.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{datatool}[2017/11/10 v2.28 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{ifthen}
 \RequirePackage{xfor}
@@ -116,9 +116,14 @@
   \renewcommand*\@dtl@mathprocessor{#1}%
 }
 \providecommand*{\@dtl@mathprocessor}{fp}
+\newcommand*{\@dtl@set@options}{}
+\define@choicekey{datatool.sty}{utf8}{true,false}[true]{%
+  \renewcommand*{\@dtl@set@options}{\setbool{@dtl@utf8}{#1}}%
+}
 \ProcessOptionsX
 \@dtl@construct@lopoffs
 \RequirePackage{datatool-base}
+\@dtl@set@options
 \DeclareRobustCommand{\DTLpar}{\par}
 \newcommand*{\DTLnewdb}[1]{%
   \DTLifdbexists{#1}%
@@ -244,7 +249,7 @@
 }
 \newcommand*{\@sDTLnewrow}[1]{%
   \global\advance\csname dtlrows@#1\endcsname by 1\relax
-  \toks@gput@right@cx{dtldb@#1}{%
+  \@dtl@toks@gput@right@cx{dtldb@#1}{%
      \noexpand\db@row@elt@w%
        \noexpand\db@row@id@w \number\csname dtlrows@#1\endcsname
        \noexpand\db@row@id@end@%
@@ -462,7 +467,7 @@
       }%
       \ifx\@dtl@oldtype\@dtl@type
       \else
-        \toks@gconcat@middle@cx{dtlkeys@#1}%
+        \@dtl@toks@gconcat@middle@cx{dtlkeys@#1}%
         {\@dtl@before}%
         {%
           \noexpand\db@plist@elt@w% start of key block
@@ -495,7 +500,7 @@
       \@dtl@checknumerical{#3}%
       \edef\@dtl@type{\number\@dtl@datatype}%
     }%
-    \toks@gput@right@cx{dtlkeys@#1}%
+    \@dtl@toks@gput@right@cx{dtlkeys@#1}%
     {%
       \noexpand\db@plist@elt@w
       \noexpand\db@col@id@w \the\dtlcolumnnum
@@ -541,7 +546,7 @@
   \@dtl@dogetprops
   \@dtl@colhead={#3}%
   \edef\@dtl@colnum{\number#2}\relax
-  \toks@gconcat@middle@cx{dtlkeys@#1}%
+  \@dtl@toks@gconcat@middle@cx{dtlkeys@#1}%
   {\@dtl@before}%
   {%
     \noexpand\db@plist@elt@w% start of block
@@ -588,7 +593,7 @@
   \dtl@dogetentry
   \ifx\dtl@entry\dtlnovalue
     \@dtl@setnewvalue{#3}%
-    \toks@gconcat@middle@cx{dtldb@#1}%
+    \@dtl@toks@gconcat@middle@cx{dtldb@#1}%
     {\dtlbeforerow}%
     {%
       \noexpand\db@row@elt@w%
@@ -825,7 +830,7 @@
   \@dtl@getrow#1\q@nil
 }
 \newcommand*{\dtlrecombine}{%
-   \toks@gconcat@middle@cx{dtldb@\dtldbname}%
+   \@dtl@toks@gconcat@middle@cx{dtldb@\dtldbname}%
    {\dtlbeforerow}%
    {%
       \noexpand\db@row@elt@w
@@ -843,7 +848,7 @@
 \newcommand{\dtlrecombineomitcurrent}{%
   \dtl@decrementrows{\dtlafterrow}{\dtlrownum}
   \csname dtldb@\dtldbname\endcsname=\dtlbeforerow
-  \toks@gput@right@cx{dtldb@\dtldbname}{\the\dtlafterrow}%
+  \@dtl@toks@gput@right@cx{dtldb@\dtldbname}{\the\dtlafterrow}%
   \dtl@message{Removed row \number\dtlrownum\space in database
     `\dtldbname'}%
 }
@@ -936,7 +941,7 @@
       \ifx\dtl@entry\dtlnovalue
         \protected@edef\@dtl@tmp{#2}%
         \expandafter\@dtl@toks\expandafter{\@dtl@tmp}%
-        \toks@gput@right@cx{dtlcurrentrow}%
+        \@dtl@toks@gput@right@cx{dtlcurrentrow}%
         {%
           \noexpand\db@col@id@w
             \number\dtlcolumnnum
@@ -966,7 +971,7 @@
       \ifx\dtl@entry\dtlnovalue
         \protected@edef\@dtl@tmp{#2}%
         \expandafter\@dtl@toks\expandafter{\@dtl@tmp}%
-        \toks@gput@right@cx{dtlcurrentrow}%
+        \@dtl@toks@gput@right@cx{dtlcurrentrow}%
         {%
           \noexpand\db@col@id@w
             \number\dtlcolumnnum
@@ -1044,6 +1049,10 @@
   \edef\dtl@dogetrowindex{\noexpand\@dtlgetrowindex{\noexpand#1}{#2}{\number#3}{\the\toks@}}%
   \dtl@dogetrowindex
 }
+\newcommand*{\xdtlgetrowindex}[4]{%
+  \protected@edef\dtl@dogetrowindex{\noexpand\@dtlgetrowindex{\noexpand#1}{#2}{\number#3}{#4}}%
+  \dtl@dogetrowindex
+}
 \newcommand*{\@dtlgetrowindex}[4]{%
   \def\@dtl@getrowindex##1% stuff before value
     \db@col@elt@w #4\db@col@elt@end@% value
@@ -1404,7 +1413,7 @@
                 \dtlforeachlevel\endcsname
               \@dtl@after=\csname @dtl@next\romannumeral
                 \dtlforeachlevel\endcsname
-              \toks@gconcat@middle@cx{dtldb@#2}%
+              \@dtl@toks@gconcat@middle@cx{dtldb@#2}%
               {\@dtl@before}%
               {%
                 \noexpand\db@row@elt@w%
@@ -1566,7 +1575,7 @@
       \ifx\dtl@entry\dtlnovalue
         \protected@edef\@dtl@tmp{#2}%
         \expandafter\@dtl@toks\expandafter{\@dtl@tmp}%
-        \toks@gput@right@cx{@dtl@cur\romannumeral\dtlforeachlevel}%
+        \@dtl@toks@gput@right@cx{@dtl@cur\romannumeral\dtlforeachlevel}%
         {%
           \noexpand\db@col@id@w \number\dtlcolumnnum
             \noexpand\db@col@id@end@
@@ -1682,7 +1691,7 @@
           \expandafter\@dtl@toks\expandafter{\@dtl@tmp}% new value
           \expandafter\@dtl@before\expandafter{\dtl@pre}%
           \expandafter\@dtl@after\expandafter{\dtl@post}%
-          \toks@gconcat@middle@cx
+          \@dtl@toks@gconcat@middle@cx
             {@dtl@cur\romannumeral\dtlforeachlevel}%
             {\@dtl@before}%
             {%
@@ -3248,10 +3257,18 @@
 }
 \newcommand{\dtl@trim}[1]{%
   \def\@dtl@trmstr{}%
-  \expandafter\@dtl@starttrim#1\@nil
+  \if#1\par
+  \else
+    \expandafter\@dtl@start@trim#1\@dtl@end@trim
+  \fi
   \let#1=\@dtl@trmstr
 }
+\def\@dtl@start@trim#1 \@dtl@end@trim{%
+ \def\@dtl@trmstr{#1}%
+}
 \long\def\@dtl@starttrim#1#2{%
+\def\tmpA{#1}\show\tmpA
+\def\tmpB{#2}\show\tmpB
   \dtl@ifsingle{#2}%
   {%
     \def\@dtl@tmpB{#2}%
@@ -3318,7 +3335,7 @@
 \@dtl@doreadraw?1?2>>>
 \gdef\@dtl@doreadraw?1?2<\relax
 \read?1 to \tmp
-\xdef?2<\tmp>\relax
+\protected@xdef?2<\tmp>\relax
 >
 \endgroup
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index ec001c01820..3cf1d931bbf 100644
--- a/Master/texmf-dist/tex/latex/datatool/person.sty
+++ b/Master/texmf-dist/tex/latex/datatool/person.sty
@@ -7,11 +7,11 @@
 %% datatool.dtx  (with options: `person.sty,package')
 %% 
 %%  datatool.dtx
-%%  Copyright 2016 Nicola Talbot
+%%  Copyright 2017 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  of this license or (at your option) any later version.
 %%  The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
 %%  and version 1.3 or later is part of all distributions of LaTeX
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2016/07/28 v2.27 (NLCT)]
+\ProvidesPackage{person}[2017/11/10 v2.28 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{datatool}
 \newcounter{people}