pst-node (22jan17)

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

8 files changed, 89 insertions, 75 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes
index e5694b77b7a..c33f007e8d5 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.39  2017-01-20 - fix for \Circlenode with +/+\dp\hbox
+1.38  2016-05-27 - revert fix for \Cnodeput. Problem was in pstricks.tex
+1.37  2016-05-26 - fixed bug with \Cnodeput 
 1.36  2016-04-24 - moved node definitions from pstricks-add 
 1.35  2014-08-04 - added \saveDataAsNodes{Filename}{NodePrefix}
 1.34  2014-06-17 - fix bug for showNodes 
diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf
deleted file mode 100644
index ae944e4e07d..00000000000
--- a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf
+++ /dev/null
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 7275e33da60..2c43f6652a2 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 77d2bd7d141..63d6c4ca04b 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,13 +1,13 @@
-%% $Id: pst-node-doc.tex 66 2014-08-04 19:10:10Z herbert $
+%% $Id: pst-node-doc.tex 295 2016-05-02 19:11:36Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \listfiles
 
+\input{pst-node}
+\let\pstFV\fileversion
+
 \usepackage[utf8]{inputenc}
 \usepackage{pst-plot}
-\usepackage{pst-node}
-%\usepackage{pax}
-\let\pstFV\fileversion
 \let\belowcaptionskip\abovecaptionskip
 %
 \newcommand\xstrut{\vphantom{\tabular{c}Üg\\Üg\endtabular}}
@@ -16,7 +16,7 @@
 \def\bgImage{%
 \psscalebox{0.85}{%
 \begin{pspicture}(-1,-1)(21,7)
-\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
+\psset{framearc=0.2,shadow,fillstyle=solid,shadowcolor=black!55}
 \psBox[blue!30]{7,6}{politische\\Kommunikation}
 \psBox[red!30]{3,4}{interpersonale\\Kommunikation} 
 	\psBox[red!30]{13,4}{massenmediale\\Kommunikation} 
@@ -39,7 +39,7 @@
 \newbox\filebox
 \setbox\filebox=\hbox{%
   \pspicture(-1,-.5)(1,.7)
-  \pspolygon[linearc=2pt,shadow=true,shadowangle=45,xunit=1.1]%
+  \pspolygon[linearc=2pt,shadow,shadowangle=45,xunit=1.1]%
     (-1,-.55)(-1,.5)(-.8,.5)(-.8,.65)(-.2,.65)(-.2,.5)(1,.5)(1,-.55)
    \endpspicture}
 
@@ -406,7 +406,7 @@ bottom right, center left, center center, center right, top left,
 top center, top right) of the \Lenv{pspicture} box.
 
 \begin{LTXexample}[width=6cm,wide=false]
-\begin{pspicture}[showgrid=true](-1,-1)(4,4)
+\begin{pspicture}[showgrid](-1,-1)(4,4)
   \psDefPSPNodes
   \psdots(PSPbl)(PSPbc)(PSPbr)
       (PSPcl)(PSPcc)(PSPcr)(PSPtl)(PSPtc)(PSPtr)
@@ -1349,7 +1349,7 @@ $ \begin{psmatrix}
  \psset{arrows=->,nodesep=3pt}
  \everypsbox{\scriptstyle}
  \ncline{1,1}{2,2}_{y}
- \ncline[doubleline=true,linestyle=dashed]{-}{1,1}{2,3}^{x}
+ \ncline[doubleline,linestyle=dashed]{-}{1,1}{2,3}^{x}
  \ncline{2,2}{3,2}<{q}
  \ncline{2,2}{2,3}_{p}
  \ncline{2,3}{3,3}>{f}
@@ -1683,7 +1683,7 @@ dictionary with the current transformation matrix, which is reset when
 using the macro \Lcs{psGetNodeCenter}.
 
 \begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true,arrowscale=2](5,5)
+\begin{pspicture}[showgrid,arrowscale=2](5,5)
 \pnode(4.5,0.5){MyNode}
 \psdot(MyNode)
 \pnode(! \psGetNodeCenter{MyNode}
@@ -1694,7 +1694,7 @@ using the macro \Lcs{psGetNodeCenter}.
 \end{LTXexample}
 
 \begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](5,5)
