From 09802588a0720cc4857282650b590ec15f4bd5be Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Aug 2014 16:54:11 +0000 Subject: pst-plot git-svn-id: svn://tug.org/texlive/trunk@34812 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-plot/Changes | 3 ++ Master/texmf-dist/doc/generic/pst-plot/README | 18 ++++++++-- Master/texmf-dist/doc/generic/pst-plot/README-doc | 3 ++ .../doc/generic/pst-plot/pst-plot-doc.pdf | Bin 1255874 -> 1217251 bytes .../doc/generic/pst-plot/pst-plot-doc.tex | 5 +-- .../texmf-dist/tex/generic/pst-plot/pst-plot.tex | 38 ++++++++++++--------- .../texmf-dist/tex/generic/pst-plot/pst-plot97.tex | 1 + Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty | 2 +- 8 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/pst-plot/README-doc diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index febbecec3d0..54691bdb897 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/Changes +++ b/Master/texmf-dist/doc/generic/pst-plot/Changes @@ -1,4 +1,7 @@ ----- pst-plot.tex +1.66 2014-07-30 - option showpoints is valid for \psCoordinates + preset to true +1.65 2014-07-12 - allow PostScript expression for \psx|yTick 1.64 2014-07-09 - added axespos for psgraph environment 1.63 2014-06-24 - added x|y versions of mathLabel and labelFontSize 1.62 2014-05-12 - moved comma and decimalSeparator into pst-tools diff --git a/Master/texmf-dist/doc/generic/pst-plot/README b/Master/texmf-dist/doc/generic/pst-plot/README index efdfe42fcfd..57233cad60e 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/README +++ b/Master/texmf-dist/doc/generic/pst-plot/README @@ -1,3 +1,15 @@ -dtk02-1.pdf : Die mathematischen Funktionen von PostScript -dtk02-2.pdf : Die Plotfunktionen von pst-plot -tugboat01-4.pdf : The plot functions of pst-plot +This version of pst-plot uses the xkeyval package, the extended +version of keyval. + +Save the files pst-plot.sty|.tex| in a directory, which is part of your +local TeX node. Then do not forget to run texhash to update this node +if these packages are new to your TeX distribution. +For more information see the documentation of your LaTeX distribution +on installing packages into your LaTeX distribution or the +TeX Frequently Asked Questions: +(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). + +pst-plot needs pstricks, which should be part of your +local TeX installation, otherwise get it from a CTAN server, f.ex. +http://mirror.ctan.org/graphics/pstricks/ + diff --git a/Master/texmf-dist/doc/generic/pst-plot/README-doc b/Master/texmf-dist/doc/generic/pst-plot/README-doc new file mode 100644 index 00000000000..efdfe42fcfd --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-plot/README-doc @@ -0,0 +1,3 @@ +dtk02-1.pdf : Die mathematischen Funktionen von PostScript +dtk02-2.pdf : Die Plotfunktionen von pst-plot +tugboat01-4.pdf : The plot functions of pst-plot diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf index 342ff2b0ad3..9b61ad2bea5 100644 Binary files a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf and b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex index 706429b8708..15754f1290d 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex @@ -1,3 +1,4 @@ +% $Id: pst-plot-doc.tex 56 2014-07-30 07:34:07Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles @@ -15,7 +16,7 @@ \def\bgImage{% \begin{pspicture}(-3.5,-3.5)(3.5,3.5) \psaxes[axesstyle=polar,subticklinestyle=dashed,subticks=2, - labelFontSize=\scriptstyle](3,3) + labelFontSize=\scriptstyle](3,360) \psplot[polarplot,algebraic,linecolor=red,linewidth=2pt, plotpoints=2000]{0}{TwoPi}{6*sin(x)*cos(x)} \end{pspicture} @@ -3487,7 +3488,7 @@ x sin dup mul x cos dup mul add sqrt \psCoordinates(*2 {x^2/10}) \psCoordinates[linecolor=blue,linestyle=dashed, dotstyle=square,dotscale=2](*4 {x^2/10}) - \psCoordinates[arrowscale=1.5,arrows=->](*6 {x^2/10}) + \psCoordinates[arrowscale=1.5,arrows=->,showpoints=false](*6 {x^2/10}) \psCoordinates[arrows=->,linecolor=blue,linestyle=dotted, dotstyle=triangle,dotscale=2](*8 {x^2/10}) \psCoordinates[dotscale=2](*9 {x^2/10}) 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 6da6f7eab16..f68a5473f94 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex @@ -1,10 +1,12 @@ +% $Id: pst-plot.tex 56 2014-07-30 07:34:07Z herbert $ +%% %% BEGIN pst-plot.tex %% %% plotting functions and data with PSTricks. %% See the betadoc documentation for usage. %% %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. -%% COPYRIGHT 2009-2014 by Herbert Voss, hvoss@tug.org. +%% COPYRIGHT 2009-2015 by Herbert Voss, hvoss@tug.org. %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -20,8 +22,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.64} -\def\filedate{2014/07/07} +\def\fileversion{1.66} +\def\filedate{2014/07/30} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -1459,14 +1461,16 @@ D\space##1% %% #4 : label \def\psxTick{\pst@object{psxTick}}% idea by Martin Chicoine \def\psxTick@i{\@ifnextchar({\psxTick@ii{0}}\psxTick@ii} -\def\psxTick@ii#1(#2)#3{{ +\def\psxTick@ii#1(#2)#3{{% \pst@killglue \addbefore@par{arrows=-,linewidth=\psk@xtickwidth\pslinewidth} \use@par - \psline(#2, \pst@xticksizeB)(#2,\pst@xticksizeA) + \edef\temp@coor{(!#2 \pst@number\pst@xticksizeB \pst@number\psyunit div)(!#2 \pst@number\pst@xticksizeA \pst@number\psyunit div)}% + \expandafter\psline\temp@coor \rput[t]{#1}(! \psk@origin #2 \pst@number\psxlabelsep \pst@number\pst@xticksizeB add - \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}}\ignorespaces} + \pst@number\psyunit div neg ){\pshlabel{#3\vphantom{1}}}% + }\ignorespaces} % %% #1 : optional arguments passed to psline %% #2 : rotating angle @@ -1474,23 +1478,25 @@ D\space##1% %% #4 : label \def\psyTick{\pst@object{psyTick}}% idea by Martin Chicoine \def\psyTick@i{\@ifnextchar({\psyTick@ii{0}}\psyTick@ii} -\def\psyTick@ii#1(#2)#3{{ +\def\psyTick@ii#1(#2)#3{{% \pst@killglue \addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth} \use@par - \psline(\pst@yticksizeB,#2)(\pst@yticksizeA,#2) - \rput[r]{#1}(! \psk@origin + \edef\temp@coor{(!\pst@number\pst@yticksizeB \pst@number\psxunit div #2)(!\pst@number\pst@yticksizeA \pst@number\psxunit div #2)}% + \expandafter\psline\temp@coor + \rput[r]{#1}(!\psk@origin \pst@number\pst@yticksizeB \pst@number\psylabelsep add \pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces} % \def\psCoordinates{\pst@object{psCoordinates}} \def\psCoordinates@i(#1){% \pst@killglue% - \begin@OpenObj - \SpecialCoor% - \psline(#1|0,0)(#1)\psline(#1)(0,0|#1)\psdot(#1)% - \end@OpenObj% - \ignorespaces% + \begingroup + \addbefore@par{showpoints} + \use@par + \psline(#1|0,0)(#1)\psline(#1)(0,0|#1)\ifshowpoints\psdot(#1)\fi% + \endgroup + \ignorespaces } % \def\stripDecimals#1{\expandafter\@stripDecimals#1..\@nil} @@ -2342,8 +2348,8 @@ D\space##1% \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi% \let\psxunit\pst@xunit \let\psyunit\pst@yunit% \ifdim\pst@xunit=\pst@yunit\relax\psset[pstricks]{runit=\pst@xunit}\fi% - \bgroup% - \use@par% + \bgroup + \use@par \ifnum\psk@axespos=0 \psaxes(#1,#2)(#3,#4)% \else diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex index c72ea79624a..8129957f7b7 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot97.tex @@ -1,3 +1,4 @@ +% $Id: pst-plot97.tex 53 2014-07-26 18:41:20Z herbert $ %% BEGIN pst-plot.tex \def\fileversion{0.93a-patch2} \def\filedate{94/09/19} diff --git a/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty index e515363d30d..50b548252f9 100644 --- a/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty +++ b/Master/texmf-dist/tex/latex/pst-plot/pst-plot.sty @@ -1,4 +1,4 @@ -% $Id: pst-plot.sty 541 2011-07-20 16:38:34Z herbert $ +% $Id: pst-plot.sty 51 2014-07-26 18:36:44Z herbert $ %% %% This is file `pst-plot.sty'. %% -- cgit v1.2.3