diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/Changes | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf | bin | 545669 -> 548107 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex | 52 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pst-node/pst-node.pro | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-node/pst-node.tex | 45 |
5 files changed, 54 insertions, 48 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index a591474db02..2e391b1bf39 100644 --- a/Master/texmf-dist/doc/generic/pst-node/Changes +++ b/Master/texmf-dist/doc/generic/pst-node/Changes @@ -1,4 +1,7 @@ ----- pst-node.tex +1.29 2013-07-13 - fix bug with missing angle in special node + coordinates + - fix for fnpnodes (argument must be in {}) 1.28 2013-07-10 - added \pnodes (plural) for multiple node definition 1.27 2013-04-12 - added macro \Cnodeput which takes radius=... into account diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf Binary files differindex 226cba9ab34..7e3bf7948ef 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex index 8c8d864c7f2..a7a55b17fdd 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pst-node-doc.tex 766 2013-04-12 14:21:05Z herbert $ +%% $Id: pst-node-doc.tex 806 2013-07-13 10:48:09Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -207,6 +207,32 @@ expects the two values for $x$ and $y$ separated by a comma: \end{LTXexample} +\begin{BDef} +\Lcs{pnodes}\OptArg*{\Largs{\Larga{offset}}}\Largr{coors}\Largb{name}\Largr{coors}\Largb{name}\ldots\\ +\Lcs{pnodes}\Largb{name}\Largr{coors}\Largr{coors}\ldots +\end{BDef} + +This command is identical to \Lcs{pnode} if it doesn't start with a node name. In this +case it works in another way. See page~\pageref{pnodes} for more information. Instead of +writing + +\begin{verbatim} +\pnode(3,1){A} +\pnode(2,4){B} +\end{verbatim} + +one can also define the nodes in a short way: +\begin{verbatim} +\pnodes(3,1){A}(2,4){B} +\end{verbatim} + +If an optional argument for the offset is used, then it is passes to all nodes. + + + + + + The command \Lcs{psnode} is a combination of using \Lcs{rput} and \Lcs{rnode}. \begin{BDef} @@ -1529,28 +1555,6 @@ Here is another: \section{Nodes} -\begin{BDef} -\Lcs{pnodes}\OptArg\Largr{coors}\Largb{name}\Largr{coors}\Largb{name}\ldots\\ -\Lcs{pnodes}\Largb{name}\Largr{coors}\Largr{coors}\ldots -\end{BDef} - -This command is identical to \Lcs{pnode} if it doesn't start with a node name. In this -case it works in another way. See page~\pageref{pnodes} for more information. Instead of -writing - -\begin{verbatim} -\pnode(3,1){A} -\pnode(2,4){B} -\end{verbatim} - -one can also define the nodes in a short way: -\begin{verbatim} -\pnodes(3,1){A}(2,4){B} -\end{verbatim} - -If an optional argument for the offset is used, then it is passes to all nodes. - - \section{Setting bounding box nodes with \nxLcs{psDefBoxNodes}} @@ -2475,7 +2479,6 @@ assuming \verb|P0...Pn| to be previously defined nodes. \end{LTXexample} \vspace{1pc} -\iffalse \begin{LTXexample}[width=.375\textwidth] \begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3) \def\func{x+sin(2*x)} @@ -2492,7 +2495,6 @@ assuming \verb|P0...Pn| to be previously defined nodes. \uput[70](N1){N1}\uput[170](N2){N2} \end{pspicture} \end{LTXexample} -\fi \vspace{1pc} diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro index 92501b0ee55..d1e4ab57c07 100644 --- a/Master/texmf-dist/dvips/pst-node/pst-node.pro +++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro @@ -1,4 +1,4 @@ -% $Id: pst-node.pro 765 2013-04-09 15:32:28Z herbert $ +% $Id: pst-node.pro 805 2013-07-11 13:18:11Z herbert $ %% %% PostScript prologue for pst-node.tex. %% Version 1.14, 2012/09/18. diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex index dc73d051cff..fe30a091034 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex @@ -1,4 +1,4 @@ -% $Id: pst-node.tex 766 2013-04-12 14:21:05Z herbert $ +% $Id: pst-node.tex 807 2013-07-13 11:27:34Z herbert $ %% BEGIN pst-node.tex %% %% Nodes with PSTricks. @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.28} -\def\filedate{2013/07/10} +\def\fileversion{1.29} +\def\filedate{2013/07/13} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -30,10 +30,10 @@ % \SpecialCoor % -%%%%%%%%%% compytibility stuff +%%%%%%%%%% compatibility stuff \define@boolkey[psset]{pst-node}[Pst@]{trueAngle}[true]{} \psset[pst-node]{trueAngle=false} -%%%%%%%%%% compytibility stuff +%%%%%%%%%% compatibility stuff % \def\pst@nodedict{tx@NodeDict begin } \def\pst@zapspace#1 #2{% @@ -501,7 +501,7 @@ \psset[pst-node]{offset=0pt} \define@key[psset]{pst-node}{angleA}[0]{\pst@getangle{#1}\psk@angleA} \define@key[psset]{pst-node}{angleB}[0]{\pst@getangle{#1}\psk@angleB}% -\define@key[psset]{pst-node}{angle}[0pt]{% +\define@key[psset]{pst-node}{angle}[0]{% \pst@getangle{#1}\psk@angleA \let\psk@angleB\psk@angleA} \psset[pst-node]{angle=0} @@ -1014,7 +1014,7 @@ tx@Dict begin \psline@iii pop end \def\Bput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\Bput@i}{\nbput@i}}} \def\Bput@i[#1]{\addto@par{labelsep=#1}\nbput@i} % -\def\node@coor#1;#2\@nil{% +\def\node@coor#1;#2\@nil{% for normal nodes (name) \pst@getnode{#1}\pst@tempg \edef\pst@coor{% \pst@nodedict @@ -1023,10 +1023,11 @@ tx@Dict begin \psline@iii pop end \pslbrace 0 0 \psrbrace ifelse end }} % -\def\Node@coor[#1]#2;#3\@nil{% +\def\Node@coor[#1]#2;#3\@nil{% for special nodes ([...]{node}node) \begingroup -\psset{#1}% -\@ifnextchar\bgroup{\Node@@@coor}{\Node@@coor}#2\@nil +\psset{angle=0,#1}% angle=0, to prevent problems if angle is set globally +\@ifnextchar\bgroup{\Node@@@coor}% we have an additional node [...]{node} + {\Node@@coor}#2\@nil% we have [...]node \endgroup \let\pst@coor\pst@tempg} % @@ -1035,19 +1036,19 @@ tx@Dict begin \psline@iii pop end \xdef\pst@tempg{% \pst@nodedict tx@NodeDict \pst@tempg known -{ \psk@nodesepA \psk@angleA -\pst@tempg load \psk@nodeseptypeA \tx@GetEdge -\psk@offsetA \psk@angleA \tx@AddOffset -\pst@tempg load \tx@GetCenter -3 -1 roll add 3 1 roll add exch } -{ CP } -ifelse -end }}% -\def\Node@@@coor#1{% + { \psk@nodesepA \psk@angleA + \pst@tempg load \psk@nodeseptypeA \tx@GetEdge + \psk@offsetA \psk@angleA \tx@AddOffset + \pst@tempg load \tx@GetCenter + 3 -1 roll add 3 1 roll add exch } + { CP } ifelse end }} +% +\def\Node@@@coor#1{% [...]{#1}node \pst@@getcoor{#1}% \def\psk@angleA{% -\pst@tempg load \tx@GetCenter \pst@coor -3 -1 roll sub 3 1 roll sub neg \tx@Atan}% + \pst@tempg load \tx@GetCenter \pst@coor + 3 -1 roll sub 3 1 roll sub neg \tx@Atan \psk@angleB add + }% \Node@@coor} % \def\nput{\pst@object{nput}} @@ -1548,7 +1549,7 @@ end }}% \pst@cntc=\pst@cnta % \advance\pst@cntc by 1 \relax %=plotpoints \ifPst@algebraic - \multido{\i=0+1}{\pst@cntc}{\pnode(*\pst@number\pst@dima\space {#3}){#4\i}% + \multido{\i=0+1}{\pst@cntc}{\pnode(*{\pst@number\pst@dima} {#3}){#4\i}% hv 20130713 \advance\pst@dima \pst@dimb}% \else \multido{\i=0+1}{\pst@cntc}{\pnode(!/x \pst@number\pst@dima\space def x #3){#4\i}% |