+\begin{pspicture}[showgrid](5,5)
 \rput(1.5,0.5){\trinode{CN}{NodeA}}
 \rput(3.5,2.5){\trinode{EN}{NodeB}}
 \pnode(! \psGetNodeCenter{CN}
@@ -1705,7 +1705,7 @@ using the macro \Lcs{psGetNodeCenter}.
 \end{LTXexample}
 
 
-The coordinates of the nodes can also be saved with \Lkeyset{saveNodeCoors=true} in global defined names
+The coordinates of the nodes can also be saved with \Lkeyword{saveNodeCoors} in global defined names
 \texttt{N-<name>.x} and \texttt{N-<name>.y}. With the optional argument \Lkeyword{NodeCoorPrefix}, which is
 by default empty, the name setting can be changed to \texttt{<NodeCoorPrefix><name>x} and \texttt{<NodeCoorPrefix><name>y}.
 
@@ -2009,7 +2009,7 @@ appropriate. The syntax is
 
 
 \begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}[showgrid](5,3)
 \psset{linecolor=black}
 \psline[linestyle=dashed]{->}(3,1.5)
 \psline[linestyle=dashed]{->}(0.375,1.5)
@@ -2151,7 +2151,7 @@ The following macros amount to special cases of node expressions.
  and \Lcs{midAB}\verb|(Q)(P){Q}|.
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2.5)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,2.5)
 \psset{arrows=->,arrowscale=1.5}
 \pnode(2,1){P}\pnode(.5,1){Q}
 \AtoB(Q)(P){QP}
@@ -2191,7 +2191,7 @@ For example,
  The expression in \texttt{t} in this case is algebraic, which is detected automatically by the macro.
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,2)
 \def\exn{cos(t) | sin(t)}
 \psparametricplot[algebraic]{0}{2}{\exn}
 \curvepnode{1}{\exn}{P}
@@ -2226,7 +2226,7 @@ For example,
  \verb|<tmin>, <tmax>| may be expressed using PostScript---eg, \verb|{Pi neg}{PiDiv2}|.
  
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
 \def\exn{t+t^2 | 2*Ex(-t)}
 \psset{plotpoints=100}
 \psparametricplot[algebraic]{0}{1}{\exn}
@@ -2256,7 +2256,7 @@ For example,
  \Lcs{fnpnode}\verb|[algebraic]{0.5}{x*(x+1)/2}{P}|. 
  
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
 \def\exn{x x 1 add mul 2 div}
 \psplot{0}{2}{\exn}
 \fnpnode{0.5}{\exn}{Q}
@@ -2274,7 +2274,7 @@ Is similar to \Lcs{curvenodes}, but for the graph of a function. The keyword \Lk
 must be specified if your expression is indeed algebraic.
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(2.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(2.5,3)
 \def\exn{x x 1 add mul 2 div}
 \psplot{0}{2}{\exn}
 \fnpnodes[plotpoints=10]{0}{2}{\exn}{A}
@@ -2314,7 +2314,7 @@ turn a list of coordinates into a node sequence P0 P1 ...
 
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
 \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
 %defines P0..P3--now join them
 \psnline[arrowscale=2]{-D>}(0,3){P}
@@ -2331,7 +2331,7 @@ turn a list of coordinates into a node sequence P0 P1 ...
 \end{verbatim}
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
 \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
 %defines P0..P3--now join them
 \psncurve[arrowscale=2]{-D>}(0,3){P}
@@ -2340,7 +2340,7 @@ turn a list of coordinates into a node sequence P0 P1 ...
 \vspace{2pc}
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true,algebraic](-.5,-.5)(2.5,2)
+\begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2)
 \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4)
 %defines P0..P3--now join them
 \psnccurve[arrowscale=2]{-D>}(0,3){P}
@@ -2361,10 +2361,14 @@ is similar to \Lcs{psLCNode},
 \begin{verbatim}
 \psLCNodeVar(A)(B)(a,b){C}
 \end{verbatim}
