pst-solides3d update (11aug09)

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

2 files changed, 24 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
index 9bb25a397fa..1a9a5c81a5a 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/Changes
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
@@ -9,6 +9,7 @@ solides3d.pro ---
 
 
 pst-solides3d.tex --- 
+4.16 2009-08-11 - fix for introduced bug in \psSolid (hv)
 4.15 2009-07-03 - allow names for the origin coordidates for \psSolid (hv)
 
 
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 d2d4667f6eb..0ca0e9f3c05 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -1,9 +1,22 @@
-%% COPYRIGHT 2008 by Manuel Luque, Arnaud Schmittbuhl, 
+%%
+%% COPYRIGHT 2008,2009 by Manuel Luque, Arnaud Schmittbuhl, 
 %% Jean-Paul Vignault, Herbert Voss.
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN
-%% archives in directory macros/latex/base/lppl.txt.
-%% etex detection by looking for the \ifcsname macro
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+% 
+%% This work consists of the file pstricks.tex, PostScript macros 
+%% for Generic TeX.
+%% See the PSTricks User's Guide for description.
+%
+% etex detection by looking for the \ifcsname macro
 \expandafter\ifx\csname ifcsname\endcsname\relax
  \newlinechar`\^^J
  \message{^^J*****************************************}
@@ -20,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.15}
-\def\filedate{2009/07/03}
+\def\fileversion{4.16}
+\def\filedate{2009/08/11}
 \message{`PSTSOLIDESIIID' v\fileversion, \filedate}
 %
 \pstheader{solides.pro}
@@ -600,11 +613,11 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
 \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@iv{ 0 0 0 }}}
+\def\psSolid{\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{%
-  \ifx#2\@empty\psSolid@iv{#1}\else\psSolid@iv{#1 #2 #3}\fi}
+  \ifx\relax#2\relax\psSolid@iv{#1}\else\psSolid@iv{#1 #2 #3}\fi}
 \def\psSolid@iv#1{%
   \pst@killglue%
   \begingroup