pst-func update (28feb08)

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

4 files changed, 40 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index 2b1979de2d7..16f14b6cfe7 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.51  2008-02-27  - enable filling support for \psIntegral  and \psCumIntegral
+		    (suggested by Rafal Bartczuk) 
 0.50  2007-08-30  - modified \psPoisson{m,N}{Lambda} (Gerry Coombes) 
 		  - modified \psPolynomial{m,n,N}{Lambda} (Gerry Coombes) 
 		  - fixed bug in \psPoisson with markZeros
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 4f55989f8ed..0682ff6291d 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 30846a8a4ba..fb9e4d2a250 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
@@ -208,7 +208,7 @@ options can be set in the usual way with \verb+\psset+.
     linestyle=dotted,Derivation=3]{-2}{4}
   \rput[lb](1.8,4){\textcolor{blue}{$f(x)=x^3$}}
   \rput[lb](0.2,8){\textcolor{red}{$f^{\prime\prime}(x)=6x$}}
-  \rput[lb](-2,5.5){\textcolor{magenta}{$f^{\prime\prime\prime}(x)=6$}}
+  \rput[lb](-2,5){\textcolor{cyan}{$f^{\prime\prime\prime}(x)=6$}}
 \end{pspicture*}
 \end{LTXexample}
 %$
@@ -442,9 +442,9 @@ the integral is performed over one of them. The second one is the cumulative
 integral of a function (similar to \verb+\psGaussI+ but valid for all functions). The third 
 one is the result of a convolution. They are defined as:
 \begin{align}
-\text{psIntegral}(x) &= \int_a^b f(x,t)dt \\
-\text{psCumIntegral}(x) &= \int_{\text{xStart}}^{x} f(t)dt \\
-\text{psConv}(x) & = \int_a^b f(t)g(x-t)dt
+\text{psIntegral}(x) &= \int_a^b f(x,t)\mathrm{d}t \\
+\text{psCumIntegral}(x) &= \int_{\text{xStart}}^{x} f(t)\mathrm{d}t \\
+\text{psConv}(x) & = \int_a^b f(t)g(x-t)\mathrm{d}t
 \end{align}
 In the first one, the integral is performed from $a$ to $b$ and the function $f$ depends 
 on two parameters. In the second one, the function $f$ depends on only one parameter, and the 
@@ -476,8 +476,9 @@ step). The precision and the smoothness of the plot depend strongly on these two
 \begin{pspicture}[linewidth=1pt](-10,-.5)(10,1.5)
   \psaxes[dx=1cm,Dx=2]{->}(0,0)(-10,0)(10,1.5)
   \psCumIntegral[plotpoints=200,Simpson=10]{-10}{10}{0 1 GAUSS}
-  \psIntegral[plotpoints=200,Simpson=10,linecolor=red]{-10}{10}(-4,6){1 GAUSS}
   \psIntegral[plotpoints=200,Simpson=100,linecolor=green]{.1}{10}(-3,3){0 exch GAUSS}
+  \psIntegral[plotpoints=200,Simpson=10,linecolor=red,
+    fillcolor=red!40,fillstyle=solid,opacity=0.5]{-10}{10}(-4,6){1 GAUSS}
 \end{pspicture}
 \end{LTXexample}
 
@@ -875,7 +876,7 @@ D_r(\chi^2) &=	int_0^{\chi^2}\frac{t^{r/2-1}e^{-t/2}\mathrm{d}t}{\Gamma(1/2r)2^{
 A statistical distribution published by William Gosset in 1908 under his %. His employer, Guinness Breweries, 
 %required him to publish under a 
 pseudonym %, so he chosed 
-"`Student"'. 
+,,Student``. 
 %Given N independent measurements x_i, let
 %t=(x^_-mu)/(s/sqrt(N)),
 The $t$-distribution with parameter $\nu$ has the density function
@@ -1333,7 +1334,7 @@ valuewidth & <number>     & 10     & the width of the string for the converted
 
 
 \section{Credits}
-Gerry Coombes | Denis Girou | Christophe Jorssen | Manuel Luque | Timothy Van Zandt 
+Rafal Bartczuk | Gerry Coombes | Denis Girou | Christophe Jorssen | Manuel Luque | Timothy Van Zandt 
 
 \bgroup
 \raggedright
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 2d0dcae366e..d5f13909efa 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -28,8 +28,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 
-\def\fileversion{0.50}
-\def\filedate{2007/08/27}
+\def\fileversion{0.51}
+\def\filedate{2008/02/27}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}
@@ -345,8 +345,10 @@
       scy b scx exch lineto
       /b b dx add def
     } repeat
-    stroke
+%    stroke
   }%
+  \psk@fillstyle%
+  \pst@stroke%
   \end@SpecialObj%
 }
 %
@@ -373,8 +375,10 @@
       scy t scx exch lineto
       /t t dd add def
     } repeat
-    stroke
+%    stroke
   }%
+  \psk@fillstyle%
+  \pst@stroke%
   \end@SpecialObj%
 }
 %
@@ -701,24 +705,33 @@
 \def\psVolume{\pst@object{psVolume}}% 2007-06-23
 \def\psVolume@i(#1,#2)#3#4{{%
   \begin@SpecialObj
-  \psplot[fillstyle=none]{#1}{#2}{#4}\psplot[fillstyle=none]{#1}{#2}{#4 neg}
-  \multido{\iA=1+1}{#3}{%
-    \pscustom{%
-      \code{
-        /dX #2 #1 sub #3 div def 
-        /Start dX \iA\space 1 sub mul #1 add def 
-        /End Start dX add def 
-        /Height End Start add 2 div /x ED #4 def } 
+  \psplot[fillstyle=none]{#1}{#2}{#4}%     original function
+  \psplot[fillstyle=none]{#1}{#2}{#4 neg}% mirrored at the x-axis
+  \multido{\iA=1+1}{#3}{%	 run it #3 times with increment \A
+    \pscustom{%                  to get a closed filled ellipse
+      \code{ %					 the PS code
+        /dX #2 #1 sub #3 div def % delta x, the step
+        /Start dX \iA\space 1 sub mul #1 add def % xStart
+        /End Start dX add def                    % xEnd=xStart+dX
+        /Height End Start add 2 div /x ED #4 def } % height=f(x)
+         % x is the mean between Start+End
       \psellipticarc(!Start 0)(! Height 8 div Height){90}{270}
-      \rlineto(! dX 0)
+      % draw the first falf of the ellipse
+      \rlineto(! dX 0)% draw a line in x-direction
       \psellipticarc(!End 0)(! Height 8 div Height){270}{90}
-      \rlineto(!dX neg 0)}}
+      % draw the other half of the ellipse
+      \rlineto(!dX neg 0)}}% draw a line in negative x-direction
   \psset{fillstyle=none}
-  \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup 8 div exch)
-  \psset{plotstyle=line,linestyle=dashed,plotpoints=40,dotstyle=*,dotsize=0.5pt}
-  \psplot{#1}{#2}{#4}\psplot{#1}{#2}{#4 neg}%
+  \psellipse(#2,0)(!#2 dup #1 sub #3 div 2 div sub /x ED #4 dup 
+	 8 div exch)% draw again the ellipse to get the borderline.
+  \psset{plotstyle=line,linestyle=dashed,
+	 plotpoints=40,dotstyle=*,dotsize=0.5pt}
+  \psplot{#1}{#2}{#4}\psplot{#1}{#2}{#4 neg}
+  % draw again the curves to get the borderline
   \end@SpecialObj
 }\ignorespaces}
+
+%
 %
 \catcode`\@=\PstAtCode\relax
 %