CTAN sync 201911030301

4 files changed, 94 insertions, 39 deletions

diff --git a/graphics/pstricks/contrib/pstricks-add/Changes b/graphics/pstricks/contrib/pstricks-add/Changes
index 7b841796d7..a4b3642b5e 100644
--- a/graphics/pstricks/contrib/pstricks-add/Changes
+++ b/graphics/pstricks/contrib/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 902 2019-01-12 10:06:35Z herbert $
+%% $Id: Changes 1104 2019-11-01 14:45:54Z herbert $
 %%
 pstricks-add.pro ----------- 
 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -41,6 +41,8 @@ pstricks-add.sty ----------- (hv)
 
 
 pstricks-add.tex ----------- (hv)
+ v 3.89  2019-11-01 - added otion singleline for \psbrace
+ v 3.88  2019-05-11 - fix for a trailing space after \psrotatet
  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
diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
index 8dbe9e74b7..dda6875065 100644
--- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
+++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
index ad9e06287c..6934007fd5 100644
--- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
+++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 887 2018-12-29 13:17:59Z herbert $
+%% $Id: pstricks-add-doc.tex 1105 2019-11-02 08:20:49Z herbert $
 %
 \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
     headinclude=false,footinclude=false,oneside]{pst-doc}
@@ -23,7 +23,6 @@
 
 %\input{data/pstricks-add-doc.data}
 
-\usepackage[utf8]{inputenc}
 %\usepackage{pstricks-add}
 %\let\pstricksaddFV\fileversion
 \usepackage{pst-eucl,pst-fun,pst-func,multirow}
@@ -206,6 +205,7 @@ The amplitude and the width can be changed by the optional arguments \Lkeyword{v
 \end{pspicture}
 \end{LTXexample}
 
+
 \clearpage
 
 %--------------------------------------------------------------------------------------
@@ -340,6 +340,8 @@ In the first case the coordinates of a point and the center and the radius
 of a circle must be given. The names of the calculates node names are \verb=CircleT1=
 and \verb=CircleT2=.
 
+
+
 \bigskip
 \begin{pspicture}[showgrid](0,3)(10,10)
 \psdot(2,4)\pscircle(7,7){2}
@@ -350,7 +352,6 @@ and \verb=CircleT2=.
 \uput[-80](CircleT1){T1}\uput[115](CircleT2){T2}
 \end{pspicture}
 
-
 \begin{lstlisting}
 \begin{pspicture}[showgrid](0,3)(10,10)
 \psdot(2,4)\pscircle(7,7){2}
@@ -370,6 +371,9 @@ ten nodes, named \verb=CircleTC1= and \verb=CircleTC2= for the two intersection
   \verb=CircleTI1=, \verb=CircleTI2=, \verb=CircleTI3=, and \verb=CircleTI4= for the
   four nodes of the inner tangent lines.
 
+
+
+
 \bigskip
 \begin{pspicture}[showgrid](-2,-2)(10,10)
 \pscircle(1,1){1}\pscircle(7,7){3}
@@ -757,6 +761,9 @@ setting of \Lkeyword{linecolor} is taken into account:
 %\pstVerb{ /m -3 -0.85 sub 4 0.6 sub div def }
 
 
+
+
+
 \clearpage
 
 %--------------------------------------------------------------------------------------
@@ -787,6 +794,33 @@ and table.
 \end{pspicture}
 \end{center}
 
+And with option \Lkeyword{singleline}:
+
+\begin{center}
+\begin{pspicture}[showgrid=true](0,1)(10,5)
+  \psbrace[braceWidthInner=1cm,singleline,
+    braceWidthOuter=1cm,bracePos=0.6,fillcolor=white,
+    nodesepA=10mm,nodesepB=10mm](0,5)(10,5){\fbox{Label}}
+\pcline{<->}(3,4)(3,5)\ncput*{\footnotesize\ttfamily braceWidthInner}
+\pcline{<->}(3,3)(3,4)\ncput*{\footnotesize\ttfamily braceWidthOuter}
+\pcline{<->}(6,2)(6,3)\ncput{\footnotesize\ttfamily nodesepB}
+\pcline{<->}(6,2)(7,2)\ncput*{\footnotesize\ttfamily A}
+\pcline{<->}(0,1.5)(6,1.5)\ncput*{\footnotesize\ttfamily bracePos}
+\psdot[dotscale=2](0,5)\uput[0](0,5){\textbf{A}}
+\psdot[dotscale=2](10,5)\uput[180](10,5){\textbf{B}}
+\end{pspicture}
+\end{center}
+
+With the option \Lkeyword{singleline} one can choose also a different linestyle which makes no sense otherwise:
+
+\begin{LTXexample}[width=4.5cm]
+\begin{pspicture}[showgrid](4,4)
+\pnode(0,0){A}
+\pnode(4,4){B}
+\psbrace[singleline,linestyle=dashed,ref=lC](A)(B){Text I}
+\psbrace[singleline,linestyle=dotted,ref=lC](3,4)(0,1){Text II}
+\end{pspicture}
+\end{LTXexample}
 A positive value for \Lkeyword{nodesepA} and \Lkeyword{nodesepB} shifts the label to the upper right
 and a negative value to the lower left. This does not depends on
 the value for the rotating of the label!
@@ -802,7 +836,8 @@ name & meaning\\\hline
 \Lkeyword{nodesepB} & y-separation (default is $0pt$)\\
 \Lkeyword{rot} & additional rotating for the text (default is $0$)\\
 \Lkeyword{ref} & reference point for the text (default is c)\\
-\Lkeyword{fillcolor} & default is black
+\Lkeyword{fillcolor} & default is black\\
+\Lkeyword{singleline} & default is false
 \end{tabular}
 \end{center}
 
@@ -868,6 +903,7 @@ be "`unfilled"'.
 \end{LTXexample}
 
 
+
 \begin{LTXexample}[width=8cm]
 \psset{unit=0.8}
 \begin{pspicture}(10,11)
@@ -996,6 +1032,7 @@ Some nonsense text, which is nothing more than nonsense.
 
 \clearpage
 
+
 %--------------------------------------------------------------------------------------
 \section{Contour plots}
 %--------------------------------------------------------------------------------------
diff --git a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
index 70fbd31dd2..c2d2cd8037 100644
--- a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
+++ b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 903 2019-01-12 17:16:09Z herbert $
+%% $Id: pstricks-add.tex 1105 2019-11-02 08:20:49Z 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.87}
-\def\filedate{2019/01/12}
+\def\fileversion{3.89}
+\def\filedate{2019/11/01}
 \let\pstricksaddFV\fileversion
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
@@ -107,7 +107,8 @@
        [ax by cx dy ex fy] concat } \tx@TMChange 
      }%
     \box\pst@hbox
