summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-15 22:45:22 +0000
committerKarl Berry <karl@freefriends.org>2013-07-15 22:45:22 +0000
commitb8995c2e1cd8aa0925d55dbb0570f1cbe0b9f457 (patch)
tree13a775bc76c93f8d9af0e9f65c9b1dc5c57b5f35 /Master/texmf-dist/tex
parentea497ad98690cb661179e6acaafc0f7a82b926a5 (diff)
pst-node (15jul13)
git-svn-id: svn://tug.org/texlive/trunk@31202 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-node/pst-node.tex45
1 files changed, 23 insertions, 22 deletions
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}%