pst-func 0.69 (21jun10)

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

7 files changed, 23 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index 81721cdc330..d902d748bf7 100644
--- a/Master/texmf-dist/doc/generic/pst-func/Changes
+++ b/Master/texmf-dist/doc/generic/pst-func/Changes
@@ -1,4 +1,5 @@
 ..... pst-func.tex
+0.69  2010-06-21  - fix bug with markZeros
 0.68  2010-02-11  - add Weibull distribution
 0.67  2010-02-09  - fix bug with arrows in \psPolynomial
 0.66  2010-01-26  - new optional argument for the Gini
@@ -79,6 +80,8 @@
 
 
 ..... pst-func.pro
+0.13  2010-06-21  - run FindZeros in a local dictionary
+                  - return [zeros] on stack
 0.12  2010-01-04  rename Points to BezierPoints to prevent clash with
                   pstricks.pro
 0.11  2009-05-05  cosmetic changes
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
index 8894fa5f494..09cfa820745 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
@@ -1,4 +1,3 @@
-%% -*-bibtex-*-
 @STRING{tugboat	= {TUGboat} }
 @STRING{beiprogramm	= {{\TeX}-Beiprogramm} }
 @STRING{bretter	= {Bretter, die die Welt bedeuten} }
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 9809b471224..a9a0cb99b1b 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/dvips/pst-func/pst-func.pro b/Master/texmf-dist/dvips/pst-func/pst-func.pro
index 47d4727b604..f1f274dc54c 100644
--- a/Master/texmf-dist/dvips/pst-func/pst-func.pro
+++ b/Master/texmf-dist/dvips/pst-func/pst-func.pro
@@ -1,4 +1,4 @@
-%% $Id: pst-func.pro 273 2010-01-26 18:28:55Z herbert $
+%% $Id: pst-func.pro 355 2010-06-21 10:02:44Z herbert $
 %%
 %% This is file `pst-func.pro',
 %%
@@ -16,7 +16,7 @@
 %%   `pst-func' is a PSTricks package to plot special math functions
 %%
 %%
-%% version 0.12 / 2010-01-04  Herbert Voss
+%% version 0.13 / 2010-06-21  Herbert Voss
 %
 /tx@FuncDict 100 dict def
 tx@FuncDict begin
@@ -229,7 +229,8 @@ tx@FuncDict begin
   Horner
 } def
 %
-/FindZeros { % dxN dxZ must be on top of the stack (x0..x1 the intervall)
+/FindZeros { % dxN dxZ must be on top of the stack (x0..x1 the intervall) => []
+  12 dict begin 
   /dxZ exch def /dxN exch def
   /pstZeros [] def 
   x0 dxZ x1 { % suche Nullstellen
@@ -246,8 +247,11 @@ tx@FuncDict begin
         } repeat
 	pstZeros aload pop
         newZero { xNull Laenge 1 add } { Laenge } ifelse } ifelse
-    array astore /pstZeros exch def
+    array astore 
+    /pstZeros exch def
   } for
+  pstZeros  % the end array is now on the stack
+  end
 } def
 %
 /Simpson { % on stack must be a b M   --- simple version ---
diff --git a/Master/texmf-dist/source/generic/pst-func/Makefile b/Master/texmf-dist/source/generic/pst-func/Makefile
index 17a844cd104..9fa9daaa701 100644
--- a/Master/texmf-dist/source/generic/pst-func/Makefile
+++ b/Master/texmf-dist/source/generic/pst-func/Makefile
@@ -14,7 +14,7 @@ ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Chan
 
 TDS = ~/PSTricks/PSTricks-TDS
 
-all : doc clean tds clean
+all : doc clean tds 
 doc: $(MAIN).pdf
 
 $(MAIN).pdf : $(MAIN).ps
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 efd6897f09b..d508a247ee6 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 285 2010-02-11 09:40:27Z herbert $
+%% $Id: pst-func.tex 355 2010-06-21 10:02:44Z herbert $
 %%
 %% This is file `pst-func.tex',
 %%
@@ -30,8 +30,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 %
-\def\fileversion{0.68}
-\def\filedate{2010/02/11}
+\def\fileversion{0.69}
+\def\filedate{2010/06/21}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}
@@ -112,12 +112,14 @@
     /x0 #1 def /x1 #2 def
     /dx x1 x0 sub \psk@plotpoints\space div def
     /Derivation \psk@Derivation\space def
+    /x x0 def
     \ifPst@markZeros 
+      5 dict begin % hold all local!
       gsave
       \pst@number\psk@zeroLineWidth SLW
       \pst@usecolor\psk@zeroLineColor
-      \psk@epsZero\space \psk@dZero\space FindZeros 
-      pstZeros aload length {
+      \psk@epsZero\space \psk@dZero\space FindZeros
+        aload length {  % zero array is on stack
         /xZero exch def
         xZero \pst@number\psxunit mul /xPixel exch def
         \psk@dotsize
@@ -131,8 +133,8 @@
         } if
       } repeat
       grestore
+      end
     \fi
-    /x x0 def
     /xy {
       x \psk@xShift\space sub coeff Derivation FuncValue \pst@number\psyunit mul 
       x \pst@number\psxunit mul exch
diff --git a/Master/texmf-dist/tex/latex/pst-func/pst-func.sty b/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
index 3dc8dc66d6e..5487a0b8e41 100644
--- a/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
+++ b/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
@@ -1,12 +1,12 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-func}[2008/03/21 package wrapper for 
+\ProvidesPackage{pst-func}[2010/06/21 package wrapper for 
   pst-func.tex (hv)]
 \input{pst-func.tex}
 \ProvidesFile{pst-func.tex}
   [\filedate\space v\fileversion\space `PST-func' (hv)]
 \IfFileExists{pst-func.pro}{%
   \ProvidesFile{pst-func.pro}
-    [2009/12/29 v. 0.12,  PostScript prologue file (hv)]
+    [2009/06/21 v. 0.13,  PostScript prologue file (hv)]
 \@addtofilelist{pst-func.pro}}{}%
 \endinput
-%% $Id: pst-func.sty 227 2009-12-29 18:38:27Z herbert $
+%% $Id: pst-func.sty 355 2010-06-21 10:02:44Z herbert $