From 3327dfbc00f9422625c9a574826755a56a9cbee5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 31 Aug 2013 22:45:45 +0000 Subject: datatool (31aug13) git-svn-id: svn://tug.org/texlive/trunk@31551 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/datatool/datatool.dtx | 54 ++++++++++++++++++---- .../texmf-dist/source/latex/datatool/datatool.ins | 5 +- 2 files changed, 48 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex/datatool') diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx index bab6974643b..109413ab6c6 100644 --- a/Master/texmf-dist/source/latex/datatool/datatool.dtx +++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx @@ -2,6 +2,8 @@ % datatool.dtx generated using makedtx version 0.94b (c) Nicola Talbot % Command line args: % -macrocode "databib\.bst" +% -setambles "databib\.bst=>\nopreamble\nopostamble" +% -comment "databib\.bst" % -src "datatool-base.sty\Z=>datatool-base.sty" % -src "datatool-fp.sty\Z=>datatool-fp.sty" % -src "datatool-pgfmath.sty\Z=>datatool-pgfmath.sty" @@ -17,7 +19,7 @@ % -author "Nicola Talbot" % -codetitle "" % datatool -% Created on 2013/8/16 12:48 +% Created on 2013/8/29 23:06 %\fi %\iffalse %<*package> @@ -64,7 +66,7 @@ datatool.dtx \doxitem{Counter}{counter}{counters} \doxitem{Option}{option}{package options} -\CheckSum{22987} +\CheckSum{22897} \RecordChanges \PageIndex @@ -77,11 +79,11 @@ datatool.dtx %\fi %\MakeShortVerb{"} % -%\title{Documented Code for datatool v2.16} +%\title{Documented Code for datatool v2.17} %\author{Nicola L. C. Talbot\\ %\url{http://www.dickimaw-books.com/}} % -%\date{2013-08-16} +%\date{2013-08-29} %\maketitle % %\pagenumbering{roman} @@ -116,7 +118,7 @@ datatool.dtx % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-base}[2013/08/16 v2.16 (NLCT)] +\ProvidesPackage{datatool-base}[2013/08/29 v2.17 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -5161,7 +5163,7 @@ datatool.dtx % Definitions of fixed-point commands that use the \sty{fp} package. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-fp}[2013/06/28 v2.14 (NLCT)] +\ProvidesPackage{datatool-fp}[2013/08/29 v2.17 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -5450,7 +5452,7 @@ datatool.dtx % Definitions of fixed-point commands that use the \sty{pgfmath} package. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-pgfmath}[2013/06/28 v2.14 (NLCT)] +\ProvidesPackage{datatool-pgfmath}[2013/08/29 v2.17 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -5707,7 +5709,7 @@ datatool.dtx %\section{Package Declaration} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool}[2013/08/16 v2.16 (NLCT)] +\ProvidesPackage{datatool}[2013/08/29 v2.17 (NLCT)] % \end{macrocode} % Load required packages: % \begin{macrocode} @@ -7488,6 +7490,40 @@ datatool.dtx } % \end{macrocode} %\end{macro} +% +%\begin{macro}{\edtlgetrowforvalue} +%\changes{2.17}{2013-08-29}{new} +%\begin{definition} +%\cs{edtlgetrowforvalue}\marg{db}\marg{column idx}\marg{value} +%\end{definition} +% A version of \cs{dtlgetrowforvalue} that expands its arguments. +% \begin{macrocode} +\newcommand{\edtlgetrowforvalue}[3]{% + \protected@edef\@dtl@dogetrowforvalue{% + \noexpand\dtlgetrowforvalue{#1}{#2}{#3}}% + \@dtl@dogetrowforvalue +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\DTLfetch} +%\changes{2.17}{2013-08-29}{new} +%\begin{definition} +%\cs{DTLfetch}\marg{db name}\marg{column1 name}\marg{column1 +%value}\marg{column2 name} +%\end{definition} +% Fetches and displays the value for \meta{column2 name} in the +% first row where the value of \meta{column1 name} is \meta{column1 +% value}. Note that all arguments are expanded. +% \begin{macrocode} +\newcommand{\DTLfetch}[4]{% + \edtlgetrowforvalue{#1}{\dtlcolumnindex{#1}{#2}}{#3}% + \dtlgetentryfromcurrentrow{\dtlcurrentvalue}{\dtlcolumnindex{#1}{#4}}% + \dtlcurrentvalue +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\dtlgetrowforvalue} %\begin{definition} %\cs{dtlgetrowforvalue}\marg{db}\marg{column idx}\marg{value} @@ -26364,6 +26400,7 @@ east,southeast,south,southwest,west,northwest}[northeast]{% %<*databib.bst> % \end{macrocode} %\fi +%\iffalse % \begin{macrocode} ENTRY { address @@ -27623,6 +27660,7 @@ FUNCTION {end.bib} EXECUTE {end.bib} % \end{macrocode} +%\fi %\iffalse % \begin{macrocode} % diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins index 1e77888877b..df96e9f5aeb 100644 --- a/Master/texmf-dist/source/latex/datatool/datatool.ins +++ b/Master/texmf-dist/source/latex/datatool/datatool.ins @@ -1,4 +1,4 @@ -% datatool.ins generated using makedtx version 0.94b 2013/8/16 12:48 +% datatool.ins generated using makedtx version 0.94b 2013/8/29 23:06 \input docstrip \preamble @@ -44,8 +44,7 @@ \usepostamble\defaultpostamble\from{datatool.dtx}{dataplot.sty,package}} \file{person.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{datatool.dtx}{person.sty,package}} -\file{databib.bst}{\usepreamble\defaultpreamble -\usepostamble\defaultpostamble\from{datatool.dtx}{databib.bst,package}} +\file{databib.bst}{\nopreamble\nopostamble\from{datatool.dtx}{databib.bst}} } \endbatchfile -- cgit v1.2.3