pst-func 0.64 (21jan10)

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

1 files changed, 15 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
index 2d9f7397067..863d4bfd28b 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-func.tex 244 2010-01-04 13:48:01Z herbert $
+%% $Id: pst-func.tex 261 2010-01-20 17:09:01Z herbert $
 %%
 %% This is file `pst-func.tex',
 %%
@@ -20,21 +20,22 @@
 \csname PSTfuncLoaded\endcsname
 \let\PSTfuncLoaded\endinput
 % Requires PSTricks, pst-node, pst-xkey
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTnodesLoaded\endinput\else\input pst-plot.tex\fi
+\ifx\PSTricksLoaded\endinput\else   \input pstricks.tex\fi
+\ifx\PSTnodesLoaded\endinput\else   \input pst-plot.tex\fi
+\ifx\PSTmathLoaded\endinput \else   \input pst-math.tex\fi
 \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
+\ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey.tex \fi
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 %
-\def\fileversion{0.63}
-\def\filedate{2010/01/04}
+\def\fileversion{0.64}
+\def\filedate{2010/01/20}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}
-\pstheader{pst-math.pro}% for GAMMALN
+%\pstheader{pst-math.pro}% for GAMMALN
 %
 % Shortcuts ....
 
@@ -737,21 +738,24 @@
 \psset[pst-func]{stepFactor=0.67}
 %
 \def\psplotImp{\pst@object{psplotImp}}% 20060420
-\def\psplotImp@i(#1,#2)(#3,#4)#5{%
+\def\psplotImp@i(#1,#2)(#3,#4){%
+  \@ifnextchar[{\psplotImp@ii(#1,#2)(#3,#4)}{\psplotImp@ii(#1,#2)(#3,#4)[]}}
+\def\psplotImp@ii(#1,#2)(#3,#4)[#5]#6{%
   \begin@OpenObj%
   \addto@pscode{
     /xMin #1 def
     /xMax #3 def
     /yMin #2 def
     /yMax #4 def
+    #5 % additional PS code
     \ifPst@polarplot 
-      /@PolarAlgPlot (#5) tx@addDict begin AlgParser end cvx def
+      /@PolarAlgPlot (#6) tx@addDict begin AlgParser end cvx def
       /Func {
         /phi y x atan def
         /r x y Pyth def 
-        \ifPst@algebraic @PolarAlgPlot \else #5 \fi } def 
+        \ifPst@algebraic @PolarAlgPlot \else #6 \fi } def 
     \else
-      /Func \ifPst@algebraic (#5) tx@addDict begin AlgParser end cvx \else { #5 } \fi  def
+      /Func \ifPst@algebraic (#6) tx@addDict begin AlgParser end cvx \else { #6 } \fi  def
     \fi
     /xPixel xMax xMin sub \pst@number\psxunit mul round cvi def
     /yPixel yMax yMin sub \pst@number\psyunit mul round cvi def