texlive[52617] Master/texmf-dist: pstricks-add (2nov19)
commits+karl at tug.org
commits+karl at tug.org
Sat Nov 2 22:06:20 CET 2019
Revision: 52617
http://tug.org/svn/texlive?view=revision&revision=52617
Author: karl
Date: 2019-11-02 22:06:20 +0100 (Sat, 02 Nov 2019)
Log Message:
-----------
pstricks-add (2nov19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes
trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes 2019-11-02 21:05:54 UTC (rev 52616)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes 2019-11-02 21:06:20 UTC (rev 52617)
@@ -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.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
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex 2019-11-02 21:05:54 UTC (rev 52616)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex 2019-11-02 21:06:20 UTC (rev 52617)
@@ -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 @@
\end{pspicture}
\end{LTXexample}
+
\clearpage
%--------------------------------------------------------------------------------------
@@ -340,6 +340,8 @@
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 @@
\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 @@
\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 @@
%\pstVerb{ /m -3 -0.85 sub 4 0.6 sub div def }
+
+
+
\clearpage
%--------------------------------------------------------------------------------------
@@ -787,6 +794,33 @@
\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 @@
\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 @@
\end{LTXexample}
+
\begin{LTXexample}[width=8cm]
\psset{unit=0.8}
\begin{pspicture}(10,11)
@@ -996,6 +1032,7 @@
\clearpage
+
%--------------------------------------------------------------------------------------
\section{Contour plots}
%--------------------------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex 2019-11-02 21:05:54 UTC (rev 52616)
+++ trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex 2019-11-02 21:06:20 UTC (rev 52617)
@@ -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 at TMChange
}%
\box\pst at hbox
- \pst at Verb{ \tx at TMRestore grestore }\endgroup}
+ \pst at Verb{ \tx at TMRestore grestore }\endgroup
+ \ignorespaces}
%
% [#1]: obtargs; (#2,#3): center; {#4}: factor; {#5}: object
\def\psHomothetie{\def\pst at par{}\pst at object{psHomothetie}}
@@ -164,6 +165,9 @@
\define at key[psset]{pstricks-add}{braceWidthInner}{\pst at getlength{#1}\psk at braceWidthInner}
\define at key[psset]{pstricks-add}{braceWidthOuter}{\pst at getlength{#1}\psk at braceWidthOuter}
%
+\define at boolkey[psset]{pstricks-add}[PST@]{singleline}[true]{}%use \ifPST at metricFunction
+\psset{singleline=false}
+
\def\psbrace{\def\pst at par{}\pst at object{psbrace}}
\def\psbrace at i(#1)(#2)#3{%
\addbefore at 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 at 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 at fillstyle\relax\else
- gsave
- ifStar { \pst at usecolor\pslinecolor }{ \pst at usecolor\psfillcolor } ifelse
- fill
- grestore
- \fi
- \pst at number\pslinewidth setlinewidth \pst at 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 at fillstyle\relax\else
+ gsave
+ ifStar { \pst at usecolor\pslinecolor }{ \pst at usecolor\psfillcolor } ifelse
+ fill
+ grestore
+ \fi
+ \fi
+% \pst at number\pslinewidth setlinewidth \pst at usecolor\pslinecolor stroke
+ \ifx\pslinestyle\@none\else
+ \pst at number\pslinewidth SLW
+ \pst at usecolor\pslinecolor
+ \@nameuse{psls@\pslinestyle}
+ \tx at setStrokeTransparency
+ \fi
+ stroke
0 0 moveto
grestore
% now calculate the label pos
@@ -1960,29 +1973,30 @@
\def\psCircleTangents{\pst at object{psCircleTangents}}
\def\psCircleTangents at i(#1){\@ifnextchar({\psCircleTangents at ii(#1)}{\psCircleTangents at iii(#1)}}%
\def\psCircleTangents at ii(#1)(#2)#3{% (viewpoint) (circle) {radius}
- \pst at killglue%
- \begingroup%
- \pst at getlength{#3}\pst at LengthA%
+ \pst at killglue
+ \begingroup
+ \pst at getlength{#3}\pst at LengthA
\addbefore at par{basename=CircleT}%
- \use at par%
- \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst at LengthA dup %
- \pst at number\psxunit div exch \pst at number\psyunit div )(#1){\psk at basename}}%
- \@cmd%
- \endgroup%
- \ignorespaces%
+ \use at par
+% \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst at LengthA dup
+% \pst at number\psxunit div exch \pst at number\psyunit div )(#1){\psk at basename}}%
+% \@cmd
+ \psEllipseTangentsN(#2)(!\pst at LengthA dup \pst at number\psxunit div exch \pst at number\psyunit div )(#1){\psk at basename}%
+ \endgroup
+ \ignorespaces
}%
\def\psCircleTangents at iii(#1)#2(#3)#4{% two circles--- (Cntr1){radius1}(Cntr2){radius2}
- \pst at killglue%
- \begingroup%
+ \pst at killglue
+ \begingroup
\pst at getlength{#2}\pst at LengthA% radius1
\pst at getlength{#4}\pst at LengthB% radius2
\addbefore at par{basename=CircleT}%
- \use at par%
- \psLCNodeVar(#1)(#3)(! \pst at LengthA \pst at number\psrunit div dup \pst at LengthB %
+ \use at par
+ \psLCNodeVar(#1)(#3)(! \pst at LengthA \pst at number\psrunit div dup \pst at LengthB
\pst at 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 at basename C1}%
% tti=r1/(r1+r2), ttx=r1/(r1-r2)
@@ -2011,7 +2025,9 @@
\def\psEllipseTangentsN(#1)(#2)(#3)#4{% (xe,ye)(a,b)(xP,yP){basename} % no optional arguments
\pst at killglue
% \pst at getcoor{#1}\pst at tempA
- \pnodes(#1){E at Cntr}(#2){@@TMP}(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
+ \pnode(#1){E at Cntr}%
+ \pnode(#2){@@TMP}%
+ \pnode(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
\pst at getcoor{#3}\my at tempC% external viewpoint
\AtoB(E at Cntr)(@@@TMP){@TMP}% center to viewpoint
\ifnum\Pst at Debug>0
@@ -2018,7 +2034,7 @@
\shownode(E at Cntr)%
\shownode(@TMP)%
\shownode(@@@TMP)%
- \fi%
+ \fi
\pnode(!
\psGetNodeCenter{E at Cntr}\space
/Xc E at Cntr.x def /Yc E at Cntr.y def
More information about the tex-live-commits
mailing list