pst-3dplot 1.86 (6oct09)

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

6 files changed, 47 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index b93e5108498..82594bd3bd0 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -1,4 +1,5 @@
 pst-3dplot.pro --------
+0.29  2009-10-06 add option SphericalCoorType
 0.28  2009-07-28 add option showgrid for sphere, paraboloid and cylinder
 0.27  2008-11-12 add routine for scalar and vector product
 0.26  2007-01-03 add routine for vector length
@@ -14,6 +15,8 @@ pst-3dplot.pro --------
 
 
 pst-3dplot.tex --------
+1.86  2009-10-06  - add option SphericalCoorType for digfferent Handling
+		    of spherical coordinates  
 1.85  2009-08-14  - add option Hincrement for \psCylinder, preset to 0.5 
 1.84  2009-07-28  - add option showgrid for sphere, paraboloid 
                     and cylinder
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
index b1f8bfdd4f1..117058e6cf3 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
index 21854316ad1..97ae30c8454 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot-doc.tex 123 2009-08-27 06:53:23Z herbert $
+%% $Id: pst-3dplot-doc.tex 129 2009-08-27 08:54:46Z herbert $
 \listfiles
 \begin{filecontents}{data3D.Roessler}
 2.0, 0.0, 0.0
@@ -469,6 +469,19 @@
 \psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15}
 \hypersetup{pdfauthor={Herbert Voss},pdftitle={3D Plots}}
 %
+\def\bgImage{%
+\begin{pspicture}(0,-3)(7,5)
+\pstThreeDCoor[xMax=2,yMax=13,zMin=0,zMax=6,IIIDticks]%
+\multido{\rA=2.0+2.5,
+  \rB=0.15+0.20}{5}{%
+    \pstParaboloid[%
+      SegmentColor={[cmyk]%
+       {\rB,0.1,0.11,0.1}}]%
+    (0,\rA,0){5}{1}}% height 5 and radius 1
+\pstThreeDLine[linestyle=dashed]{->}(0,0,5)(0,13,5)
+\end{pspicture}
+}
+%
 \begin{document}
 \author{Herbert Voß}
 \docauthor{}
@@ -496,6 +509,7 @@ It is also important that after \LPack{pst-3dplot} no package is loaded, which u
 \vfill\noindent
 Thanks for feedback and contributions to:\\
 Bruce Burlton, Bernhard Elsner, Christophe Jorssen, Markus Krebs, Chris Kuklewicz, Darrell Lamm, 
+Patrice Mégret, 
 Rolf Niepraschk,  
 Michael Sharpe, Uwe Siart, Thorsten Suhling, Maja Zaloznik 
 
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index e347fde46cf..4260d7ed25e 100644
--- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
+++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 123 2009-08-27 06:53:23Z herbert $
+%% $Id: pst-3dplot.pro 136 2009-10-06 21:37:53Z herbert $
 %%
 %% This is file `pst-3dplot.pro',
 %%
@@ -16,7 +16,7 @@
 %%   `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects
 %%
 %%
-%% version 0.28 / 2009-04-20  Herbert Voss <voss _at_ PSTricks.de>
+%% version 0.29 / 2009-10-06  Herbert Voss <voss _at_ PSTricks.de>
 %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu<
 %%            
 %
@@ -63,9 +63,18 @@ tx@3DPlotDict begin
   /latitude exch def
   /longitude exch def
   /Radius exch def
