From d4165c0f6f43432d33b38973f1399652280b89a8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Jul 2014 22:28:24 +0000 Subject: pstricks-add (16jul14) git-svn-id: svn://tug.org/texlive/trunk@34630 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 3 +- .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 5115226 -> 5116132 bytes .../doc/generic/pstricks-add/pstricks-add-doc.tex | 24 ++++++++------ .../tex/generic/pstricks-add/pstricks-add.tex | 35 +++++++++++++-------- 4 files changed, 38 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index b8535206e8d..2426c7bd2d0 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 923 2014-06-16 07:31:28Z herbert $ +%% $Id: Changes 932 2014-07-10 19:59:36Z herbert $ %% pstricks-add.pro ----------- 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY @@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.74 2014-07-15 - Allow a node as a startpoint for \psVector v 3.73 2014-06-16 - enable \ncput et al for \psVector v 3.72 2014-06-12 - allow multiple coors for \psVector v 3.67 2014-05-07 - some minor fixes to \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 8b265124401..d6c13d48ecb 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf and b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf differ 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 c4c2fad2532..ae7e83a0114 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 924 2014-06-16 21:25:49Z herbert $ +%% $Id: pstricks-add-doc.tex 933 2014-07-11 19:23:25Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -225,6 +225,15 @@ coordinates of the endpoint are \emph{always} interpreted relative to the last the vector. The first vector refers to the coordinates set by \Lcs{psStartPoint}. With the boolean argument one can draw the horizontal angle of the vector. +\begin{BDef} +\Lcs{psVector}\OptArgs\OptArg*{\texttt{}}\coord1\coord2\ldots\Largr{\coord{n}}\\ +\Lcs{psStartPoint}\OptArg{node basename}\Largr{$x$,$y$} +\end{BDef} + +If the optional argument in angle braces is given then it will be the start point +for the current vector and the next ones, until a new start point is defined or a +new optional argument is used. + The style of the angle arc is saved in \Lkeyval{psMarkAngleStyle} and the style for the horizontal line in \Lkeyval{psMarkAngleLineStyle} and preset to @@ -235,8 +244,7 @@ for the horizontal line in \Lkeyval{psMarkAngleLineStyle} and preset to \begin{pspicture}[showgrid](10,10) - \psStartPoint(1,1) - \psVector(3;30)(4;60)\nbput{$V_2$} + \psVector<1,1>(3;30)(4;60)\nbput{$V_2$} \psVector[linecolor=red](3;10)\nbput{$V_3$} \psVector[linestyle=dashed](4;110)\nbput{$V_4$} \psStartPoint(1,1)\psset{markAngle} @@ -247,12 +255,11 @@ for the horizontal line in \Lkeyval{psMarkAngleLineStyle} and preset to \begin{lstlisting} \begin{pspicture}[showgrid](10,10) - \psStartPoint(1,1) - \psVector(3;30)(4;60)\nbput{$V_2$} + \psVector<1,1>(3;30)(4;60)\nbput{$V_2$} \psVector[linecolor=red](3;10)\nbput{$V_3$} \psVector[linestyle=dashed](4;110)\nbput{$V_4$} - \psStartPoint(1,1)\psset{markAngle} - \psVector[linestyle=dashed](4;110)\ncput*{$V_1$} + \psset{markAngle} + \psVector[linestyle=dashed]<1,1>(4;110)\ncput*{$V_1$} \psVector[linecolor=red](3;10)\ncput*{$V_2$} \psVector(4;60)(3;30)\ncput*{$V_4$} \end{pspicture} @@ -264,9 +271,6 @@ the first \Lcs{psVector}. With the macro \Lcs{psStartPoint} one can set the star with optional argument the name of the nodes. \verb=Vector3= is the default node name of the endpoint of the third vector or the name of the starting point of the forth vector. -\begin{BDef} -\Lcs{psStartPoint}\OptArg{node basename}\Largr{$x$,$y$} -\end{BDef} \begin{pspicture}[showgrid,linewidth=1pt](10,10.4) \psStartPoint[A](1,1)% nodes have the base name A 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 018fa300df7..cc9e083a2be 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 924 2014-06-16 21:25:49Z herbert $ +%% $Id: pstricks-add.tex 933 2014-07-11 19:23:25Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -30,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.73} -\def\filedate{2014/06/16} +\def\fileversion{3.74} +\def\filedate{2014/07/15} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -2330,11 +2330,16 @@ a add \global\psVectorCtr=\@ne \gdef\psVectorName{#1}% \pnode(#2){#10}% - \pst@getcoor{#2}\pst@tempA% - \pstVerb{tx@Dict begin - \pst@tempA - \pst@number\psyunit div /cp.Y exch def - \pst@number\psxunit div /cp.X exch def end }\ignorespaces} +% \pst@getcoor{#2}\pst@vector@cp + \pstVerb{ + gsave tx@Dict begin + STV CP T \psGetNodeCenter{#10} + /cp.X #10.x def /cp.Y #10.y def +% \pst@vector@cp +% \pst@number\psyunit mul /cp.Y exch def +% \pst@number\psxunit mul /cp.X exch def + end grestore }% + \ignorespaces} % \def\psVector{\pst@object{psVector}} \def\psVector@i{% @@ -2343,11 +2348,15 @@ a add % \addto@par{showpoints=false}% \psVector@ii} -\def\psVector@ii(#1){% +\def\psVector@ii{\@ifnextchar<\psVector@iii\psVector@iv}% +\def\psVector@iii<#1>{\psStartPoint(#1)\psVector@iv} + +\def\psVector@iv(#1){% \pst@getcoor{#1}\pst@tempCoor \begingroup \use@keep@par - \rput(! cp.X cp.Y ){% + \pst@cntm=\the\psVectorCtr \advance\pst@cntm by \m@ne + \rput(\psVectorName\the\pst@cntm){% \else cp.X cp.Y \fi){% \pnode(0,0){@@@A}\pnode(#1){@@@B} \ifPst@markAngle \psarc[style=psMarkAngleStyle](0,0){1}{0}{!\pst@tempCoor exch atan}% @@ -2358,12 +2367,12 @@ a add \pst@number\psxunit div cp.X add exch ){\psVectorName\the\psVectorCtr}% \global\advance\psVectorCtr by \@ne% \endgroup - \pst@Verb{ %tx@Dict begin + \pst@Verb{ \pst@tempCoor \pst@number\psyunit div cp.Y add /cp.Y exch def - \pst@number\psxunit div cp.X add /cp.X exch def %end + \pst@number\psxunit div cp.X add /cp.X exch def }% - \@ifnextchar(\psVector@ii\ignorespaces} + \@ifnextchar(\psVector@iv\ignorespaces} % \define@key[psset]{pstricks-add}{basename}{\def\psk@basename{#1}}% \psset[pstricks-add]{basename=}% -- cgit v1.2.3