pst-func (12mar17)

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

5 files changed, 89 insertions, 89 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index 5ee0621abc9..b2c4046fbfc 100644
--- a/Master/texmf-dist/doc/generic/pst-func/Changes
+++ b/Master/texmf-dist/doc/generic/pst-func/Changes
@@ -1,5 +1,6 @@
 ..... pst-func.tex
-0.83  2017-03-07  - added some more macros for binomial distributions
+0.84  2017-03-11  - some more modifications to the binomial distributions (ts)
+0.83  2017-03-07  - added some more macros for binomial distributions (ts)
 0.82  2016-05-01  - psk@PontName->\psk@func@PointName (same name in pst-eucl)
 0.81  2014-05-20  - changed \pstVerb to \pst@Verb in \psZero to allow
                     variables from tx@Dict
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 473fe07ab53..e749f71bfb1 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
@@ -14,7 +14,7 @@
 @STRING{theatertage	= {{\TeX}-Theatertage} }
 
 @Article{	  dtk02.2:jackson.voss:plot-funktionen,
-  author	= {Laura E. Jackson and Herbert Vo{\ss}},
+  author	= {Laura E. Jackson and Herbert Voß},
   title		= {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
   journal	= dtk,
   year		= 2002,
@@ -34,7 +34,7 @@
 }
 
 @Article{	  dtk02.1:voss:mathematischen,
-  author	= {Herbert Vo{\ss}},
+  author	= {Herbert Voß},
   title		= {Die mathematischen {F}unktionen von {P}ost{S}cript},
   journal	= dtk,
   year		= 2002,
@@ -48,7 +48,7 @@
   abstract	= { \PS, faktisch genauso alt wie {\TeX}, ist im
 		  Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
 		  darum geht zu beurteilen, was es denn nun im eigentlichen
-		  Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
+		  Sinne ist. Außerdem wird h{\"a}ufig vergessen, dass
 		  sich mit den \PS-Funktionen viele Dinge erledigen lassen,
 		  bei denen sonst auf externe Programme zur{\"u}ckgegriffen
 		  wird. Dies wird im Folgenden f{\"u}r die mathematischen
@@ -57,24 +57,15 @@
 }
 
 @Book{tlgc2,
-  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
+  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Voß},
   title		= {The {\LaTeX} {G}raphics {C}ompanion},
   publisher	= {{Addison-Wesley Publishing Company}},
-  edition	= second,
+  edition	= 2,
   year		= {2007},
   address	= {Reading, Mass.}
 }
 
 
-@Book{voss:chaos,
-  author	= {Herbert Vo{\ss}},
-  title		= {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen 
-    {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
-  publisher	= {{Franzis Verlag}},
-  year		= {1994},
-  address	= {Poing}
-}
-
 @Article{girou:01:,
   author	= {Denis Girou},
   title		= {Pr\'esentation de {PST}ricks},
@@ -104,44 +95,41 @@
   year           = 1989,
 }
 
-@Manual{pstricks,
+@online{pstricks,
   Title          = {PSTricks - {\PS} macros for generic {\TeX}},
   Author         = {{Timothy van} Zandt},
   Organization   = {},
-  Address        = {\url{http://www.tug.org/application/PSTricks}},
-  Note           = {},
+  url        = {http://www.tug.org/application/PSTricks},
   year           = 1993
 }
 
-@Manual{pst-plot,
+@ctan{pst-plot,
   Title          = {\texttt{pst-plot}: Plotting two dimensional functions and data},
-  Author         = {{Timothy van} Zandt},
+  Author         = {{Timothy van} Zandt and Herbert Voß},
   Organization   = {},
-  Address        = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
-  Note           = {},
+  url        = {/graphics/pstricks/generic/pst-plot.tex},
   year           = 1999
 }
 
-@Manual{multido,
+@ctan{multido,
   Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
   Author         = {{Timothy van} Zandt},
-  Organization   = {},
-  Address        = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
+  url        = {/graphics/pstricks/generic/multido.tex},
   Note           = {},
   year           = 1997
 }
 
 @Book{PSTricks2,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {6.},
+  edition	= {7},
   publisher	= {DANTE -- Lehmanns},
-  year		= {2010},
-  address	= {Heidelberg/Berlin}
+  year		= {2016},
+  publisher	= {Heidelberg and Berlin}
 }
 
 @Book{voss:math,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {Typesetting mathematics with \LaTeX},
   publisher	= {UIT},
   year		= {2010},
@@ -149,7 +137,7 @@
 }
 
 @Book{PSTricks2-UIT,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {PSTricks -- Graphics for \TeX\ and \LaTeX},
   publisher	= {UIT},
   year		= {2011},
@@ -157,25 +145,24 @@
 }
 
 @Book{LaTeXRef-UIT,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {{\LaTeX} quick reference},
   publisher	= {UIT},
   year		= {2012},
   address	= {Cambridge}
 }
 
-@Manual{wolfram,
+@online{wolfram,
   author	= {Eric Weisstein},
   title		= {Wolfram MathWorld},
   publisher	= {{Wolfram}},
   year		= {2007},
-  address	= {\url{http://mathworld.wolfram.com}}
+  url	= {http://mathworld.wolfram.com}
 }
 
-@Manual{pst-tools,
+@ctan{pst-tools,
   author	= {Herbert Voß},
   title		= {\texttt{pst-tools} -- Helper functions},
-  publisher	= {CTAN},
   year		= {2012},
-  address	= {\url{CTAN:/graphics/pstricks/contrib/pst-tools}}
+  url	= {/graphics/pstricks/contrib/pst-tools}
 }
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 f037e3a5c4a..eb54d3153d8 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 c6f152ad565..2c508068253 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
@@ -20,6 +20,10 @@
   \psGauss[sigma=1, linecolor=blue, linewidth=2pt]{-1.75}{1.75}
 \end{pspicture}}
 
+\usepackage[style=dtk]{biblatex}
+\addbibresource{pst-func-doc.bib}
+
+
 \lstset{language=PSTricks,
     morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl},basicstyle=\footnotesize\ttfamily}
 %
@@ -1036,15 +1040,14 @@ and is predefined with 5.
 
 
 \subsection{Binomial distribution}\label{sec:bindistri}
-These five macros plot binomial probability mass function \Lcs{psBinomial} and \Lcs{psBinomialC} in curve style, the normalized one is \Lcs{psBinomialN}. The cumulative distribution function $F$ \Lcs{psBinomialF} and the complement of the cumulative distribution function to one ($1-F$) \Lcs{psBinomialFS}
-It is always done in the $y$-Intervall $[0;1]$.
-Rescaling to another one can be done by setting the \Lkeyword{yunit} option
+\begin{sloppypar}
+The following five macros plot binomial probability mass function \Lcs{psBinomial} and \Lcs{psBinomialC} in curve style, the normalized one is \Lcs{psBinomialN}. The cumulative distribution function $F$ \Lcs{psBinomialF} and the complement of the cumulative distribution function ($1-F$) \Lcs{psBinomialFS}
+The vertical range for the plots is the $y$-Intervall $[0;1]$.
+Rescaling other values can be done by setting the \Lkeyword{yunit} option
 to any other value.
+\end{sloppypar}
 
-The binomial distribution \Lcs{psBinomial} gives the discrete probability distribution $P_p(n|N)$ of obtaining
-exactly $n$ successes out of $N$ Bernoulli trials (where the result of each
-Bernoulli trial is true with probability $p$ and false with probability
-$q=1-p$. The binomial distribution is therefore given by
+The binomial distribution \Lcs{psBinomial} gives the discrete probability distribution $P_p(n|N)$ $n$ successes out of $N$ Bernoulli trials (where the result of each Bernoulli trial is true with probability $p$ and false with probability $q=1-p$). The binomial distribution is therefore given by
 
 \begin{align}
 P_p(n|N) &= \binom{N}{n}p^nq^{N-n} \\
@@ -1053,7 +1056,7 @@ P_p(n|N) &= \binom{N}{n}p^nq^{N-n} \\
 
 where $(N; n)$ is a binomial coefficient and $P$ the probability.
 
-The syntax is quite easy:
+The syntax is:
 
 \begin{BDef}
 \Lcs{psBinomial}\OptArgs\Largb{N}\Largb{probability p}\\
@@ -1248,6 +1251,10 @@ valid for \Lcs{psBinomialN}. The option \Lkeyword{showpoints} is valid if \Lkeyv
 
 
 
+
+
+
+
 \clearpage
 \subsection{Poisson distribution}
 Given a Poisson process\footnote{\url{http://mathworld.wolfram.com/PoissonProcess.html}}, 
@@ -1834,7 +1841,7 @@ The original Weierstraß function can be used with the optional argument:
 \clearpage
 \section{\nxLcs{psplotImp} -- plotting implicit defined functions}
 For a given area, the macro calculates in a first step row by row for every pixel (1pt)
-the function $f(x,y)$ and checks for avchanging of the value from $f(x,y)<0$ to $f(x,y)>0$
+the function $f(x,y)$ and checks for  a changing of the value from $f(x,y)<0$ to $f(x,y)>0$
 or vice versa. If this happens, then the pixel must be  part of the curve of
 the function $f(x,y)=0$. In a second step the same is done column by column.
 This may take some time because an area of $400\times 300$ pixel needs 120 thousand calculations
@@ -2169,10 +2176,10 @@ $f(x)$ has to be described as usual for the macro \Lcs{psplot}.
 \xkvview{family=pst-func,columns={key,type,default}}
 
 \bgroup
-\raggedright
+\RaggedRight
 \nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-func-doc}
+%\bibliographystyle{plain}
+\printbibliography{pst-func-doc}
 \egroup
 
 \printindex
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 7d42c7f194d..3c6d6b4200d 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -31,8 +31,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 %
-\def\fileversion{0.83}
-\def\filedate{2017/03/07}
+\def\fileversion{0.84}
+\def\filedate{2017/03/11}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}
@@ -549,9 +549,10 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
     \def\pst@tempA{#3}%
     \ifx\pst@tempA\@empty\psBinomial@iii{#1}{#2}{#2}{#5}%
     \else\psBinomial@iii{#1}{#2}{#3}{#5}\fi
-  \fi}%
+  \fi}
+%
 \def\psBinomial@iii#1#2#3#4{%
-  \begin@OpenObj%
+  \begin@OpenObj
   \addto@pscode{
     /scx { \pst@number\psxunit mul } def
     /scy { \pst@number\psyunit mul } def
@@ -590,22 +591,22 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
     } for
     \ifPst@markZeros\else k dx add scx 0 L \fi % last line down to x-axis
   }%
-%  \psk@fillstyle%
-%  \pst@stroke%
-  \end@OpenObj%
+%  \psk@fillstyle
+%  \pst@stroke
+  \end@OpenObj
 }%
 %
 \def\psBinomialN{\pst@object{psBinomialN}}%
 \def\psBinomialN@i#1#2{%
-\leavevmode
-\pst@killglue
-\begingroup
-\use@par
-\init@pscode
-\def\cplotstyle{curve}%
-\ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi
-\addto@pscode{%
-\ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi
+  \leavevmode
+  \pst@killglue
+  \begingroup
+  \use@par
+  \init@pscode
+  \def\cplotstyle{curve}%
+  \ifx\psplotstyle\cplotstyle \@nameuse{beginplot@\psplotstyle}\fi
+  \addto@pscode{%
+   \ifx\psplotstyle\cplotstyle /Curve true def \else /Curve false def \fi
     /scx { \pst@number\psxunit mul } def
     /scy { \pst@number\psyunit mul } def
     /N #1 def
@@ -644,14 +645,14 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
       /xOld x def
     } for
     Curve { [ xEnd 0 Coors aload pop } if% showpoints on top of the stack
-}%
-\ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else
-\psk@fillstyle
-\pst@stroke
-\fi
-\use@pscode
-\endgroup
-\ignorespaces%
+  }%
+  \ifx\psplotstyle\cplotstyle\@nameuse{endplot@\psplotstyle}\else
+    \psk@fillstyle
+    \pst@stroke
+  \fi
+  \use@pscode
+  \endgroup
+  \ignorespaces
 }%
 \def\psBinomialF{\pst@object{psBinomialF}}
 \def\psBinomialF@i#1#2{\psBinomialF@ii#1,,,\@nil{#2}}%
@@ -665,7 +666,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
     \else\psBinomialF@iii{#1}{#2}{#3}{#5}\fi
   \fi}%
 \def\psBinomialF@iii#1#2#3#4{%
-  \begin@OpenObj%
+  \begin@OpenObj
   \addto@pscode{
     /scx { \pst@number\psxunit mul } def
     /scy { \pst@number\psyunit mul } def
@@ -677,6 +678,15 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
     /q 1 p sub def
     \ifPst@markZeros /kOld dx neg m add def \else
     /kOld m def \fi
+    \psFunc@leftEnd 0 eq
+    { }
+    { kOld 0 eq
+    { kOld \psFunc@leftEnd sub scx 0 moveto   % starting point
+    \ifPst@LineEnding
+    kOld \psFunc@radiusout\pst@number\psxunit div sub scx 0 L stroke 
+     kOld scx 0 newpath \psFunc@radiusout 0 360 arc kOld scx 0 \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill \else
+    kOld scx 0 L stroke \fi }
+    { } ifelse } ifelse
     kOld scx 0 moveto   % starting point
     0 1 m 1 sub {
       /k exch def       % save loop variable
@@ -684,27 +694,21 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
         { /Y q N exp def
           /F Y def}
         { /Y Y N k sub 1 add mul k div p mul q div def
-          /F F Y add def}
+          /F F Y add def }
       ifelse
     } for
     m 1 n {             % n-m+1 times
       /k exch def       % save loop variable
       k 0 eq
         { /Y q N exp def
-          /F Y def}
+          /F Y def }
         { /Y Y N k sub 1 add mul k div p mul q div def
-          /F F Y add def}
+          /F F Y add def }
       ifelse % recursive definition
       \ifPst@markZeros kOld scx F scy L k dx add scx F scy L k dx add scx 0 L kOld 1 add scx 0 L
       \else
-      \ifPst@LineEnding
-      k 0 eq
-      { }
-      { kOld scx F scy newpath \psFunc@radiusout 0 360 arc kOld scx F scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill } ifelse \fi
+       kOld scx F scy newpath \psFunc@radiusout 0 360 arc kOld scx F scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill 
       kOld \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div add \fi
-      k 0 eq
-      { \psFunc@leftEnd sub }
-      { } ifelse
       scx F scy moveto
       k 1 add
       \ifPst@LineEnding\psFunc@radiusout\pst@number\psxunit div sub \fi
@@ -715,7 +719,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
       \ifPst@LineEnding
       k N eq
       { }
-      { k 1 add scx F scy newpath \psFunc@radiusout 0 360 arc k 1 add scx F scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill } 
+      { k 1 add scx F scy newpath \psFunc@radiusout 0 360 arc k 1 add scx F scy \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill }
       ifelse
         \ifPst@VLines
         Y \psFunc@radiusout\pst@number\psyunit div 2 mul le
@@ -753,7 +757,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
     \else\psBinomialFS@iii{#1}{#2}{#3}{#5}\fi
   \fi}%
 \def\psBinomialFS@iii#1#2#3#4{%
-  \begin@OpenObj%
+  \begin@OpenObj
   \addto@pscode{
     /scx { \pst@number\psxunit mul } def
     /scy { \pst@number\psyunit mul } def
@@ -830,7 +834,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
       /kOld kOld 1 add def
     } for
   }%
-  \end@OpenObj%
+  \end@OpenObj
 }%
 %
 \def\psBinomialC{\pst@object{psBinomialC}}
@@ -858,7 +862,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
 %    /xEnd xOld neg dx add scx def
     Curve
       { /Coors [xOld dx sub scx 0] def }% saves the coordinates for curve
-      { xOld scx 0 moveto }	% starting point
+      { xOld scx 0 moveto }% starting point
     ifelse
    0 1 N {				% N times
       /k exch def			% save loop variable
@@ -891,7 +895,7 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
 \fi
 \use@pscode
 \endgroup
-\ignorespaces}
+\ignorespaces}%
 %
 %
 \def\psPoisson{\pst@object{psPoisson}}% with contributions from Gerry Coombes
@@ -1649,3 +1653,4 @@ radiusout=2,radiusinL=0,radiusinR=1.5,LineEnding=true,leftEnd=1,rightEnd=2,VLine
 %% END: pst-func.tex
 \endinput
 %
+