+
+\begin{sloppypar}
 does the same, but the third argument \verb|(a,b)| may be specified in any form acceptable 
 to \Lcs{SpecialCoor}. (With \Lcs{psLCNode}, each coefficient may be specified in PostScript code.) 
 One other difference is that \Lcs{psLCNodeVar} allows the reuse of a node name in place. For example, 
 it is possible to write
+\end{sloppypar}
+
 \begin{verbatim}
 \psLCNodeVar(A)(B)(2,3){A}% symbol A reassigned
 \end{verbatim}
@@ -2382,14 +2386,17 @@ is similar to \Lcs{psRelNode}, and provides a means of scaling and rotating  a l
  \begin{verbatim}
 \psRelNode[angle=30](A)(B){2}{C}
 \end{verbatim}
- but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor}, 
- while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible. 
- Note that  \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}|  may be interpreted as defining \texttt{C} to 
- be the complex product of \texttt{A} and \texttt{B}. 
+
+\begin{sloppypar}
+but the third argument (2;30) may be specified in any form acceptable to \Lcs{SpecialCoor}, 
+while specifying the angle argument in \Lcs{psRelNode} using PostScript is not possible. 
+Note that  \Lcs{psRelNodeVar}\verb|(0,0)(A)(B){C}|  may be interpreted as defining \texttt{C} to 
+be the complex product of \texttt{A} and \texttt{B}. 
+\end{sloppypar}
 
 
 \begin{LTXexample}[width=5cm]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \pnode(0,.5){P}\pnode(1.5,.75){Q}
 \psRelNodeVar(P)(Q)(2;20){R}
 \psline(Q)(P)\uput[-45](P){P}
@@ -2403,7 +2410,8 @@ is similar to \Lcs{psRelNode}, and provides a means of scaling and rotating  a l
 \begin{BDef}
 \Lcs{psRelLineVar}\Largr{node A}\Largr{node B}\Largr{radius;angle}\Largb{node name}
 \end{BDef}
- stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}. 
+
+stands to \Lcs{psRelLine} as \Lcs{psRelNodeVar} stands relative to \Lcs{psRelNode}. 
  
 \Lcs{psRelLine}\verb|Var(A)(B)(a;b){C}| defines the node \texttt{C}, and, in addition, draws the line segment \texttt{AC}. 
 
@@ -2423,7 +2431,7 @@ could be handled easily by \Lcs{psline}. Internally, \Lcs{rhombus} uses
 
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \pnode(0,.5){P}\pnode(1,1){Q}
 \psrline{->}(P)(Q)(2;20)
 \uput[-45](P){P}
@@ -2437,7 +2445,7 @@ The \texttt{x} here stands for expression. The idea is that one builds a
 line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|.
 
 \begin{LTXexample}[width=.35\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,4)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,4)
 \def\pfn{t | t^2/4}
 \psparametricplot[algebraic]{0}{3.5}{\pfn}
 \curvepnode{2}{\pfn}{P}% sets P, Ptang
@@ -2490,7 +2498,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
 \pnode(1,1.1){A}\pnode(2,1.5){B}
 \polyIntersections{N1}{N2}(A)(B){P}{4}
@@ -2502,7 +2510,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 \end{LTXexample}
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
 \pnode(1,1.1){A}\pnode(2,3){B}
 \polyIntersections{N1}{N2}(A)(B){P}{4}
@@ -2514,7 +2522,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 \end{LTXexample}
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \def\fn{1.5+sin(t)+.4*sin(2*t)%
  | 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}%
 \pnode(1,1.1){A}\pnode(2,1.2){B}
@@ -2532,7 +2540,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \def\fn{1.5+sin(t)+.4*sin(2*t)%
  | 1+cos(t)+.2*cos(2*t)+.2*sin(4*t)}%
 \pnode(.8,.6){A}\pnode(2.5,-.5){B}
@@ -2549,7 +2557,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \pnodes{P}(0,.5)(3,.5)(2.5,2)(.5,2.5)(0,.5)
 \pnode(1,1.1){A}\pnode(2,1.5){B}
 \polyIntersections{N1}{N2}(A)(B){P}{3}
