datatool (28sep19)

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

10 files changed, 252 insertions, 170 deletions

diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index b00bc9c0d8f..493ccc0c51a 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databar}[2019/09/27 v2.32 (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 e6e60cc6c98..b53e33f7a84 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databib}[2019/09/27 v2.32 (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 7485711aca1..f759feff100 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datagidx}[2019/09/27 v2.32 (NLCT)]
 \RequirePackage{datatool}
 \RequirePackage{etoolbox}
 \RequirePackage{xkeyval}
@@ -2221,15 +2221,31 @@
   \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}%
+\@ifl@t@r\fmtversion{2019/10/01}
+{%
+  \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}%
+   \let\UTFviii@two@octets\UTFviii@two@octets@combine
+  }%
+}
+{%
+  \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}%
+  }%
 }
 \providecommand{\newterm}{\datagidx@newterm}
 \@onlypreamble\newterm
@@ -3215,16 +3231,7 @@
       {%
         \ifcsdef{datagidx@prev@loc@\Label}%
         {%
-          \protected@edef\@prev@location{%
-             \csname datagidx@prev@loc@\Label\endcsname}%
-          \@onelevel@sanitize\@prev@location
-          \protected@edef\@cur@location{\CurrentLocation}%
-          \@onelevel@sanitize\@cur@location
-          \ifdefequal{\@prev@location}{\@cur@location}%
-          {}%
-          {%
-            \global\let\@datagidx@dorerun@warn\@data@rerun@warn
-          }%
+          \dtlgidx@checklocationchange
         }%
         {%
            \global\let\@datagidx@dorerun@warn\@data@rerun@warn
@@ -3248,6 +3255,18 @@
     {}%
   }%
 }
+\newcommand*{\dtlgidx@checklocationchange}{%
+  \protected@edef\@prev@location{%
+     \csname datagidx@prev@loc@\Label\endcsname}%
+  \@onelevel@sanitize\@prev@location
+  \protected@edef\@cur@location{\CurrentLocation}%
+  \@onelevel@sanitize\@cur@location
+  \ifdefequal{\@prev@location}{\@cur@location}%
+  {}%
+  {%
+    \global\let\@datagidx@dorerun@warn\@data@rerun@warn
+  }%
+}
 \newcommand{\datagidx@doifdisplayed}[1]{%
   \DTLifnull{\Location}%
   {%
diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty
index 2ff28193efd..7cc497345e7 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datapie}[2019/09/27 v2.32 (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 d5a0239fb4a..948b20ca41e 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{dataplot}[2019/09/27 v2.32 (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 34109c37115..bf18843e419 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-base}[2019/09/27 v2.32 (NLCT)]
 \RequirePackage{etoolbox}
 \RequirePackage{amsmath}
 \RequirePackage{xkeyval}
@@ -1435,8 +1435,7 @@
       \dtl@split@str##2\@nil
     }%
   }%
-  \def\dtl@split@str##1#2\@nil{%
-  \def#4{##1}}%
+  \def\dtl@split@str##1#2\@nil{\def#4{##1}}%
   \dtl@splitstr#1#2\@nil
 }
 \newcommand{\DTLsubstituteall}[3]{%
@@ -1698,6 +1697,8 @@
     #4%
   }%
 }
