pst-node 1.11 (22apr10)

git-svn-id: svn://tug.org/texlive/trunk@17965 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 57 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes
index 525e39b8dd4..f84457d3035 100644
--- a/Master/texmf-dist/doc/generic/pst-node/Changes
+++ b/Master/texmf-dist/doc/generic/pst-node/Changes
@@ -1,7 +1,13 @@
 ----- pst-node.tex
+1.11  2010-04-22 - modified version of \shownode (ms)
+                 - modified \curvepnodes (ms)
 1.10  2010-01-22 - first version with pst-xkey and an own 
                    documentation (hv) 
 
 ----- pst-node.sty
      2008-12-12 first version (hv) 
 
+
+----- pst-node.pro
+1.11  2010-04-22 - added function /concatstringarray (ms)
+1.10  2010-01-22 - first version  
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
index 3d93947a5e7..8d0a82c2fa6 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 dcb3ed4cdf1..c96035e847c 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 263 2010-01-22 11:13:25Z herbert $
+%% $Id: pst-node-doc.tex 304 2010-04-22 08:23:39Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \listfiles
@@ -929,12 +929,11 @@ with only two particular arrow shapes---those arrows specified with either
 \end{pspicture} 
 \end{LTXexample}
 
-
+\clearpage
 \section{List of all optional arguments for \texttt{pst-node}}
 
 \xkvview{family=pst-node,columns={key,type,default}}
 
-
 \nocite{*}
 \bgroup
 \RaggedRight
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro
index 4436aac9e87..94a343c6c1b 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro
@@ -1,7 +1,7 @@
-% $Id: pst-node.pro 263 2010-01-22 11:13:25Z herbert $
+% $Id: pst-node.pro 304 2010-04-22 08:23:39Z herbert $
 %%
 %% PostScript prologue for pst-node.tex.
-%% Version 1.10, 2010/01/22.
+%% Version 1.11, 2010/04/22.
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -184,13 +184,23 @@ end
   cleartomark 
 } def
 %
-/BezierMidpoint { /y3 ED /x3 ED /y2 ED /x2 ED /y1 ED /x1 ED /y0 ED /x0 ED
-/t ED /cx x1 x0 sub 3 mul def /cy y1 y0 sub 3 mul def /bx x2 x1 sub 3
-mul cx sub def /by y2 y1 sub 3 mul cy sub def /ax x3 x0 sub cx sub bx
-sub def /ay y3 y0 sub cy sub by sub def ax t 3 exp mul bx t t mul mul
-add cx t mul add x0 add ay t 3 exp mul by t t mul mul add cy t mul add
-y0 add 3 ay t t mul mul mul 2 by t mul mul add cy add 3 ax t t mul mul
-mul 2 bx t mul mul add cx add atan /NAngle ED /Y ED /X ED } def
+/BezierMidpoint { 
+  /y3 ED /x3 ED /y2 ED /x2 ED /y1 ED /x1 ED /y0 ED /x0 ED /t ED 
+  /cx x1 x0 sub 3 mul def 
+  /cy y1 y0 sub 3 mul def 
+  /bx x2 x1 sub 3 mul cx sub def 
+  /by y2 y1 sub 3 mul cy sub def 
+  /ax x3 x0 sub cx sub bx sub def 
+  /ay y3 y0 sub cy sub by sub def 
+  ax t 3 exp mul bx t t mul mul add 
+  cx t mul add x0 add ay t 3 exp mul 
+  by t t mul mul add cy t mul add
+  y0 add 3 ay t t mul mul mul 2 
+  by t mul mul add cy add 3 ax t t mul mul mul 
+  2 bx t mul mul add cx add atan /NAngle ED 
+  /Y ED /X ED 
+} def
+%
 /HPosBegin { yB yA ge { /t 1 t sub def } if /Y yB yA sub t mul yA add def
 } def
 /HPosEnd { /X Y yyA sub yyB yyA sub Div xxB xxA sub mul xxA add def
@@ -568,6 +578,16 @@ def /HPutPos { VPutPos@ HPutLine } def mark LPutVar tx@Dict begin
   Y add /Y ED 
 } def
 %
