pst-node (28feb11)

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

1 files changed, 25 insertions, 26 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 6c94d8afec0..7bbc8871c87 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 440 2010-12-28 21:06:39Z herbert $
+% $Id: pst-node.tex 465 2011-02-28 16:08:12Z 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.14}
-\def\filedate{2010/12/28}
+\def\fileversion{1.15}
+\def\filedate{2011/02/28}
 \message{ v\fileversion, \filedate}
 %
 \edef\TheAtCode{\the\catcode`\@}
@@ -73,8 +73,7 @@
 \pstree@nodehook
 \global\let\pstree@nodehook\relax}
 \let\pstree@nodehook\relax
-\newif\ifnodealign
-\define@boolkey[psset]{pst-node}[true]{nodealign}{}
+\define@boolkey[psset]{pst-node}[Pst@]{nodealign}[true]{}
 \psset[pst-node]{nodealign=false}
 
 \def\pst@nodealign{%
@@ -102,15 +101,15 @@
     \pst@dimg=\psk@dimen\pslinewidth
     \advance\pst@dimc-\pst@dimg
     \advance\pst@dimc.5\pslinewidth
-    \ifnodealign
+    \ifPst@nodealign
       \kern\pst@dimc
       \vrule width\z@ height \pst@dimc depth \pst@dimc
     \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
-%%    %\ifnodealign \kern\pst@dimc\egroup \fi}%
-    \ifnodealign\kern\pst@dimc\fi%
+%%    %\ifPst@nodealign \kern\pst@dimc\egroup \fi}%
+    \ifPst@nodealign\kern\pst@dimc\fi%
 %%    % DG/SR modification end
   }%
   \ignorespaces}
@@ -158,10 +157,10 @@
     \cnodeput@iv{#1}%
     \pscirclebox@iii
     \box\pst@hbox}%
-  \ifnodealign \psboxseptrue \fi
+  \ifPst@nodealign \psboxseptrue \fi
   \ifpsboxsep \pscirclebox@sep \fi
   \leavevmode
-  \ifnodealign\pst@nodealign\fi
+  \ifPst@nodealign\pst@nodealign\fi
   \box\pst@hbox
   \endgroup}
 \def\Circlenode{\pst@object{Circlenode}}
@@ -177,10 +176,10 @@
 \Cnodeput@iv{#1}%
 \pscircle(.5\wd\pst@hbox,\pst@dima){\pst@dimb}%
 \box\pst@hbox}%
-\ifnodealign \psboxseptrue \fi
+\ifPst@nodealign \psboxseptrue \fi
 \ifpsboxsep \psCirclebox@sep \fi
 \leavevmode
-\ifnodealign\pst@nodealign\fi
+\ifPst@nodealign\pst@nodealign\fi
 \box\pst@hbox
 \endgroup}
 \def\tx@GetRnodePos{GetRnodePos }
@@ -198,7 +197,7 @@
 % DG/SR modification end
 #1%
 \if@star\pst@starbox\fi
-\ifnodealign\lower\pst@dimb\fi
+\ifPst@nodealign\lower\pst@dimb\fi
 \hbox{%
 \pst@newnode{#2}{16}{%
 \pst@number{\ht\pst@hbox}%
@@ -251,12 +250,12 @@
 /h \pst@number\pst@dimd 2 mul def
 /NodePos { \tx@DiaNodePos } def}%
 \box\pst@hbox}%
-\ifnodealign\psboxseptrue\fi
+\ifPst@nodealign\psboxseptrue\fi
 \ifpsboxsep\psdiabox@sep\fi
 % DG/SR modification begin - Sep. 2, 1997 - Patch 3
 \leavevmode
 % DG/SR modification end
-\ifnodealign\lower\pst@dimb\fi
+\ifPst@nodealign\lower\pst@dimb\fi
 \box\pst@hbox
 \endgroup}
 \def\tx@TriNodePos{TriNodePos }
@@ -286,12 +285,12 @@
     }%
     \box\pst@hbox%
   }%
-  \ifnodealign\psboxseptrue\fi
+  \ifPst@nodealign\psboxseptrue\fi
   \ifpsboxsep\pstribox@sep\fi
 % DG/SR modification begin - Sep. 2, 1997 - Patch 3
   \leavevmode
 % DG/SR modification end
-  \ifnodealign\lower\pst@tempa\fi
+  \ifPst@nodealign\lower\pst@tempa\fi
   \box\pst@hbox%
   \endgroup}
 %
@@ -310,12 +309,12 @@
 /h \pst@number\pst@dimd def
 /NodePos { \tx@OvalNodePos } def}%
 \unhbox\pst@hbox}%
-\ifnodealign\psboxseptrue\fi
+\ifPst@nodealign\psboxseptrue\fi
 \ifpsboxsep\psovalbox@sep\fi
 % DG/SR modification begin - Sep. 2, 1997 - Patch 3
 \leavevmode
 % DG/SR modification end
-\ifnodealign\lower\pst@dimb\fi
+\ifPst@nodealign\lower\pst@dimb\fi
 \box\pst@hbox
 \endgroup}
 %
@@ -328,7 +327,7 @@
     \pst@@getcoor{#1}%
     \pst@getdotsize%
     \pstree@nodehook%
-    \ifnodealign%
+    \ifPst@nodealign%
       \pst@dima=\pst@dimg%
       \kern\pst@dima%
       \vrule width\z@ height \pst@dimh depth \pst@dimh%
@@ -340,7 +339,7 @@
       /h \pst@number\pst@dimh def
       /NodePos { \tx@OvalNodePos } def}%
     \psdot@ii(#1)%
-    \ifnodealign\kern\pst@dima\fi}%
+    \ifPst@nodealign\kern\pst@dima\fi}%
   \ignorespaces}
 %
 \define@key[psset]{pst-node}{framesize}{\pst@expandafter\psset@@framesize{#1} \@nil}
@@ -366,7 +365,7 @@
   \hbox{%
     \use@par%
     \begin@ClosedObj%
-    \ifnodealign
+    \ifPst@nodealign
       \kern\psk@framewidth\p@
       \vrule width\z@ height \psk@frameheight\p@ depth \psk@frameheight\p@
       \edef\pst@coor{0 0 }%
@@ -393,7 +392,7 @@
     \def\pst@linetype{2}%
     \showpointsfalse%
     \end@ClosedObj%
-    \ifnodealign\kern\psk@framewidth\p@\fi}% end of \hbox
+    \ifPst@nodealign\kern\psk@framewidth\p@\fi}% end of \hbox
   \ignorespaces}
 %
 %
@@ -1111,7 +1110,7 @@ end }}%
   \ifnum\pscol>1\relax \pshskip\pscolsep \fi
   \psk@mnodesize
   \hfil
-  \nodealigntrue
+  \Pst@nodealigntrue
   \if@pst\csname mnode@\psk@mnode\endcsname
   \else\csname mnode@\psk@emnode\endcsname\fi
   \psk@mcol
@@ -1147,8 +1146,8 @@ end }}%
 \def\mnode@oval{\ovalnode@ii{\psm@thenode}}
 \def\mnode@tri{\trinode@ii{\psm@thenode}}
 \def\mnode@dia{\dianode@ii{\psm@thenode}}
-\def\mnode@C{{\nodealigntrue\cnode@ii(\z@,\z@){\psk@radius}{\psm@thenode}}}
-\def\mnode@f{{\nodealigntrue\fnode@ii(\z@,\z@){\psm@thenode}}}
+\def\mnode@C{{\Pst@nodealigntrue\cnode@ii(\z@,\z@){\psk@radius}{\psm@thenode}}}
+\def\mnode@f{{\Pst@nodealigntrue\fnode@ii(\z@,\z@){\psm@thenode}}}
 \def\mnode@circle{\circlenode@ii{\psm@thenode}}
 % hv modification begin - Aug. 16, 2007
 \def\mnode@Circle{\Circlenode@ii{\psm@thenode}}