pstricks-add 3.44 (28aug10)

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

5 files changed, 39 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 4d4cb461d1e..b97240ac9ef 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 345 2010-06-10 16:07:44Z herbert $
+%% $Id: Changes 375 2010-08-28 15:10:24Z herbert $
 %%
 pstricks-add.pro ----------- 
 0.23 2009-12-20 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,9 @@ pstricks-add.sty ----------- (hv)
 
 
 pstricks-add.tex ----------- (Dominik Rodriguez/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)  
  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  
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 d71d4a19ff8..97a52ef8cc1 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 0ba4e700e95..6a47db801e2 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 345 2010-06-10 16:07:44Z herbert $
+%% $Id: pstricks-add-doc.tex 376 2010-08-28 15:40:17Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \listfiles
@@ -66,8 +66,7 @@ version >1.04 from June 2004, otherwise the additional macros may
 not work as expected. The ellipsis material and the option
 \verb+asolid+ (renamed to \verb+eofill+) are
 \index{fillstyle!eofill@\texttt{eofill}} now part of the new
-\verb+pstricks.tex+ package, available at CTAN or at
-\url{http://perce.de/LaTeX/}. \LPack{pstricks-add} will for ever be
+\verb+pstricks.tex+ package, available on CTAN. \LPack{pstricks-add} will for ever be
 an experimental and dynamical package, try it at your own risk.
 
 \begin{itemize}
@@ -96,6 +95,7 @@ Christophe Fourey;
 Hubert G\"a\ss lein;
 J\"urgen Gilg;
 Denis Girou;
+Pablo Gonzáles;
 Peter Hutnick;
 Christophe Jorssen;
 Uwe Kern;
@@ -106,6 +106,7 @@ Rolf Niepraschk;
 Alan Ristow;
 Christine R\"omer;
 Arnaud Schmittbuhl;
+John Smith;
 Timothy Van Zandt
 \end{abstract}
 
@@ -3201,23 +3202,37 @@ is the first plotted line ($y=1$). With the option
 
 \bgroup
 \begin{center}
-%\begin{LTXexample}[pos=t,preset=\centering]
+\psscalebox{0.6}{%
 \begin{pspicture}(-0.5,-0.75)(11,11)
   \psaxes{->}(11,11)
   \psMatrixPlot[dotsize=1.1cm,dotstyle=square*,linecolor=magenta]%
     {10}{10}{matrix.data}
   \psMatrixPlot[dotsize=.5cm,dotstyle=o,ChangeOrder]{10}{10}{matrix.data}
-\end{pspicture}
-%\end{LTXexample}
+\end{pspicture}}\quad
+\psscalebox{0.6}{%
+\begin{pspicture}(-0.5,-0.75)(11,11)
+  \psaxes{->}(11,11)
+  \psMatrixPlot[dotsize=1.1cm,dotstyle=square*,linecolor=magenta,XYoffset=-0.5]%
+    {10}{10}{matrix.data}
+  \psMatrixPlot[dotsize=.5cm,dotstyle=o,ChangeOrder,XYoffset=-0.5]{10}{10}{matrix.data}
+\end{pspicture}}
 \end{center}
 
 \begin{lstlisting}
+\psscalebox{0.6}{%
 \begin{pspicture}(-0.5,-0.75)(11,11)
   \psaxes{->}(11,11)
   \psMatrixPlot[dotsize=1.1cm,dotstyle=square*,linecolor=magenta]%
     {10}{10}{matrix.data}
   \psMatrixPlot[dotsize=.5cm,dotstyle=o,ChangeOrder]{10}{10}{matrix.data}
-\end{pspicture}
+\end{pspicture}}\quad
+\psscalebox{0.6}{%
+\begin{pspicture}(-0.5,-0.75)(11,11)
+  \psaxes{->}(11,11)
+  \psMatrixPlot[dotsize=1.1cm,dotstyle=square*,linecolor=magenta,XYoffset=-0.5]%
+    {10}{10}{matrix.data}
+  \psMatrixPlot[dotsize=.5cm,dotstyle=o,ChangeOrder,XYoffset=-0.5]{10}{10}{matrix.data}
+\end{pspicture}}
 \end{lstlisting}
 
 \begin{LTXexample}[pos=t,preset=\centering]
@@ -4520,7 +4535,7 @@ calculated on the \PS side.
 \end{center}
 
 \begin{lstlisting}
-\newcommand{\Touch}{%
+\newcommand\Touch{%
 \psframe[linestyle=none,fillstyle=solid,fillcolor=bl,dimen=middle](0.1,0.75)}
 \definecolor[ps]{bl}{rgb}{tx@addDict begin Red Green Blue end}%
 % Echelle 1cm <-> 40 nm
diff --git a/Master/texmf-dist/source/generic/pstricks-add/Makefile b/Master/texmf-dist/source/generic/pstricks-add/Makefile
index bb21287cbd4..0da1532cc1e 100644
--- a/Master/texmf-dist/source/generic/pstricks-add/Makefile
+++ b/Master/texmf-dist/source/generic/pstricks-add/Makefile
@@ -18,7 +18,7 @@ all : doc clean tds
 doc: $(MAIN).pdf
 
 $(MAIN).pdf : $(MAIN).ps
-	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+	GS_OPTIONS="-dAutoRotatePages=/None -dNOSAFER" ps2pdf $<
 
 $(MAIN).ps : $(MAIN).dvi
 	dvips $<
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 32b74604d82..6dd69d86909 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 345 2010-06-10 16:07:44Z herbert $
+%% $Id: pstricks-add.tex 376 2010-08-28 15:40:17Z 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.41}
-\def\filedate{2010/06/16}
+\def\fileversion{3.44}
+\def\filedate{2010/08/28}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -828,15 +828,14 @@
 %code to place ticks along polyline
 \def\pspolylineticks{\pst@object{pspolylineticks}}%
 \def\pspolylineticks@i#1{\@ifnextchar[{\pspolylineticks@ii{#1}}{\pspolylineticks@ii{#1}[]}}%  
+\newcount\pst@cntC%
 \def\pspolylineticks@ii#1[#2]#3#4#5{{%
 %#1= root name,#2=pscode (optional),#3=metric function,#4=first tick,#5=tick count
 % Metric function may be a function of x, y (keyword metricFunction)
 % or a function of x, y, dx, dy, ds  requiring incremental build
-\pst@killglue%
 \addbefore@par{arrows=-,linewidth=\psk@ytickwidth\pslinewidth}%
 \use@par%
 \pst@killglue%there's a leak that can occur here with ticksize--fixed in recent pstricks.tex
-\newcount\pst@cntC%
 \pst@cntC=\expandafter\csname #1pointcount\endcsname\relax%
 \pst@cntb=\pst@cntC\advance\pst@cntb\m@ne\relax%
 \pst@cntd=\pst@cntC\advance\pst@cntd\@ne\relax%
@@ -1118,16 +1117,13 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
   \endgroup
   \ignorespaces}
 %
