pst-solides3d (25jul09)

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

1 files changed, 25 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
index dee5f4aaf0e..d2d4667f6eb 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -20,8 +20,8 @@
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
 \ifx\MultidoLoaded\endinput\else\input multido.tex \fi 
 % JPV & ML & AS & HV
-\def\fileversion{4.11}
-\def\filedate{2008/10/29}
+\def\fileversion{4.15}
+\def\filedate{2009/07/03}
 \message{`PSTSOLIDESIIID' v\fileversion, \filedate}
 %
 \pstheader{solides.pro}
@@ -91,6 +91,10 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
 \psset[pst-solides3d]{args=}%
 \define@key[psset]{pst-solides3d}{transform}{\def\pst@solides@transform{#1}} %
 \psset[pst-solides3d]{transform=}%
+\define@key[psset]{pst-solides3d}{zcolor}{\def\pst@solides@zcolor{#1}} %
+\psset[pst-solides3d]{zcolor=}%
+\define@key[psset]{pst-solides3d}{tablez}{\def\pst@solides@tablez{#1}} %
+\psset[pst-solides3d]{tablez=}%
 
 \def\Section{%
          R h 2 div neg % sommet 1
@@ -419,7 +423,9 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
   \endgroup%
   \ignorespaces%
 }
-
+%
+\@ifundefined{pst@linetype}{\def\pst@linetype{0}}{}%  preventing errors hv 2009-07-03
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% code insere dans le .ps
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -475,6 +481,8 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
 /args  { \pst@solides@args} def
 /Mode \pst@solides@mode\space def % resolution du trace
 /lightintensity \pst@solides@lightintensity\space def % intensite de la lumiere
+/tablez  [\pst@solides@tablez] def
+/zcolor  [\pst@solides@zcolor] def
 %
 /solidlinewidth {\pst@number\pslinewidth} def
 /linecolor  {\pst@usecolor\pslinecolor} def
@@ -586,21 +594,26 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \define@boolkey[psset]{pst-solides3d}[Pst@]{solidmemory}[true]{}
-\psset{solidmemory=false}%
+\psset{solidmemory=false}
 %
-\def\composeSolid{\use@pscode}
+\let\composeSolid\use@pscode
 \let\endpspictureS@lid\endpspicture%  redefine \endpspicture (hv)
 \def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid} 
 
 \def\psSolid{\def\pst@par{}\pst@object{psSolid}}
-\def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@ii(0.,0.,0.)}}
-\def\psSolid@ii(#1,#2,#3){{%
-  \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi
+\def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@iv{ 0 0 0 }}}
+\def\psSolid@ii(#1){\expandafter\psSolid@iii#1,,,\@nil}
+\def\psSolid@iii#1,#2,#3,#4\@nil{%
+  \ifx#2\@empty\psSolid@iv{#1}\else\psSolid@iv{#1 #2 #3}\fi}
+\def\psSolid@iv#1{%
+  \pst@killglue%
+  \begingroup
+  \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi%
   \addto@pscode{
     1 setlinejoin
     \tx@optionssolides
     SolidesDict begin
-    #1 #2 #3
+    #1
     /CZ exch def
     /CY exch def
     /CX exch def
@@ -608,8 +621,9 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
     \psk@solides@object\space
     end
   }% fin du code ps
-  \ifPst@solidmemory\else\end@ClosedObj\fi
-  \ignorespaces}}
+  \ifPst@solidmemory\else\end@ClosedObj\fi%
+  \endgroup%  
+  \ignorespaces}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%