pst-solides3d 4.19 (30apr10)

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

1 files changed, 32 insertions, 6 deletions

diff --git a/Master/texmf-dist/dvips/pst-solides3d/solides.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
index 2680568f365..456b984a364 100644
--- a/Master/texmf-dist/dvips/pst-solides3d/solides.pro
+++ b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
@@ -1,8 +1,9 @@
 %!
 % PostScript prologue for pst-solides3d.tex.
-% Version 4.16, 2010/01/07
+% Version 4.20, 2010/04/27
 %
-%% COPYRIGHT 2009 by Jean-Paul Vignault
+%% COPYRIGHT 2009/10 by Jean-Paul Vignault
+%% opacity changes by Herbert Voss
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
@@ -5246,6 +5247,7 @@ end
 } def
 
 %%%%% ### solidnumsommets ###
+/solidnumsep 15 def
 /solidnumsommets {
 8 dict begin
 %   Font findfont 10 scalefont setfont
@@ -5279,7 +5281,7 @@ end
          %% le sommet i est dans la face j
          sol j solidcentreface /G defpoint3d
          G S vecteur3d normalize3d
-         15 dup ptojpoint pop
+         solidnumsep dup ptojpoint pop
          mulv3d
          S addv3d
          3dto2d cctext 
@@ -5389,9 +5391,17 @@ end
 %%    G
 %%    solid 2 i solidgetsommetface
 %%    vecteur3d
-
+%
    /n solid i solidfacenombresommets def
-   solid i solidcentreface /G defpoint3d
+   n 3 ge {
+      [
+         solid 0 i solidgetsommetface
+         solid 1 i solidgetsommetface
+         solid 2 i solidgetsommetface
+      ] isobarycentre3d /G defpoint3d
+   } {
+      solid i solidcentreface /G defpoint3d
+   } ifelse
   %% debug %%   G 3dto2d point
    G
    solid 0 i solidgetsommetface
@@ -8446,7 +8456,7 @@ end
 
    %% tableau des sommets
    /S [
-       0 0 0
+       0 0 0 0 f_surface
        1 1 nx {
            /j exch def
            1 1 ny {
@@ -10727,6 +10737,22 @@ end
    gere_pstricks_opt
 } def
 
+/pst-Surface* {
+   r
+   ngrid length 2 ge {
+      [ngrid 0 get ngrid 1 get]
+   } {
+      ngrid length 1 eq {
+         [ngrid 0 get dup]
+      } ifelse
+   } ifelse
+   {f} newsurface*
+   solidbiface {
+      dup videsolid
+   } if
+   gere_pstricks_opt
+} def
+
 /pst-surface {
    base
    base aload pop