pst-func 0.64 (21jan10)

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

5 files changed, 21 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index 83b92f89549..6321e0e8dd6 100644
--- a/Master/texmf-dist/doc/generic/pst-func/Changes
+++ b/Master/texmf-dist/doc/generic/pst-func/Changes
@@ -1,4 +1,6 @@
 ..... pst-func.tex
+0.64  2010-01-19  - new optional argument for \psplotImp
+                    to insert predefined PS code
 0.63  2010-01-04  - fixed bug with Bezier definition
 0.62  2009-12-01  - fixed bug with \pst@Shift in \psGaussI
 0.61  2009-11-30  - fixed bug with \psGaussI
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
index bb23b30c4f6..b37bb2a36ba 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
index 5ada7d63722..c9310fcfd91 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-func-doc.tex 244 2010-01-04 13:48:01Z herbert $
+%% $Id: pst-func-doc.tex 261 2010-01-20 17:09:01Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
    smallheadings, headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -1480,7 +1480,7 @@ The only special keyword is \Lkeyword{stepFactor} which is preset to 0.67 and co
 and vertical step width.
 
 \begin{BDef}
-\Lcs{psplotImp}\OptArgs\Largr{xMin,yMin}\Largr{xMax,yMax}\Largb{function f(x,y)}
+\Lcs{psplotImp}\OptArgs\Largr{xMin,yMin}\Largr{xMax,yMax}\OptArg{PS code}\Largb{function f(x,y)}
 \end{BDef}
 
 The function must be of $f(x,y)=0$ and described in \PS code, or alternatively with
diff --git a/Master/texmf-dist/dvips/pst-func/pst-func.pro b/Master/texmf-dist/dvips/pst-func/pst-func.pro
index 1fd52ca119d..93d3feec02a 100644
--- a/Master/texmf-dist/dvips/pst-func/pst-func.pro
+++ b/Master/texmf-dist/dvips/pst-func/pst-func.pro
@@ -6,7 +6,7 @@
 %%
 %% Package `pst-func'
 %%
-%% Herbert Voss <voss _at_ pstricks.de>
+%% Herbert Voss <hvoss@tug.org>
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -16,7 +16,7 @@
 %%   `pst-func' is a PSTricks package to plot special math functions
 %%
 %%
-%% version 0.12 / 2010-01-04  Herbert Voss <hvoss _at_ tug.org>
+%% version 0.12 / 2010-01-04  Herbert Voss
 %
 /tx@FuncDict 100 dict def
 tx@FuncDict begin
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