texlive[45759] Master/texmf-dist: datatool (12nov17)
commits+karl at tug.org
commits+karl at tug.org
Sun Nov 12 23:21:33 CET 2017
Revision: 45759
http://tug.org/svn/texlive?view=revision&revision=45759
Author: karl
Date: 2017-11-12 23:21:33 +0100 (Sun, 12 Nov 2017)
Log Message:
-----------
datatool (12nov17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/datatool/CHANGES
trunk/Master/texmf-dist/doc/latex/datatool/README
trunk/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
trunk/Master/texmf-dist/source/latex/datatool/datatool.dtx
trunk/Master/texmf-dist/source/latex/datatool/datatool.ins
trunk/Master/texmf-dist/tex/latex/datatool/databar.sty
trunk/Master/texmf-dist/tex/latex/datatool/databib.sty
trunk/Master/texmf-dist/tex/latex/datatool/datagidx.sty
trunk/Master/texmf-dist/tex/latex/datatool/datapie.sty
trunk/Master/texmf-dist/tex/latex/datatool/dataplot.sty
trunk/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
trunk/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
trunk/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
trunk/Master/texmf-dist/tex/latex/datatool/datatool.sty
trunk/Master/texmf-dist/tex/latex/datatool/person.sty
Modified: trunk/Master/texmf-dist/doc/latex/datatool/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/datatool/CHANGES 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/doc/latex/datatool/CHANGES 2017-11-12 22:21:33 UTC (rev 45759)
@@ -1,3 +1,9 @@
+v2.29
+
+ * datatool.sty:
+
+ - bug fix https://tex.stackexchange.com/questions/400921
+
v2.28:
* datatool.sty:
Modified: trunk/Master/texmf-dist/doc/latex/datatool/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/datatool/README 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/doc/latex/datatool/README 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.tex 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/doc/latex/datatool/datatool-user.tex 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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 @@
\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.
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/datatool/datatool.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/datatool/datatool.dtx 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/source/latex/datatool/datatool.dtx 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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 @@
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{23978}
+\CheckSum{23959}
\RecordChanges
\PageIndex
@@ -81,11 +81,11 @@
%\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 @@
%
% \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 @@
% 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 @@
% 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 @@
%\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 @@
\noexpand\long
\noexpand\def\noexpand\@dtl at lopoff#1##1##2\noexpand\to##3##4{%
\noexpand\ifx#2##1\noexpand\relax
- \noexpand\@dtl at qlopoff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl at qlopoff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl at ifsingle{##1}%
+ {\noexpand\@dtl at qlopoff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl at qlopoff#1{##1}##2\noexpand\to##3##4\relax}%
+ }%
\noexpand\else
- \noexpand\@dtl at lop@ff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl at lop@ff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl at ifsingle{##1}%
+ {\noexpand\@dtl at lop@ff#1##1##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl at lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ }%
\noexpand\fi
}%
}
@@ -13593,22 +13605,34 @@
% \begin{macrocode}
\newcommand*{\@dtl at 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 at trim#2%
+ \ifx#2\empty
+ \else
+ \expandafter\@dtl at stripeol#2%
+ \let#2\@dtl at strippedline
+ \fi
+}
% \end{macrocode}
-%\changes{2.13}{2013-01-15}{removed spurious space}
+%\end{macro}
+%
+%\begin{macro}{\@dtl at stripeol}
+%\changes{2.29}{2017-11-12}{new}
% \begin{macrocode}
- }%
-}
+\begingroup
+\catcode\endlinechar=\active%
+\gdef\@dtl at stripeol#1
+{\gdef\@dtl at strippedline{#1}}
+\endgroup
% \end{macrocode}
%\end{macro}
%
@@ -13625,10 +13649,6 @@
% \begin{macrocode}
\@dtl at rawread#1 to #2%
% \end{macrocode}
-% Trim the end of line character
-% \begin{macrocode}
- \dtl at trim#2%
-% \end{macrocode}
% Apply mappings
% \begin{macrocode}
\dtl at domappings\@dtl at line
@@ -14017,79 +14037,6 @@
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\dtl at trim}
-%\begin{definition}
-%\cs{dtl at 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 at trim}[1]{%
- \def\@dtl at trmstr{}%
- \if#1\par
- \else
- \expandafter\@dtl at start@trim#1\@dtl at end@trim
- \fi
- \let#1=\@dtl at trmstr
-}
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\@dtl at start@trim}
-%\changes{2.28}{2017-11-10}{new}
-% \begin{macrocode}
-\def\@dtl at start@trim#1 \@dtl at end@trim{%
- \def\@dtl at trmstr{#1}%
-}
-% \end{macrocode}
-%\end{macro}
-%
-%\begin{macro}{\@dtl at 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 at starttrim#1#2{%
-\def\tmpA{#1}\show\tmpA
-\def\tmpB{#2}\show\tmpB
- \dtl at ifsingle{#2}%
- {%
- \def\@dtl at tmpB{#2}%
- }%
- {%
- \def\@dtl at tmpB{{#2}}%
- }%
- \ifx\par#1%
- \edef\@dtl at dotrim{\noexpand\@dtl at trim{} \expandonce\@dtl at tmpB}%
- \else
- \dtl at ifsingle{#1}%
- {%
- \def\@dtl at tmpA{#1}%
- }%
- {%
- \def\@dtl at tmpA{{#1}}%
- }%
- \ifx\@dtl at tmpB\@nnil
- \def\@dtl at dotrim{}%
- \let\@dtl at trmstr\@dtl at tmpA
- \else
- \edef\@dtl at dotrim{\noexpand\@dtl at trim
- \expandonce\@dtl at tmpA\expandonce\@dtl at tmpB}%
- \fi
- \fi
- \@dtl at dotrim
-}
-% \end{macrocode}
-%\end{macro}
-%\begin{macro}{\@dtl at trim}
-% No longer used as from v2.28. May be removed in later versions.
-% \begin{macrocode}
-\long\def\@dtl at trim#1 \@nil{\long\def\@dtl at trmstr{#1}}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\DTLloadrawdb}
%\begin{definition}
%\cs{DTLloadrawdb}\marg{db name}\marg{filename}
@@ -14147,8 +14094,10 @@
\@dtl at activatebraces
\@dtl at doreadraw?1?2>>>
\gdef\@dtl at doreadraw?1?2<\relax
-\read?1 to \tmp
-\protected at xdef?2<\tmp>\relax
+\begingroup\catcode\endlinechar=\active\global\read?1 to \dtl at tmp\endgroup
+\expandafter\@dtl at stripeol\dtl at tmp
+\let\dtl at tmp\@dtl at strippedline
+\protected at xdef?2<\dtl at tmp>\relax
>
\endgroup
% \end{macrocode}
@@ -14283,7 +14232,7 @@
% 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 @@
%\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 @@
% 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 @@
% 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 @@
% 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 @@
% 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}
Modified: trunk/Master/texmf-dist/source/latex/datatool/datatool.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/datatool/datatool.ins 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/source/latex/datatool/datatool.ins 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/datatool/databar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/databar.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/databar.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/datatool/databib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/databib.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/databib.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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 at style}{plain}
\define at choicekey{databib.sty}{style}{plain,abbrv,alpha}{%
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datagidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datagidx.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datagidx.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datapie.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datapie.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datapie.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/datatool/dataplot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/dataplot.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/dataplot.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datatool-base.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datatool-base.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/datatool/datatool.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/datatool.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/datatool.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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 at lopoff#1##1##2\noexpand\to##3##4{%
\noexpand\ifx#2##1\noexpand\relax
- \noexpand\@dtl at qlopoff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl at qlopoff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl at ifsingle{##1}%
+ {\noexpand\@dtl at qlopoff#1##1##2\noexpand\to##3##4\relax}%
+ {\noexpand\@dtl at qlopoff#1{##1}##2\noexpand\to##3##4\relax}%
+ }%
\noexpand\else
- \noexpand\@dtl at lop@ff#1##1##2\noexpand\to##3##4\relax
+ \noexpand\ifstrempty{##1}%
+ {\noexpand\@dtl at lop@ff#1{}##2\noexpand\to##3##4\relax}%
+ {%
+ \noexpand\dtl at ifsingle{##1}%
+ {\noexpand\@dtl at lop@ff#1##1##2\noexpand\to##3##4\relax}
+ {\noexpand\@dtl at lop@ff#1{##1}##2\noexpand\to##3##4\relax}
+ }%
\noexpand\fi
}%
}
@@ -3085,17 +3097,23 @@
\define at key{loaddb}{omitlines}{\dtl at omitlines=#1\relax}
\newcommand*{\dtldefaultkey}{Column}
\newcommand*{\@dtl at readline}[2]{%
- \read#1 to #2%
- \ifdefempty{#2}%
- {%
- }%
- {%
- \dtl at trim#2%
- }%
+ \begingroup
+ \catcode\endlinechar=\active%
+ \global\read#1 to #2%
+ \endgroup
+ \ifx#2\empty
+ \else
+ \expandafter\@dtl at stripeol#2%
+ \let#2\@dtl at strippedline
+ \fi
}
+\begingroup
+\catcode\endlinechar=\active%
+\gdef\@dtl at stripeol#1
+{\gdef\@dtl at strippedline{#1}}
+\endgroup
\newcommand*{\@dtl at readrawline}[2]{%
\@dtl at rawread#1 to #2%
- \dtl at trim#2%
\dtl at domappings\@dtl at line
}
\newif\ifDTLnewdbonload
@@ -3255,48 +3273,6 @@
doesn't exist)}{}%
}%
}
-\newcommand{\dtl at trim}[1]{%
- \def\@dtl at trmstr{}%
- \if#1\par
- \else
- \expandafter\@dtl at start@trim#1\@dtl at end@trim
- \fi
- \let#1=\@dtl at trmstr
-}
-\def\@dtl at start@trim#1 \@dtl at end@trim{%
- \def\@dtl at trmstr{#1}%
-}
-\long\def\@dtl at starttrim#1#2{%
-\def\tmpA{#1}\show\tmpA
-\def\tmpB{#2}\show\tmpB
- \dtl at ifsingle{#2}%
- {%
- \def\@dtl at tmpB{#2}%
- }%
- {%
- \def\@dtl at tmpB{{#2}}%
- }%
- \ifx\par#1%
- \edef\@dtl at dotrim{\noexpand\@dtl at trim{} \expandonce\@dtl at tmpB}%
- \else
- \dtl at ifsingle{#1}%
- {%
- \def\@dtl at tmpA{#1}%
- }%
- {%
- \def\@dtl at tmpA{{#1}}%
- }%
- \ifx\@dtl at tmpB\@nnil
- \def\@dtl at dotrim{}%
- \let\@dtl at trmstr\@dtl at tmpA
- \else
- \edef\@dtl at dotrim{\noexpand\@dtl at trim
- \expandonce\@dtl at tmpA\expandonce\@dtl at tmpB}%
- \fi
- \fi
- \@dtl at dotrim
-}
-\long\def\@dtl at trim#1 \@nil{\long\def\@dtl at trmstr{#1}}
\newcommand*\DTLloadrawdb{%
\let\@dtl at doreadline\@dtl at readrawline
\@dtlloaddb
@@ -3334,8 +3310,10 @@
\@dtl at activatebraces
\@dtl at doreadraw?1?2>>>
\gdef\@dtl at doreadraw?1?2<\relax
-\read?1 to \tmp
-\protected at xdef?2<\tmp>\relax
+\begingroup\catcode\endlinechar=\active\global\read?1 to \dtl at tmp\endgroup
+\expandafter\@dtl at stripeol\dtl at tmp
+\let\dtl at tmp\@dtl at strippedline
+\protected at xdef?2<\dtl at tmp>\relax
>
\endgroup
\begingroup
Modified: trunk/Master/texmf-dist/tex/latex/datatool/person.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/datatool/person.sty 2017-11-12 22:15:14 UTC (rev 45758)
+++ trunk/Master/texmf-dist/tex/latex/datatool/person.sty 2017-11-12 22:21:33 UTC (rev 45759)
@@ -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}
More information about the tex-live-commits
mailing list