diff options
author | Karl Berry <karl@freefriends.org> | 2018-04-08 19:45:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-04-08 19:45:42 +0000 |
commit | 5e1d404afe82e273e057cf994040faeecbc18668 (patch) | |
tree | c92548b115769ae8773a49fa850d22541f65def7 /Master/texmf-dist/tex/generic/pgfplots/numtable | |
parent | 3b2c534b1fceba64b45a5f594393b5807189bfc2 (diff) |
pgfplots (7apr18)
git-svn-id: svn://tug.org/texlive/trunk@47373 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/numtable')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstable.code.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex | 27 |
2 files changed, 34 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstable.code.tex b/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstable.code.tex index 5812550a4fc..4e33bacd635 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstable.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstable.code.tex @@ -1159,8 +1159,15 @@ \else \def\pgfplotstable@loc@TMPa{#2}% \fi + % + % let the table contain one column named '@@@@@temporary@column@': \pgfplotslistnew#3{@@@@@temporary@column@\\}% - \expandafter\pgfplots@assign@list\csname\string#3@@@@@@temporary@column@\endcsname{1,2,...,\pgfplotstable@loc@TMPa}% + % populate the temporary column with enough rows: + \ifnum\pgfplotstable@loc@TMPa>0 + \expandafter\pgfplots@assign@list\csname\string#3@@@@@@temporary@column@\endcsname{1,...,\pgfplotstable@loc@TMPa}% + \else + \expandafter\pgfplotslistnewempty\csname\string#3@@@@@@temporary@column@\endcsname% + \fi % % now, create all real columns: \pgfplotstableset{#1,% diff --git a/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex b/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex index 1cb10748269..b8f63abe8ad 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex @@ -1731,11 +1731,36 @@ \ifpgfplotstable@search@header \ifpgfplotstableread@curline@contains@colnames \else - \pgfplotstableread@isnumber@ITERATE#1\pgfplotstable@EOI + \def\pgfplotstableread@CURTOK{#1}% + % can we safely use the \pgfmathfloatparsenumber here? I + % doubt it -- what if the header contains macros? + % + % there is no (simple) expandable "to lower case". check + % for the most common forms here. + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@nan + \else + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@NaN + \else + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@NAN + \else + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@inf + \else + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@Inf + \else + \ifx\pgfplotstableread@CURTOK\pgfplotstableread@isnumber@INF + \else + \pgfplotstableread@isnumber@ITERATE#1\pgfplotstable@EOI + \fi\fi\fi\fi\fi\fi %\ifpgfplotstableread@curline@contains@colnames\pgfplots@message{'#1' is a column name!}\else\pgfplots@message{'#1' is NO column name!}\fi \fi \fi } +\def\pgfplotstableread@isnumber@nan{nan} +\def\pgfplotstableread@isnumber@NaN{NaN} +\def\pgfplotstableread@isnumber@NAN{NAN} +\def\pgfplotstableread@isnumber@inf{inf} +\def\pgfplotstableread@isnumber@INF{INF} +\def\pgfplotstableread@isnumber@Inf{Inf} \def\pgfplotstableread@isnumber@plus{+} \def\pgfplotstableread@isnumber@minus{-} \def\pgfplotstableread@isnumber@zero{0} |