pst-plot (25oct11)

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

1 files changed, 23 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index b506876b75f..7d8fb31ebdc 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 541 2011-07-20 16:38:34Z herbert $
+% $Id: pst-plot.tex 587 2011-10-24 20:15:21Z herbert $
 %% BEGIN pst-plot.tex
 %%
 %% plotting functions and data with PSTricks.
@@ -20,8 +20,8 @@
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex  \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi
 %
-\def\fileversion{1.30}
-\def\filedate{2011/07/20}
+\def\fileversion{1.31}
+\def\filedate{2011/10/24}
 \message{ v\fileversion, \filedate\space (tvz,hv)}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -306,22 +306,27 @@ D\space##1%
    }{
      NArray M get /Median ED  		% odd numbers of values
    } ifelse
-   m 2 mod 1 eq {	  		% get the lower Quartil even/odd
-     M 2 div cvi 1 add dup /M2 ED		% save middle index
-     1 sub NArray exch get 
-     NArray M2 get 
-     add 2 div /LowerQuartil ED
+   m 4 mod 0 eq {	  		% get the lower Quartil even/odd
+     m 4 div cvi dup 1 sub NArray exch get
+     exch NArray exch get
+%     M 2 div cvi 1 add dup /M2 ED		% save middle index
+%     1 sub NArray exch get 
+%     NArray M2 get 
+     add 2 div floor /LowerQuartil ED
    }{ 
      NArray M 2 div cvi get /LowerQuartil ED 
    } ifelse				% end even/odd 
-   m 2 mod 1 eq {	  		% get the upper Quartil
-     M 1.5 mul cvi 1 add dup /M3 ED
-     1 sub NArray exch get 
-     NArray M3 get 
-     add 2 div /UpperQuartil ED
+   m 0.75 mul dup dup cvi sub 0 eq {	% get the upper Quartil
+%    0.75*m is an integer
+     cvi dup 1 sub NArray exch get exch NArray exch get
+%     M 1.5 mul cvi 1 add dup /M3 ED
+%     1 sub NArray exch get 
+%     NArray M3 get 
+     add 2 div floor /UpperQuartil ED
    }{					% upper quartil
-     NArray M 1.5 mul cvi get /UpperQuartil ED
+     NArray m 0.75 mul floor cvi get /UpperQuartil ED
    } ifelse 
+%
    /IQL UpperQuartil LowerQuartil sub \pst@IQLfactor\space mul def
    0 1 m 1 sub { % Index on stack
      dup /Index ED
@@ -1999,10 +2004,10 @@ D\space##1%
 \def\pst@@hlabels{%
   \psDEBUG[pst@@hlabels]{xticksizeC=\the\pst@xticksizeC}%
   \setbox\z@=\vbox{%			save all in a box
-    \ifcase\psk@xlabelPos
-      \vskip-\pst@xticksizeA\vskip\psxlabelsep\or
-      \vskip-1ex\vskip-\pslabelsep\or
-      \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex
+    \ifcase\psk@xlabelPos% 0
+      \vskip-\pst@xticksizeA\vskip\psxlabelsep\or % 1
+      \vskip-1ex\vskip-\pslabelsep\or % 2
+      \vskip-\pst@xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3
     \fi
     \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi
     \hbox to\z@{%