texlive[46635] Master/texmf-dist: pst-plot (14feb18)
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 14 22:31:49 CET 2018
Revision: 46635
http://tug.org/svn/texlive?view=revision&revision=46635
Author: karl
Date: 2018-02-14 22:31:49 +0100 (Wed, 14 Feb 2018)
Log Message:
-----------
pst-plot (14feb18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2018-02-14 21:31:31 UTC (rev 46634)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2018-02-14 21:31:49 UTC (rev 46635)
@@ -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
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex 2018-02-14 21:31:31 UTC (rev 46634)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex 2018-02-14 21:31:49 UTC (rev 46635)
@@ -117,7 +117,7 @@
\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}
Modified: trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2018-02-14 21:31:31 UTC (rev 46634)
+++ trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2018-02-14 21:31:49 UTC (rev 46635)
@@ -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 @@
\read1 to \pst at tempA
\repeat
\psDEBUG[pst-plot]{>>> ignored \the\pst at cnta\space data lines}%
- \global\pst at linecnt=\psk at nStep%
- \readdata@%
- \fi%
- \endgroup%
+ \global\pst at linecnt=\psk at nStep
+ \readdata@
+ \fi
+ \endgroup
\global\let#2\pst at tempg%
\global\let\pst at tempg\relax%
\ignorespaces}
@@ -156,16 +156,26 @@
\def\savedata#1{\begingroup\pst at datadelimiters\savedata@{#1}}
%
\newread\RCD at file
-\def\psreadDataColumn#1#2#3#4{% #1:column #2:delimiter #3:\result #4:data file
+\def\psreadDataColumn{\@ifnextchar[\psreadDataColumn at i{\psreadDataColumn at i[]}}
+\def\psreadDataColumn at i[#1]{%
+ \psset{#1}%
+ \psreadDataColumn at ii
+}
+\def\psreadDataColumn at ii#1#2#3#4{% #1:column #2:delimiter #3:\result #4:data file
\immediate\openin\RCD at file=#4\relax
\global\let#3=\@empty
+ \pst at cnta=0
+ \loop \ifnum\the\pst at cnta<\psk at ignoreLines
+ \advance\pst at cnta by 1\relax
+ \read\RCD at file to \@tempa
+ \repeat
\loop
\read\RCD at file to \@tempa
- \ifeof\RCD at file\else
- \edef\@tempa{\@tempa#2}%
- \def\reserved at b{}%
- \@tempswafalse
- \@tempcnta=#1\relax
+ \ifeof\RCD at file\else
+ \edef\@tempa{\@tempa#2}%
+ \def\reserved at b{}%
+ \@tempswafalse
+ \@tempcnta=#1\relax
\expandafter\@tfor\expandafter\reserved at a
\expandafter:\expandafter=\@tempa\do{% loop over every token
\if\reserved at a#2\relax% delimiter?
@@ -2597,7 +2607,7 @@
\if at star\pspicture*(\pst at dimm,\pst at dimn)(\pst at dimo,\pst at dimp)\else
\pspicture(\pst at dimm,\pst at dimn)(\pst at dimo,\pst at dimp)\fi
\let\psxunit\pst at xunit \let\psyunit\pst at yunit
- \ifdim\pst at xunit=\pst at yunit\relax\psset[pstricks]{runit=\pst at xunit}\fi%
+ \ifdim\pst at xunit=\pst at yunit\relax\psset{runit=\pst at xunit}\fi%
\bgroup
\use at par
\ifPst at psgrid
@@ -2639,8 +2649,8 @@
\pst at dimd=#6\pst at yunit \advance\pst at dimd by \psk at ury%
\if at star\pspicture*(\pst at dima,\pst at dimb)(\pst at dimc,\pst at dimd)\else%
\pspicture(\pst at dima,\pst at dimb)(\pst at dimc,\pst at dimd)\fi%
- \psset[pstricks]{xunit=\pst at xunit,yunit=\pst at yunit}
- \ifdim\pst at xunit=\pst at yunit \psset[pstricks]{runit=\pst at xunit}\fi%
+ \psset{xunit=\pst at xunit,yunit=\pst at yunit}
+ \ifdim\pst at xunit=\pst at yunit \psset{runit=\pst at xunit}\fi%
\bgroup%
\use at par%
\ifPst at psgrid
More information about the tex-live-commits
mailing list