From 36b0711314bd0cca39ee7297df4ac8a6dc40eca4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Nov 2017 22:21:33 +0000 Subject: datatool (12nov17) git-svn-id: svn://tug.org/texlive/trunk@45759 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/datatool/databar.sty | 2 +- Master/texmf-dist/tex/latex/datatool/databib.sty | 2 +- Master/texmf-dist/tex/latex/datatool/datagidx.sty | 2 +- Master/texmf-dist/tex/latex/datatool/datapie.sty | 2 +- Master/texmf-dist/tex/latex/datatool/dataplot.sty | 2 +- .../tex/latex/datatool/datatool-base.sty | 2 +- .../texmf-dist/tex/latex/datatool/datatool-fp.sty | 2 +- .../tex/latex/datatool/datatool-pgfmath.sty | 2 +- Master/texmf-dist/tex/latex/datatool/datatool.sty | 88 ++++++++-------------- Master/texmf-dist/tex/latex/datatool/person.sty | 2 +- 10 files changed, 42 insertions(+), 64 deletions(-) (limited to 'Master/texmf-dist/tex/latex/datatool') diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty index 4747467b428..9a87841acb5 100644 --- a/Master/texmf-dist/tex/latex/datatool/databar.sty +++ b/Master/texmf-dist/tex/latex/datatool/databar.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{databar}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{databar}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{dataplot} \newif\ifDTLcolorbarchart diff --git a/Master/texmf-dist/tex/latex/datatool/databib.sty b/Master/texmf-dist/tex/latex/datatool/databib.sty index aef44e924d3..7383f02f3e3 100644 --- a/Master/texmf-dist/tex/latex/datatool/databib.sty +++ b/Master/texmf-dist/tex/latex/datatool/databib.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{databib}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{databib}[2017/11/12 v2.29 (NLCT)] \RequirePackage{datatool} \newcommand*{\dtlbib@style}{plain} \define@choicekey{databib.sty}{style}{plain,abbrv,alpha}{% diff --git a/Master/texmf-dist/tex/latex/datatool/datagidx.sty b/Master/texmf-dist/tex/latex/datatool/datagidx.sty index 6c61620a65e..d551c9eec11 100644 --- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty +++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datagidx}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datagidx}[2017/11/12 v2.29 (NLCT)] \RequirePackage{datatool} \RequirePackage{etoolbox} \RequirePackage{xkeyval} diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty index 29947301e0f..46891f689e5 100644 --- a/Master/texmf-dist/tex/latex/datatool/datapie.sty +++ b/Master/texmf-dist/tex/latex/datatool/datapie.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datapie}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datapie}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \newif\ifDTLcolorpiechart \DTLcolorpiecharttrue diff --git a/Master/texmf-dist/tex/latex/datatool/dataplot.sty b/Master/texmf-dist/tex/latex/datatool/dataplot.sty index e4946d3b55f..a549087f53f 100644 --- a/Master/texmf-dist/tex/latex/datatool/dataplot.sty +++ b/Master/texmf-dist/tex/latex/datatool/dataplot.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{dataplot}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{dataplot}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{tikz} \RequirePackage{datatool} diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty index 81c32e0cb7b..a487ef0b315 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-base}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datatool-base}[2017/11/12 v2.29 (NLCT)] \RequirePackage{etoolbox} \RequirePackage{amsmath} \RequirePackage{xkeyval} diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty index 6358eaf4f41..932b82c89cf 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-fp}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datatool-fp}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{fp} \RequirePackage{datatool-base} diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty index a5cd567b589..b803279b4ca 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-pgfmath}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datatool-pgfmath}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{pgfrcs,pgfkeys,pgfmath} \ProcessOptionsX diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty index ea7835d4dcb..6069e3ef6aa 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}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{datatool}[2017/11/12 v2.29 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{ifthen} \RequirePackage{xfor} @@ -72,9 +72,21 @@ \noexpand\long \noexpand\def\noexpand\@dtl@lopoff#1##1##2\noexpand\to##3##4{% \noexpand\ifx#2##1\noexpand\relax - \noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax + \noexpand\ifstrempty{##1}% + {\noexpand\@dtl@qlopoff#1{}##2\noexpand\to##3##4\relax}% + {% + \noexpand\dtl@ifsingle{##1}% + {\noexpand\@dtl@qlopoff#1##1##2\noexpand\to##3##4\relax}% + {\noexpand\@dtl@qlopoff#1{##1}##2\noexpand\to##3##4\relax}% + }% \noexpand\else - \noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax + \noexpand\ifstrempty{##1}% + {\noexpand\@dtl@lop@ff#1{}##2\noexpand\to##3##4\relax}% + {% + \noexpand\dtl@ifsingle{##1}% + {\noexpand\@dtl@lop@ff#1##1##2\noexpand\to##3##4\relax} + {\noexpand\@dtl@lop@ff#1{##1}##2\noexpand\to##3##4\relax} + }% \noexpand\fi }% } @@ -3085,17 +3097,23 @@ \define@key{loaddb}{omitlines}{\dtl@omitlines=#1\relax} \newcommand*{\dtldefaultkey}{Column} \newcommand*{\@dtl@readline}[2]{% - \read#1 to #2% - \ifdefempty{#2}% - {% - }% - {% - \dtl@trim#2% - }% + \begingroup + \catcode\endlinechar=\active% + \global\read#1 to #2% + \endgroup + \ifx#2\empty + \else + \expandafter\@dtl@stripeol#2% + \let#2\@dtl@strippedline + \fi } +\begingroup +\catcode\endlinechar=\active% +\gdef\@dtl@stripeol#1 +{\gdef\@dtl@strippedline{#1}} +\endgroup \newcommand*{\@dtl@readrawline}[2]{% \@dtl@rawread#1 to #2% - \dtl@trim#2% \dtl@domappings\@dtl@line } \newif\ifDTLnewdbonload @@ -3255,48 +3273,6 @@ doesn't exist)}{}% }% } -\newcommand{\dtl@trim}[1]{% - \def\@dtl@trmstr{}% - \if#1\par - \else - \expandafter\@dtl@start@trim#1\@dtl@end@trim - \fi - \let#1=\@dtl@trmstr -} -\def\@dtl@start@trim#1 \@dtl@end@trim{% - \def\@dtl@trmstr{#1}% -} -\long\def\@dtl@starttrim#1#2{% -\def\tmpA{#1}\show\tmpA -\def\tmpB{#2}\show\tmpB - \dtl@ifsingle{#2}% - {% - \def\@dtl@tmpB{#2}% - }% - {% - \def\@dtl@tmpB{{#2}}% - }% - \ifx\par#1% - \edef\@dtl@dotrim{\noexpand\@dtl@trim{} \expandonce\@dtl@tmpB}% - \else - \dtl@ifsingle{#1}% - {% - \def\@dtl@tmpA{#1}% - }% - {% - \def\@dtl@tmpA{{#1}}% - }% - \ifx\@dtl@tmpB\@nnil - \def\@dtl@dotrim{}% - \let\@dtl@trmstr\@dtl@tmpA - \else - \edef\@dtl@dotrim{\noexpand\@dtl@trim - \expandonce\@dtl@tmpA\expandonce\@dtl@tmpB}% - \fi - \fi - \@dtl@dotrim -} -\long\def\@dtl@trim#1 \@nil{\long\def\@dtl@trmstr{#1}} \newcommand*\DTLloadrawdb{% \let\@dtl@doreadline\@dtl@readrawline \@dtlloaddb @@ -3334,8 +3310,10 @@ \@dtl@activatebraces \@dtl@doreadraw?1?2>>> \gdef\@dtl@doreadraw?1?2<\relax -\read?1 to \tmp -\protected@xdef?2<\tmp>\relax +\begingroup\catcode\endlinechar=\active\global\read?1 to \dtl@tmp\endgroup +\expandafter\@dtl@stripeol\dtl@tmp +\let\dtl@tmp\@dtl@strippedline +\protected@xdef?2<\dtl@tmp>\relax > \endgroup \begingroup diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty index 3cf1d931bbf..292938d0f99 100644 --- a/Master/texmf-dist/tex/latex/datatool/person.sty +++ b/Master/texmf-dist/tex/latex/datatool/person.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{person}[2017/11/10 v2.28 (NLCT)] +\ProvidesPackage{person}[2017/11/12 v2.29 (NLCT)] \RequirePackage{ifthen} \RequirePackage{datatool} \newcounter{people} -- cgit v1.2.3