summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/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/source/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/source/latex/datatool')
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx92
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins4
2 files changed, 61 insertions, 35 deletions
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