pstricks-add 3.41 (17jun10)

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

1 files changed, 15 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index aff34a73d99..32b74604d82 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -31,8 +31,8 @@
 \ifx\PSTXKeyLoaded\endinput\else  \input pst-xkey \fi
 \ifx\PSTmathLoaded\endinput\else  \input pst-math \fi
 %
-\def\fileversion{3.40}
-\def\filedate{2010/06/05}
+\def\fileversion{3.41}
+\def\filedate{2010/06/16}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -939,17 +939,21 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
 \def\psComment@i{\pst@getarrows\psComment@ii}
 \def\psComment@ii(#1)(#2)#3{\@ifnextchar[
   {\psComment@iii(#1)(#2){#3}}
-  {\psComment@iii(#1)(#2){#3}[\ncput]}}
-\def\psComment@iii(#1)(#2)#3[#4]{%  
-  \let\pst@Comment#4
+  {\psComment@iii(#1)(#2){#3}[\ncline]}}
+\def\psComment@iii(#1)(#2)#3[#4]{\@ifnextchar[
+  {\psComment@iv(#1)(#2){#3}[#4]}
+  {\psComment@iv(#1)(#2){#3}[#4][\rput]}}
+\def\psComment@iv(#1)(#2)#3[#4][#5]{%
+  \pnode(#1){comment@1}
+  \pnode(#2){comment@2}
+  \ifx\relax#4\relax\let\pst@ConnectionCommand\ncline
+  \else\let\pst@ConnectionCommand#4\fi
+  \ifx\relax#5\relax\let\pst@PutCommand\rput
+  \else\let\pst@PutCommand#5\fi
   \addbefore@par{npos=0}%
   \begin@SpecialObj%
-  \pcline(#1)(#2)
-  \ifx#4\rput\relax
-    \if@star\rput*(#1){#3}\else\rput(#1){#3}\fi
-  \else
-    \if@star\pst@Comment*{#3}\else\pst@Comment*{#3}\fi
-  \fi
+  \pst@ConnectionCommand{comment@1}{comment@2}
+  \if@star\pst@PutCommand*(#1){#3}\else\pst@PutCommand(#1){#3}\fi
   \end@SpecialObj%
   \ignorespaces%
 }