pst-solides3d (16nov12)

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

1 files changed, 22 insertions, 19 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 617dc7c0af1..ca4e4eae9da 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -33,8 +33,8 @@
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi 
 % JPV & ML & AS & HV
-\def\fileversion{4.23}
-\def\filedate{2010/09/22}
+\def\fileversion{4.24}
+\def\filedate{2011/07/13}
 \message{`PSTSOLIDESIIID' v\fileversion, \filedate}
 %
 \pstheader{pst-solides3d.pro}
@@ -60,10 +60,10 @@
 \define@key[psset]{pst-solides3d}{RotZ}{\def\psk@solides@RotZ{#1}}% rotation autour de Oz en degres
 \psset[pst-solides3d]{RotZ=0,RotX=0,RotY=0,Decran=50}% valeurs par defaut
 % parametres propres a chaque objet
-\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1}} % nb points par courbe
-\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1}} % numero face du solide
-\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1}} % angle calotte sphere
-\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1}} % angle calotte sphere
+\define@key[psset]{pst-solides3d}{resolution}{\def\pst@solides@resolution{#1 }} % nb points par courbe
+\define@key[psset]{pst-solides3d}{no}{\def\pst@solides@no{#1 }} % numero face du solide
+\define@key[psset]{pst-solides3d}{phi}{\def\pst@solides@phi{#1 }} % angle calotte sphere
+\define@key[psset]{pst-solides3d}{theta}{\def\pst@solides@theta{#1 }} % angle calotte sphere
 \define@key[psset]{pst-solides3d}{r0}{\def\pst@solides@rO{#1}} % rayon interieur tore
 \define@key[psset]{pst-solides3d}{r1}{\def\pst@solides@rI{#1}} % rayon moyen tore
 \define@key[psset]{pst-solides3d}{R}{\def\pst@solides@R{#1}} % rayon moyen tore
@@ -79,7 +79,7 @@
 \define@key[psset]{pst-solides3d}{intersectiontype}{\def\pst@solides@intersectiontype{#1}} %
 %
 %% les affectations par defaut
-\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,%
+\psset[pst-solides3d]{R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,
 trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontype=-1}
 %
 %%%%%%%%%%%%%%%%% variables complexes %%%%%%%%%%%%%%%%%
@@ -341,6 +341,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
   \@ifnextchar[{\gridIIID@ii(#1,#2)(#3,#4)}{\gridIIID@ii(#1,#2)(#3,#4)[2,2,3]}}
 \def\gridIIID@ii(#1,#2)(#3,#4)[#5,#6,#7]{%
   \pst@killglue%
+  \addbefore@par{planmarks}%
   \begingroup%
   \use@par%
   \psSolid[object=parallelepiped,
@@ -434,7 +435,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
 %% code insere dans le .ps
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-\pst@def{optionssolides}<%
+\pst@def{optionssolides}<
   /PSfont {\pst@solides@PSfont} def
   /pst@fill { \psk@opacityalpha .setopacityalpha fill } def
   /strokeopacity \psk@opacityalpha def
@@ -443,21 +444,22 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
 %% /cm {\pst@number\psunit mul} def
 %% /cm_1 {\pst@number\psunit div} def
   /decal \pst@solides@decal\space def % decalage
-  /viewpointXYZ {\pst@solides@viewpoint} def
+  /viewpointXYZ { \pst@solides@viewpoint } def
   /Decran \pst@solides@Decran\space def % distance de l'ecran
 %
-/RotX \psk@solides@RotX\space def
-/RotY \psk@solides@RotY\space def
-/RotZ \psk@solides@RotZ\space def
+  /RotX \psk@solides@RotX\space def
+  /RotY \psk@solides@RotY\space def
+  /RotZ \psk@solides@RotZ\space def
 %
-/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } bind def
+  /fontsize \pst@solides@fontsize\space \pst@number\psunit mul 28.45 div def
 %
-/projectionsifacevisible \ifPst@visibility true \else false \fi def
+  /projectionsifacevisible \ifPst@visibility true \else false \fi def
 %
 /R \pst@solides@R\space def % pour le tore
 /r1 \pst@solides@rI\space def % pour le tore
 /r0 \pst@solides@rO\space def % pour le tore
-/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+\pst@solides@resolution setresolution % ------ hv 20110713
 /phi \pst@solides@phi\space def % pour la calotte spherique
 /theta \pst@solides@theta\space def % pour la calotte spherique
 /r \pst@solides@r\space def % rayon sphere circonscrite
@@ -567,7 +569,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
 \let\endpspictureS@lid\endpspicture%  redefine \endpspicture (hv)
 \def\endpspicture{\ifPst@solidmemory\use@pscode\fi\endpspictureS@lid\global\Pst@solidmemoryfalse}
 %
-\def\psSolid{\pst@object{psSolid}}
+\def\psSolid{\def\pst@par{}\pst@object{psSolid}}
 \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{%
@@ -578,7 +580,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
   \addto@pscode{
     \tx@setTransparency
     1 setlinejoin
-    \tx@optionssolides
+    \tx@optionssolides 
     SolidesDict begin
     #1 
     /CZ exch def
@@ -848,7 +850,7 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
 /solidlinewidth {\pst@number\pslinewidth} def
 /PSfont {\pst@solides@PSfont} def
 /normale {\pst@solides@normal} bind def
-/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } bind def
+/fontsize {\pst@solides@fontsize\space \pst@number\psunit mul 28.45 div } def
 /origin {\pst@solides@origin} def
 /RotationAngleText {\pst@solides@RotationAngleText} def
 /range [ \pst@solides@range ] def
@@ -863,7 +865,8 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
 \ifx\pst@solides@plan\@empty     \else/planprojpst \pst@solides@plan \space def \fi
 \ifx\pst@solides@solidname\@empty\else/solidprojname {\pst@solides@solidname\space} def \fi
 /noface \pst@solides@no\space def % no de la face du solide
-/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+%/resolution \pst@solides@resolution\space def % pour le nb de points par courbe
+\pst@solides@resolution setresolution % ------ hv 20110713
 >
 
 %\makeatletter