CTAN sync 202111040301

6 files changed, 24 insertions, 34 deletions

diff --git a/graphics/pstricks/contrib/pst-func/Changes b/graphics/pstricks/contrib/pst-func/Changes
index 82e56e9c02..9ecb5349bb 100644
--- a/graphics/pstricks/contrib/pst-func/Changes
+++ b/graphics/pstricks/contrib/pst-func/Changes
@@ -1,4 +1,5 @@
 ..... pst-func.tex
+0.99  2021-11-03  - fix for psLorenz (missing sort routine)
 0.98  2021-10-30  - fix for Gini coefficiant
 0.97  2021-10-29  - fix and extension for \psLorenz curve
 0.96  2021-04-06  - added start/endAngle for \psLame
diff --git a/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.pdf b/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.pdf
index bb11138494..b791d5e480 100644
--- a/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.pdf
+++ b/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.pdf
diff --git a/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.tex b/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.tex
index 119d23f317..8e87d3a6d3 100644
--- a/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.tex
+++ b/graphics/pstricks/contrib/pst-func/doc/pst-func-doc.tex
@@ -55,6 +55,7 @@
 \tableofcontents
 \psset{unit=1cm}
 
+
 \clearpage
 
 \begin{abstract}
@@ -65,6 +66,7 @@ All should be already part of your local \TeX\ installation. If not, or in case
 of having older versions, go to \url{http://www.CTAN.org/} and load the newest version.
 
 \vfill\noindent
+{\raggedright
 Thanks to \\
     Rafal Bartczuk,
     Jean-C\^ome Charpentier,
@@ -76,8 +78,9 @@ Thanks to \\
     Attila Gati, 
     Horst Gierhardt,  
     Jürgen Gilg,
+    Michel Hoppe,
     Christophe Jorssen,
-    Lars Kotthoff, 
+    Lars Kotthoff,
     Marcel Krüger,
     Buddy Ledger,
     Pablo Gonzáles Luengo,
@@ -90,8 +93,7 @@ Thanks to \\
     Timothy Van Zandt, 
     Michael Zedler,
 and last but not least
-    \url{http://mathworld.wolfram.com}.
-
+    \url{http://mathworld.wolfram.com}.\par}
 \end{abstract}
 
 
@@ -1129,6 +1131,7 @@ the constant value can only be set with \Lkeyword{cosCoeff}=\verb+a0+.
 
 \clearpage
 \section{\Lcs{psBessel}}
+\subsection{Default type}
 The Bessel function of order $n$ is defined as
 %
 \begin{align}
@@ -1202,8 +1205,8 @@ way, at the cost of some reduction in graphics resolution.
 }
 \end{LTXexample}
 
-\clearpage
-\section{Modfied Bessel function of first order}
+%\clearpage
+\subsection{Modfied Bessel function of first order}
 The modified Bessel function of first order is defined as
 %
 \begin{align}
@@ -2115,7 +2118,8 @@ example.
 \end{LTXexample}
 
 \clearpage
-\section{\nxLcs{psLorenz}, Lorenz curve}
+\section{Special Functions}
+\subsection{\nxLcs{psLorenz} -- Lorenz curve}
 The so-called \Index{Lorenz curve} is used in economics to describe inequality in
 wealth or size. The Lorenz curve is a function of the cumulative proportion of
 \textit{ordered individuals} mapped onto the corresponding cumulative proportion
@@ -2169,23 +2173,8 @@ origin of the coordinate system.
 \endpsgraph
 \end{LTXexample}
 
-
-\begin{LTXexample}[pos=t,preset=\centering]
-\psset{lly=-13mm,llx=-5mm}
-\psgraph[Dx=0.2,Dy=0.2,axesstyle=frame](0,0)(1,1){6cm}{6cm}
-\psline[linestyle=dashed](1,1)
-\psLorenz[Gini,linecolor=red,linewidth=1.5pt]<.2 .2 .2 .2 .2>{.1 .1 .1 .35 .35 } 
-\psLorenz[Gini,linecolor=blue,linestyle=dashed,linewidth=1.5pt]{.1 .1 .1 .35 .35 } 
-\endpsgraph
-\end{LTXexample}
-
-
-
-
-
-
 \clearpage
-\section{\nxLcs{psLame} -- Lam\'e Curve, a superellipse}
+\subsection{\nxLcs{psLame} -- Lam\'e Curve, a superellipse}
 A superellipse is a curve with Cartesian equation
 %	
 \begin{align}
@@ -2268,7 +2257,7 @@ and unit.
 \egroup
 
 \clearpage
-\section{\nxLcs{psThomae} -- the popcorn function}
+\subsection{\nxLcs{psThomae} -- the popcorn function}
 \Index{Thomae's function}, also known as the \Index{popcorn function}, 
 the \Index{raindrop function}, the \Index{ruler function} or the 
 \Index{Riemann function}, is a modification of the \Index{Dirichlet} function. 
@@ -2300,7 +2289,7 @@ The plotted number of points is the third parameter.
 
 
 \clearpage
-\section{\nxLcs{psWeierstrass} -- a pathological function}
+\subsection{\nxLcs{psWeierstrass} -- a pathological function}
 
 The Weierstrass function is an example of a pathological real-valued function 
 on the real line. The function has the property that it is continuous 
@@ -2352,7 +2341,7 @@ The original Weierstraß function can be used with the optional argument:
 
 
 \clearpage
-\section{\nxLcs{psplotImp} -- plotting implicit defined functions}
+\subsection{\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  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
@@ -2502,7 +2491,7 @@ The data then can be read back to get a continous line of the plot.
 \fi
 
 \clearpage
-\section{\nxLcs{psVolume} -- Rotating functions around the x-axis}
+\subsection{\nxLcs{psVolume} -- Rotating functions around the x-axis}
 This macro shows the behaviour of a \Index{rotated function} around the $x$-axis.
 
 \begin{BDef}
diff --git a/graphics/pstricks/contrib/pst-func/dvips/pst-func.pro b/graphics/pstricks/contrib/pst-func/dvips/pst-func.pro
index 25c4a831d1..f752442e87 100644
--- a/graphics/pstricks/contrib/pst-func/dvips/pst-func.pro
+++ b/graphics/pstricks/contrib/pst-func/dvips/pst-func.pro
@@ -16,7 +16,7 @@
 %%   `pst-func' is a PSTricks package to plot special math functions
 %%
 %%
-%% version 0.18 / 2021-10-30  Herbert Voss
+%% version 0.17 / 2018-12-13  Herbert Voss
 %
 /tx@FuncDict 100 dict def
 tx@FuncDict begin
diff --git a/graphics/pstricks/contrib/pst-func/latex/pst-func.sty b/graphics/pstricks/contrib/pst-func/latex/pst-func.sty
index e70a9ebe55..ff1038570d 100644
--- a/graphics/pstricks/contrib/pst-func/latex/pst-func.sty
+++ b/graphics/pstricks/contrib/pst-func/latex/pst-func.sty
@@ -1,5 +1,5 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-func}[2021/10/30 package wrapper for pst-func.tex (hv)]
+\ProvidesPackage{pst-func}[2018/12/13 package wrapper for pst-func.tex (hv)]
 \RequirePackage{pst-plot}
 \RequirePackage{pst-math}
 \RequirePackage{pst-tools}
@@ -10,7 +10,7 @@
 \ProvidesFile{pst-func.tex}
   [\filedate\space v\fileversion\space `PST-func' (hv)]
 \IfFileExists{pst-func.pro}{%
-  \ProvidesFile{pst-func.pro}[2021/10/30 v. 0.18,  PostScript prologue file (hv)]
+  \ProvidesFile{pst-func.pro}[2018/12/13 v. 0.17,  PostScript prologue file (hv)]
 \@addtofilelist{pst-func.pro}}{}%
 \endinput
-%% $Id: pst-func.sty 308 2021-10-30 14:11:45Z herbert $
+%% $Id: pst-func.sty 306 2021-10-29 14:48:08Z herbert $
diff --git a/graphics/pstricks/contrib/pst-func/tex/pst-func.tex b/graphics/pstricks/contrib/pst-func/tex/pst-func.tex
index 1f51fba97c..1e982ddb2b 100644
--- a/graphics/pstricks/contrib/pst-func/tex/pst-func.tex
+++ b/graphics/pstricks/contrib/pst-func/tex/pst-func.tex
@@ -31,8 +31,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 %
-\def\fileversion{0.98}
-\def\filedate{2021/10/30}
+\def\fileversion{0.99}
+\def\filedate{2021/11/03}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}
@@ -1607,14 +1607,14 @@ grestore
   \def\Lorenz@code{
     25 dict begin
     [ #2 ] dup length /nVal ED 
-    /Yval ED
+    bubblesort /Yval ED
     Yval arraySum /Ysum ED
     Yval { Ysum div } forall nVal array astore /YvalRel ED %  Pred dist
     \if$#1$
       /temp {1 nVal div} bind def
       [ nVal { temp } repeat ] /XvalRel ED
       [ 1 1 nVal { nVal div } for ] /XvalRelCum ED
-      YvalRel bubblesort /YvalRel ED      
+      %YvalRel bubblesort /YvalRel ED      
     \else
       [ #1 ] /Xval ED
       Xval arraySum /Xsum ED