diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/Changes | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf | bin | 1331838 -> 1316550 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex | 28 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 52 |
4 files changed, 57 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes index f6a73776d22..c7ab6a9df40 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/Changes +++ b/Master/texmf-dist/doc/generic/pst-plot/Changes @@ -1,4 +1,5 @@ ----- pst-plot.tex +1.92 2019-05-16 - fix for missing position test of special labels 1.91 2018-08-31 - fix for showorigin and triglabels 1.90 2018-03-28 - fix for showoriginfalse and yAxis=false 1.89 2018-02-18 - fix for trailing space in loglines=all 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 Binary files differindex f622e6d7a8e..a82d02ccc14 100644 --- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf 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 8eba29b72bb..00617d6ad3f 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,4 +1,4 @@ -% $Id: pst-plot-doc.tex 799 2018-08-31 16:27:35Z herbert $ +% $Id: pst-plot-doc.tex 1056 2019-05-17 07:39:59Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles @@ -205,7 +205,8 @@ example is equivalent to when \Lcs{listplot} is used: \begin{BDef} \Lcs{psplot}\OptArgs\Largb{$x_!\min@$}\Largb{$x_!\max@$}\Largb{function}\\ -\Lcs{parametricplot}\OptArgs\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) y(t)} +\Lcs{parametricplot}\OptArgs\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) y(t)}\\ +\Lcs{parametricplot}\OptArg{algebraic,...}\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) | y(t)} \end{BDef} \Lcs{psplot} can be used to plot a function $f(x)$, if you know a little @@ -227,7 +228,8 @@ $\sin(x)\cos((x/2)^2)$ and $\sin^2(x)$: \end{LTXexample} \Lcs{parametricplot} is for a parametric plot of $(x(t),y(t))$. \Larg{function} is the PostScript -code or algebraic expression for calculating the pair $x(t)$ $y(t)$. +code or algebraic expression for calculating the pair $x(t)$ $y(t)$. For an algebraic expression they must be +devided by a vertical rule. For example, \begin{LTXexample}[wide,width=4cm] @@ -251,6 +253,20 @@ Here is a parametric plot of $(\sin(t),\sin(2t))$: \end{LTXexample} +\begin{LTXexample}[wide,width=6.5cm] +\begin{pspicture}[showgrid,algebraic](-3,-3)(3,3) +\psframe[dimen=m](-3,-3)(3,3) + \pscustom[fillstyle=hlines]{% + \psplot{-3}{3}{-x^2/3} + \psparametricplot{-3}{3}{t^2/3 | t} + \psplot{3}{-3}{x^2/3} + \psparametricplot{3}{-3}{-t^2/3 | t} +} +\end{pspicture} +\end{LTXexample} + + + The number of points that the \Lcs{psplot} and \Lcs{parametricplot} commands calculate is set by the \LKeyset{plotpoints=<value>} @@ -276,6 +292,7 @@ most cases superfluous. \begin{BDef} \Lcs{psplot}\OptArgs\Largb{x0}\Largb{x1}\OptArg{PS commands}\Largb{function}\\ \Lcs{psparametricplot}\OptArgs\Largb{t0}\Largb{t1}\OptArg{PS commands}\Largb{x(t) y(t)}\\ +\Lcs{psparametricplot}\OptArg{algebraic,...}\Largb{t0}\Largb{t1}\OptArg{PS commands}\Largb{x(t) | y(t)}\\ \Lcs{psaxes}\OptArgs\OptArg*{\Largb{arrows}}\coord0\coord1\coord2\OptArg{Xlabel,Xangle}\OptArg{Ylabel,Yangle} \end{BDef} @@ -1005,7 +1022,8 @@ the setting of \Lkeyword{mathLabel} is taken into account. \begin{LTXexample}[width=.4\linewidth] -\begin{psgraph}[Dx=2,Dy=2](0,0)(-4,-2.2)(4,2.2){.5\textwidth}{!} +\begin{psgraph}[Dx=2,Dy=2,showorigin=false]% + (0,0)(-4,-2.2)(4,2.2){.5\textwidth}{!} \psxTick[linecolor=red,labelsep=-20pt]{45}(1.25){x_0} \psyTick[linecolor=blue](1){y_0} \end{psgraph} @@ -3286,7 +3304,7 @@ drawn tilde and the value for the inrrupted section, e.g. \verb|interrupt={15,1, %-------------------------------------------------------------------------------------- With the setting \Lkeyset{plotstyle=ybar} the graph is set with horizontal bars instead of vertical. For \Lkeyword{yLabels} see section~\ref{yLabels}. -. + \begin{center} \savedata{\data}[1 1 1 2 1 3 2 4 3 5 4 6 4 7 6 8 6 9 7 10 25 11 30 12 32 13] 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 7f6ba8a1922..2436a847390 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 798 2018-08-31 14:47:43Z herbert $ +% $Id: pst-plot.tex 1056 2019-05-17 07:39:59Z herbert $ %% %% BEGIN pst-plot.tex %% @@ -23,8 +23,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.91} -\def\filedate{2018/08/31} +\def\fileversion{1.92} +\def\filedate{2019/05/16} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -714,15 +714,15 @@ D\space##1% \ifPst@valuesStar Str stringwidth pop /yS \psk@fontscale def /xS ED gsave newpath - xO \ifPst@xvalues \pst@number\pslabelsep add \fi - yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi + xO \ifPst@xvalues \pst@number\pslabelsep add \fi + yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi xS 0 rlineto 0 yS rlineto xS neg 0 rlineto 0 yS neg rlineto closepath 1 setgray fill stroke grestore \fi xO \ifPst@xvalues \pst@number\pslabelsep add \fi - yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi + yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi Str show grestore } repeat @@ -934,11 +934,11 @@ D\space##1% \def\psplot{\def\pst@par{}\pst@object{psplot}} \def\psplot@i#1#2{\@ifnextchar[{\psplot@x{#1}{#2}}{\psplot@x{#1}{#2}[]}} \def\psplot@x#1#2[#3]#4{% - \pst@killglue% - \begingroup% - \use@par% + \pst@killglue + \begingroup + \use@par \@nameuse{beginplot@\psplotstyle}% - \ifPst@polarplot% + \ifPst@polarplot \addto@pscode{ \psplot@init #3 @@ -1005,16 +1005,16 @@ D\space##1% /xy { x \pst@number\psxunit mul F@pstplot \pst@number\psyunit mul % \ifPst@algebraic F@pstplot \else #4 \fi \pst@number\psyunit mul } def}% - \fi% + \fi \gdef\psplot@init{}% \ifx\pslinestyle\psls@@symbol \psplot@iii \else - \@pstfalse% + \@pstfalse \@nameuse{testqp@\psplotstyle}% - \if@pst\psplot@ii\else\psplot@iii\fi% - \fi% - \endgroup% + \if@pst\psplot@ii\else\psplot@iii\fi + \fi + \endgroup \ignorespaces} % \def\psplot@ii{% @@ -1228,7 +1228,15 @@ D\space##1% \edef\psk@dy{\number\pst@dimg}} \psset[pst-plot]{dy=0} % -\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{} +\define@boolkey[psset]{pst-plot}[]{showXorigin}[true]{} +\define@boolkey[psset]{pst-plot}[]{showYorigin}[true]{} +\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{% + \ifshoworigin + \showXorigintrue\showYorigintrue + \else + \showXoriginfalse\showYoriginfalse + \fi +} \psset[pst-plot]{showorigin=true} % \long\def\psrotatebox#1#2{% @@ -2016,7 +2024,7 @@ D\space##1% \ifPst@xAxis \SpecialLabelsDonefalse \begingroup - \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi +%%% \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi \ifnum\psk@dx=\z@ \pst@dimg=\psk@Dx\psxunit \ifdim\pst@dimg<\p@ @@ -2481,8 +2489,14 @@ D\space##1% \ifdim\pst@pmtempb pt < \z@ \def\pst@pmtempe{\pst@int{\pst@pmtempc}}\else\def\pst@pmtempe{\pst@int{\pst@pmtempd}}\fi \multido{\nA=0+1,\rA=#3+\psk@Dy}{\pst@pmtempe}{% \ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi - \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){% - \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}}% + \ifnum\psk@ylabelPos=0 + \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){% + \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}% + \else + \uput{\psylabelsep}[0]{\pst@yLabelsRot}(0,\rA){% + \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}% + \fi + }% \SpecialLabelsDonetrue \fi \fi |