summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-07 22:50:44 +0000
committerKarl Berry <karl@freefriends.org>2018-12-07 22:50:44 +0000
commit8ea05b291a97fc98c330f2c40922932a0c460398 (patch)
tree9be62aed6a7172fe0f52fac4297b19b5e95dfdc3 /Master/texmf-dist/tex
parent5d57c7c06864a08c811765622587b93af1d8cd23 (diff)
datatool (7dec18)
git-svn-id: svn://tug.org/texlive/trunk@49344 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-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.sty126
-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.sty2
-rw-r--r--Master/texmf-dist/tex/latex/datatool/person.sty2
10 files changed, 106 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index c4fc87c5885..b00bc9c0d8f 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{databar}[2018/12/07 v2.31 (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 7566095f896..e6e60cc6c98 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{databib}[2018/12/07 v2.31 (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 26788602407..7485711aca1 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datagidx}[2018/12/07 v2.31 (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 890ebc158b8..2ff28193efd 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datapie}[2018/12/07 v2.31 (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 e5c00a27a6b..d5a0239fb4a 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{dataplot}[2018/12/07 v2.31 (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 3ac36bf6f15..34109c37115 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datatool-base}[2018/12/07 v2.31 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
@@ -180,12 +180,62 @@
#3%
\fi
}
-\newcommand*{\DTLnumitemsinlist}[2]{%
+\newif\ifDTLlistskipempty
+\DTLlistskipemptytrue
+\newrobustcmd{\DTLlistelement}[2]{%
+ \begingroup
+ \@dtl@tmpcount=0\relax
+ \@for\@dtl@element:=#1\do{%
+ \ifDTLlistskipempty
+ \ifdefempty{\@dtl@element}%
+ {}%
+ {%
+ \advance\@dtl@tmpcount by 1\relax%
+ \ifnum\@dtl@tmpcount=#2 \@dtl@element\@endfortrue\fi
+ }%
+ \else
+ \advance\@dtl@tmpcount by 1\relax%
+ \ifnum\@dtl@tmpcount=#2 \@dtl@element\@endfortrue\fi
+ \fi
+ }%
+ \if@endfor \else\@dtl@listelement@outofrange{#2}\fi
+ \endgroup
+}
+\newrobustcmd{\DTLfetchlistelement}[3]{%
+ \begingroup
+ \@dtl@tmpcount=0\relax
+ \@for\@dtl@element:=#1\do{%
+ \ifDTLlistskipempty
+ \ifdefempty{\@dtl@element}%
+ {}%
+ {%
+ \advance\@dtl@tmpcount by 1\relax%
+ \ifnum\@dtl@tmpcount=#2 \@endfortrue\fi
+ }%
+ \else
+ \advance\@dtl@tmpcount by 1\relax%
+ \ifnum\@dtl@tmpcount=#2 \@endfortrue\fi
+ \fi
+ }%
+ \if@endfor \else\def\@dtl@element{\@dtl@listelement@outofrange{#2}}\fi
+ \edef\x{%
+ \endgroup
+ \noexpand\def\noexpand#3{\expandonce\@dtl@element}%
+ }\x
+}
+\newcommand{\@dtl@listelement@outofrange}[1]{%
+ \PackageWarning{datatool-base}{List index `\number#1' out of range}%
+}
+\newrobustcmd{\DTLnumitemsinlist}[2]{%
\@dtl@tmpcount=0\relax
\@for\@dtl@element:=#1\do{%
- \ifdefempty{\@dtl@element}%
- {}%
- {\advance\@dtl@tmpcount by 1\relax}%
+ \ifDTLlistskipempty
+ \ifdefempty{\@dtl@element}%
+ {}%
+ {\advance\@dtl@tmpcount by 1\relax}%
+ \else
+ \advance\@dtl@tmpcount by 1\relax
+ \fi
}%
\edef#2{\number\@dtl@tmpcount}%
}
@@ -393,7 +443,13 @@
\def\@dtl@formatlist@prelastitem{}%
\def\@dtl@formatlist@prelastitemsep{}%
\@for\@dtl@formatlist@item:=#1\do{%
- \expandafter\@dtl@formatlist@handler\expandafter{\@dtl@formatlist@item}%
+ \ifDTLlistskipempty
+ \ifdefempty{\@dtl@formatlist@item}%
+ {}%
+ {\expandafter\@dtl@formatlist@handler\expandafter{\@dtl@formatlist@item}}%
+ \else
+ \expandafter\@dtl@formatlist@handler\expandafter{\@dtl@formatlist@item}%
+ \fi
}%
\@dtl@formatlist@prelastitem\@dtl@formatlist@lastitem
}
@@ -1448,24 +1504,16 @@
\fi
\fi
}
+\newcommand*{\@dtl@protect}{\protect}
+\newcommand*{\@dtl@minus}{-}
+\newcommand*{\@dtl@plus}{+}
+\newcommand*{\@dtl@dollar}{\$}
\def\@dtl@checknumericalstart#1#2\@nil\@nil{%
-\ifx#1\protect\relax
- \@dtl@checknumericalstart#2\@nil\@nil\relax
-\else
- \ifx-#1\relax
- \def\@dtl@tmp{#2}%
- \ifdefempty{\@dtl@tmp}%
- {%
- \@dtl@datatype=0\relax
- }%
- {%
- \ifnum\@dtl@datatype=0\relax
- \@dtl@datatype=1\relax
- \fi
- \@dtl@checknumericalstart#2\@nil\@nil\relax
- }%
+ \def\@dtl@tmp{#1}%
+ \ifx\@dtl@tmp\@dtl@protect
+ \@dtl@checknumericalstart#2\@nil\@nil\relax
\else
- \ifx+#1\relax
+ \ifx\@dtl@tmp\@dtl@minus
\def\@dtl@tmp{#2}%
\ifdefempty{\@dtl@tmp}%
{%
@@ -1478,11 +1526,8 @@
\@dtl@checknumericalstart#2\@nil\@nil\relax
}%
\else
- \def\@dtl@tmp{#1}%
- \ifx#1\$\relax
- \@dtl@datatype=3\relax
- \@dtl@checknumericalstart#2\@nil\@nil\relax
- \else
+ \ifx\@dtl@tmp\@dtl@plus
+ \def\@dtl@tmp{#2}%
\ifdefempty{\@dtl@tmp}%
{%
\@dtl@datatype=0\relax
@@ -1491,12 +1536,35 @@
\ifnum\@dtl@datatype=0\relax
\@dtl@datatype=1\relax
\fi
- \@dtl@checknumericalloop#1#2\@nil\@nil\relax
+ \@dtl@checknumericalstart#2\@nil\@nil\relax
}%
+ \else
+ \def\@dtl@tmp{#1}%
+ \ifx\@dtl@tmp\@dtl@dollar
+ \def\@dtl@tmp{#2}%
+ \ifdefempty{\@dtl@tmp}%
+ {%
+ \@dtl@datatype=0\relax
+ }%
+ {%
+ \@dtl@datatype=3\relax
+ \@dtl@checknumericalstart#2\@nil\@nil\relax
+ }%
+ \else
+ \ifdefempty{\@dtl@tmp}%
+ {%
+ \@dtl@datatype=0\relax
+ }%
+ {%
+ \ifnum\@dtl@datatype=0\relax
+ \@dtl@datatype=1\relax
+ \fi
+ \@dtl@checknumericalloop#1#2\@nil\@nil\relax
+ }%
+ \fi
\fi
\fi
\fi
-\fi
}
\newif\if@dtl@numgrpsep
\newcommand*{\@dtl@ifDigitOrDecimalSep}[3]{%
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 83bf3e9db8f..35e494caab0 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datatool-fp}[2018/12/07 v2.31 (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 8c73becaebd..903eee29c8f 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2018/12/07 v2.31 (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 b5ee1db93af..b90881d77b1 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{datatool}[2018/12/07 v2.31 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index b21bd8c6c47..3c850394864 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}[2018/04/16 v2.30 (NLCT)]
+\ProvidesPackage{person}[2018/12/07 v2.31 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}