texlive[45176] Master/texmf-dist: pst-plot (30aug17)
commits+karl at tug.org
commits+karl at tug.org
Thu Aug 31 01:00:42 CEST 2017
Revision: 45176
http://tug.org/svn/texlive?view=revision&revision=45176
Author: karl
Date: 2017-08-31 01:00:42 +0200 (Thu, 31 Aug 2017)
Log Message:
-----------
pst-plot (30aug17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib
trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2017-08-30 21:48:09 UTC (rev 45175)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/Changes 2017-08-30 23:00:42 UTC (rev 45176)
@@ -1,4 +1,9 @@
----- pst-plot.tex
+1.83 2017-08-29 - fix for real axes length and x|yLabels
+ - added two more optional arguments for boxplots
+1.82 2017-07-13 - revert last change
+1.81 2017-06-26 - try to prevent overfull hbox for the x axis
+ used \hbox to \hsize instead of \hbox to \z@
1.80 2017-05-23 - use \psx|ylabelsep for plotstyle xvalues
1.79 2017-05-22 - fix trailing space in \setDefaulthLabels
1.78 2017-04-16 - remove change of showorigin in \pst at hlabels
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib 2017-08-30 21:48:09 UTC (rev 45175)
+++ trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.bib 2017-08-30 23:00:42 UTC (rev 45176)
@@ -6,7 +6,7 @@
author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = {second},
+ edition = {2},
year = {2007},
address = {Boston, Mass.}
}
@@ -40,28 +40,28 @@
year = 1989,
}
- at Manual{multido,
+ at ctan{multido,
Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/macros/generic/multido.tex}},
- Note = {},
- year = 1997
+ Organization = {CTAN},
+ url = {/macros/generic/multido/},
+ year = 2010,
+version = {1.42},
}
@Book{PSTricks2,
author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
- publisher = {DANTE -- Lehmanns},
- year = {2010},
- address = {Heidelberg/Hamburg}
+ edition = {7},
+ publisher = {DANTE and Lehmanns Media},
+ year = {2016},
+ location = {Heidelberg and Berlin}
}
@Book{PSTricksE,
author = {Herbert Vo\ss{}},
title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
- edition = {1.},
+ edition = {1},
publisher = {UIT},
year = {2011},
address = {Cambridge -- UK}
@@ -70,7 +70,7 @@
@Book{LTXquick,
author = {Herbert Vo\ss{}},
title = {{\LaTeX} quick reference},
- edition = {1.},
+ edition = {1},
publisher = {UIT},
year = {2012},
address = {Cambridge -- UK}
@@ -79,10 +79,10 @@
@Book{presentations,
author = {Herbert Vo\ss},
title = {Presentations with \LaTeX},
- edition = {1.},
- publisher = {DANTE -- Lehmanns Media},
- year = {2012},
- address = {Heidelberg/Berlin}
+ edition = {2},
+ publisher = {DANTE and Lehmanns Media},
+ year = {2017},
+ address = {Heidelberg and Berlin}
}
@@ -90,8 +90,8 @@
author = {Victor Eijkhout},
title = {\TeX\ by Topic -- {A} \TeX{}nician Reference},
edition = {1},
- publisher = {DANTE -- lehmanns media},
+ publisher = {DANTE and Lehmanns Media},
year = {2014},
- address = {Heidelberg/Berlin}
+ address = {Heidelberg and Berlin}
}
Modified: trunk/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-08-30 21:48:09 UTC (rev 45175)
+++ trunk/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex 2017-08-30 23:00:42 UTC (rev 45176)
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.80}
-\def\filedate{2017/05/23}
+\def\fileversion{1.83}
+\def\filedate{2017/08/29}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -162,7 +162,6 @@
\loop
\read\RCD at file to \@tempa
\ifeof\RCD at file\else
- %%%\typeout{*** \@tempa ***}%
\edef\@tempa{\@tempa#2}%
\def\reserved at b{}%
\@tempswafalse
@@ -370,7 +369,7 @@
/u xiSquare fi mul xi xifi mul sub n xiSquare mul xi dup mul sub div def
/v n xifi mul xi fi mul sub n xiSquare mul xi dup mul sub div def
\Pst at Debug\space 0 gt { % print the equation
- /Helvetica findfont 12 scalefont setfont
+ /NimbusSanL-Regu findfont 12 scalefont setfont
0 -50 moveto (y=) show % print y=
v \pst at number\psyunit \pst at number\psxunit div div 20 string cvs show ( x+) show % m*x+
u \pst at number\psyunit div 20 string cvs show } if
@@ -398,6 +397,11 @@
\define at key[psset]{pst-plot}{postAction}[]{\def\psk at postAction{%
\ifx\relax#1\relax\else\pst at number\psyunit div #1 \pst at number\psyunit mul \fi }}
\psset[pst-plot]{postAction=}
+\define at key[psset]{pst-plot}{mediancolor}[black]{\pst at getcolor{#1}\median at linecolor}
+\psset[pst-plot]{mediancolor=black}
+\define at boolkey[psset]{pst-plot}[Pst@]{markMedian}[true]{}
+\psset[pst-plot]{markMedian=false}
+
%
\def\psBoxplot at ii{%
\addto at pscode{
@@ -489,15 +493,29 @@
Barwidth dup add 0 rlineto
Barwidth LowerQuartil \psk at postAction lineto
closepath
+ \pst at usecolor\psfillcolor
gsave \pst at usecolor\psfillcolor \tx at setTransparency fill grestore
- Barwidth neg Median \psk at postAction moveto % median
- Barwidth dup add 0 rlineto
+ \@nameuse{psls at solid}
+ \ifPst at markMedian
+ \pst at number\pslabelsep neg Median moveto currentpoint
+ /YMedian ED /XMedian ED
+ Barwidth neg Median \psk at postAction lineto % median
+ \else
+ Barwidth neg Median \psk at postAction moveto % median
+ \fi
+ Barwidth dup add 0 rlineto
\pst at number\pslinewidth SLW
- \pst at usecolor\pslinecolor
+ \pst at usecolor\median at linecolor
\tx at setStrokeTransparency
% \tx at setStrokeTransparency
- \@nameuse{psls at solid}
-}}%
+% \@nameuse{psls at solid}
+ stroke
+% \ifPst at markMedian XMedian XMedian moveto \fi
+ }
+% \ifPst at markMedian
+% \rput{90}(! currentpoint \tx at ScreenCoor){2.5}
+% \fi
+}%
%
\def\beginplot at Boxplot{\init at pscode}
\def\endplot at Boxplot{%
@@ -652,11 +670,12 @@
\addto at pscode{\pst at cp \psline at iii \psk at Oy\space \pst at number\psyunit mul \tx at LineToXAxis}%
\end at OpenObj}
%
-\define at key[psset]{pst-plot}{PSfont}[Times-Roman]{\def\psk at PSfont{/#1 }}
+\define at key[psset]{pst-plot}{PSfont}[NimbusRomNo9L-Regu]{\def\psk at PSfont{/#1 }}
+%\define at key[psset]{pst-plot}{PSfont}[Times-Roman]{\def\psk at PSfont{/#1 }}
\define at key[psset]{pst-plot}{valuewidth}[10]{\pst at getint{#1}\psk at valuewidth }
\define at key[psset]{pst-plot}{fontscale}[10]{\pst at checknum{#1}\psk at fontscale }
\define at key[psset]{pst-plot}{decimals}[-1]{\pst at getint{#1}\psk at decimals }
-\psset[pst-plot]{PSfont=Times-Roman,fontscale=10,valuewidth=10,decimals=-1}
+\psset[pst-plot]{PSfont=NimbusRomNo9L-Regu,fontscale=10,valuewidth=10,decimals=-1}
%
\newdimen\psxlabelsep
\newdimen\psylabelsep
@@ -1969,8 +1988,8 @@
\pssetylength\pst at dimh{#2}% o-y
\pssetxlength\pst at dima{#3}% ll-x
\pssetylength\pst at dimb{#4}% ll-y
- \pssetxlength\pst at dimc{#5}% ur-x
- \pssetylength\pst at dimd{#6}% ur-y
+% \pssetxlength\pst at dimc{#5}% ur-x
+% \pssetylength\pst at dimd{#6}% ur-y
% If minimum values are negative in log mode, we modify Ox
% (respectively Oy) if this was not done by the user
% X axis labels (\psk at log = 0 or 1)
@@ -2371,9 +2390,9 @@
\pst at cnta=#1\relax% % Distance (in sp) to end.
\divide\pst at cnta\psk at dx\relax% % Number of ticks/labels
\ifnum\pst at cnta=\z@\else%
- \pst at dimb=\psk at dx sp % Space between ticks.
-% \ifPst at yAxis\else\showorigintrue\fi %%%% 20170417
- \ifnum\psk at labels<\tw@ \ifPst at xAxis\pst@@hlabels\fi\fi
+ \pst at dimb=\psk at dx sp% % Space between ticks.
+ \ifPst at yAxis\else\showorigintrue\fi
+ \ifnum\psk at labels<\tw@\ifPst at xAxis\pst@@hlabels\fi\fi
\showoriginfalse
\fi
\fi
@@ -2390,8 +2409,11 @@
% \multido{\iB=#3+1,\rB=#3+\pst at tempA}{\pst at tempB}%
% {\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rB,0)%\psxlabelsep)
% {\strut\pshlabel{\psPutXLabel{\iB}}}}%
- \multido{\nA=0+1,\rA=#3+\psk at Dx}{\numexpr#4-#3+1}{\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rA,0){%
- \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nA}}}}%
+ \edef\pst at Xstart{\pst at int{#3}}%
+ \edef\pst at Xend{\pst at int{#4}}%
+ \multido{\nA=0+1,\rA=\pst at Xstart+\psk at Dx}{%
+ \numexpr\pst at Xend-\pst at Xstart+1}{\uput{\psxlabelsep}[\pst at tempC]{\pst at xLabelsRot}(\rA,0){%
+ \strut\expandafter\pshlabel\expandafter{\psPutXLabel{\nA}}}}%
\SpecialLabelsDonetrue
\fi
\fi
@@ -2406,7 +2428,8 @@
\vskip-\pst at xticksizeB\vskip-\psxlabelsep\vskip-1ex % 3
\fi
\ifnum\pst at cnta<\z@ \pst at dimb=-\pst at dimb\fi
- \hbox to\z@{%
+% \hbox to \z@{%
+ \hbox to \hsize{% to prevent overfull hbox 20170626
\ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk at Ox}\hss}\fi
\mmultido{\nA=\psk at Ox+\psk at Dx}{\pst at cnta}{%
\hskip\pst at dimb \hbox to \z@{\hss
@@ -2435,8 +2458,11 @@
\fi
\fi
\else
- \multido{\nA=0+1,\rA=#3+\psk at Dy}{\numexpr#4-#3+1}{\uput{\psylabelsep}[180]{\pst at yLabelsRot}(0,\rA){%
- \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
+ \edef\pst at Ystart{\pst at int{#3}}%
+ \edef\pst at Yend{\pst at int{#4}}%
+ \multido{\nA=0+1,\rA=\pst at Ystart+\psk at Dy}{\numexpr\pst at Yend-\pst at Ystart+1}{%
+ \uput{\psylabelsep}[180]{\pst at yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nA}}}}%
\SpecialLabelsDonetrue
\fi
\fi
More information about the tex-live-commits
mailing list