summaryrefslogtreecommitdiff
path: root/Master
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
parent7f4fbb6f8595f086b514e4c489becf404a62be4b (diff)
datatool (17jan14)
git-svn-id: svn://tug.org/texlive/trunk@32703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/datatool/CHANGES15
-rw-r--r--Master/texmf-dist/doc/latex/datatool/INSTALL11
-rw-r--r--Master/texmf-dist/doc/latex/datatool/README4
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-code.pdfbin893369 -> 908802 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.pdfbin600386 -> 600057 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/datatool-user.tex50
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdfbin35087 -> 35074 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdfbin22872 -> 22860 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdfbin122606 -> 122594 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdfbin180324 -> 180116 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdfbin104460 -> 104736 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.tex3
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdfbin128798 -> 128783 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdfbin22164 -> 21642 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdfbin33977 -> 33964 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdfbin0 -> 61053 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdfbin34628 -> 34615 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdfbin31764 -> 31752 bytes
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx92
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins4
-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
30 files changed, 157 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES
index 987f07c8ce7..175bfb35174 100644
--- a/Master/texmf-dist/doc/latex/datatool/CHANGES
+++ b/Master/texmf-dist/doc/latex/datatool/CHANGES
@@ -1,3 +1,18 @@
+v2.19:
+
+ * datatool:
+
+ - changed \\ to \dtldisplaycr in \DTLdisplaydb
+ and set \dtldisplaycr to \tabularnewline
+
+ - fixed bug in \glsaddall
+
+ * datagidx:
+
+ - added \glslink
+
+ - defines \@idxitem if not already defined
+
v2.18:
* datatool:
diff --git a/Master/texmf-dist/doc/latex/datatool/INSTALL b/Master/texmf-dist/doc/latex/datatool/INSTALL
index 55acc329594..86bfd84c2d6 100644
--- a/Master/texmf-dist/doc/latex/datatool/INSTALL
+++ b/Master/texmf-dist/doc/latex/datatool/INSTALL
@@ -39,12 +39,13 @@ Run LaTeX on datatool.ins to generate the package style files:
latex datatool.ins
-To create the package documentation (datatool.pdf):
+To create the package documentation (datatool-code.pdf):
-pdflatex datatool.dtx
-makeindex -s gind.ist datatool.idx
-pdflatex datatool.dtx
-pdflatex datatool.dtx
+pdflatex -jobname datatool-code datatool.dtx
+makeindex -s gind.ist datatool-code.idx
+makeindex -s gglo.ist -o datatool-code.gls datatool-code.glo
+pdflatex -jobname datatool-code datatool.dtx
+pdflatex -jobname datatool-code datatool.dtx
If TEXMF denotes the base directory of your local TeX installation (e.g.
/usr/share/texmf-local/ or C:\localtexmf\) then create the following
diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README
index c215e9e5819..9f93eadae57 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.18
+LaTeX Bundle : datatool v2.19
-Last Modified : 2013-09-06
+Last Modified : 2014-01-17
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 aadde68d664..a0192a52006 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 16f513d7498..a1941a87ab8 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 d641d8a5f3a..372ca7d0299 100644
--- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
+++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex
@@ -91,11 +91,11 @@
\MakeShortVerb{"}
\DeleteShortVerb{\|}
- \title{User Manual for datatool bundle version~2.18}
+ \title{User Manual for datatool bundle version~2.19}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2013-09-06}
+ \date{2014-01-17}
\maketitle
\pagenumbering{roman}
@@ -110,7 +110,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.18}
+ read \qt{Documented Code for datatool v2.19}
\item[INSTALL] Installation instructions.
@@ -2258,8 +2258,17 @@ before you use \cs{DTLloaddb}. You can reverse this using
\end{definition}
The file (\meta{filename}) may have a header row at the start of the file,
which provides the \meta{key} when creating a new database entry
-using \ics{DTLnewdbentry}. The optional argument \meta{options}
-is a key=value list of options. Available options are:
+using \ics{DTLnewdbentry}.
+The optional argument \meta{options}
+is a \meta{key}=\meta{value} list of options.
+\begin{important}
+Some of the keys may take a comma-separated list as a value.
+Note that spaces count in the default \TeX\ way within these lists.
+Remember that \TeX\ considers an end-of-line character as a space.
+If you have a long list, consider using the comment character (\%)
+to suppress unwanted space caused by line breaks in the code.
+\end{important}
+Available options are:
\begin{description}
\item[\csopt{DTLloaddb}{noheader}] This is a boolean value and
indicates if the file does not contain a header. If no value is
@@ -2275,7 +2284,8 @@ keys are supplied in \meta{options}, then the keys will be given by
\cs{dtldefaultkey}\meta{n}, where \meta{n} is the column number and
\DescribeMacro{\dtldefaultkey}\cs{dtldefaultkey} defaults to
``\dtldefaultkey''. Note that the list of keys must be delimited by
-braces since they contain commas. For example:
+braces since they contain commas.
+For example:
\begin{verbatim}
\DTLloaddb[noheader,keys={Temperature,Time,T2G}]{data}{data.csv}
\end{verbatim}
@@ -2312,6 +2322,10 @@ The delimiter can be changed using
\begin{definition}[\DescribeMacro{\DTLsetdelimiter}]%
\cs{DTLsetdelimiter}\marg{character}
\end{definition}
+\begin{important}
+Note that spaces count in the default \TeX\ manner (unless you
+specify a whitespace character as the delimiter).
+\end{important}
For example, suppose you have a file called \texttt{mydata.csv}
which contains the following:
@@ -2698,6 +2712,12 @@ Specifies the vertical alignment of the \env{tabular} environment
used by \cs{DTLdisplaydb}. Defaults to \texttt{c} (centred). May be redefined
to \texttt{t} (top) or \texttt{b} (bottom).
+\begin{definition}[\DescribeMacro{\dtldisplaycr}]
+\cs{dtldisplaycr}
+\end{definition}
+Specifies how to separate rows. Defaults to just
+\ics{tabularnewline}.
+
\begin{definition}[\DescribeMacro{\dtldisplaystarttab}]%
\cs{dtldisplaystarttab}
\end{definition}
@@ -6104,7 +6124,7 @@ adding to the definition of
\begin{definition}[\DescribeMacro\newtermlabelhook]
\cs{newtermlabelhook}
\end{definition}
-You can use \sty{etoolbox's} \ics{appto} command to append to this
+You can use \sty{etoolbox}'s \ics{appto} command to append to this
hook. For example, suppose you want to index the terms \verb|\TeX|,
\verb|e\TeX| and \verb|pdf\TeX|, but you want the terms to have the
label and sort fields to be just \verb|TeX|, \verb|eTeX| and
@@ -6247,6 +6267,11 @@ following analogous commands instead:
\cs{USEentrynl}\marg{label}\marg{field}
\end{definition}
+You can also specify your own custom text:
+\begin{definition}[\DescribeMacro\glslink]
+\cs{glslink}\marg{label}\marg{text}
+\end{definition}
+
In all the above commands, the \meta{label} argument may optionally
start with \oarg{format}, where format is the name of a control
name \emph{without} the preceding backslash. This command will be
@@ -6524,6 +6549,11 @@ Note that, unlike the \sty{glossaries} package, \cs{acr} isn't the
same as \cs{gls}. With \styfmt{datagidx}, \cs{gls} always references
the \csopt{newterm}{text} field. There is no ``first'' field.
+\begin{important}
+Take care when using acronyms with \cls{beamer}. Using overlays can
+cause problems with first use expansions.
+\end{important}
+
As a general rule, you're not supposed to capitalise the first
letter of an acronym (especially if it is displayed in small caps) but if you need to
you can use:
@@ -10426,13 +10456,11 @@ stores in \meta{cs} (which must be a command name).
\addcontentsline{toc}{chapter}{Acknowledgements}
\chapter*{Acknowledgements}
-Many thanks to Morten~H\o gholm for suggesting a much more
+Many thanks to Morten~H\o gholm for providing a much more
efficient way of storing the information in databases which
has significantly improved the time it takes to \LaTeX\ documents
containing large databases.
-\clearpage
-\phantomsection
-\addcontentsline{toc}{chapter}{Index}\PrintIndex
+\PrintIndex
\end{document}
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 dcc87e1095b..17044288c1b 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 5a700b54650..393b0bd3cf5 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 d209c431431..684937017cf 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-gidx.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf
index 6423b8921da..d2d1b4fe58a 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 a2ff8cfbfb9..701f67fc3c8 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-glossary.tex b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.tex
index b24fa252894..1265fd9f4b0 100644
--- a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.tex
+++ b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.tex
@@ -192,6 +192,9 @@ Next use:
Full form:
\Gls{html}, \gls{xml} and \gls{css}.
+\newpage
+
+Provide your own link text: \glslink{[textbf]css}{style sheet}.
\newpage
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 95dc10fa433..a9bbadda262 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 f945e24d367..d37597a1005 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 e0562d58ab1..59a472f70e2 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
new file mode 100644
index 00000000000..4d8764d920e
--- /dev/null
+++ 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 d3c91d76512..80681527934 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 46d94b1b278..5a91c1b86b7 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 3e6c46f074e..ac9fe123f73 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -1,5 +1,5 @@
%\iffalse
-% datatool.dtx generated using makedtx version 0.94b (c) Nicola Talbot
+% datatool.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
% -macrocode "databib\.bst"
% -setambles "databib\.bst=>\nopreamble\nopostamble"
@@ -19,7 +19,7 @@
% -author "Nicola Talbot"
% -codetitle ""
% datatool
-% Created on 2013/9/6 9:51
+% Created on 2014/1/17 12:07
%\fi
%\iffalse
%<*package>
@@ -42,7 +42,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2013 Nicola Talbot, all rights reserved.
+% Copyright (C) 2014 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -66,7 +66,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{22921}
+\CheckSum{22929}
\RecordChanges
\PageIndex
@@ -79,11 +79,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.18}
+%\title{Documented Code for datatool v2.19}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2013-09-06}
+%\date{2014-01-17}
%\maketitle
%
%\pagenumbering{roman}
@@ -98,8 +98,7 @@ datatool.dtx
%\pagenumbering{arabic}
%
%\StopEventually{%
-% \clearpage\phantomsection
-% \addcontentsline{toc}{chapter}{Index}\PrintIndex
+% \PrintIndex
% \clearpage\phantomsection
% \addcontentsline{toc}{chapter}{History}\PrintChanges
%}
@@ -5709,7 +5708,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2013/09/06 v2.18 (NLCT)]
+\ProvidesPackage{datatool}[2014/01/17 v2.19 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -7535,7 +7534,7 @@ datatool.dtx
% Like \cs{dtlgetrow}, but gets the row where the entry in column
% \meta{column index} matches \meta{value}. Produces an error if row
% not found.
-%\changes{2012-09-25}{2.11}{new}
+%\changes{2.11}{2012-09-25}{new}
% \begin{macrocode}
\newcommand*{\dtlgetrowforvalue}[3]{%
\dtlgetrowindex{\dtl@rowidx}{#1}{#2}{#3}%
@@ -9817,6 +9816,13 @@ datatool.dtx
\newcommand*{\dtldisplaystartrow}{}
% \end{macrocode}
%\end{macro}
+%
+%\begin{macro}{\dtldisplaycr}
+%\changes{2.19}{2014-01-17}{new}
+% \begin{macrocode}
+\newcommand{\dtldisplaycr}{\tabularnewline}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\DTLdisplaydb}
%\begin{definition}
@@ -9904,8 +9910,9 @@ datatool.dtx
\@sDTLforeach{#2}{}{%
% \end{macrocode}
% Do the start row hook if not the first row
+%\changes{2.19}{2014-01-17}{switched to \cs{dtldisplaycr}}
% \begin{macrocode}
- \DTLiffirstrow{}{\\\dtldisplaystartrow}%
+ \DTLiffirstrow{}{\dtldisplaycr\dtldisplaystartrow}%
% \end{macrocode}
% Reset \cs{@dtl@doamp} so it doesn't do an ampersand at the
% start of the first column.
@@ -9986,10 +9993,11 @@ datatool.dtx
%
%\begin{macro}{\@dtl@resetdostartrow}
% Resets start row hook so that it skips the first row.
+%\changes{2.19}{2014-01-17}{switched to \cs{dtldisplaycr}}
% \begin{macrocode}
\newcommand*{\@dtl@resetdostartrow}{%
\gdef\@dtl@dostartrow{%
- \gdef\@dtl@dostartrow{\\\dtldisplaystartrow}}%
+ \gdef\@dtl@dostartrow{\dtldisplaycr\dtldisplaystartrow}}%
}
% \end{macrocode}
%\end{macro}
@@ -13095,7 +13103,7 @@ datatool.dtx
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2013/07/10 v2.15 (NLCT)]
+\ProvidesPackage{datagidx}[2014/01/17 v2.19 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -14446,6 +14454,14 @@ datatool.dtx
}
% \end{macrocode}
%\end{macro}
+%
+%\begin{macro}{\@idxitem}
+% Some classes, such as \cls{beamer}, don't define \cs{@idxitem} so
+% if it's not already defined, define it here.
+% \begin{macrocode}
+\providecommand{\@idxitem}{\par\hangindent 40\p@}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\datagidxstart}
% Indicates what to do at the start of the glossary/index.
% \begin{macrocode}
@@ -17866,15 +17882,17 @@ datatool.dtx
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\datagidx@use@entry}
+%\begin{macro}{\@datagidx@use@entry}
%\begin{definition}
-%\cs{use@entry}\marg{field}\marg{link text}
+%\cs{@datagidx@use@entry}\marg{link text}
%\end{definition}
% The label and format should have been stored in
% \cs{datagidx@label} and \cs{datagidx@format} before calling this
% macro.
+%\changes{2.19}{2014-01-17}{renamed \cs{datagidx@use@entry} to
+%\cs{@datagidx@use@entry} and removed redundant field argument}
% \begin{macrocode}
-\newcommand*{\datagidx@use@entry}[2]{%
+\newcommand*{\@datagidx@use@entry}[1]{%
% \end{macrocode}
% Does this term exist?
% \begin{macrocode}
@@ -17918,13 +17936,6 @@ datatool.dtx
}%
{}%
% \end{macrocode}
-% Get the entry for the given field in the current row and store in
-% \cs{datagidx@value}.
-% \begin{macrocode}
- \dtlgetentryfromcurrentrow
- {\datagidx@value}%
- {\dtlcolumnindex{\newterm@database}{#1}}%
-% \end{macrocode}
% Update the "Used" field.
% \begin{macrocode}
\dtlreplaceentryincurrentrow
@@ -17949,7 +17960,7 @@ datatool.dtx
% field.
% \begin{macrocode}
\datagidx@target{\datagidx@label}{\datagidx@format}%
- {\csuse{the\DTLgidxCounter}}{#2}%
+ {\csuse{the\DTLgidxCounter}}{#1}%
}%
}
% \end{macrocode}
@@ -18260,7 +18271,7 @@ datatool.dtx
\dtlgetrow{#1}{\datagidx@count}%
% \end{macrocode}
% Get the label for this row.
-%\changes{??}{??}{Fixed bug in database reference}
+%\changes{2.19}{2014-01-17}{Fixed bug in database reference}
% \begin{macrocode}
\dtlgetentryfromcurrentrow
{\datagidx@label}%
@@ -18275,13 +18286,13 @@ datatool.dtx
\egroup
% \end{macrocode}
% Update the "Used" field.
-%\changes{??}{??}{Fixed bug in database reference}
+%\changes{2.19}{2014-01-17}{Fixed bug in database reference}
% \begin{macrocode}
\dtlreplaceentryincurrentrow
{1}{\dtlcolumnindex{#1}{Used}}%
% \end{macrocode}
% Get the entry for the "FirstId" field and store in \cs{datagidx@id}
-%\changes{??}{??}{Fixed bug in database reference}
+%\changes{2.19}{2014-01-17}{Fixed bug in database reference}
% \begin{macrocode}
\dtlgetentryfromcurrentrow
{\datagidx@id}%
@@ -18312,6 +18323,21 @@ datatool.dtx
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glslink}
+%\begin{definition}
+%\cs{glslink}\marg{label}\marg{text}
+%\end{definition}
+% Use given entry but user supplies text.
+% \begin{macrocode}
+\DeclareRobustCommand*{\glslink}[2]{%
+ \datagidx@parse@formatlabel{#1}%
+ \datagidxlink{\datagidx@label}%
+ {%
+ \@datagidx@use@entry{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
%
%\begin{macro}{\useentry}
%\begin{definition}
@@ -18324,7 +18350,7 @@ datatool.dtx
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\datagidx@value}%
+ \@datagidx@use@entry{\datagidx@value}%
}%
}
% \end{macrocode}
@@ -18340,7 +18366,7 @@ datatool.dtx
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\xmakefirstuc{\datagidx@value}}%
+ \@datagidx@use@entry{\xmakefirstuc{\datagidx@value}}%
}%
}
% \end{macrocode}
@@ -18357,7 +18383,7 @@ datatool.dtx
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
\datagidxlink{\datagidx@label}%
{%
- \datagidx@use@entry{#2}{\MakeTextUppercase{\datagidx@value}}%
+ \@datagidx@use@entry{\MakeTextUppercase{\datagidx@value}}%
}%
}
% \end{macrocode}
@@ -18373,7 +18399,7 @@ datatool.dtx
\DeclareRobustCommand*{\useentrynl}[2]{%
\datagidx@parse@formatlabel{#1}%
\DTLgidxFetchEntry{\datagidx@value}{\datagidx@label}{#2}%
- \datagidx@use@entry{#2}{\datagidx@value}%
+ \@datagidx@use@entry{\datagidx@value}%
}
% \end{macrocode}
%\end{macro}
@@ -18386,7 +18412,7 @@ datatool.dtx
\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}}%
}
% \end{macrocode}
%\end{macro}
@@ -18399,7 +18425,7 @@ datatool.dtx
\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}}%
}
% \end{macrocode}
%\end{macro}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index 78fa2dca79b..be1294e0d3f 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.ins
+++ b/Master/texmf-dist/source/latex/datatool/datatool.ins
@@ -1,10 +1,10 @@
-% datatool.ins generated using makedtx version 0.94b 2013/9/6 9:51
+% datatool.ins generated using makedtx version 1.1 2014/1/17 12:07
\input docstrip
\preamble
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/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