summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-12 22:21:33 +0000
committerKarl Berry <karl@freefriends.org>2017-11-12 22:21:33 +0000
commit36b0711314bd0cca39ee7297df4ac8a6dc40eca4 (patch)
treed23506ca4cca205ac68f5fbe44e212b78ebe91a1
parentfa79c49c2003754b312b19ce1392aac877fcec32 (diff)
datatool (12nov17)
git-svn-id: svn://tug.org/texlive/trunk@45759 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/datatool/CHANGES6
-rw-r--r--Master/texmf-dist/doc/latex/datatool/README4
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-code.pdfbin1183848 -> 1183498 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.pdfbin639593 -> 639593 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.tex6
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdfbin24911 -> 24911 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdfbin35054 -> 35054 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdfbin22848 -> 22848 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdfbin122418 -> 122418 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdfbin89544 -> 89544 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdfbin179794 -> 179794 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdfbin104427 -> 104427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdfbin128777 -> 128777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdfbin22122 -> 22122 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdfbin33945 -> 33945 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdfbin89713 -> 89713 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdfbin34602 -> 34602 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdfbin31739 -> 31739 bytes
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx171
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databar.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databib.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datagidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datapie.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/dataplot.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-fp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool.sty88
-rw-r--r--Master/texmf-dist/tex/latex/datatool/person.sty2
30 files changed, 114 insertions, 181 deletions
diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index fbe8768300d..065de4e0230 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,9 @@
+v2.29
+
+ * datatool.sty:
+
+ - bug fix https://tex.stackexchange.com/questions/400921
+
v2.28:
* datatool.sty:
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index 0f23674cad3..235d519262e 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.28
+LaTeX Bundle : datatool v2.29
-Last Modified : 2017-11-10
+Last Modified : 2017-11-12
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
index 473f0ce7570..3e675a4d750 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
index 0fd37dd87fe..c30a9d4c59f 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
index ca1e0098df3..15581834dc6 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
@@ -103,11 +103,11 @@
\MakeShortVerb{"}
- \title{User Manual for datatool bundle version~2.28}
+ \title{User Manual for datatool bundle version~2.29}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2017-11-10}
+ \date{2017-11-12}
\maketitle
\pagenumbering{roman}
@@ -122,7 +122,7 @@ The \styfmt{datatool} bundle comes with the following documentation:
\item[\url{datatool-code.pdf}]
Advanced users wishing to know more about the inner workings of
all the packages provided in the \styfmt{datatool} bundle should
- read \qt{Documented Code for datatool v2.28}
+ read \qt{Documented Code for datatool v2.29}
\item[INSTALL] Installation instructions.
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 cac7938fe64..16939783dfd 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
index da792ad297e..1eca8e93e70 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
index 860bc996584..6e52c65c3db 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
index 3b83af7bf01..5a6b72c81b0 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
index 63dff3a1384..ec831104578 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
index 39ac866b414..05f0edfdd0e 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
index 130dfab5cc0..364bade336a 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
index 4c197d65490..87d9bc84996 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
index 2b6f7db9b1c..76ffb5360ea 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
index bb4bdcdd3d1..4d81b41ce27 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
index 3a1926d7f9c..d485331bb66 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
index dfc1ef3ea0d..160737dce1f 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
index cd5364234f4..cefa7f50291 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx
index d1de576df24..f6691483ac1 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -1,11 +1,6 @@
%\iffalse
% datatool.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -setambles "databib\.bst=>\nopreamble\nopostamble"
-% -comment "databib\.bst"
-% -codetitle ""
-% -macrocode "databib\.bst"
-% -author "Nicola Talbot"
% -src "datatool-base.sty\Z=>datatool-base.sty"
% -src "datatool-fp.sty\Z=>datatool-fp.sty"
% -src "datatool-pgfmath.sty\Z=>datatool-pgfmath.sty"
@@ -17,9 +12,14 @@
% -src "dataplot.sty\Z=>dataplot.sty"
% -src "person.sty\Z=>person.sty"
% -src "databib.bst\Z=>databib.bst"
+% -author "Nicola Talbot"
+% -comment "databib\.bst"
% -doc "datatool-manual.tex"
+% -codetitle ""
+% -setambles "databib\.bst=>\nopreamble\nopostamble"
+% -macrocode "databib\.bst"
% datatool
-% Created on 2017/11/10 16:07
+% Created on 2017/11/12 15:47
%\fi
%\iffalse
%<*package>
@@ -68,7 +68,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{23978}
+\CheckSum{23959}
\RecordChanges
\PageIndex
@@ -81,11 +81,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.28}
+%\title{Documented Code for datatool v2.29}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2017-11-10}
+%\date{2017-11-12}
%\maketitle
%
%\pagenumbering{roman}
@@ -121,7 +121,7 @@ datatool.dtx
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-base}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6008,7 +6008,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{fp} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-fp}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6297,7 +6297,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{pgfmath} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6638,7 +6638,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -6736,9 +6736,21 @@ datatool.dtx
\noexpand\long
\noexpand\def\noexpand\@dtl@lopoff#1##1##2\noexpand\to##3##4{%
\noexpand\ifx#2##1\noexpand\relax
- \noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl@qlopoff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl@ifsingle{##1}%
+ {\noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl@qlopoff#1{##1}##2\noexpand\to##3##4\relax}%
+ }%
\noexpand\else
- \noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl@lop@ff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl@ifsingle{##1}%
+ {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ }%
\noexpand\fi
}%
}
@@ -13593,22 +13605,34 @@ datatool.dtx
% \begin{macrocode}
\newcommand*{\@dtl@readline}[2]{%
% \end{macrocode}
-% Read a line from "#1" and store in "#2"
+% Read a line from "#1" and store in "#2" but make sure end of line
+% character is removed.
+%\changes{2.29}{2017-11-12}{changed line read}
% \begin{macrocode}
- \read#1 to #2%
+ \begingroup
+ \catcode\endlinechar=\active%
+ \global\read#1 to #2%
+ \endgroup
% \end{macrocode}
-% Trim the end of line character
+%If empty the row starts with a comment
% \begin{macrocode}
- \ifdefempty{#2}%
- {%
- }%
- {%
- \dtl@trim#2%
+ \ifx#2\empty
+ \else
+ \expandafter\@dtl@stripeol#2%
+ \let#2\@dtl@strippedline
+ \fi
+}
% \end{macrocode}
-%\changes{2.13}{2013-01-15}{removed spurious space}
+%\end{macro}
+%
+%\begin{macro}{\@dtl@stripeol}
+%\changes{2.29}{2017-11-12}{new}
% \begin{macrocode}
- }%
-}
+\begingroup
+\catcode\endlinechar=\active%
+\gdef\@dtl@stripeol#1
+{\gdef\@dtl@strippedline{#1}}
+\endgroup
% \end{macrocode}
%\end{macro}
%
@@ -13625,10 +13649,6 @@ datatool.dtx
% \begin{macrocode}
\@dtl@rawread#1 to #2%
% \end{macrocode}
-% Trim the end of line character
-% \begin{macrocode}
- \dtl@trim#2%
-% \end{macrocode}
% Apply mappings
% \begin{macrocode}
\dtl@domappings\@dtl@line
@@ -14017,79 +14037,6 @@ datatool.dtx
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\dtl@trim}
-%\begin{definition}
-%\cs{dtl@trim}\marg{line}
-%\end{definition}
-% Trims the trailing space from \meta{line}.
-%\changes{2.28}{2017-11-10}{fix bug no 123}
-% \begin{macrocode}
-\newcommand{\dtl@trim}[1]{%
- \def\@dtl@trmstr{}%
- \if#1\par
- \else
- \expandafter\@dtl@start@trim#1\@dtl@end@trim
- \fi
- \let#1=\@dtl@trmstr
-}
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\@dtl@start@trim}
-%\changes{2.28}{2017-11-10}{new}
-% \begin{macrocode}
-\def\@dtl@start@trim#1 \@dtl@end@trim{%
- \def\@dtl@trmstr{#1}%
-}
-% \end{macrocode}
-%\end{macro}
-%
-%\begin{macro}{\@dtl@starttrim}
-% Start trimming. (No longer used as from v2.28. May be removed in
-% later versions.)
-%\changes{2.10}{2012-07-18}{added check in the event there's no
-%trailing space}
-%\changes{2.23}{2015-07-11}{fixed bug in the event that either argument is
-%in a group}
-% \begin{macrocode}
-\long\def\@dtl@starttrim#1#2{%
-\def\tmpA{#1}\show\tmpA
-\def\tmpB{#2}\show\tmpB
- \dtl@ifsingle{#2}%
- {%
- \def\@dtl@tmpB{#2}%
- }%
- {%
- \def\@dtl@tmpB{{#2}}%
- }%
- \ifx\par#1%
- \edef\@dtl@dotrim{\noexpand\@dtl@trim{} \expandonce\@dtl@tmpB}%
- \else
- \dtl@ifsingle{#1}%
- {%
- \def\@dtl@tmpA{#1}%
- }%
- {%
- \def\@dtl@tmpA{{#1}}%
- }%
- \ifx\@dtl@tmpB\@nnil
- \def\@dtl@dotrim{}%
- \let\@dtl@trmstr\@dtl@tmpA
- \else
- \edef\@dtl@dotrim{\noexpand\@dtl@trim
- \expandonce\@dtl@tmpA\expandonce\@dtl@tmpB}%
- \fi
- \fi
- \@dtl@dotrim
-}
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\@dtl@trim}
-% No longer used as from v2.28. May be removed in later versions.
-% \begin{macrocode}
-\long\def\@dtl@trim#1 \@nil{\long\def\@dtl@trmstr{#1}}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\DTLloadrawdb}
%\begin{definition}
%\cs{DTLloadrawdb}\marg{db name}\marg{filename}
@@ -14147,8 +14094,10 @@ datatool.dtx
\@dtl@activatebraces
\@dtl@doreadraw?1?2>>>
\gdef\@dtl@doreadraw?1?2<\relax
-\read?1 to \tmp
-\protected@xdef?2<\tmp>\relax
+\begingroup\catcode\endlinechar=\active\global\read?1 to \dtl@tmp\endgroup
+\expandafter\@dtl@stripeol\dtl@tmp
+\let\dtl@tmp\@dtl@strippedline
+\protected@xdef?2<\dtl@tmp>\relax
>
\endgroup
% \end{macrocode}
@@ -14283,7 +14232,7 @@ datatool.dtx
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datagidx}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -20333,7 +20282,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{databib}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -23256,7 +23205,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{databar}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -24563,7 +24512,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datapie}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -25365,7 +25314,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{dataplot}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Required packages
% \begin{macrocode}
@@ -26987,7 +26936,7 @@ east,southeast,south,southwest,west,northwest}[northeast]{%
% Package identification:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{person}[2017/11/12 v2.29 (NLCT)]
% \end{macrocode}
% Requires the \sty{ifthen} package.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index 27f87c7c334..c0563f7e9c1 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.ins
+++ b/Master/texmf-dist/source/latex/datatool/datatool.ins
@@ -1,4 +1,4 @@
-% datatool.ins generated using makedtx version 1.2 2017/11/10 16:07
+% datatool.ins generated using makedtx version 1.2 2017/11/12 15:47
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index 4747467b428..9a87841acb5 100644
--- a/Master/texmf-dist/tex/latex/datatool/databar.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databar.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{databar}[2017/11/12 v2.29 (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 aef44e924d3..7383f02f3e3 100644
--- a/Master/texmf-dist/tex/latex/datatool/databib.sty
+++ b/Master/texmf-dist/tex/latex/datatool/databib.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{databib}[2017/11/12 v2.29 (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 6c61620a65e..d551c9eec11 100644
--- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datagidx}[2017/11/12 v2.29 (NLCT)]
\RequirePackage{datatool}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty
index 29947301e0f..46891f689e5 100644
--- a/Master/texmf-dist/tex/latex/datatool/datapie.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datapie.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datapie}[2017/11/12 v2.29 (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 e4946d3b55f..a549087f53f 100644
--- a/Master/texmf-dist/tex/latex/datatool/dataplot.sty
+++ b/Master/texmf-dist/tex/latex/datatool/dataplot.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{dataplot}[2017/11/12 v2.29 (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 81c32e0cb7b..a487ef0b315 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-base}[2017/11/12 v2.29 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 6358eaf4f41..932b82c89cf 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-fp}[2017/11/12 v2.29 (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 a5cd567b589..b803279b4ca 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2017/11/12 v2.29 (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 ea7835d4dcb..6069e3ef6aa 100644
--- a/Master/texmf-dist/tex/latex/datatool/datatool.sty
+++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{datatool}[2017/11/12 v2.29 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -72,9 +72,21 @@
\noexpand\long
\noexpand\def\noexpand\@dtl@lopoff#1##1##2\noexpand\to##3##4{%
\noexpand\ifx#2##1\noexpand\relax
- \noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl@qlopoff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl@ifsingle{##1}%
+ {\noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl@qlopoff#1{##1}##2\noexpand\to##3##4\relax}%
+ }%
\noexpand\else
- \noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl@lop@ff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl@ifsingle{##1}%
+ {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ }%
\noexpand\fi
}%
}
@@ -3085,17 +3097,23 @@
\define@key{loaddb}{omitlines}{\dtl@omitlines=#1\relax}
\newcommand*{\dtldefaultkey}{Column}
\newcommand*{\@dtl@readline}[2]{%
- \read#1 to #2%
- \ifdefempty{#2}%
- {%
- }%
- {%
- \dtl@trim#2%
- }%
+ \begingroup
+ \catcode\endlinechar=\active%
+ \global\read#1 to #2%
+ \endgroup
+ \ifx#2\empty
+ \else
+ \expandafter\@dtl@stripeol#2%
+ \let#2\@dtl@strippedline
+ \fi
}
+\begingroup
+\catcode\endlinechar=\active%
+\gdef\@dtl@stripeol#1
+{\gdef\@dtl@strippedline{#1}}
+\endgroup
\newcommand*{\@dtl@readrawline}[2]{%
\@dtl@rawread#1 to #2%
- \dtl@trim#2%
\dtl@domappings\@dtl@line
}
\newif\ifDTLnewdbonload
@@ -3255,48 +3273,6 @@
doesn't exist)}{}%
}%
}
-\newcommand{\dtl@trim}[1]{%
- \def\@dtl@trmstr{}%
- \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}%
- }%
- {%
- \def\@dtl@tmpB{{#2}}%
- }%
- \ifx\par#1%
- \edef\@dtl@dotrim{\noexpand\@dtl@trim{} \expandonce\@dtl@tmpB}%
- \else
- \dtl@ifsingle{#1}%
- {%
- \def\@dtl@tmpA{#1}%
- }%
- {%
- \def\@dtl@tmpA{{#1}}%
- }%
- \ifx\@dtl@tmpB\@nnil
- \def\@dtl@dotrim{}%
- \let\@dtl@trmstr\@dtl@tmpA
- \else
- \edef\@dtl@dotrim{\noexpand\@dtl@trim
- \expandonce\@dtl@tmpA\expandonce\@dtl@tmpB}%
- \fi
- \fi
- \@dtl@dotrim
-}
-\long\def\@dtl@trim#1 \@nil{\long\def\@dtl@trmstr{#1}}
\newcommand*\DTLloadrawdb{%
\let\@dtl@doreadline\@dtl@readrawline
\@dtlloaddb
@@ -3334,8 +3310,10 @@
\@dtl@activatebraces
\@dtl@doreadraw?1?2>>>
\gdef\@dtl@doreadraw?1?2<\relax
-\read?1 to \tmp
-\protected@xdef?2<\tmp>\relax
+\begingroup\catcode\endlinechar=\active\global\read?1 to \dtl@tmp\endgroup
+\expandafter\@dtl@stripeol\dtl@tmp
+\let\dtl@tmp\@dtl@strippedline
+\protected@xdef?2<\dtl@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 3cf1d931bbf..292938d0f99 100644
--- a/Master/texmf-dist/tex/latex/datatool/person.sty
+++ b/Master/texmf-dist/tex/latex/datatool/person.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2017/11/10 v2.28 (NLCT)]
+\ProvidesPackage{person}[2017/11/12 v2.29 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}