Changeset 121
- Timestamp:
- 10/29/08 14:54:51 (2 months ago)
- Files:
-
- trunk/pst-solides3d.tex (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/pst-solides3d.tex
r109 r121 21 21 \ifx\MultidoLoaded\endinput\else\input multido.tex \fi 22 22 % JPV & ML & AS & HV 23 \def\fileversion{4.1 0}24 \def\filedate{2008/ 07/24}23 \def\fileversion{4.11} 24 \def\filedate{2008/10/29} 25 25 \message{`PSTSOLIDESIIID' v\fileversion, \filedate} 26 26 % … … 595 595 \def\psSolid{\def\pst@par{}\pst@object{psSolid}} 596 596 \def\psSolid@i{\@ifnextchar({\psSolid@ii}{\psSolid@ii(0.,0.,0.)}} 597 \def\psSolid@ii(#1,#2,#3){ %598 \ifPst@solidmemory\ begingroup\use@par\else\begin@ClosedObj\fi597 \def\psSolid@ii(#1,#2,#3){{% 598 \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi 599 599 \addto@pscode{ 600 600 1 setlinejoin … … 609 609 end 610 610 }% fin du code ps 611 \ifPst@solidmemory\e ndgroup\else\end@ClosedObj\fi612 \ignorespaces} 611 \ifPst@solidmemory\else\end@ClosedObj\fi 612 \ignorespaces}} 613 613 614 614 … … 617 617 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 618 618 \def\codejps#1{{% 619 \define@key[psset]{pst-solides3d}{object}{\def\psk@solides@object{#1}} 620 \psSolid[object={#1} exec](0,0,0)}} 619 \define@key[psset]{pst-solides3d}{object}{\def\psk@solides@object{#1}}% 620 \psSolid[object={#1} exec](0,0,0)}}% 621 621 622 622 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% … … 649 649 \def\psPoint{\def\pst@par{}\pst@object{psPoint}} 650 650 \def\psPoint@i(#1,#2,#3)#4{{% coordonnees cartesiennes 651 \begin@SpecialObj651 % \begin@SpecialObj 652 652 \pnode(! 653 653 \tx@optionssolides … … 656 656 3dto2d cm_1 exch cm_1 exch 657 657 end){#4}% 658 \end@SpecialObj}\ignorespaces% 658 % \end@SpecialObj 659 }\ignorespaces% 659 660 } 660 661 … … 678 679 \psSolid[object=vecteur,RotZ=#2,RotY=-#3, 679 680 args=1.7 0 0](xP,yP,zP) 680 \endgroup%681 \ignorespaces} 682 % 681 \endgroup% 682 \ignorespaces% 683 } 683 684 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 684 685 %% les axes IIId … … 786 787 \fi 787 788 }} 788 % 789 789 790 790 791 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 791 792 %% la macro \defFunction 792 793 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 793 \def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}} 794 \def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}}% 794 795 \def\defFunction@i[#1]#2(#3)#4#5#6{% 795 \pst@killglue% 796 % \psset{solidmemory} 797 % \global\Pst@solidmemorytrue 796 \pst@killglue 797 \global\Pst@solidmemorytrue 798 798 \begingroup 799 \psset{#1} 799 \psset{#1}% 800 800 \defFunction@ii{#3}\edef\@tempa{\the\toks@}% 801 801 \ifPst@algebraic … … 804 804 \def\@tempb{#5}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi 805 805 \def\@tempb{#6}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi 806 \pstVerb{ 807 % \codejps{ 806 \codejps{% 808 807 /#2 { 3 dict begin \@tempa \the\toks@ 809 808 gere_pst-deffunction end } def }% 20080625 810 809 \else 811 \pstVerb{ 812 % \codejps{ 810 \codejps{% 813 811 /#2 { 3 dict begin \the\toks@ #4 #5 #6 814 812 gere_pst-deffunction end } def }% 20080625 815 \fi %816 \endgroup} 817 % 818 \def\defFunction@ii#1{\defFunction@iii#1,,,\end} 813 \fi 814 \endgroup}% 815 % 816 \def\defFunction@ii#1{\defFunction@iii#1,,,\end}% 819 817 \def\defFunction@iii#1,#2,#3,#4\end{% 820 818 \toks@={}% … … 827 825 \edef\@tmpPSDefns{/#1 exch def \the\toks@}% 828 826 \global\toks@=\expandafter{\@tmpPSDefns}% 829 } 827 }% 830 828 \def\store@toks@after#1{% 831 829 \edef\@tmpPSDefns{\the\toks@ (#1) tx@AlgToPs begin AlgToPs end cvx }%
