pstricks-add 3.41 (17jun10)

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

4 files changed, 24 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index ed170bb49aa..4d4cb461d1e 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv)
 
 
 pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.41  2010-06-16 - fix bug with psComment and the \if@star (hv)  
  v 3.40  2010-03-12 - add macros for ticks on curves (ms)  
  v 3.39  2010-03-12 - fixed bug with algebraic option in \psplotTangent  
  v 3.38  2009-12-13 - moved \Pst@algebraic into the base pstricks.tex  
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
index 2934d0dd2f2..d71d4a19ff8 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index 9b2809aba56..0ba4e700e95 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
@@ -283,12 +283,15 @@ only valid if they are part of the \verb+\pscustom+ macro.
 %--------------------------------------------------------------------------------------
 
 \begin{BDef}
-\LcsStar{psComment}\OptArgs\OptArg*{\Largb{arrows}}\coord0\coord1\Largb{Text}\OptArg{line macro}
+\LcsStar{psComment}\OptArgs\OptArg*{\Largb{arrows}}\coord0\coord1\Largb{Text}\OptArg{line macro}\OptArg{put macro}
 \end{BDef}
 
 By default the macro uses the \Lcs{ncline} macro to draw a line from the first to the
-second point. With the second additional argument one can use another macro for
-the line.
+second point, it can be changed with the first additional optional argument. The label is
+put by default with \Lcs{rput}, which can be changed with the last optional argument.
+If this is used, then the line macro has also be defined, eg \verb+\psComment(A)(B){text}[\ncarc][\ncput}+
+At least, leave the argument empty.
+
 
 \begin{LTXexample}[pos=t,wide]
 \SpecialCoor\newpsstyle{weiss}{fillstyle=solid,fillcolor=white}
@@ -310,8 +313,8 @@ the line.
   \psline(-5,5.8)(-5.78,5.8)  \psline(-5.78,5.47)(2.85,5.47)
   \psline(-5.8,3.52)(-5,3.5)  \psline(3.57,4.89)(-5.8,4.89)
   \psComment*[ref=r]{->}(-8.14,1.19)(-4.31,3.27){Mantelstift}
-  \psComment*[ref=r]{->}(-8.17,-0.56)(-4.37,1.59){Kernstift}[\rput]
-  \psComment*[ref=r]{->}(-7.91,-2.24)(-4.44,-0.23){Feder}[\rput]
+  \psComment*[ref=r]{->}(-8.17,-0.56)(-4.37,1.59){Kernstift}[\ncarc]
+  \psComment*[ref=r]{->}(-7.91,-2.24)(-4.44,-0.23){Feder}[\ncarc]
   \psComment[npos=-0.1]{->}(-3.48,8.72)(-1.33,5.46){Nur f\"ur Profil}
 \end{pspicture}
 \end{LTXexample}
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%
 }