+%------------------------- helper functions ---------------------
+%
+/concatstringarray{  %  [(a) (b) ... (z)] --> (ab...z)  20100422
+  0 1 index { length add } forall 
+  string     
+  0 3 2 roll      
+  { 3 copy putinterval length add }forall 
+  pop  
+} bind def
+%
 end
 %
 % END pst-node.pro
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 71a2ee98e08..217630d9864 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 263 2010-01-22 11:13:25Z herbert $
+% $Id: pst-node.tex 304 2010-04-22 08:23:39Z 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.10}
-\def\filedate{2010/01/22}
+\def\fileversion{1.11}
+\def\filedate{2010/04/22}
 \message{ v\fileversion, \filedate}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -1436,19 +1436,18 @@ end }}%
   \use@par
   \edef\my@tempA{#3}% x(t) y(t) expanded
   \expandafter\testAlg\my@tempA|\@nil %
-%modify code to work in ps
-  \pstVerb{%
-	tx@Dict begin 
+  \pstVerb{% 
+	tx@Dict begin % so we can use definitions from tx@Dict
 	/t0 #1 def
-	/t1 #2 def  % so we can use constants from tx@Dict
+	/t1 #2 def  
 	 t1 t0 sub end \psk@plotpoints div /dt exch def }%
   \pst@cntc=\psk@plotpoints\relax%\psk@plotpoints=plotpoints-1
   \advance\pst@cntc by \@ne\relax %=plotpoints
-  \ifx\my@tempD\@empty\pstVerb{/Func (#3) cvx def }%
+  \ifx\my@tempD\@empty\pstVerb{tx@Dict begin /Func (#3) cvx def end }%add tx@Dict
   \else\pstVerb{tx@Dict begin /Func (#3 ) AlgParser cvx def end }%
   \fi%
   \multido{\i=0+1}{\pst@cntc}{%
-    \pnode(! /t #1 dt \i\space mul add def t Func ){#4\i}}%
+    \pnode(! /t #1 dt \i\space mul add def Func ){#4\i}}% remove t before Func
   \expandafter\xdef \csname #4nodecount\endcsname {\psk@plotpoints}%
   \typeout{Created nodes #40 .. #4\psk@plotpoints}%
 }\ignorespaces}%
@@ -1502,10 +1501,16 @@ end }}%
 \ignorespaces}%
 %
 \def\shownode(#1){%display node user coords in console
-\pstVerb{ (Node #1: ) = }%
-\pnode(! /nodecoors 2 array def \psGetNodeCenter{#1} 
- nodecoors 1 #1.y put nodecoors 0 #1.x put nodecoors == #1.x #1.y ){temp@}
-}
+  \pstVerb{ tx@Dict begin { STV CP T } exec % set scaling 
+    tx@NodeDict /N@#1 known {
+     \psGetNodeCenter{#1} 2 dict begin 
+     /str 10 string def /tmpar [(Node #1: ) <28> () (, ) () <29>] def 
+     tmpar 4 #1.y str cvs put /str 10 string def tmpar 2 #1.x str cvs put 
+     tmpar concatstringarray = end }
+   {(Node #1: (NOT KNOWN)) = } ifelse 
+  end 
+}}%
+%
 % Use to construct a sequence of nodes
 % Eg, \pnodes{P}(0,1)(2;5)(3,4) defines nodes P0, P1, P2 with respective locations
 % and a macro \Pnodecount containing the highest index created
diff --git a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
index b6ccb5aa42b..10524f6b604 100644
--- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
+++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty
@@ -1,10 +1,10 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-node}[2010/01/22 package wrapper for pst-node.tex]
+\ProvidesPackage{pst-node}[2010/04/22 package wrapper for pst-node.tex]
 \input{pst-node.tex}
 \ProvidesFile{pst-node.tex}
   [\filedate\space \fileversion\space `pst-node' (tvz)]
 \IfFileExists{pst-node.pro}{%
     \ProvidesFile{pst-node.pro}
-      [2010/01/22 v. 1.10,  PostScript prologue file (hv)]
+      [2010/04/22 v. 1.11,  PostScript prologue file (hv)]
       \@addtofilelist{pst-node.pro}}{}%
 \endinput