diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool/datatool.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/datatool/datatool.sty | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty index b90881d77b1..07b9a82f41b 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 2018 Nicola Talbot +%% Copyright 2019 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}[2018/12/07 v2.31 (NLCT)] +\ProvidesPackage{datatool}[2019/09/27 v2.32 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{ifthen} \RequirePackage{xfor} @@ -637,7 +637,7 @@ {% {% \dtlgetrow{#1}{#2}% - \@dtl@assign{#3}{#1}% + \@dtl@assign{#3}{#1}% }% }% {% @@ -1330,7 +1330,7 @@ \gdef\DTLiffirstrow##1##2{% \expandafter\ifnum \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname - =1\relax + =1 %space intended ##1% \else ##2% @@ -1341,7 +1341,7 @@ \gdef\DTLiflastrow##1##2{% \expandafter\ifnum \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname - =\csname dtlrows@#2\endcsname\relax + =\csname dtlrows@#2\endcsname ##1% \else ##2% @@ -1380,10 +1380,7 @@ \expandafter\global \csname @dtl@next\romannumeral\dtlforeachlevel\endcsname = \dtlafterrow - \ifx\relax#3\relax - \else - \@dtl@assign{#3}{#2}% - \fi + \ifblank{#3}{}{\@dtl@assign{#3}{#2}}% \ifthenelse{#1}% {% \refstepcounter{DTLrow\romannumeral\dtlforeachlevel}% @@ -1484,7 +1481,7 @@ \gdef\DTLiffirstrow##1##2{% \expandafter\ifnum \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname - =1\relax + =1 % space intended ##1% \else ##2% @@ -1495,7 +1492,7 @@ \gdef\DTLiflastrow##1##2{% \expandafter\ifnum \csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname - =\csname dtlrows@#2\endcsname\relax + =\csname dtlrows@#2\endcsname ##1% \else ##2% @@ -1522,11 +1519,11 @@ \expandafter\global \csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname = \expandafter{\dtl@thisrow}% - \ifx\relax#3\relax - \else + \ifblank{#3}{} + {% \dtlcurrentrow=\expandafter{\dtl@thisrow}% \@dtl@assign{#3}{#2}% - \fi + }% \ifthenelse{#1}% {% \refstepcounter{DTLrow\romannumeral\dtlforeachlevel}% |