diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool/datatool.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/datatool/datatool.sty | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty index af902a2cf02..645feeed87e 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool}[2014/02/03 v2.20 (NLCT)] +\ProvidesPackage{datatool}[2014/03/08 v2.21 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{ifthen} \RequirePackage{xfor} @@ -759,13 +759,24 @@ \newcommand{\dtl@gathervalues}[3][key]{% \dtlforeachkey(\@dtl@key,\@dtl@col,\@dtl@type,\@dtl@head)\in{#2}\do {% - \dtlgetentryfromrow{\@dtl@tmp}{\@dtl@col}{\dtlcurrentrow}% + \dtlgetentryfromrow{\@dtl@tmp}{\@dtl@col}{#3}% \ifx\@dtl@tmp\dtlnovalue \@dtl@setnull{\@dtl@tmp}{\@dtl@key}% \fi \expandafter\let\csname @dtl@#1@\@dtl@key\endcsname\@dtl@tmp }% } +\newcommand{\dtl@g@gathervalues}[3][key]{% + \dtlforeachkey(\@dtl@key,\@dtl@col,\@dtl@type,\@dtl@head)\in{#2}\do + {% + \dtlgetentryfromrow{\@dtl@tmp}{\@dtl@col}{#3}% + \ifx\@dtl@tmp\dtlnovalue + \@dtl@setnull{\@dtl@tmp}{\@dtl@key}% + \fi + \expandafter\global + \expandafter\let\csname @dtl@#1@\@dtl@key\endcsname\@dtl@tmp + }% +} \newtoks\dtlcurrentrow \newtoks\dtlbeforerow \newtoks\dtlafterrow @@ -1920,7 +1931,6 @@ }% \edef\@dtl@dobegintab{\noexpand\begin{longtable}{\@dtl@tabargs}}% \@dtl@dobegintab - \dtldisplaystarttab \ifx\@dtl@foot\@nnil \else \@dtl@foot\endfoot @@ -1931,6 +1941,7 @@ \fi \ifx\@dtl@cap\@nnil \@dtl@resetdoamp + \dtldisplaystarttab \dtlforeachkey(\@dtl@key,\@dtl@idx,\@dtl@type,\@dtl@head)% \in{#2}\do {% @@ -1949,7 +1960,8 @@ \else \label{\@dtl@label}% \fi - \\% + \dtldisplaycr + \dtldisplaystarttab \@dtl@resetdoamp \dtlforeachkey(\@dtl@key,\@dtl@idx,\@dtl@type,\@dtl@head)% \in{#2}\do @@ -1961,14 +1973,14 @@ }% }% \@dtl@resetdoamp - \@dtl@resetdostartrow + \dtldisplaycr\dtldisplayafterhead \endfirsthead \ifx\@dtl@contcap\@nnil \caption{\@dtl@cap}% \else \caption{\@dtl@contcap}% \fi - \\% + \dtldisplaycr\dtldisplaystarttab \@dtl@resetdoamp \dtlforeachkey(\@dtl@key,\@dtl@idx,\@dtl@type,\@dtl@head)% \in{#2}\do @@ -1981,7 +1993,8 @@ }% \@dtl@resetdoamp \@dtl@resetdostartrow - \endhead\dtldisplayafterhead + \dtldisplaycr\dtldisplayafterhead + \endhead \fi \@sDTLforeach{#2}{}{% \@dtl@dostartrow |