+\newif\ifdtlcompareskipcs
+\dtlcompareskipcsfalse
 \newcommand*{\dtlcompare}[3]{%
   \dtl@subnobrsp{#2}{\@dtl@argA}%
   \dtl@subnobrsp{#3}{\@dtl@argB}%
@@ -1717,87 +1718,123 @@
       #1=1\relax
     }%
     {%
-      \DTLsubstituteall{\@dtl@argA}{ }{\space }%
-      \DTLsubstituteall{\@dtl@argB}{ }{\space }%
+      \dtl@setwordbreaksnohyphens{\@dtl@argA}{\@dtl@wordbreak}%
+      \let\@dtl@argA\dtl@string
+      \dtl@setwordbreaksnohyphens{\@dtl@argB}{\@dtl@wordbreak}%
+      \let\@dtl@argB\dtl@string
       \expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
       \let\dtl@firstA=\dtl@first
       \let\dtl@restA=\dtl@rest
       \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
       \let\dtl@firstB=\dtl@first
       \let\dtl@restB=\dtl@rest
-      \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}{%
-      \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}{%
-      \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
-      \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
-      \ifnum\dtl@codeA=-1\relax
-        \ifnum\dtl@codeB=-1\relax
-           \edef\dtl@donext{%
-             \noexpand\dtlcompare
-             {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
-           \dtl@donext
-        \else
-           \edef\dtl@donext{%
-             \noexpand\dtlcompare
-               {\noexpand#1}%
-               {\expandonce\dtl@restA}%
-               {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
-           \dtl@donext
-        \fi
-      \else
-        \ifnum\dtl@codeB=-1\relax
-           \edef\dtl@donext{%
-             \noexpand\dtlcompare
-               {\noexpand#1}%
-               {\expandonce\dtl@firstA\expandonce\dtl@restA}%
-               {\expandonce\dtl@restB}}%
-           \dtl@donext
-        \else
-          \ifnum\dtl@codeA<\dtl@codeB
-            #1=-1\relax
-          \else
-            \ifnum\dtl@codeA>\dtl@codeB
-              #1=1\relax
+      \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}%
+      {%
+        \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}%
+        {%
+          \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
+          \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
+          \let\dtl@donextcompare\@firstofone
+          \ifdtlcompareskipcs
+            \ifnum\dtl@codeA=0\relax
+              \ifnum\dtl@codeB=0\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                   {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \else
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                   {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \fi
             \else
-               \ifdefempty{\dtl@restA}%
-               {%
-                 \ifdefempty{\dtl@restB}%
-                 {%
-                   #1=0\relax
-                 }%
-                 {%
-                   #1=-1\relax
-                 }%
-               }%
-               {%
-                 \ifdefempty{\restB}%
-                 {%
-                   #1=1\relax
-                 }%
-                 {%
-                   \protected@edef\dtl@donext{%
-                     \noexpand\dtlcompare
-                       {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
-                   \dtl@donext
-                 }%
-               }%
+              \ifnum\dtl@codeB=0\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                   {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \fi
             \fi
           \fi
-        \fi
-      \fi
-      }{%
-      \edef\dtl@donext{%
-        \noexpand\dtlcompare
-          {\noexpand#1}%
-          {\expandonce\dtl@firstA\expandonce\dtl@restA}%
-          {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
-      \dtl@donext
-      }}{%
-      \edef\dtl@donext{%
-        \noexpand\dtlcompare
-          {\noexpand#1}%
-          {\expandonce\dtl@firstA\expandonce\dtl@restA}%
-          {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
-      \dtl@donext
+          \dtl@donextcompare
+          {%
+            \ifnum\dtl@codeA=-1\relax
+              \ifnum\dtl@codeB=-1\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                   {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+              \else
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                     {\noexpand#1}%
+                     {\expandonce\dtl@restA}%
+                     {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+                 \dtl@donext
+              \fi
+            \else
+              \ifnum\dtl@codeB=-1\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlcompare
+                     {\noexpand#1}%
+                     {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+                     {\expandonce\dtl@restB}}%
+                 \dtl@donext
+              \else
+                \ifnum\dtl@codeA<\dtl@codeB
+                  #1=-1\relax
+                \else
+                  \ifnum\dtl@codeA>\dtl@codeB
+                    #1=1\relax
+                  \else
+                     \ifdefempty{\dtl@restA}%
+                     {%
+                       \ifdefempty{\dtl@restB}%
+                       {%
+                         #1=0\relax
+                       }%
+                       {%
+                         #1=-1\relax
+                       }%
+                     }%
+                     {%
+                       \ifdefempty{\dtl@restB}%
+                       {%
+                         #1=1\relax
+                       }%
+                       {%
+                         \protected@edef\dtl@donext{%
+                           \noexpand\dtlcompare
+                             {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+                         \dtl@donext
+                       }%
+                     }%
+                  \fi
+                \fi
+              \fi
+            \fi
+          }%
+        }%
+        {%
+          \edef\dtl@donext{%
+            \noexpand\dtlcompare
+              {\noexpand#1}%
+              {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+              {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+          \dtl@donext
+        }%
+      }%
+      {%
+        \edef\dtl@donext{%
+          \noexpand\dtlcompare
+            {\noexpand#1}%
+            {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+            {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+        \dtl@donext
       }%
     }%
   }%
@@ -2216,63 +2253,92 @@
         {%
           \expandafter\dtl@setlccharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
           \expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
-          \ifnum\dtl@codeA=-1\relax
-            \ifnum\dtl@codeB=-1\relax
-               \edef\dtl@donext{%
-                 \noexpand\dtlicompare{\noexpand#1}%
-                 {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
-               \dtl@donext
+          \let\dtl@donextcompare\@firstofone
+          \ifdtlcompareskipcs
+            \ifnum\dtl@codeA=0\relax
+              \ifnum\dtl@codeB=0\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare
+                   {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \else
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare
+                   {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \fi
             \else
-               \edef\dtl@donext{%
-                 \noexpand\dtlicompare
-                   {\noexpand#1}%
-                   {\expandonce\dtl@restA}%
-                   {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
-               \dtl@donext
+              \ifnum\dtl@codeB=0\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare
+                   {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+                 \let\dtl@donextcompare\@gobble
+              \fi
             \fi
-          \else
-            \ifnum\dtl@codeB=-1\relax
-               \edef\dtl@donext{%
-                 \noexpand\dtlicompare
-                  {\noexpand#1}%
-                  {\expandonce\dtl@firstA\expandonce\dtl@restA}%
-                  {\expandonce\dtl@restB}}%
-               \dtl@donext
+          \fi
+          \dtl@donextcompare
+          {%
+            \ifnum\dtl@codeA=-1\relax
+              \ifnum\dtl@codeB=-1\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare{\noexpand#1}%
+                   {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+                 \dtl@donext
+              \else
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare
+                     {\noexpand#1}%
+                     {\expandonce\dtl@restA}%
+                     {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+                 \dtl@donext
+              \fi
             \else
-              \ifnum\dtl@codeA<\dtl@codeB
-                #1=-1\relax
+              \ifnum\dtl@codeB=-1\relax
+                 \edef\dtl@donext{%
+                   \noexpand\dtlicompare
+                    {\noexpand#1}%
+                    {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+                    {\expandonce\dtl@restB}}%
+                 \dtl@donext
               \else
-                \ifnum\dtl@codeA>\dtl@codeB
-                  #1=1\relax
+                \ifnum\dtl@codeA<\dtl@codeB
+                  #1=-1\relax
                 \else
-                   \ifdefempty{\dtl@restA}%
-                   {%
-                     \ifdefempty{\dtl@restB}%
-                     {%
-                       #1=0\relax
-                     }%
-                     {%
-                       #1=-1\relax
-                     }%
-                   }%
-                   {%
-                     \ifdefempty{\restB}%
+                  \ifnum\dtl@codeA>\dtl@codeB
+                    #1=1\relax
+                  \else
+                     \ifdefempty{\dtl@restA}%
                      {%
-                       #1=1\relax
+                       \ifdefempty{\dtl@restB}%
+                       {%
+                         #1=0\relax
+                       }%
+                       {%
+                         #1=-1\relax
+                       }%
                      }%
                      {%
-                       \edef\dtl@donext{%
-                         \noexpand\dtlicompare
-                           {\noexpand#1}%
-                           {\expandonce\dtl@restA}%
-                           {\expandonce\dtl@restB}}%
-                       \dtl@donext
+                       \ifdefempty{\dtl@restB}%
+                       {%
+                         #1=1\relax
+                       }%
+                       {%
+                         \edef\dtl@donext{%
+                           \noexpand\dtlicompare
+                             {\noexpand#1}%
+                             {\expandonce\dtl@restA}%
+                             {\expandonce\dtl@restB}}%
+                         \dtl@donext
+                       }%
                      }%
-                   }%
+                  \fi
                 \fi
               \fi
             \fi
-          \fi
+          }%
         }%
         {%
           \edef\dtl@donext{%
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 35e494caab0..3346d6576d6 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-fp}[2019/09/27 v2.32 (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 903eee29c8f..6a069ccf368 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2019/09/27 v2.32 (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 b90881d77b1..07b9a82f41b 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool}[2019/09/27 v2.32 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{ifthen}
 \RequirePackage{xfor}
@@ -637,7 +637,7 @@
   {%
     {%
       \dtlgetrow{#1}{#2}%
-    \@dtl@assign{#3}{#1}%
+      \@dtl@assign{#3}{#1}%
     }%
   }%
   {%
@@ -1330,7 +1330,7 @@
         \gdef\DTLiffirstrow##1##2{%
           \expandafter\ifnum
            \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
-           =1\relax
+           =1 %space intended
             ##1%
           \else
             ##2%
@@ -1341,7 +1341,7 @@
         \gdef\DTLiflastrow##1##2{%
           \expandafter\ifnum
            \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
-           =\csname dtlrows@#2\endcsname\relax
+           =\csname dtlrows@#2\endcsname
             ##1%
           \else
             ##2%
@@ -1380,10 +1380,7 @@
           \expandafter\global
             \csname @dtl@next\romannumeral\dtlforeachlevel\endcsname
               = \dtlafterrow
-          \ifx\relax#3\relax
-          \else
-            \@dtl@assign{#3}{#2}%
-          \fi
+          \ifblank{#3}{}{\@dtl@assign{#3}{#2}}%
           \ifthenelse{#1}%
           {%
             \refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
@@ -1484,7 +1481,7 @@
         \gdef\DTLiffirstrow##1##2{%
           \expandafter\ifnum
            \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
-           =1\relax
+           =1 % space intended
             ##1%
           \else
             ##2%
@@ -1495,7 +1492,7 @@
         \gdef\DTLiflastrow##1##2{%
           \expandafter\ifnum
            \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
-           =\csname dtlrows@#2\endcsname\relax
+           =\csname dtlrows@#2\endcsname
             ##1%
           \else
             ##2%
@@ -1522,11 +1519,11 @@
           \expandafter\global
             \csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname
               = \expandafter{\dtl@thisrow}%
-          \ifx\relax#3\relax
-          \else
+          \ifblank{#3}{}
+          {%
             \dtlcurrentrow=\expandafter{\dtl@thisrow}%
             \@dtl@assign{#3}{#2}%
-          \fi
+          }%
           \ifthenelse{#1}%
           {%
             \refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index 3c850394864..a5543e8dc26 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 2018 Nicola Talbot
+%%  Copyright 2019 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}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{person}[2019/09/27 v2.32 (NLCT)]
 \RequirePackage{ifthen}
 \RequirePackage{datatool}
 \newcounter{people}