pstricks-add 3.45 (3nov10)

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

5 files changed, 39 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index b97240ac9ef..8ec95a8c4ae 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 375 2010-08-28 15:10:24Z herbert $
+%% $Id: Changes 412 2010-11-03 19:39:07Z herbert $
 %%
 pstricks-add.pro ----------- 
 0.23 2009-12-20 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv)
 
 
 pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.45  2010-11-01 - modified \Put for checking coor type (hv)  
  v 3.44  2010-08-28 - new option XYoffset for \psMatrixPlot (hv)  
  v 3.43  2010-08-17 - moved option method into pst-plot (hv)  
  v 3.42  2010-08-01 - fix bug with \newcount\pst@cntC (hv)  
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
index cb8f1f164c5..d4f14bc76c0 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
@@ -17,9 +17,9 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss},
   title		= {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {fifth},
-  publisher	= {DANTE -- Lob.media},
-  year		= {2008},
+  edition	= {6.},
+  publisher	= {DANTE -- Lehmanns},
+  year		= {2010},
   address	= {Heidelberg/Hamburg}
 }
 
@@ -171,11 +171,3 @@
   year         = 2004
 }
 
-@book{voss06,
-  Title	= {Mathematiksatz in \LaTeX{}},
-  Author = {Herbert Vo\ss},
-  Publisher = {Lehmanns Media/DANTE},
-  Edition=	{first},
-  Address= {Berlin/Heidelberg},
-  Year= {2009},
-}
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 97a52ef8cc1..f430f60b0e9 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 6a47db801e2..eac99b23d76 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
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 376 2010-08-28 15:40:17Z herbert $
+%% $Id: pstricks-add-doc.tex 412 2010-11-03 19:39:07Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \listfiles
@@ -4058,16 +4058,23 @@ should increase along the curve, or it can be an function whose increment is a s
 positive function of {\tt x, y, dx, dy, ds} where the last term is the arc-length element 
 that you could specify alternately as {\tt dx dup mul dy dup mul add sqrt}.
 % start new material
-In addition, a new command \Lcs{Put} is proposed, expanding as necessary to \Lcs{rput} or \Lcs{uput}. Its syntax is
+
+
+In addition, a new command \Lcs{Put} is proposed, expanding as appropriate to \Lcs{rput} or \Lcs{uput}. Its syntax is
 
 \begin{BDef}
-\LcsStar{Put}\OptArgs\Largb{<ref>}\Largr{<position>}\Largb{<stuff>}
+\LcsStar{Put}\OptArgs\OptArg*{\Largb{<ref>}}\Largr{<position>}\Largb{<stuff>}
 \end{BDef}
