From 646227dfa8135f57fbdaf259d889b55065bb763a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Jan 2009 00:42:36 +0000 Subject: pst-solides3d update (12jan09) git-svn-id: svn://tug.org/texlive/trunk@11864 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-solides3d/pst-solides3d.tex | 50 +++++++++++----------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pst-solides3d') 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 799492dc8ca..dee5f4aaf0e 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.10} -\def\filedate{2008/07/24} +\def\fileversion{4.11} +\def\filedate{2008/10/29} \message{`PSTSOLIDESIIID' v\fileversion, \filedate} % \pstheader{solides.pro} @@ -594,8 +594,8 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \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\begingroup\use@par\else\begin@ClosedObj\fi +\def\psSolid@ii(#1,#2,#3){{% + \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi \addto@pscode{ 1 setlinejoin \tx@optionssolides @@ -608,16 +608,16 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d \psk@solides@object\space end }% fin du code ps - \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi - \ignorespaces} + \ifPst@solidmemory\else\end@ClosedObj\fi + \ignorespaces}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% la macro \codejps %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\codejps#1{{% -\define@key[psset]{pst-solides3d}{object}{\def\psk@solides@object{#1}} -\psSolid[object={#1} exec](0,0,0)}} +\define@key[psset]{pst-solides3d}{object}{\def\psk@solides@object{#1}}% +\psSolid[object={#1} exec](0,0,0)}}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% la macro \psTransformPoint @@ -648,14 +648,15 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d % \psPoint[options du point de vue](x y z) \def\psPoint{\def\pst@par{}\pst@object{psPoint}} \def\psPoint@i(#1,#2,#3)#4{{% coordonnees cartesiennes - \begin@SpecialObj +% \begin@SpecialObj \pnode(! \tx@optionssolides SolidesDict begin #1 #2 #3 3dto2d cm_1 exch cm_1 exch end){#4}% - \end@SpecialObj}\ignorespaces% +% \end@SpecialObj +}\ignorespaces% } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -677,9 +678,9 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d /zP Rayon #3 sin mul def}% \psSolid[object=vecteur,RotZ=#2,RotY=-#3, args=1.7 0 0](xP,yP,zP) -\endgroup% -\ignorespaces} -% + \endgroup% + \ignorespaces% +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% les axes IIId %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -785,37 +786,34 @@ end } def \end@ClosedObj% \fi }} -% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% la macro \defFunction %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}} +\def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}}% \def\defFunction@i[#1]#2(#3)#4#5#6{% \pst@killglue -% \psset{solidmemory} -% \global\Pst@solidmemorytrue + \global\Pst@solidmemorytrue \begingroup - \psset{#1} + \psset{#1}% \defFunction@ii{#3}\edef\@tempa{\the\toks@}% \ifPst@algebraic \toks@={}% \def\@tempb{#4}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi \def\@tempb{#5}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi \def\@tempb{#6}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi - \pstVerb{ -% \codejps{ + \codejps{% /#2 { 3 dict begin \@tempa \the\toks@ gere_pst-deffunction end } def }% 20080625 \else - \pstVerb{ -% \codejps{ + \codejps{% /#2 { 3 dict begin \the\toks@ #4 #5 #6 gere_pst-deffunction end } def }% 20080625 - \fi% - \endgroup} + \fi + \endgroup}% % -\def\defFunction@ii#1{\defFunction@iii#1,,,\end} +\def\defFunction@ii#1{\defFunction@iii#1,,,\end}% \def\defFunction@iii#1,#2,#3,#4\end{% \toks@={}% \def\arg@ii{#1}\ifx\arg@ii\@empty \else\store@toks@before\arg@ii\fi @@ -826,7 +824,7 @@ end } def \def\store@toks@before#1{% \edef\@tmpPSDefns{/#1 exch def \the\toks@}% \global\toks@=\expandafter{\@tmpPSDefns}% -} +}% \def\store@toks@after#1{% \edef\@tmpPSDefns{\the\toks@ (#1) tx@AlgToPs begin AlgToPs end cvx }% \global\toks@=\expandafter{\@tmpPSDefns}% -- cgit v1.2.3