-  /z { Radius latitude sin mul } def
-  /x { Radius longitude cos mul latitude cos mul } def
-  /y { Radius longitude sin mul latitude cos mul } def
+  1 { %  dummy loop, will run only 1 time, allows exit
+    SphericalCoorType 0 le {                                               % the default |
+     /z { Radius latitude sin mul } def
+     /x { Radius longitude cos mul latitude cos mul } def
+     /y { Radius longitude sin mul latitude cos mul } def
+      exit } if
+    SphericalCoorType 2 le {
+     /z { Radius longitude cos mul } def
+     /x { Radius longitude sin mul latitude cos mul} def
+     /y { Radius longitude sin mul latitude sin mul } def
+      exit } if
+  } repeat
 } def
 %
 /ConvCylToCartesian { % r phi h -> x y z
@@ -320,7 +329,7 @@ tx@3DPlotDict begin
   exch } def
 %
 /setColorLight { % expects 7 values on stack C M Y K xL yL zL
-% les rayons de lumière
+% les rayons de lumi�re
   xLight dup mul yLight dup mul zLight dup mul add add sqrt /NormeLight ED
 % the color values
   /K ED
@@ -384,11 +393,11 @@ tx@3DPlotDict begin
       /Xpoint Rsphere theta increment 2 div add cos mul phi increment 2 div add cos mul CX add def
       /Ypoint Rsphere theta increment 2 div add sin mul phi increment 2 div add cos mul CY add def
       /Zpoint Rsphere phi increment 2 div add sin mul CZ add def
-      % normale à la facette
+      % normale � la facette
       /nXfacette Xpoint CX sub def
       /nYfacette Ypoint CY sub def
       /nZfacette Zpoint CZ sub def
-      % test de visibilité
+      % test de visibilit�
       /PSfacetteSphere 
         vX nXfacette mul
         vY nYfacette mul add
@@ -599,7 +608,7 @@ tx@3DPlotDict begin
     nZfacetteBox dup mul
     add add sqrt def
   NormeN 0 eq { /NormeN 1e-10 def } if
-% test de visibilité
+% test de visibilit�
   /PSfacetteBox 
     vX nXfacetteBox mul
     vY nYfacetteBox mul add
@@ -657,7 +666,7 @@ tx@3DPlotDict begin
     /V {Z sqrt} bind def
     /TableauxPoints [
       0 1 359 { 
-        /U ED [ U U Z V calculate2DPoint ] % on décrit le cercle
+        /U ED [ U U Z V calculate2DPoint ] % on d�crit le cercle
       } for
     ] def
     newpath
@@ -716,7 +725,7 @@ tx@3DPlotDict begin
           nZfacetteParaboloid dup mul
           add add sqrt} bind def
         NormeN 0 eq {/NormeN 1e-10 def} if
-% test de visibilité
+% test de visibilit�
        /PSfacetteParaboloid vX nXfacetteParaboloid mul
                   vY nYfacetteParaboloid mul add
                   vZ nZfacetteParaboloid mul add def
diff --git a/Master/texmf-dist/source/generic/pst-3dplot/Makefile b/Master/texmf-dist/source/generic/pst-3dplot/Makefile
index 707179c5fd7..2a4d9aca9e6 100644
--- a/Master/texmf-dist/source/generic/pst-3dplot/Makefile
+++ b/Master/texmf-dist/source/generic/pst-3dplot/Makefile
@@ -29,10 +29,9 @@ $(MAIN).dvi : $(MAIN).tex
 	$(LATEX) $<
 	if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
 	if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+	makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx
 	makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
 	  $(basename $<).glo
-	makeindex -t $(basename $<).ilg -o $(basename $<).ind \
-	  $(basename $<).idx
 	bibtex $(basename $<)
 	$(LATEX) $<
 	$(LATEX) $<
diff --git a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
index a6857d694de..395d95988b8 100644
--- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
+++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.tex 123 2009-08-27 06:53:23Z herbert $
+%% $Id: pst-3dplot.tex 136 2009-10-06 21:37:53Z herbert $
 %%
 %% This is file `pst-3dplot.tex',
 %%
@@ -25,8 +25,8 @@
 \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi% loads node and plot
 \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 %
-\def\fileversion{1.85}
-\def\filedate{2009/07/29}
+\def\fileversion{1.86}
+\def\filedate{2009/10/06}
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -84,11 +84,14 @@
         \def\psk@ThreeDplot@Alpha{45}
       \or %4
 %        \def\psk@ThreeDplot@Alpha{135}
+      \else
+%
     \fi}
 % 0 default
 % 1 z y are orthogonal and angle x|y is Alpha, Beta has no meaning 
 % 1 z y are orthogonal and angle Alpha is always 135, x-axis shortened by 1/sqrt(2), Beta has no meaning 
-\psset[pst-3dplot]{drawing,drawCoor,hiddenLine=false,SphericalCoor=false,
+\define@key[psset]{pst-3dplot}{SphericalCoorType}[0]{\pst@checknum{#1}\psk@ThreeDplot@SphericalCoorType} 
+\psset[pst-3dplot]{drawing,drawCoor,hiddenLine=false,SphericalCoor=false,SphericalCoorType=0,
     leftHanded=false,eulerRotation=false,coorType=0,showgrid}
 %
 % ------- the global definitions for the pspicture frame ------
@@ -307,6 +310,7 @@
  {end} if % End the correct dict if necessary
   /leftHanded \ifPst@leftHanded true \else false \fi def
   /coorType \psk@ThreeDplot@coorType\space def
+  /SphericalCoorType \psk@ThreeDplot@SphericalCoorType\space def
   \psk@ThreeDplot@xyzLight\space 
   /zLight ED /yLight ED /xLight ED 
 }%