-where the optional {\tt *} blanks the background, the optional \OptArgs\ may be used to specify a 
-rotation (eg, \Lkeyword{rot}=45), and \Lkeyword{ref} takes one of two forms: (a) a {\tt refpt} 
-such as {tt Bl}, in which case \Lcs{rput} is called; (b) a polar form of offset (eg, 
-\verb|7pt;30|, or \verb|;(P)| in which \Ldim{pslabelsep} is substituted for the radius), 
-in which case \Lcs{uput} is called.
+
+where the optional {\tt *} blanks the background, the optional \OptArgs\ may be used to specify a rotation 
+using any form acceptable to \Lcs{SpecialCoor} (eg, \nxLkeyword{rot=45} or \Lkeyword{rot}\verb|={(1,1)}| 
+or \Lkeyword{rot}\verb|=(P)|, and \Larg{ref} takes one of 
+two forms: \verb=(a)= a refpt such as {\tt Bl}, in which case \Lcs{rput} is called; (b) a polar form of offset 
+(eg, \verb=7pt;30=, or \verb=;(P)= --- in the latter case, \Ldim{pslabelsep} is substituted for the missing 
+radius), in which case a modified form of \Lcs{uput} is called. The idea of \Lcs{Put} is to allow  {\tt position}, 
+{\tt ref} and {\tt rot} to be specified in any of the forms acceptable to \Lcs{SpecialCoor} and to do so with 
+the same output no matter what form is used. The cost of this consistency is that \Lcs{Put} can lead to results 
+that differ from \Lcs{uput} in some special cases. 
 
 
 \subsection{Details}
@@ -4337,17 +4344,13 @@ The next examples works without visible ticks, using the macros to construct nod
 % ticks at s=1,2,... , start at tick index 0, set 9 ticks
 % the tick at s=1 has index 0
 % ticks at s=1,2... (increment function = distance)
-%\traceon
 \multido{\i=0+3}{3}{\Put[rot=(PTangent\i)]{7pt;(PNormal\i)}(PTick\i){PTick\i}}%
-%\traceoff
-%\uput[-135](PTick1){$s=3$}%
+\uput[-135](PTick1){$s=2$}%
 \end{pspicture}
 \end{LTXexample}
 
-\clearpage
 This variant also has no visible ticks, but makes a color gradient along the curve based on arc-length from the start.
 
-
 \begin{LTXexample}[pos=t]
 \begin{pspicture}(-1,-1)(10,4)
 \psparametricplot[plotpoints=200,linecolor=white]{0}{360}{ t cos 1 add 4 mul t 1 add 20 div ln 2 div 1 add }
@@ -4356,11 +4359,6 @@ This variant also has no visible ticks, but makes a color gradient along the cur
 \definecolorseries{ctest}{hsb}{last}{green}{violet}
 \resetcolorseries[88]{ctest}%
 \multido{\iA=0+1,\iB=1+1}{87}{\psline[linewidth=2pt,linecolor=ctest!![\iB](PTick\iA)(PTick\iB)}%
-%\multido{\i=0+1}{9}{\psdot[dotscale=1.5,dotstyle=o](PTick\i)}%
-% ticks at s=1,2,... , start at tick index 0, set 9 ticks
-% the tick at s=1 has index 0
-% ticks at s=1,2... (increment function = distance)
-%\uput[-135](PTick1){$s=3$}%
 \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 6dd69d86909..7b68855d1de 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 376 2010-08-28 15:40:17Z herbert $
+%% $Id: pstricks-add.tex 412 2010-11-03 19:39:07Z herbert $
 %%
 %%
 %% This is file `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.44}
-\def\filedate{2010/08/28}
+\def\fileversion{3.45}
+\def\filedate{2010/11/03}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -755,27 +755,24 @@
 }>
 %
 \def\parseRP#1;#2;#3\@nil{%check whether arg of refpt contains ;
-\def\arg@A{#1}\def\arg@B{#2}%
-%\ifx\arg@B\@empty\let\uflag\@empty\else\edef\uflag{1}\fi%
-}%
+  \def\arg@A{#1}\def\arg@B{#2}}
+%
 \def\Put{\pst@object{Put}}%
 \def\Put@i{\@ifnextchar({\Put@ii{}}{\Put@ii}}%  
 \def\Put@ii#1(#2)#3{{%
-\pst@killglue%
-\use@par%
-\expandafter\parseRP#1;;\@nil%sets \arg@A, \arg@B
-\ifx\arg@B\@empty% use \rput
-  \edef\arg@A{\if@star*\fi%
-  \ifx\arg@A\@empty\else[\arg@A]\fi%
-  }%
-  \edef\pst@tempA{\noexpand\rput\arg@A(#2){\noexpand#3}}\pst@tempA%
-\else% use \uput
-  \edef\arg@A{\if@star*\fi%
-  \ifx\arg@A\@empty\else{\arg@A}\fi%
-  \ifx\arg@B\@empty[0]\else[\arg@B]\fi%
-  }%
-  \edef\pst@tempA{\noexpand\uput\arg@A(#2){\noexpand#3}}\pst@tempA%
-\fi}\ignorespaces}%
+  \pst@killglue%
+  \use@par%
+  \expandafter\parseRP#1;;\@nil%sets \arg@A, \arg@B
+  \ifx\arg@B\@empty% use \rput
+    \edef\arg@A{\if@star*\fi\ifx\arg@A\@empty\else[\arg@A]\fi}%
+    \expandafter\rput\arg@A(>#2){#3}
+  \else% use \uput
+    \edef\arg@A{\if@star*\fi%
+      \ifx\arg@A\@empty\else{\arg@A}\fi%
+      \ifx\arg@B\@empty[0]\else[\arg@B]\fi}%
+    \expandafter\uput\arg@A(>#2){#3}
+  \fi}\ignorespaces}%
+
 % Modify pst@rot so that a rotation may be specified with a node or ps code
 %
 \define@key[psset]{pstricks-add}{Os}[0]{\def\PST@Os{#1}}