pst-plot (10jul13)

git-svn-id: svn://tug.org/texlive/trunk@31173 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 34 insertions, 7 deletions

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 3ba69d200c1..5389d51c181 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 776 2013-04-29 10:10:22Z herbert $
+% $Id: pst-plot.tex 802 2013-07-09 20:24:11Z herbert $
 %% BEGIN pst-plot.tex
 %%
 %% plotting functions and data with PSTricks.
@@ -20,8 +20,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.45}
-\def\filedate{2013/04/29}
+\def\fileversion{1.47}
+\def\filedate{2013/07/08}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -152,6 +152,36 @@ 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
+  \immediate\openin\RCD@file=#4\relax
+  \global\let#3=\@empty
+  \loop
+    \read\RCD@file to \@tempa
+  \ifeof\RCD@file\else
+    %%%\typeout{*** \@tempa ***}%
+    \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?
+        \advance\@tempcnta \m@ne
+        \ifnum \@tempcnta=\z@
+          \expandafter\g@addto@macro\expandafter#3\expandafter{\reserved@b\space}%
+          \@tempswatrue
+        \fi
+        \def\reserved@b{}% ???
+      \else
+        \edef\reserved@b{\reserved@b\reserved@a}
+      \fi
+      \if@tempswa\@break@tfor\fi
+    }%
+  \repeat
+  \immediate\closein\RCD@file
+}
+
 %%%%%%%%%%%%%% the plot-styles %%%%%%%%%%%%%%%%%%
 %
 \def\beginplot@line{\begin@OpenObj}
@@ -1985,9 +2015,6 @@ D\space##1%
   \ignorespaces%
 }%
 %
-%
-%
-%
 \def\psxs@frame{%
   \begin@SpecialObj%
     \addto@pscode{					% the frame
@@ -2358,7 +2385,7 @@ D\space##1%
   \expandafter\get@Label\psk@yLabels,\@nil
 }
 \def\get@Label#1,#2\@nil{%
-  \ifnum\the\pst@cnto=\the\pst@cntp 
+  \ifnum\the\pst@cnto=\the\pst@cntp\relax 
     #1
   \else\global\advance\pst@cnto by \@ne 
     \expandafter\get@Label#2,\@nil