diff options
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf | bin | 1342048 -> 1347667 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 42 |
4 files changed, 28 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index fcd95a468eb..e30b579308a 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/Changes +++ b/Master/texmf-dist/doc/generic/pst-plot/Changes @@ -1,4 +1,5 @@ ----- pst-plot.tex +1.88 2018-02-14 - add ignoreLines also for \psreadDataColumn 1.87 2017-12-12 - fix for ylabelFactor and polarplot 1.86 2017-11-16 - fix for trailing spaces in x|ylabelPos 1.85 2017-11-12 - try to prevent overfull hbox for the x axis diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf Binary files differindex fcb586f654b..f3e35974212 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex index 6b0468faf8c..4384d6de6ba 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex @@ -117,7 +117,7 @@ contain units. The values of \Lcs{psxunit} and \Lcs{psyunit} are used as the uni \Lcs{psdataplot}\OptArgs\Largb{\Lcs{\Larga{macro}}}\\ \Lcs{savedata}\Largb{\Lcs{\Larga{macro}}}\Largs{data}\\ \Lcs{readdata}\Largb{\Lcs{\Larga{macro}}}\Largb{file}\\ - \Lcs{psreadColumnData}\Largb{colNo}\Largb{delimiter}\Largb{\Lcs{\Larga{macro}}}\Largb{filename}\\ + \Lcs{psreadDataColumn}\OptArgs\Largb{colNo}\Largb{delimiter}\Largb{\Lcs{\Larga{macro}}}\Largb{filename}\\ \Lcs{listplot}\Largb{data}\\ \Lcs{pslistplot}\Largb{data} \end{BDef} diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex index 5c536b5eea6..bf2270f3acf 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex @@ -1,4 +1,4 @@ -% $Id: pst-plot.tex 686 2017-12-11 20:16:01Z herbert $ +% $Id: pst-plot.tex 699 2017-12-31 10:27:45Z herbert $ %% %% BEGIN pst-plot.tex %% @@ -23,8 +23,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.87} -\def\filedate{2017/12/12} +\def\fileversion{1.88} +\def\filedate{2018/02/14} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -123,10 +123,10 @@ D\space##1% \read1 to \pst@tempA \repeat \psDEBUG[pst-plot]{>>> ignored \the\pst@cnta\space data lines}% - \global\pst@linecnt=\psk@nStep% - \readdata@% - \fi% - \endgroup% + \global\pst@linecnt=\psk@nStep + \readdata@ + \fi + \endgroup \global\let#2\pst@tempg% \global\let\pst@tempg\relax% \ignorespaces} @@ -156,16 +156,26 @@ D\space##1% \def\savedata#1{\begingroup\pst@datadelimiters\savedata@{#1}} % \newread\RCD@file -\def\psreadDataColumn#1#2#3#4{% #1:column #2:delimiter #3:\result #4:data file +\def\psreadDataColumn{\@ifnextchar[\psreadDataColumn@i{\psreadDataColumn@i[]}} +\def\psreadDataColumn@i[#1]{% + \psset{#1}% + \psreadDataColumn@ii +} +\def\psreadDataColumn@ii#1#2#3#4{% #1:column #2:delimiter #3:\result #4:data file \immediate\openin\RCD@file=#4\relax \global\let#3=\@empty + \pst@cnta=0 + \loop \ifnum\the\pst@cnta<\psk@ignoreLines + \advance\pst@cnta by 1\relax + \read\RCD@file to \@tempa + \repeat \loop \read\RCD@file to \@tempa - \ifeof\RCD@file\else - \edef\@tempa{\@tempa#2}% - \def\reserved@b{}% - \@tempswafalse - \@tempcnta=#1\relax + \ifeof\RCD@file\else + \edef\@tempa{\@tempa#2}% + \def\reserved@b{}% + \@tempswafalse + \@tempcnta=#1\relax \expandafter\@tfor\expandafter\reserved@a \expandafter:\expandafter=\@tempa\do{% loop over every token \if\reserved@a#2\relax% delimiter? @@ -2597,7 +2607,7 @@ D\space##1% \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi \let\psxunit\pst@xunit \let\psyunit\pst@yunit - \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi% + \ifdim\pst@xunit=\pst@yunit\relax\psset{runit=\pst@xunit}\fi% \bgroup \use@par \ifPst@psgrid @@ -2639,8 +2649,8 @@ D\space##1% \pst@dimd=#6\pst@yunit \advance\pst@dimd by \psk@ury% \if@star\pspicture*(\pst@dima,\pst@dimb)(\pst@dimc,\pst@dimd)\else% \pspicture(\pst@dima,\pst@dimb)(\pst@dimc,\pst@dimd)\fi% - \psset[pstricks]{xunit=\pst@xunit,yunit=\pst@yunit} - \ifdim\pst@xunit=\pst@yunit \psset[pstricks]{runit=\pst@xunit}\fi% + \psset{xunit=\pst@xunit,yunit=\pst@yunit} + \ifdim\pst@xunit=\pst@yunit \psset{runit=\pst@xunit}\fi% \bgroup% \use@par% \ifPst@psgrid |