@@ -2564,7 +2572,7 @@ assuming \verb|P0...Pn| to be previously defined nodes.
 \vspace{1pc}
 
 \begin{LTXexample}[width=.375\textwidth]
-\begin{pspicture}[showgrid=true](-.5,-.5)(3.5,3)
+\begin{pspicture}[showgrid](-.5,-.5)(3.5,3)
 \def\func{x+sin(2*x)}
 \psplot[algebraic]{0}{3.14}{\func}
 \fnpnodes[algebraic]{0}{3.14}{\func}{P}
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro
index 39243dc0b01..c0f9f9d1f44 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro
@@ -7,7 +7,7 @@
 %% of the LaTeX Project Public License Distributed from CTAN archives
 %% in directory macros/latex/base/lppl.txt.
 %
-%%%%  EMPTY lines are not aload!!! Problem with pst-eps -> \par
+%%%%  EMPTY lines are not alowed!!! Problem with pst-eps -> \par
 %
 %
 tx@Dict begin 			% from main pstricks dict
diff --git a/Master/texmf-dist/dvips/pst-node/pst-node97.pro b/Master/texmf-dist/dvips/pst-node/pst-node97.pro
index 13050273845..5f7170abe97 100644
--- a/Master/texmf-dist/dvips/pst-node/pst-node97.pro
+++ b/Master/texmf-dist/dvips/pst-node/pst-node97.pro
@@ -1,4 +1,5 @@
 %!
+% $Id: pst-node97.pro 68 2014-08-07 10:16:26Z herbert $
 % PostScript prologue for pst-node.tex.
 % Created 1993/3/12. Source file was pst-node.doc
 % Version 0.93a, 93/03/12.
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 2bcddd7d126..9704763806b 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 68 2014-08-07 10:16:26Z herbert $
+% $Id: pst-node.tex 373 2017-01-20 14:30:39Z herbert $
 %%
 %% BEGIN pst-node.tex
 %%
@@ -18,8 +18,8 @@
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 %
-\def\fileversion{1.36}
-\def\filedate{2016/04/24}
+\def\fileversion{1.39}
+\def\filedate{2017/01/20}
 \message{ v\fileversion, \filedate}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -148,8 +148,8 @@
 
 \def\pst@nodealign{%
 \pst@dimg=\ht\pst@hbox
-\advance\pst@dimg-\dp\pst@hbox
-\divide\pst@dimg2
+\advance\pst@dimg by -\dp\pst@hbox
+\divide\pst@dimg by \tw@
 \lower\pst@dimg}
 %
 \def\tx@InitPnode{InitPnode }
@@ -195,10 +195,7 @@
     \fi
     \pscircle@do(#1){#2}%
     \pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}%
-%%    % DG/SR modification begin - Jul. 30, 1997 - Patch 2
-%%    %\ifPst@nodealign \kern\pst@dimc\egroup \fi}%
     \ifPst@nodealign\kern\pst@dimc\fi%
-%%    % DG/SR modification end
   }%
   \ignorespaces}
 %
