summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/datatool
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-17 22:32:49 +0000
committerKarl Berry <karl@freefriends.org>2014-01-17 22:32:49 +0000
commit15d66dd18d30c82ae2c30ee9668585bf80dc954e (patch)
tree2387e2a32cf825e92f16291810ebca0d5d443ae5 /Master/texmf-dist/tex/latex/datatool
parent7f4fbb6f8595f086b514e4c489becf404a62be4b (diff)
datatool (17jan14)
git-svn-id: svn://tug.org/texlive/trunk@32703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool')
-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.sty31
-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.sty9
-rw-r--r--Master/texmf-dist/tex/latex/datatool/person.sty2
10 files changed, 31 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty
index 2cfbae3f740..cc179817cb8 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/databib.sty b/Master/texmf-dist/tex/latex/datatool/databib.sty
index 2e67913e4b5..38010aaaf23 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/datagidx.sty b/Master/texmf-dist/tex/latex/datatool/datagidx.sty
index 6c2ef481bae..0f219ea40b2 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 2013 Nicola Talbot
+%% Copyright 2014 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}[2013/07/10 v2.15 (NLCT)]
+\ProvidesPackage{datagidx}[2014/01/17 v2.19 (NLCT)]
\RequirePackage{datatool}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
@@ -703,6 +703,7 @@
\newcommand*{\datagidx@sort}{%
\dtlsort{Sort,FirstId}{\DTLgidxCurrentdb}{\dtlwordindexcompare}%
}
+\providecommand{\@idxitem}{\par\hangindent 40\p@}
\newcommand*{\datagidxstart}%
{%
\bgroup
@@ -2660,7 +2661,7 @@
\def\datagidx@format{#1}%
\def\datagidx@label{#2}%
}
-\newcommand*{\datagidx@use@entry}[2]{%
+\newcommand*{\@datagidx@use@entry}[1]{%
\ifcsundef{datagidxentry@\datagidx@label}
{%
\PackageError{datagidx}{Entry `\datagidx@label' doesn't exist}{}%
@@ -2684,9 +2685,6 @@
\dtlappendentrytocurrentrow{FirstId}{\datagidx@formatanchor\count@}%
}%
{}%
- \dtlgetentryfromcurrentrow
- {\datagidx@value}%
- {\dtlcolumnindex{\newterm@database}{#1}}%
\dtlreplaceentryincurrentrow
{1}{\dtlcolumnindex{\newterm@database}{Used}}%
\dtlgetentryfromcurrentrow
@@ -2695,7 +2693,7 @@
\dtlrecombine
\datagidx@markparent{\newterm@database}{\datagidx@parent}%
\datagidx@target{\datagidx@label}{\datagidx@format}%
- {\csuse{the\DTLgidxCounter}}{#2}%
+ {\csuse{the\DTLgidxCounter}}{#1}%
}%
}
\newcommand*{\DTLgidxCounter}{page}
@@ -2860,12 +2858,19 @@
\PackageError{datagidx}{Database `#1' doesn't exist}{}%
}%
}
+\DeclareRobustCommand*{\glslink}[2]{%
+ \datagidx@parse@formatlabel{#1}%
+ \datagidxlink{\datagidx@label}%
+ {%
+ \@datagidx@use@entry{#2}%
+ }%
+}
\DeclareRobustCommand*{\useentry}[2]{%
\datagidx@parse@formatlabel{#1}%
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\datagidx@value}%
+ \@datagidx@use@entry{\datagidx@value}%
}%
}
\DeclareRobustCommand*{\Useentry}[2]{%
@@ -2873,7 +2878,7 @@
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\xmakefirstuc{\datagidx@value}}%
+ \@datagidx@use@entry{\xmakefirstuc{\datagidx@value}}%
}%
}
\DeclareRobustCommand*{\USEentry}[2]{%
@@ -2881,23 +2886,23 @@
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\MakeTextUppercase{\datagidx@value}}%
+ \@datagidx@use@entry{\MakeTextUppercase{\datagidx@value}}%
}%
}
\DeclareRobustCommand*{\useentrynl}[2]{%
\datagidx@parse@formatlabel{#1}%
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
- \datagidx@use@entry{#2}{\datagidx@value}%
+ \@datagidx@use@entry{\datagidx@value}%
}
\DeclareRobustCommand*{\Useentrynl}[2]{%
\datagidx@parse@formatlabel{#1}%
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
- \datagidx@use@entry{#2}{\xmakefirstuc{\datagidx@value}}%
+ \@datagidx@use@entry{\xmakefirstuc{\datagidx@value}}%
}
\DeclareRobustCommand*{\USEentrynl}[2]{%
\datagidx@parse@formatlabel{#1}%
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
- \datagidx@use@entry{#2}{\MakeTextUppercase{\datagidx@value}}%
+ \@datagidx@use@entry{\MakeTextUppercase{\datagidx@value}}%
}
\DeclareRobustCommand*{\gls}[1]{\useentry{#1}{Text}}
\DeclareRobustCommand*{\glspl}[1]{\useentry{#1}{Plural}}
diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty
index c48d051638e..41bc83f17b7 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/dataplot.sty b/Master/texmf-dist/tex/latex/datatool/dataplot.sty
index 36209d39185..4e835f9d4d7 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty
index 8d7474b95ec..e0e288a574e 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty
index 19fb072f8f2..3efea2761cf 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty
index c2dc4a70488..a1189238346 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty
index 9281a51c9cf..7d85323adc7 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 2013 Nicola Talbot
+%% Copyright 2014 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}[2013/09/06 v2.18 (NLCT)]
+\ProvidesPackage{datatool}[2014/01/17 v2.19 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -1773,6 +1773,7 @@
\newcommand*{\dtldisplayafterhead}{}
\newcommand*{\dtldisplayvalign}{c}
\newcommand*{\dtldisplaystartrow}{}
+\newcommand{\dtldisplaycr}{\tabularnewline}
\newcommand*{\DTLdisplaydb}[2][]{%
\def\@dtl@doamp{\gdef\@dtl@doamp{&}}%
@@ -1810,7 +1811,7 @@
\dtldisplayafterhead
\@dtl@resetdoamp
\@sDTLforeach{#2}{}{%
- \DTLiffirstrow{}{\\\dtldisplaystartrow}%
+ \DTLiffirstrow{}{\dtldisplaycr\dtldisplaystartrow}%
\@dtl@resetdoamp
\DTLforeachkeyinrow{\@dtl@val}%
{%
@@ -1846,7 +1847,7 @@
\define@key{displaylong}{omit}{\def\@dtl@omitlist{#1}}
\newcommand*{\@dtl@resetdostartrow}{%
\gdef\@dtl@dostartrow{%
- \gdef\@dtl@dostartrow{\\\dtldisplaystartrow}}%
+ \gdef\@dtl@dostartrow{\dtldisplaycr\dtldisplaystartrow}}%
}
\newcommand*{\DTLdisplaylongdb}[2][]{%
\def\@dtl@cap{\@nil}%
diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty
index 6578c5a8a9e..3783b063d35 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 2013 Nicola Talbot
+%% Copyright 2014 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3