pstricks-add (12jan19)

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

4 files changed, 106 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index ea75954dce9..7b841796d79 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 851 2018-12-08 20:06:43Z herbert $
+%% $Id: Changes 902 2019-01-12 10:06:35Z herbert $
 %%
 pstricks-add.pro ----------- 
 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -41,6 +41,7 @@ pstricks-add.sty ----------- (hv)
 
 
 pstricks-add.tex ----------- (hv)
+ v 3.87  2019-01-12 - added \psCallout
  v 3.86  2018-12-08 - added some more options for \psCancel
  v 3.85b 2018-02-04 - use LaTeX package pst-calculate
  v 3.85a 2018-02-03 - added area computing for \psStep
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index 6a023990141..8dbe9e74b7b 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index 1e583d4f2fe..ad9e06287cd 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 851 2018-12-08 20:06:43Z herbert $
+%% $Id: pstricks-add-doc.tex 887 2018-12-29 13:17:59Z herbert $
 %
 \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
     headinclude=false,footinclude=false,oneside]{pst-doc}
@@ -115,6 +115,7 @@ Pablo Gonzáles;
 Peter Hutnick;
 Christophe Jorssen;
 Uwe Kern;
+Friedrich Lenk;
 Manuel Luque;
 Jens-Uwe Morawski;
 Tobias N\"ahring;
@@ -4679,6 +4680,7 @@ Spectrum of hydrogen emission (Manuel Luque)
 
 
 
+
 %--------------------------------------------------------------------------------------
 \section{Gouraud shading}
 %--------------------------------------------------------------------------------------
@@ -4705,6 +4707,8 @@ be seen with Acroread 7 or later. The syntax is easy:
 \end{pspicture}
 \end{LTXexample}
 
+
+
 \begin{LTXexample}[pos=t,preset=\centering]
 \begin{pspicture}(0,-.25)(10,10)
   \psGTriangle*(0,0)(9,10)(10,3){black}{white!50}{red!50!green!95}
@@ -4728,6 +4732,62 @@ be seen with Acroread 7 or later. The syntax is easy:
 \end{pspicture}
 \end{LTXexample}
 
+
+
+
+
+\section{\Lcs{psCallout}}
+
+\begin{BDef}
+\Lcs{psCallout}\OptArgs\Largr{$x_0,y_0$}\Largb{Text}
+\end{BDef}
+
+Possible parameter are:
+
+\begin{description}
+  \item[tipAngle] The angle of the tip depending to the horizontal line. 
+  \item[tipLength] The length of the tip from the coordinates to the box.
+  \item[tipWidth] The width of the tip end.
+  \item[tipPos] Relative position of the tip end to the width of the box.
+\end{description}
+
+
+
+
+\begin{LTXexample}[pos=t,preset=\centering]
+\begin{pspicture}(-5.5,-1)(4,5.5)
+\psaxes[labels=none,ticks=none]{->}(0,0)(-5,-1)(3.5,5)[$x$,-90][$y$,0]
+\psyTick(1){1}\uput[225](0,0){0}
+\psplot[algebraic,,yMaxValue=4.5,linecolor=red,linewidth=1.5pt]{-2.5}{3}{Euler^(-(x))}
+\psCallout(1,0.5){\scriptsize $f(x)=e^{-x}$}
+\psCallout[tipAngle=90](1,1.6){\scriptsize $f(x)=e^{-x}$}
+\psCallout[tipLength=10mm](1,3){$f(x)=e^{-x}$}
+\psCallout[tipLength=10mm,tipAngle=120,tipPos=0.8](-1,1){$f(x)=e^{-x}$}
+\psCallout[tipAngle=120,fillcolor=red!40,fillstyle=solid](-4,3){%
+   \shortstack{Some math\\$f(x)=e^{-x}$}}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
+\begin{LTXexample}[pos=t,preset=\centering]
+\begin{pspicture}(-5.5,-1)(4,5.5)
+\psaxes[labels=none,ticks=none]{->}(0,0)(-5,-1)(3.5,5)[$x$,-90][$y$,0]
+\psyTick(1){1}\uput[225](0,0){0}
+\psplot[algebraic,,yMaxValue=4.5,linecolor=red,linewidth=1.5pt]{-2.5}{3}{Euler^(-(x))}
+\psset{linearc=0.4}%
+\psCallout(1,0.5){\scriptsize $f(x)=e^{-x}$}
+\psCallout[tipAngle=90](1,1.6){\scriptsize $f(x)=e^{-x}$}
+\psCallout[tipLength=10mm](1,3){$f(x)=e^{-x}$}
+\psCallout[tipLength=10mm,tipAngle=120,tipPos=0.8](-1,1){$f(x)=e^{-x}$}
+\psCallout[tipAngle=120,fillcolor=red!40,fillstyle=solid](-4,3){%
+   \shortstack{Some math\\$f(x)=e^{-x}$}}
+\end{pspicture}
+\end{LTXexample}
+
+
+
 \section{Internal color macros}
 The internal macros \Lcs{pswavelengthToRGB} and \Lcs{pswavelengthToRGB} can be used for own purposed.
 They are defines as follows:
@@ -4741,6 +4801,9 @@ both macros leave the value(s) on the stack which then can be used for further
 manipulating or setting the color with \Lps{setgray} or \Lps{setrgbcolor}. 
 For an example see Section~\ref{sec:psMatrix}.
 
+
+
+
 \appendix
 
 
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index 59f4353922f..70fbd31dd2d 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 852 2018-12-08 20:32:46Z herbert $
+%% $Id: pstricks-add.tex 903 2019-01-12 17:16:09Z herbert $
 %%
 %% This is file `pstricks-add.tex',
 %%
@@ -31,8 +31,8 @@
 \ifx\PSTXKeyLoaded\endinput\else  \input pst-xkey \fi
 \ifx\PSTmathLoaded\endinput\else  \input pst-math \fi
 %
-\def\fileversion{3.86}
-\def\filedate{2018/12/08}
+\def\fileversion{3.87}
+\def\filedate{2019/01/12}
 \let\pstricksaddFV\fileversion
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
@@ -594,6 +594,43 @@ a add
   \ignorespaces%
 }
 %
+\define@key[psset]{pstricks-add}{tipAngle}[60]{\pst@getangle{#1}\psk@tipAngle}
+\define@key[psset]{pstricks-add}{tipLength}[5mm]{\pst@getlength{#1}\psk@tipLength}
+\define@key[psset]{pstricks-add}{tipWidth}[2mm]{\pst@getlength{#1}\psk@tipWidth}
+\define@key[psset]{pstricks-add}{tipPos}[0.2]{\def\psk@tipPos{#1 }}
+\psset[pstricks-add]{tipAngle=60,tipLength=5mm,tipWidth=2mm,tipPos=0.2}%
+%
+\def\psCallout{\def\pst@par{}\pst@object{psCallout}}
+\def\psCallout@i(#1)#2{%
+  \setbox\pst@hbox=\hbox{#2}%
+  \begingroup
+  \addbefore@par{linewidth=0.1pt,framesep=6pt}%
+  \use@par
+  \pstVerb{
+    /boxsepX { \pst@number\psframesep\space \pst@number\psxunit div } bind def
+    /boxsepY { \pst@number\psframesep\space \pst@number\psyunit div } bind def
+    /tipEnd { \psk@tipLength\space \pst@number\psxunit div \psk@tipAngle\space PtoC } bind def
+    /boxW { \pst@number\wd\pst@hbox\space \pst@number\psxunit div boxsepX 2 mul add } bind def
+    /boxH { \pst@number\ht\pst@hbox\space \pst@number\psyunit div boxsepY 2 mul add } bind def
+  }%
+  \rput(#1){%
+    \psline[linearc=0,linejoin=2]%
+      (! tipEnd exch \psk@tipWidth\space 2 div \pst@number\psxunit div sub exch)%
+      (0,0)
+      (! tipEnd exch \psk@tipWidth\space 2 div \pst@number\psxunit div add exch)%
+    \psline[linejoin=2]%
+      (! tipEnd exch \psk@tipWidth\space 2 div \pst@number\psxunit div sub exch)%
+      (! tipEnd exch \psk@tipPos boxW mul sub exch)% lower left
+      (! tipEnd exch \psk@tipPos boxW mul sub exch boxH add )% upper left
+      (! tipEnd exch 1 \psk@tipPos sub boxW mul add exch boxH add)% upper right 
+      (! tipEnd exch 1 \psk@tipPos sub boxW mul add exch)
+      (! tipEnd exch \psk@tipWidth\space 2 div \pst@number\psxunit div add exch)%
+    \rput[lb](! tipEnd boxsepY add exch \psk@tipPos boxW mul sub boxsepX add exch){#2}%
+  }%
+  \endgroup
+  \ignorespaces
+}
+%
 \def\tx@MovetoByHand{ tx@addDict begin MovetoByHand end }
 \def\tx@LinetoByHand{ tx@addDict begin LinetoByHand end }
 %/amplHand {.8} def