@@ -210,32 +207,36 @@
 \def\cnodeput@i{\@ifnextchar({\cnodeput@iii}{\cnodeput@ii}}
 \def\cnodeput@ii#1{%
   \addto@par{rot={#1}}%
-  \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}}
+  \@ifnextchar({\cnodeput@iii}{\cnodeput@iii(\z@,\z@)}%
+}
 \def\cnodeput@iii(#1)#2{%
   \pst@killglue
   \@fixedradiusfalse
   \def\pst@nodehook{\cnodeput@iv{#2}}%
-  \pst@makebox{\cput@v{#1}}}
+  \pst@makebox{\cput@v{#1}}%
+}
 \def\cnodeput@iv#1{%
   \pst@newnode{#1}{11}{\pscirclebox@iv \pst@number\pslinewidth add}{\tx@InitCnode}%
-  \global\let\pst@nodehook\relax}
-%  
+  \global\let\pst@nodehook\relax
+  \ignorespaces
+}
 \def\Cnodeput{\pst@object{Cnodeput}}
 \def\Cnodeput@i{\@ifnextchar({\Cnodeput@iii}{\Cnodeput@ii}}
 \def\Cnodeput@ii#1{%
-\addto@par{rot={#1}}%
-\@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}}
+  \addto@par{rot={#1}}%
+  \@ifnextchar({\Cnodeput@iii}{\Cnodeput@iii(\z@,\z@)}}
 \def\Cnodeput@iii(#1)#2{%
-\pst@killglue
-\@fixedradiustrue
-\def\pst@nodehook{\Cnodeput@iv{#2}}%
-\pst@makebox{\cput@v{#1}}}
+  \pst@killglue
+  \@fixedradiustrue
+  \def\pst@nodehook{\Cnodeput@iv{#2}}%
+  \pst@makebox{\cput@v{#1}}%
+}
 \def\Cnodeput@iv#1{%
-\pst@newnode{#1}{11}{%
-\pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y
-\pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r
-{\tx@InitCnode}%
-\global\let\pst@nodehook\relax}
+  \pst@newnode{#1}{11}{%
+    \pst@number{\wd\pst@hbox} 2 div \pst@number\pst@dima % x y
+    \pst@number\pst@dimb \pst@number\pslinewidth \psk@dimen .5 sub mul sub }% r
+       {\tx@InitCnode}%
+  \global\let\pst@nodehook\relax}
 %
 \def\circlenode{\pst@object{circlenode}}
 \def\circlenode@i#1{\pst@makebox{\circlenode@ii{#1}}}
@@ -257,21 +258,21 @@
 \def\Circlenode@i#1{\pst@makebox{\Circlenode@ii{#1}}}
 \def\Circlenode@ii#1{%
 \begingroup
-\pst@useboxpar
-\pst@dima=\ht\pst@hbox
-\advance\pst@dima\dp\pst@hbox
-\divide\pst@dima\tw@
-\pssetlength\pst@dimb\psk@radius
-\setbox\pst@hbox=\hbox{%
-\Cnodeput@iv{#1}%
-\pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}%
-\box\pst@hbox}%
-\ifPst@nodealign \psboxseptrue \fi
-\ifpsboxsep \psCirclebox@sep \fi
-\leavevmode
-\ifPst@nodealign\pst@nodealign\fi
-\box\pst@hbox
-\endgroup}
+  \pst@useboxpar
+  \pst@dima=\ht\pst@hbox
+  \advance\pst@dima by -\dp\pst@hbox
+  \divide\pst@dima by \tw@
+  \pssetlength\pst@dimb\psk@radius
+  \setbox\pst@hbox=\hbox{%
+  \Cnodeput@iv{#1}%
+  \pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}%
+  \box\pst@hbox}%
+  \ifPst@nodealign \psboxseptrue \fi
+  \ifpsboxsep \psCirclebox@sep \fi
+  \leavevmode
+  \ifPst@nodealign\pst@nodealign\fi
+  \box\pst@hbox
+  \endgroup}
 \def\tx@GetRnodePos{GetRnodePos }
 \def\tx@InitRnode{InitRnode }
 %
diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex
index 5df456f3d0b..1c6c95478b0 100644
--- a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex
+++ b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex
@@ -1,3 +1,4 @@
+% $Id: pst-node97.tex 129 2014-10-09 14:15:40Z herbert $
 %% BEGIN: pst-node.tex
 %% Generated on <1993/3/12> from `pst-node.doc'.
 %% For use with the PostScript header file `pst-node.pro'.
@@ -27,11 +28,11 @@
 \csname PSTnodesLoaded\endcsname
 \let\PSTnodesLoaded\endinput
 \ifx\PSTricksLoaded\endinput\else
-\def\next{\input pstricks.tex}\expandafter\next
+\def\next{\input pstricks97.tex}\expandafter\next
 \fi
 \edef\TheAtCode{\the\catcode`\@}
 \catcode`\@=11
-\pstheader{pst-node.pro}
+\pstheader{pst-node97.pro}
 \def\pst@nodedict{tx@NodeDict begin }
 \def\pst@getnode#1#2{%
 \pst@expandafter\pst@@getnode{#1} * \@nil{#1}#2}