summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/datatool
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-11 22:20:47 +0000
committerKarl Berry <karl@freefriends.org>2015-07-11 22:20:47 +0000
commit169f36cf85710819b29b10a3f1f2943b6282b437 (patch)
treef374cf937ca51a171d9f43275e5667b7e89a3b95 /Master/texmf-dist/tex/latex/datatool
parent43acef71933c2d1bbe6f685b4a7896db35cdfb39 (diff)
datatool (11jul15)
git-svn-id: svn://tug.org/texlive/trunk@37837 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool')
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databar.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/databib.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datagidx.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datapie.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/dataplot.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-base.sty45
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-fp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool.sty32
-rw-r--r--Master/texmf-dist/tex/latex/datatool/person.sty12
10 files changed, 71 insertions, 46 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index cc179817cb8..299ab3dcd59 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{databar}[2015/07/11 v2.23 (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 d0c658f9926..62f315bd24d 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2014/06/10 v2.22 (NLCT)]
+\ProvidesPackage{databib}[2015/07/11 v2.23 (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 159eb55f5e8..79800baf338 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2014/01/17 v2.19 (NLCT)]
+\ProvidesPackage{datagidx}[2015/07/11 v2.23 (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 41bc83f17b7..fc7d158d960 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{datapie}[2015/07/11 v2.23 (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 4e835f9d4d7..66614bdd404 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{dataplot}[2015/07/11 v2.23 (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 14eb1f27055..37df89e72d3 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2014/06/10 v2.22 (NLCT)]
+\ProvidesPackage{datatool-base}[2015/07/11 v2.23 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
@@ -1503,10 +1503,10 @@
{%
\DTLsubstituteall{\@dtl@argA}{ }{\space }%
\DTLsubstituteall{\@dtl@argB}{ }{\space }%
- \expandafter\dtl@getfirst\@dtl@argA\end
+ \expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
- \expandafter\dtl@getfirst\@dtl@argB\end
+ \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
\expandafter\dtl@ifsingle\expandafter{\dtl@firstA}{%
@@ -1577,14 +1577,14 @@
}%
}%
}
-\def\dtl@getfirst#1#2\end{%
+\def\dtl@getfirst#1#2\end@dtl@getfirst{%
\def\dtl@first{#1}%
\ifdefempty{\dtl@first}%
{%
\def\dtl@rest{#2}%
}%
{%
- \dtl@ifsingle{#1}{\def\dtl@rest{#2}}{\dtl@getfirst#1#2\end}%
+ \dtl@ifsingle{#1}{\def\dtl@rest{#2}}{\dtl@getfirst#1#2\end@dtl@getfirst}%
}%
}
\newcount\dtl@codeA
@@ -1649,10 +1649,10 @@
\let\@dtl@argA\dtl@string
\dtl@setwordbreaksnohyphens{\@dtl@argB}{\@dtl@wordbreak}%
\let\@dtl@argB\dtl@string
- \expandafter\dtl@getfirst\@dtl@argA\end
+ \expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
- \expandafter\dtl@getfirst\@dtl@argB\end
+ \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
\expandafter\dtl@ifsingle\expandafter{\dtl@firstA}%
@@ -2210,14 +2210,14 @@
\dtl@donext
}
\newcommand*{\@dtl@testifsubstring}[2]{%
- \def\@dtl@argA{#1}%
- \def\@dtl@argB{#2}%
- \ifdefempty{\@dtl@argB}%
+ \def\@dtl@subs@argA{#1}%
+ \def\@dtl@subs@argB{#2}%
+ \ifdefempty{\@dtl@subs@argB}%
{%
\@dtl@conditiontrue
}%
{%
- \ifdefempty{\@dtl@argA}%
+ \ifdefempty{\@dtl@subs@argA}%
{%
\@dtl@conditionfalse
}%
@@ -2225,12 +2225,14 @@
\@dtl@teststartswith{#1}{#2}%
\if@dtl@condition
\else
- \expandafter\dtl@getfirst\@dtl@argA\end
- \expandafter\dtl@ifsingle\expandafter{\dtl@first}{%
+ \dtl@getfirst#1\end@dtl@getfirst
+ \expandafter\dtl@ifsingle\expandafter{\dtl@first}%
+ {%
\expandafter\@dtl@testifsubstring\expandafter{\dtl@rest}{#2}%
- }{%
+ }%
+ {%
\protected@edef\@dtl@donext{\noexpand\@dtl@testifsubstring
- {\expandonce\dtl@first\expandonce\dtl@rest}{\expandonce\@dtl@argB}}%
+ {\expandonce\dtl@first\expandonce\dtl@rest}{\expandonce\@dtl@subs@argB}}%
\@dtl@donext
}%
\fi
@@ -2278,10 +2280,10 @@
\@dtl@conditiontrue
}%
{%
- \expandafter\dtl@getfirst\@dtl@argA\end
+ \expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
- \expandafter\dtl@getfirst\@dtl@argB\end
+ \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
\expandafter\dtl@ifsingle\expandafter{\dtl@firstA}%
@@ -2551,6 +2553,13 @@
\TE@throw\noexpand\dtl@teststartswith{#1}{#2}%
\noexpand\if@dtl@condition
}
+\newcommand*{\DTLisinlist}[2]{%
+ \TE@throw\noexpand\dtl@testinlist{#1}{#2}%
+ \noexpand\if@dtl@condition
+}
+\newcommand*{\dtl@testinlist}[2]{%
+ \DTLifinlist{#1}{#2}{\@dtl@conditiontrue}{\@dtl@conditionfalse}%
+}
\newcommand*{\dtl@testnumclosedbetween}[3]{%
\DTLifnumclosedbetween{#1}{#2}{#3}%
{\@dtl@conditiontrue}{\@dtl@conditionfalse}%
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 3efea2761cf..3d2e5a6798e 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/08/29 v2.17 (NLCT)]
+\ProvidesPackage{datatool-fp}[2015/07/11 v2.23 (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 a1189238346..82904f6cdd8 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/08/29 v2.17 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2015/07/11 v2.23 (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 79299f2620f..46b03f234e4 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 2014 Nicola Talbot
+%% Copyright 2015 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,13 +39,12 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2014/06/10 v2.22 (NLCT)]
+\ProvidesPackage{datatool}[2015/07/11 v2.23 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
\RequirePackage{substr}
\RequirePackage{etoolbox}
-\RequirePackage{etex}
\newcommand*{\@dtl@separator}{,}
\newcommand*{\DTLsetseparator}[1]{%
\renewcommand*{\@dtl@separator}{#1}%
@@ -57,6 +56,9 @@
\catcode`\^^I12
\DTLsetseparator{^^I}%
}
+\gdef\DTLmaketabspace{%
+ \catcode`\^^I10\relax
+}
\endgroup
\begingroup
\catcode`\"12\relax
@@ -2504,7 +2506,7 @@
\newtoks\@dtl@list
\newcommand*{\DTLsort}{\@ifstar\@sDTLsort\@DTLsort}
\newcommand{\@DTLsort}[3][]{%
- \dtlsort[#1]{#2}{#3}{\dtlicompare}%
+ \dtlsort[#1]{#2}{#3}{\dtlcompare}%
}
\newcommand*{\@sDTLsort}[3][]{%
\dtlsort[#1]{#2}{#3}{\dtlicompare}%
@@ -3250,15 +3252,29 @@
\let#1=\@dtl@trmstr
}
\long\def\@dtl@starttrim#1#2{%
- \def\@dtl@tmpB{#2}%
+ \dtl@ifsingle{#2}%
+ {%
+ \def\@dtl@tmpB{#2}%
+ }%
+ {%
+ \def\@dtl@tmpB{{#2}}%
+ }%
\ifx\par#1%
- \def\@dtl@dotrim{\@dtl@trim{} #2}%
+ \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{}%
- \def\@dtl@trmstr{#1}%
+ \let\@dtl@trmstr\@dtl@tmpA
\else
- \def\@dtl@dotrim{\@dtl@trim#1#2}%
+ \edef\@dtl@dotrim{\noexpand\@dtl@trim
+ \expandonce\@dtl@tmpA\expandonce\@dtl@tmpB}%
\fi
\fi
\@dtl@dotrim
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index 3783b063d35..8e5bf2590a3 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 2014 Nicola Talbot
+%% Copyright 2015 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}[2013/06/28 v2.14 (NLCT)]
+\ProvidesPackage{person}[2015/07/11 v2.23 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}
@@ -148,7 +148,7 @@
\newcommand{\ifmale}[3]{%
\ifpersonexists{#1}%
{%
- \edef\@gender{\csname person@\@thisperson @gender\endcsname}%
+ \edef\@gender{\csname person@#1@gender\endcsname}%
\ifx\@gender\@male@label
#2%
\else
@@ -183,7 +183,7 @@
\newcommand{\iffemale}[3]{%
\ifpersonexists{#1}%
{%
- \edef\@gender{\csname person@\@thisperson @gender\endcsname}%
+ \edef\@gender{\csname person@#1@gender\endcsname}%
\ifx\@gender\@female@label
#2%
\else
@@ -604,10 +604,10 @@
\fi
}
\newcommand*{\persongender}[1]{%
- \ifpersonmale{#1}{\malename}{\femalename}%
+ \ifmale{#1}{\malename}{\femalename}%
}
\newcommand*{\getpersongender}[2]{%
- \ifpersonmale{#2}{\let#1\malename}{\let#1\femalename}%
+ \ifmale{#2}{\let#1\malename}{\let#1\femalename}%
}
\newcommand*{\getpersonname}[2]{%
\ifpersonexists{#2}%