-\define@key[psset]{pstricks-add}{method}{\def\psk@method{#1}}%     	   adams - rk4
+%\define@key[psset]{pstricks-add}{method}{\def\psk@method{#1}}%     	   defined in pst-plot
 \define@key[psset]{pstricks-add}{whichabs}{\def\psk@whichabs{#1}}%
 \define@key[psset]{pstricks-add}{whichord}{\def\psk@whichord{#1}}%
 \define@key[psset]{pstricks-add}{plotfuncx}{\def\psk@plotfuncx{#1}}%
 \define@key[psset]{pstricks-add}{plotfuncy}{\def\psk@plotfuncy{#1}}%
 \define@key[psset]{pstricks-add}{expression}{\def\psk@expression{#1}}%
 \define@boolkey[psset]{pstricks-add}[Pst@]{buildvector}[true]{}%
-\def\@rkiv{rk4}%		Runge-Kutta 4  method
-\def\@adams{adams}%		Adams method
-\def\@default{default}%		Adams method
 %
 \define@key[psset]{pstricks-add}{varsteptol}{\def\psk@varsteptol{#1}}%  
 \define@key[psset]{pstricks-add}{adamsorder}{\def\psk@adamsorder{#1}}% 
@@ -1376,7 +1372,6 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
   \ignorespaces%				% part of \end@OpenObj
 }%
 %
-\def\@varrkiv{varrkiv}%		Runge-Kutta 4 with an adaptive step method
 %% #1-#2 x range
 %% #3 initial value of y (which is a vector) y(0) y'(0) y''(0) ...
 %% #4 value of the derivative (y and t can be used)
@@ -1641,6 +1636,10 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
 %   .....
 % ] def
 %
+\define@key[psset]{pstricks-add}{Xoffset}[0pt]{\pst@getlength{#1}\psk@Xoffset}
+\define@key[psset]{pstricks-add}{Yoffset}[0pt]{\pst@getlength{#1}\psk@Yoffset}
+\define@key[psset]{pstricks-add}{XYoffset}[0pt]{\pst@getlength{#1}\psk@Xoffset\let\psk@Yoffset\psk@Xoffset}
+\psset[pstricks-add]{XYoffset=0pt}
 \define@key[psset]{pstricks-add}{colorType}[0]{\def\psk@colorType{#1}}
 \psset[pstricks-add]{colorType=0} % 0-> two color mode 1->wavelength mode (400..700nm)
 % 0-> two color mode 
@@ -1659,6 +1658,7 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
     dotmatrix { dup Min lt { /Min ED } { dup Max gt { /Max ED } { pop } ifelse } ifelse } forall
     /dMaxMin Max Min sub def
     \psk@dotsize
+    \psk@Xoffset\space \psk@Yoffset\space translate
     \@nameuse{psds@\psk@dotstyle} % 
     /n 0 def   		% index for element
     1 1 #1 {		% the y loop (outer one)
@@ -2039,7 +2039,7 @@ dup #1Delta.X m 1 add get mul #1.X m get add #1Tick.X j 3 -1 roll put % s on sta
     ArrowInside={}, ArrowInsidePos=0.5,
     ArrowInsideNo=1, ArrowInsideOffset=0,
     randomPoints=1000,color=false,
-    method={},whichabs={},whichord={},
+    whichabs={},whichord={},
     plotfuncx={},plotfuncy={},buildvector=false,
     Derive={},adamsorder=4,
     Tnormal=false,