summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-20 22:56:55 +0000
committerKarl Berry <karl@freefriends.org>2017-03-20 22:56:55 +0000
commite7b67086abd330ff0b6a29c64adc4fb7854b398b (patch)
treefca5cd1a72526241849b50b2aef5335a84628911 /Master
parent46128c8be93ce0af49085f64ba84fbf08d1406c2 (diff)
pst-plot (20mar17)
git-svn-id: svn://tug.org/texlive/trunk@43556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin1330754 -> 1336184 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex42
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex15
4 files changed, 49 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 4f86720c577..1209320794e 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.77 2017-03-20 - new optional argument for \psCoordinates
1.76 2017-01-18 - allow yLabels and xLabels for negative axes
1.75 2016-05-18 - fix bug with psgraph and position of labels
1.74 2016-05-11 - fix bug with trailing space
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 871949a51a9..8d73c862875 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
Binary files 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 7876b6b93fd..2edbf3c1156 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 303 2016-05-12 20:44:22Z herbert $
+% $Id: pst-plot-doc.tex 393 2017-03-20 08:00:05Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
@@ -1226,8 +1226,36 @@ There is a new value \Lkeyval{cspline} for the plotstyle to interpolate a curve
\end{pspicture}
\end{LTXexample}
+
+\begin{LTXexample}[pos=b]
+\begin{pspicture}(-0.5,-1.5)(1.5,1.5)
+\psaxes[showorigin=false,yLabels={a,b,c}](0,0)(0,-1)(1,1)
+\end{pspicture}
+\begin{pspicture}(-0.5,-0.5)(1.5,2.5)
+\psaxes[showorigin=false,yLabels={a,b,c}](1,2)
+\end{pspicture}
+\begin{pspicture}(-0.5,-2.5)(1.5,.5)
+\psaxes[showorigin=false,yLabels={a,b,c}](0,0)(0,-2)(1,0)
+\end{pspicture}
+
+\begin{pspicture}(-1.5,-1.5)(1.5,1.5)
+\psaxes[showorigin=false,xLabels={a,b,c}](0,0)(-1,-1)(1,1)
+\end{pspicture}
+\begin{pspicture}(-0.5,-0.5)(1.5,2.5)
+\psaxes[showorigin=false,xLabels={a,b,c}](2,2)
+\end{pspicture}
+\begin{pspicture}(-2.5,-2.5)(1.5,.5)
+\psaxes[showorigin=false,xLabels={a,b,c}](0,0)(-2,-2)(0,0)
+\end{pspicture}
+\end{LTXexample}
+
+
The values for \Lkeyword{xlabelsep} and \Lkeyword{ylabelsep} are taken into account.
+
+
+
+
\subsection{Option \nxLkeyword{xLabelOffset} and \nxLkeyword{ylabelOffset}}\label{labelOffset}
@@ -3461,18 +3489,24 @@ x sin dup mul x cos dup mul add sqrt
\Lcs{psCoordinates}\OptArgs\Largr{\CAny}
\end{BDef}
+A special optional argument is \Lkeyword{markPoint} which is preset to \texttt{true}. With
+\Lkeyword{showpoints} one can set all three points with the same symbol: start point, curve point, and end point.
+
\medskip
\begin{LTXexample}[pos=t]
\begin{pspicture}(-5mm,-1cm)(10,10)
\psaxes{->}(10,10)
\psplot[algebraic,linecolor=red,linewidth=2pt]{0}{10}{x^2/10}
- \psCoordinates(*2 {x^2/10})
+ \psCoordinates(*1.5 {x^2/10})
+ \psCoordinates[showpoints](*2.2 {x^2/10})
\psCoordinates[linecolor=blue,linestyle=dashed,
dotstyle=square,dotscale=2](*4 {x^2/10})
- \psCoordinates[arrowscale=1.5,arrows=->,showpoints=false](*6 {x^2/10})
+ \psCoordinates[arrowscale=1.5,arrows=->,markPoint=false](*6 {x^2/10})
+ \psCoordinates[linecolor=blue,linewidth=0.3pt,
+ dotstyle=x,dotscale=2,showpoints](*7 {x^2/10})
\psCoordinates[arrows=->,linecolor=blue,linestyle=dotted,
- dotstyle=triangle,dotscale=2](*8 {x^2/10})
+ dotstyle=triangle,dotscale=2,showpoints](*8 {x^2/10})
\psCoordinates[dotscale=2](*9 {x^2/10})
\end{pspicture}
\end{LTXexample}
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 70eb527b170..4c527a0f4a0 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 304 2016-05-18 17:25:06Z herbert $
+% $Id: pst-plot.tex 393 2017-03-20 08:00:05Z 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.76}
-\def\filedate{2017/01/18}
+\def\fileversion{1.77}
+\def\filedate{2017/03/20}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1676,13 +1676,18 @@ D\space##1%
\pst@number\pst@yticksizeB \pst@number\psylabelsep add
\pst@number\psxunit div neg #2){\psvlabel{#3}}}\ignorespaces}
%
+\define@boolkey[psset]{pst-plot}[Pst@]{markPoint}[true]{}%
+\psset[pst-plot]{markPoint}
+%
\def\psCoordinates{\pst@object{psCoordinates}}
\def\psCoordinates@i(#1){%
\pst@killglue%
\begingroup
- \addbefore@par{showpoints}
+ \addbefore@par{showpoints=false,markPoint}
\use@par
- \psline(#1|0,0)(#1)\psline(#1)(0,0|#1)\ifshowpoints\psdot(#1)\fi%
+ \psline(#1|0,0)(#1)% single lines to allow arrows
+ \psline(#1)(0,0|#1)%
+ \ifPst@markPoint\psdot(#1)\fi%
\endgroup
\ignorespaces
}