Changeset 121

Show
Ignore:
Timestamp:
10/29/08 14:54:51 (2 months ago)
Author:
jpv
Message:

Suppression d'un espace

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/pst-solides3d.tex

    r109 r121  
    2121\ifx\MultidoLoaded\endinput\else\input multido.tex \fi  
    2222% JPV & ML & AS & HV 
    23 \def\fileversion{4.10
    24 \def\filedate{2008/07/24
     23\def\fileversion{4.11
     24\def\filedate{2008/10/29
    2525\message{`PSTSOLIDESIIID' v\fileversion, \filedate} 
    2626% 
     
    595595\def\psSolid{\def\pst@par{}\pst@object{psSolid}} 
    596596\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\fi 
     597\def\psSolid@ii(#1,#2,#3){{
     598  \ifPst@solidmemory\use@par\else\begin@ClosedObj\fi 
    599599  \addto@pscode{ 
    600600    1 setlinejoin 
     
    609609    end 
    610610  }% fin du code ps 
    611   \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi 
    612   \ignorespaces} 
     611  \ifPst@solidmemory\else\end@ClosedObj\fi 
     612  \ignorespaces}} 
    613613 
    614614 
     
    617617%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
    618618\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)}}% 
    621621 
    622622%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
     
    649649\def\psPoint{\def\pst@par{}\pst@object{psPoint}} 
    650650\def\psPoint@i(#1,#2,#3)#4{{% coordonnees cartesiennes 
    651   \begin@SpecialObj 
     651%  \begin@SpecialObj 
    652652  \pnode(! 
    653653    \tx@optionssolides 
     
    656656    3dto2d cm_1 exch cm_1 exch 
    657657    end){#4}% 
    658   \end@SpecialObj}\ignorespaces% 
     658%  \end@SpecialObj 
     659}\ignorespaces% 
    659660} 
    660661 
     
    678679\psSolid[object=vecteur,RotZ=#2,RotY=-#3, 
    679680         args=1.7 0 0](xP,yP,zP) 
    680 \endgroup% 
    681 \ignorespaces} 
    682 
     681  \endgroup% 
     682  \ignorespaces% 
     683
    683684%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
    684685%% les axes IIId 
     
    786787\fi 
    787788}} 
    788 
     789 
    789790 
    790791%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
    791792%% la macro \defFunction 
    792793%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
    793 \def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}} 
     794\def\defFunction{\@ifnextchar[{\defFunction@i}{\defFunction@i[]}}% 
    794795\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  
    798798  \begingroup 
    799   \psset{#1} 
     799  \psset{#1}% 
    800800  \defFunction@ii{#3}\edef\@tempa{\the\toks@}% 
    801801  \ifPst@algebraic 
     
    804804    \def\@tempb{#5}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi 
    805805    \def\@tempb{#6}\ifx\@tempb\@empty \else\store@toks@after\@tempb\fi 
    806     \pstVerb{ 
    807 %    \codejps{ 
     806    \codejps{% 
    808807      /#2 { 3 dict begin \@tempa \the\toks@ 
    809808         gere_pst-deffunction end } def }% 20080625 
    810809  \else 
    811     \pstVerb{ 
    812 %    \codejps{ 
     810    \codejps{% 
    813811       /#2 { 3 dict begin \the\toks@ #4 #5 #6 
    814812         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}% 
    819817\def\defFunction@iii#1,#2,#3,#4\end{% 
    820818  \toks@={}% 
     
    827825  \edef\@tmpPSDefns{/#1 exch def \the\toks@}% 
    828826  \global\toks@=\expandafter{\@tmpPSDefns}% 
    829 } 
     827}% 
    830828\def\store@toks@after#1{% 
    831829  \edef\@tmpPSDefns{\the\toks@ (#1) tx@AlgToPs begin AlgToPs end cvx }%