-  \pst@Verb{ \tx@TMRestore grestore  }\endgroup}
+  \pst@Verb{ \tx@TMRestore grestore  }\endgroup
+  \ignorespaces}
 %
 % [#1]: obtargs; (#2,#3): center; {#4}: factor; {#5}: object
 \def\psHomothetie{\def\pst@par{}\pst@object{psHomothetie}}
@@ -164,6 +165,9 @@
 \define@key[psset]{pstricks-add}{braceWidthInner}{\pst@getlength{#1}\psk@braceWidthInner}
 \define@key[psset]{pstricks-add}{braceWidthOuter}{\pst@getlength{#1}\psk@braceWidthOuter}
 %
+\define@boolkey[psset]{pstricks-add}[PST@]{singleline}[true]{}%use \ifPST@metricFunction
+\psset{singleline=false}
+
 \def\psbrace{\def\pst@par{}\pst@object{psbrace}}
 \def\psbrace@i(#1)(#2)#3{%
   \addbefore@par{ref=lb,linewidth=0.01pt,fillstyle=solid,fillcolor=black}% default setting
@@ -194,21 +198,30 @@
     Left radius2 neg Left radius1 add radius2 neg radius1 arcto pop4
     Right radius2 sub radius1 sub 0 rlineto
     Length radius2 neg Length 0 radius2 arcto pop4
+    \ifPST@singleline\else
 %    0 Width neg rlineto
-    Length radius2 Width add neg Length radius2 sub radius2 Width add neg radius2 arcto pop4
-    Right radius2 sub radius1 sub neg 0 rlineto
-    Left radius1 add Width radius1 add radius2 add neg radius1 90 180 arc
-    Left radius1 sub Width radius1 add radius2 add neg radius1 0 90 arc
-    Left radius2 sub radius1 sub neg 0 rlineto 
-    radius2 Width neg radius2 270 180 arcn
-    0 0 lineto 
-    \ifx\psk@fillstyle\relax\else
-      gsave
-      ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse 
-      fill
-    grestore
-    \fi 
-    \pst@number\pslinewidth setlinewidth \pst@usecolor\pslinecolor stroke
+      Length radius2 Width add neg Length radius2 sub radius2 Width add neg radius2 arcto pop4
+      Right radius2 sub radius1 sub neg 0 rlineto
+      Left radius1 add Width radius1 add radius2 add neg radius1 90 180 arc
+      Left radius1 sub Width radius1 add radius2 add neg radius1 0 90 arc
+      Left radius2 sub radius1 sub neg 0 rlineto 
+      radius2 Width neg radius2 270 180 arcn
+      0 0 lineto 
+      \ifx\psk@fillstyle\relax\else
+        gsave
+        ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse 
+        fill
+      grestore
+      \fi 
+    \fi
+%    \pst@number\pslinewidth setlinewidth \pst@usecolor\pslinecolor stroke
+    \ifx\pslinestyle\@none\else
+      \pst@number\pslinewidth SLW
+      \pst@usecolor\pslinecolor 
+      \@nameuse{psls@\pslinestyle}
+      \tx@setStrokeTransparency
+    \fi
+    stroke
     0 0 moveto
     grestore
 %   now calculate the label pos
@@ -1960,29 +1973,30 @@ a add
 \def\psCircleTangents{\pst@object{psCircleTangents}}
 \def\psCircleTangents@i(#1){\@ifnextchar({\psCircleTangents@ii(#1)}{\psCircleTangents@iii(#1)}}%
 \def\psCircleTangents@ii(#1)(#2)#3{%  (viewpoint) (circle) {radius}
-    \pst@killglue%
-    \begingroup%
-       \pst@getlength{#3}\pst@LengthA%
+    \pst@killglue
+    \begingroup
+       \pst@getlength{#3}\pst@LengthA
        \addbefore@par{basename=CircleT}%
-       \use@par%
-       \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst@LengthA dup %
-       \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}}%
-       \@cmd%
-    \endgroup%
-  \ignorespaces%  
+       \use@par
+%       \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst@LengthA dup 
+%       \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}}%
+%       \@cmd
+       \psEllipseTangentsN(#2)(!\pst@LengthA dup \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}%
+    \endgroup
+  \ignorespaces
 }%
 \def\psCircleTangents@iii(#1)#2(#3)#4{%  two circles--- (Cntr1){radius1}(Cntr2){radius2}
-  \pst@killglue%
-  \begingroup%
+  \pst@killglue
+  \begingroup
      \pst@getlength{#2}\pst@LengthA% radius1
      \pst@getlength{#4}\pst@LengthB% radius2
      \addbefore@par{basename=CircleT}%
-     \use@par%
-     \psLCNodeVar(#1)(#3)(! \pst@LengthA \pst@number\psrunit div dup \pst@LengthB %
+     \use@par
+     \psLCNodeVar(#1)(#3)(! \pst@LengthA \pst@number\psrunit div dup \pst@LengthB 
      \pst@number\psrunit div % r1 r1 r2 on stack
      3 copy add div /tti ED sub dup 0 eq % r1 r1-r2 on stack
      { pop pop /ttx 1000 def }{ div dup abs 1000 gt % r1/(r1-r2) on stack
-     { 0 gt { ttx 1000 def }{ ttx -1000 def } ifelse}{ /ttx ED } ifelse } ifelse %
+     { 0 gt { ttx 1000 def }{ ttx -1000 def } ifelse}{ /ttx ED } ifelse } ifelse 
      1 tti sub tti )% 1-tti tti on stack
      {\psk@basename C1}%
      % tti=r1/(r1+r2), ttx=r1/(r1-r2)
@@ -2011,14 +2025,16 @@ a add
 \def\psEllipseTangentsN(#1)(#2)(#3)#4{%  (xe,ye)(a,b)(xP,yP){basename} % no optional arguments
   \pst@killglue
 %  \pst@getcoor{#1}\pst@tempA
-  \pnodes(#1){E@Cntr}(#2){@@TMP}(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
+  \pnode(#1){E@Cntr}%
+  \pnode(#2){@@TMP}%
+  \pnode(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
   \pst@getcoor{#3}\my@tempC% external viewpoint
   \AtoB(E@Cntr)(@@@TMP){@TMP}% center to viewpoint
   \ifnum\Pst@Debug>0
     \shownode(E@Cntr)%
     \shownode(@TMP)%
     \shownode(@@@TMP)%
-  \fi%
+  \fi
   \pnode(! 
      \psGetNodeCenter{E@Cntr}\space
      /Xc E@Cntr.x def /Yc E@Cntr.y def