diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex | 86 |
1 files changed, 73 insertions, 13 deletions
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 da14efc159f..f8cf773826b 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex @@ -85,15 +85,60 @@ /pgfplots/table/meta index/.initial=, /pgfplots/table/meta/.initial=, /pgfplots/table/meta expr/.initial=, - /pgfplots/table/x error index/.initial=, - /pgfplots/table/y error index/.initial=, - /pgfplots/table/z error index/.initial=, - /pgfplots/table/x error/.initial=, - /pgfplots/table/y error/.initial=, - /pgfplots/table/z error/.initial=, - /pgfplots/table/x error expr/.initial=, - /pgfplots/table/y error expr/.initial=, - /pgfplots/table/z error expr/.initial=, + /pgfplots/table/x error index/.style={ + x error plus index={#1},% + x error minus index={#1}% + }, + /pgfplots/table/y error index/.style={ + y error plus index={#1},% + y error minus index={#1}% + }, + /pgfplots/table/z error index/.style={ + z error plus index={#1},% + z error minus index={#1}% + }, + /pgfplots/table/x error/.style={ + x error plus={#1},% + x error minus={#1}% + }, + /pgfplots/table/y error/.style={ + y error plus={#1},% + y error minus={#1}% + }, + /pgfplots/table/z error/.style={ + z error plus={#1},% + z error minus={#1}% + }, + /pgfplots/table/x error expr/.style={ + x error plus expr={#1},% + x error minus expr={#1}% + }, + /pgfplots/table/y error expr/.style={ + y error plus expr={#1},% + y error minus expr={#1}% + }, + /pgfplots/table/z error expr/.style={ + z error plus expr={#1},% + z error minus expr={#1}% + }, + /pgfplots/table/x error plus index/.initial=, + /pgfplots/table/y error plus index/.initial=, + /pgfplots/table/z error plus index/.initial=, + /pgfplots/table/x error plus/.initial=, + /pgfplots/table/y error plus/.initial=, + /pgfplots/table/z error plus/.initial=, + /pgfplots/table/x error plus expr/.initial=, + /pgfplots/table/y error plus expr/.initial=, + /pgfplots/table/z error plus expr/.initial=, + /pgfplots/table/x error minus index/.initial=, + /pgfplots/table/y error minus index/.initial=, + /pgfplots/table/z error minus index/.initial=, + /pgfplots/table/x error minus/.initial=, + /pgfplots/table/y error minus/.initial=, + /pgfplots/table/z error minus/.initial=, + /pgfplots/table/x error minus expr/.initial=, + /pgfplots/table/y error minus expr/.initial=, + /pgfplots/table/z error minus expr/.initial=, /pgfplots/table/ignore chars/.initial=, /pgfplots/table/white space chars/.initial=, /pgfplots/table/comment chars/.initial=, @@ -153,6 +198,13 @@ \fi \let#1=\pgfutil@empty },% + /pgfplots/exception/table columns unbalanced/.code={% + \ifx\pgfplotsexceptionmsg\relax + \pgfplots@error{#1}% + \else + \pgfplots@error{\pgfplotsexceptionmsg}% + \fi + }, } % \pgfplotstableread[OPTIONS] {FILE} to \name @@ -1135,7 +1187,7 @@ \fi \ifnum\pgfplotstableread@curcol=\pgfplotstableread@numcols\relax \else - \pgfplotstable@error{input table '\pgfplotstableread@filename' has an unbalanced number of columns in row '\thepgfplotstableread@lineno' (expected '\thepgfplotstableread@numcols' cols; got '\thepgfplotstableread@curcol'). Maybe the input table is corrupted? If you need unbalanced data, consider using 'nan' in empty cells (perhaps combined with 'unbounded coords=jump')}% + \pgfplotsthrow{table columns unbalanced}{input table '\pgfplotstableread@filename' has an unbalanced number of columns in row '\thepgfplotstableread@lineno' (expected '\thepgfplotstableread@numcols' cols; got '\thepgfplotstableread@curcol'). Maybe the input table is corrupted? If you need unbalanced data, consider using 'nan' in empty cells (perhaps combined with 'unbounded coords=jump')}\pgfeov% \fi \ifpgfplots@tableread@to@listener \ifpgfplotstableread@curline@contains@colnames @@ -1494,9 +1546,9 @@ \pgfplotstable@getcol{#1}\of{\pgfplotstableread@filename}\to{#2}\getcolmethod{getptr}% }% -% As \pgfplotstablereadgetptrtocolname, but this here access columns +% As \pgfplotstablereadgetptrtocolname, but this here accesses columns % by index. -\def\pgfplotstablereadgetptrtocolindex@#1#2{\def#2{#1}}% +\def\pgfplotstablereadgetptrtocolindex@#1#2{\edef#2{#1}}% % \pgfplotstablereadevalptr{<\ptr>}{<\content} % writes the current value of <\ptr> to <\content>. The pointer <\ptr> @@ -1525,7 +1577,7 @@ \else \begingroup \t@pgfplots@tokc={#1}% - \pgfplotstable@error{Table '\pgfplotstableread@filename' appears to have too many columns in line \thepgfplotstableread@lineno: Ignoring '\the\t@pgfplots@tokc'. PGFPlots found that the number of columns is larger than the previously determined number of columns. Please verify that every cell entry is separated correctly (use braces {<cell entry>} if necessary. Also verify that column names are plain ASCII.). This error is not critical}% + \pgfplotsthrow{table columns unbalanced}{Table '\pgfplotstableread@filename' appears to have too many columns in line \thepgfplotstableread@lineno: Ignoring '\the\t@pgfplots@tokc'. PGFPlots found that the number of columns is larger than the previously determined number of columns. Please verify that every cell entry is separated correctly (use braces {<cell entry>} if necessary. Also verify that column names are plain ASCII.). This error is not critical}\pgfeov% \endgroup \fi } @@ -1533,6 +1585,14 @@ \long\def\pgfplotstableread@impl@collectcolnames@NEXT#1{% + \edef\pgfplotstable@loc@TMPa{#1}% + \ifx\pgfplotstable@loc@TMPa\pgfutil@empty + \edef\pgfplotstable@loc@TMPa{\thepgfplotstableread@curcol}% + \pgfplotswarning{empty column name}{\pgfplotstableread@filename}{\pgfplotstable@loc@TMPa'}\pgfeov% + \fi + \expandafter\pgfplotstableread@impl@collectcolnames@NEXT@\expandafter{\pgfplotstable@loc@TMPa}% +} +\long\def\pgfplotstableread@impl@collectcolnames@NEXT@#1{% %\pgfplots@message{Got column name no \thepgfplotstableread@curcol\ as '#1'}% \pgfutil@ifundefined{pgfplotstableread@impl@COLNAME@#1}{% \def\pgfplotstable@loc@TMPa{#1}% |