diff options
Diffstat (limited to 'macros/latex/contrib/profcollege/metapost')
5 files changed, 197 insertions, 127 deletions
diff --git a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp index c308ec750c..78f07bda2d 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp @@ -145,10 +145,10 @@ vardef Test(expr cptk)(text cptnt)= elseif substring(cptk,cptk+1) of cptnt=")":draw Affichage("01000001000001000010000100010001000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt="*":draw Affichage("00000001001010101110101010010000000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt="+":draw Affichage("00000001000010011111001000010000000") shifted(Decalage); - elseif substring(cptk,cptk+1) of cptnt=",":draw Affichage("00000000000000000000011000010001000") shifted(Decalage); +% elseif substring(cptk,cptk+1) of cptnt=",":draw Affichage("00000000000000000000011000010001000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt="-":draw Affichage("00000000000000011111000000000000000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt=".":draw Affichage("00000000000000000000000000110001100") shifted(Decalage); - elseif substring(cptk,cptk+1) of cptnt="/":draw Affichage("00000000010001000100010001000000000") shifted(Decalage); +% elseif substring(cptk,cptk+1) of cptnt="/":draw Affichage("00000000010001000100010001000000000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt=":":if Math=true: draw Affichage("00000000000000000000000000000000000") shifted(Decalage); else: @@ -172,6 +172,7 @@ vardef Test(expr cptk)(text cptnt)= elseif substring(cptk,cptk+1) of cptnt="$":draw Affichage("00000000000000100001000010000111111") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt="^":draw Affichage("00100010101000100000000000000000000") shifted(Decalage); elseif substring(cptk,cptk+1) of cptnt="_":draw Affichage("11111111111111111111111111111111111") shifted(Decalage); + elseif substring(cptk,cptk+1) of cptnt="~":draw Affichage("01000010000111001000010000100001000") shifted(Decalage); fi; enddef; diff --git a/macros/latex/contrib/profcollege/metapost/PfCMonde.mp b/macros/latex/contrib/profcollege/metapost/PfCMonde.mp index 11051483e4..fb3064cefd 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCMonde.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCMonde.mp @@ -32,6 +32,9 @@ payscolor=tan; vardef flamme=reverse(2mm*(0.5,1){dir90}..2mm*(0.75,1.5)..{dir90}2mm*(1,2))--2mm*(0.5,1){dir=-90}..2mm*(1,0.5)..{dir=90}2mm*(1.5,1)--((2mm*(0.5,1){dir90}..2mm*(0.75,1.5)..{dir90}2mm*(1,2)) reflectedabout (2mm*(1,0),2mm*(1,0)+2mm*(0,1)))--cycle enddef; +% +pair poubelle; + %Les marques string marque_p; @@ -629,13 +632,23 @@ vardef lecturep(expr nomfichier,fond)= nbpts:=scantokens readfrom nomfichier; numeric ll; ll=0; - for k=1 upto nbpts: + if nbpts<Allegee: + Alleg:=4; + else: + Alleg:=Allegee; + fi; +% for k=1 upto nbpts: + for k=1 upto (nbpts div Alleg): pair latlon; - latlon=scantokens readfrom nomfichier; +% latlon=scantokens readfrom nomfichier; +% latlon=((scantokens readfrom nomfichier)+(scantokens readfrom nomfichier)+(scantokens readfrom nomfichier))/3; + latlon=((scantokens readfrom nomfichier) for l=2 upto Alleg: + +(scantokens readfrom nomfichier) + endfor)/Alleg; if projection="mercator": - Coord[k]=mercatorc(xpart(latlon/60),ypart(latlon/60)) + Coord[k]=mercatorc(xpart(latlon/60),ypart(latlon/60)); elseif projection="winkel": - Coord[k]=winkelc(xpart(latlon/60),ypart(latlon/60)) + Coord[k]=winkelc(xpart(latlon/60),ypart(latlon/60)); elseif projection="cylindrique": Coord[k]=cylindriquec(xpart(latlon/60),ypart(latlon/60)); elseif projection="simple": @@ -661,11 +674,14 @@ vardef lecturep(expr nomfichier,fond)= fi; if ll>0: pays=Coord[1] - for l=4 step 3 until ll:%upto ll: +% for l=4 step 3 until ll:%upto ll:4-3 + for l=2 upto (nbpts div Alleg): --Coord[l] endfor; if noncolore=true: - fill pays--cycle withcolor payscolor; + if Impression=false: + fill pays--cycle withcolor payscolor; + fi; else: fill pays--cycle withcolor fond; fi; @@ -689,9 +705,20 @@ vardef Lectureilesp= fond=scantokens readfrom nomfichiermul; numeric ll; ll=0; - for k=1 upto nbpts: +%%%%%%%%%%%% + if nbpts<Allegee: + Alleg:=1; + else: + Alleg:=Allegee; + fi; + %%%%%%%% +% for k=1 upto nbpts: + for k=1 upto (nbpts div Alleg): pair latlon; - latlon=scantokens readfrom nomfichiermul; +% latlon=scantokens readfrom nomfichiermul; + latlon=((scantokens readfrom nomfichiermul) for l=2 upto Alleg: + +(scantokens readfrom nomfichiermul) + endfor)/Alleg; if projection="mercator": Coord[k]=mercatorc(xpart(latlon/60),ypart(latlon/60)); elseif projection="winkel": @@ -716,13 +743,14 @@ vardef Lectureilesp= endfor; path pays; if (projection="mercator") or (projection="winkel") or (projection="cylindrique") or (projection="simple") or (projection="bonne"): - ll:=nbpts + ll:=(nbpts div Alleg) fi; if ll>0: pays=Coord[1] - for l=2 upto ll: +% for l=2 upto ll: + for l=2 upto (nbpts div Alleg): --Coord[l] - endfor; + endfor; if noncolore=true: fill pays--cycle withcolor payscolor; else: @@ -730,6 +758,12 @@ vardef Lectureilesp= fi; draw pays; fi; + % rustine pour tout lire chaque partie de Ile.dat + if Alleg>1: + for po=1 upto (nbpts mod Alleg): + poubelle:=scantokens readfrom nomfichiermul; + endfor; + fi; endfor; closefrom nomfichiermul; if (projection="mercator") or (projection="winkel") or (projection="cylindrique") or (projection="simple"): diff --git a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp index 0fe551dc9c..3b47a88983 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp @@ -751,6 +751,37 @@ vardef Objetsphere[](expr Rn)= apj.@:=apj-1; enddef; +vardef Objetdemispherebasse[](expr Rn)= + Outcolor.@:=outcolor; + Incolor.@:=incolor; + if creux:Ferme.@:=false else: Ferme.@:=true fi; + scantokens("numeric "&substring(0,1) of Rn&"; "&Rn&";"); + vardef Famille(expr u,v)=(R*(cos(u)*cos(v),cos(u)*sin(v),sin(u))) enddef; + umin:=-pi/2; umax:=0; upas:=0.5*pi/nb; + vmin:=-pi; vpas:=2*pi/subh; vmax:=0; + apj:=0; + %On crée les facettes et on calcule la profondeur en Z. + for k=0 upto (nb-1): + for l=0 upto (subh-1): + tcpt.@[apj]:=apj; + OTFc.@[apj].nb:=4; + OTFc.@[apj][1]:=Image(Famille(umin+(k+1)*upas,vmin+l*vpas)); + OTFc.@[apj][2]:=Image(Famille(umin+k*upas,vmin+l*vpas)); + OTFc.@[apj][3]:=Image(Famille(umin+k*upas,vmin+(l+1)*vpas)); + OTFc.@[apj][4]:=Image(Famille(umin+(k+1)*upas,vmin+(l+1)*vpas)); + OTFc.@[apj].iso:=(OTFc.@[apj][1]+OTFc.@[apj][2]+OTFc.@[apj][3]+OTFc.@[apj][4])/4; + ALT.@[apj]:=-Zpart(GCoord(OTFc.@[apj].iso)); + if ProduitScalaire(Oeil-OTFc.@[apj].iso,Normal(OTFc.@[apj].iso,OTFc.@[apj][1],OTFc.@[apj][2]))>=0: + Vue.@[apj]:=true;coul.@[apj]:=outcolor; + else: + Vue.@[apj]:=false;coul.@[apj]:=incolor; + fi; + apj:=apj+1; + endfor; + endfor; + apj.@:=apj-1; +enddef; + vardef ObjetSphereNew[](expr Rn)= Outcolor.@:=outcolor; Incolor.@:=incolor; diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp index f60928745c..2a7ce304e2 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp @@ -66,6 +66,8 @@ print=false; numeric coefprint; coefprint:=0.95; +color White; +White:=white; %texte ou symbole droite gauche boolean symbole; symbole=true; @@ -130,7 +132,7 @@ vardef OvalVar(expr ar)= TAvar=OvalBox(TTv); Ovar=image( fill TAvar if print=false : withcolor OrangeTrois else : withcolor white fi; - draw TAvar if print=false : withcolor coefprint*white fi; + draw TAvar if print=false : withcolor coefprint*White fi; label(TEX("\barre\bfseries "&ar),(0,0)) if print=false : withcolor white fi; ); Ovar:=Ovar shifted(-center Ovar); @@ -145,7 +147,7 @@ vardef OvalList(text listelist)= CList=image( fill TAlist if print=false : withcolor OrangeListTrois else : withcolor white fi; draw LOCMt; - draw TAlist if print=false : withcolor coefprint*white fi; + draw TAlist if print=false : withcolor coefprint*White fi; ); CList:=CList shifted(-center CList); CList @@ -189,7 +191,7 @@ vardef OvalNb(expr ar)= tanb=OvalBox(ar); Onb=image( fill tanb withcolor white; - draw tanb if print=false : withcolor coefprint*white fi; + draw tanb if print=false : withcolor coefprint*White fi; label(TEX("\barre "&ar),(0,0)); ); Onb @@ -202,7 +204,7 @@ vardef OvalText(expr ar)= TA=OvalBox(ar); $=image(% fill TA withcolor white; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX("\barre "&ar),(0,0)); ); $:=$ shifted(-center $); @@ -216,9 +218,9 @@ vardef OvalOp(text listeop)= LOPop=ColleBoxNew(listeop); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -232,7 +234,7 @@ vardef OvalApp(text listop)= ta=OvalBox(TTap); $=image( fill ta if print=false : withcolor VioletAppTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; draw TTap; ); $:=$ shifted(-center $); @@ -247,7 +249,7 @@ vardef OvalSon(text listop)= ta=OvalBox(TTap); $=image( fill ta if print=false : withcolor SonTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; draw TTap; ); $:=$ shifted(-center $); @@ -264,7 +266,7 @@ vardef OvalMusique(expr ar)= TA=OvalBox(TT); $=image( fill TA if print : withcolor white else : withcolor StyloTrois fi; - draw TT if print=true : withcolor coefprint*white fi; + draw TT if print=true : withcolor coefprint*White fi; ); else: message("La commande --OvalStylo-- n'accepte qu'un argument de type string."); @@ -280,7 +282,7 @@ vardef OvalMouv(expr ar)= ta=OvalBox(TTm); $=image( fill ta if print=false : withcolor BleuMouvTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX("\longbarre "&ar),center ta) if print=false : withcolor blanc fi; ); $ @@ -297,7 +299,7 @@ vardef OvalCapMenu(expr ar)= TAMC=OvalBox(TTm); $=image( fill TAMC if print : withcolor white else : withcolor CapFonceTrois fi; - draw TAMC if print=false : withcolor coefprint*white fi; + draw TAMC if print=false : withcolor coefprint*White fi; label(TEX(TTm),center TAMC); ); $ @@ -312,7 +314,7 @@ vardef OvalCap(text listecap)= Cap=image( fill TAcap if print=false : withcolor CapteurTrois else : withcolor white fi; draw LOCMcap; - draw TAcap if print=false : withcolor coefprint*white fi; + draw TAcap if print=false : withcolor coefprint*White fi; ); Cap:=Cap shifted(-center Cap); Cap @@ -327,7 +329,7 @@ vardef OvalMouvMenu(expr ar)= ta=OvalBox(TTm); $=image( fill ta if print=false : withcolor dBleuMouvTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -341,7 +343,7 @@ vardef OvalAppMenu(expr ar)= ta=OvalBox(TTm); $=image( fill ta if print=false : withcolor FondOvalAppMenu else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -359,7 +361,7 @@ vardef OvalMenuSon(expr ar)= TA=OvalBox(TTm); $=image(% fill TA if print : withcolor white else : withcolor DSonTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm),center TA); ); $ @@ -375,7 +377,7 @@ vardef OvalMenuControle(expr ar)= TA=OvalBox(TTm); $=image( fill TA if print : withcolor white else : withcolor CloneTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -396,7 +398,7 @@ vardef OvalStylo(expr ar)= TA=OvalBox(TT); $=image( fill TA if print : withcolor white else : withcolor OvalStyloTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TT),(0,0)) if print=false : withcolor white fi; ); else: @@ -430,7 +432,7 @@ vardef OvalMenuEvenement(expr ar)= TA=OvalBox(TTm); $=image( fill TA if print : withcolor white else : withcolor MessageTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -445,7 +447,7 @@ vardef RecMouvMenu(expr ar)= ta=RecBox(TTm); $=image( fill ta if print=false : withcolor BleuMouvTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -459,7 +461,7 @@ vardef RecMenuApp(expr ar)= ta=RecBox(TTm); $=image( fill ta if print=false : withcolor VioletAppTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -474,7 +476,7 @@ vardef RecMenuOp(expr ar)= TA=RecBox(TTm); $=image( fill TA if print : withcolor white else : withcolor FondOvalOp fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -488,7 +490,7 @@ vardef RecMenuSon(expr ar)= TA=RecBox(TTm); $=image( fill TA if print : withcolor white else : withcolor SonTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -502,7 +504,7 @@ vardef RecEvenementMenu(expr ar)= ta=RecBox(TTm); $=image( fill ta if print=false : withcolor EvenementTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -516,7 +518,7 @@ vardef RecMenuCap(expr ar)= ta=RecBox(TTm); $=image( fill ta if print=false : withcolor CapteurTrois else: withcolor white fi; - draw ta if print=false : withcolor coefprint*white fi; + draw ta if print=false : withcolor coefprint*White fi; label(TEX(TTm),center ta); ); $ @@ -531,7 +533,7 @@ vardef RecMenuVar(expr ar)= TA=RecBox(TTm); $=image( fill TA if print : withcolor white else : withcolor OrangeTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -546,7 +548,7 @@ vardef RecMenuList(expr ar)= TA=RecBox(TTm); $=image( fill TA if print : withcolor white else : withcolor OrangeListTrois fi; - draw TA if print=false : withcolor coefprint*white fi; + draw TA if print=false : withcolor coefprint*White fi; label(TEX(TTm), center TA); ); $ @@ -599,7 +601,8 @@ vardef ColleBoxNew(text t)=%Pour coller plusieurs boites if string p_: NBCOLLE:=Box(p_); HOLD:=image( - label(TEX("\sffamily\bfseries\longbarre "&p_),(0,0)) if print=false : withcolor white fi;%->ok +% label(TEX("\sffamily\bfseries\longbarre "&p_),(0,0)) if print=false : withcolor white fi;%->ok + label(TEX("\sffamily\barre\bfseries "&p_),(0,0)) if print=false : withcolor white fi;%->ok ); HOLD:=(HOLD shifted ((xpart((center HOLD)-(llcorner HOLD))+LONG,0))); else: @@ -637,7 +640,7 @@ vardef AFFI(expr texta)= cadre=CADRE(texta); picture TEXT; TEXT=image(% - fill cadre withcolor if print=true :coefprint*white else: if unknown ColBloc : white else : ColBloc fi; fi; + fill cadre withcolor if print=true :coefprint*White else: if unknown ColBloc : white else : ColBloc fi; fi; draw texta; draw cadre withcolor CoulLignes; ); @@ -693,7 +696,7 @@ vardef AFFICONTROLE(expr texta)= cadre=CADRECONTROLE(texta); picture TEXT; TEXT=image( - fill cadre withcolor if print=true :coefprint*white else: if unknown ColBloc : white else : ColBloc fi; fi; + fill cadre withcolor if print=true :coefprint*White else: if unknown ColBloc : white else : ColBloc fi; fi; draw texta; draw tracecadre withcolor CoulLignes; ); @@ -734,7 +737,7 @@ vardef AFFIED(expr texta)= cadre=CADREED(texta); picture TEXT; TEXT=image( - fill cadre withcolor if print=true :coefprint*white else: if unknown ColBloc : white else : ColBloc fi; fi; + fill cadre withcolor if print=true :coefprint*White else: if unknown ColBloc : white else : ColBloc fi; fi; draw texta; draw cadre withcolor CoulLignes; ); @@ -1384,10 +1387,10 @@ vardef DoubleNote= save $; picture $; $=image( - draw (((0,0)--(0,18pt)) shifted(-12,-9pt)) withpen pencircle scaled 1bp withcolor if print: coefprint*white else: StyloTrois fi; + draw (((0,0)--(0,18pt)) shifted(-12,-9pt)) withpen pencircle scaled 1bp withcolor if print: coefprint*White else: StyloTrois fi; draw NoteImage shifted((-5,-2)); draw NoteImage shifted((3.5,2)); - draw (((0,0)--(0,18pt)) shifted(12,-9pt)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*white else: (69/255,168/255,140/255) fi;%Trop clair->(14/255,187/255,139/255); + draw (((0,0)--(0,18pt)) shifted(12,-9pt)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*White else: (69/255,168/255,140/255) fi;%Trop clair->(14/255,187/255,139/255); ); $:=$ shifted(-3,0); $ @@ -1435,7 +1438,7 @@ vardef ImageCrayon= picture titi; titi=image(% draw CrayonImage shifted(-12,0); - draw (((0,0)--(0,18pt)) shifted(9,-9)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*white else: (69/255,168/255,140/255) fi;%Trop clair->(14/255,187/255,139/255); + draw (((0,0)--(0,18pt)) shifted(9,-9)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*White else: (69/255,168/255,140/255) fi;%Trop clair->(14/255,187/255,139/255); ); titi enddef; @@ -1574,7 +1577,7 @@ vardef CrayonImage= draw (6.496090,12.082000); drawoptions(); pickup pencircle scaled 0bp; - draw (-3,0)--(-3,18) withcolor if print : coefprint*white else: StyloTrois fi; + draw (-3,0)--(-3,18) withcolor if print : coefprint*White else: StyloTrois fi; pickup pencircle scaled eppen; ); cray:=cray shifted((0,-9pt)); @@ -1598,7 +1601,7 @@ vardef AffichageStop= (ulcorner texto+(0,eb)){dir180}..{dir-90}(ulcorner texto+(-eb,0))--cycle; picture TEXT; TEXT=image( - fill cadre withcolor if print : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; + fill cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; draw texto; draw cadre withcolor CoulLignes; ); @@ -1683,8 +1686,8 @@ cadre=(coindebutbloc[numblocrep]+(0.125,0.125))-- {dir90}(llcorner texto+(0.125,0)+(0,eb))-- cycle; $=image( - fill cadre withcolor if print : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; - draw cadre withcolor if print : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; + fill cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; + draw cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; AA:=ahangle; ahangle:=90; drawarrow (lrcorner texto+(-0.625cm,0.15cm)){dir-15}..{dir90}(urcorner texto+(-0.25cm,-0.1cm)) withpen pencircle scaled2bp if print=false : withcolor white fi; @@ -1798,8 +1801,8 @@ else: cycle; fi; $=image( - fill cadre withcolor if print : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; - draw cadre withcolor if print : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; + fill cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; + draw cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; draw texto; if BlocStopAvant=false: draw (coindebutbloc[numblocrep]+(0.0625+0.5cm,0)+(eb,0)){dir180}.. @@ -1908,8 +1911,8 @@ vardef Sinon= cycle; fi; $=image( - fill cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; - draw cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi; + fill cadre withcolor if print=true : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; + draw cadre withcolor if print=true : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi; if print: label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto))); else: @@ -2303,7 +2306,7 @@ vardef AffichageBlocDef= cycle; picture TEXT; TEXT=image( - fill cadre withcolor if print : coefprint*white else : BlocTrois fi;%if unknown colBloc : DarkPurple else: colBloc fi fi; + fill cadre withcolor if print : coefprint*White else : BlocTrois fi;%if unknown colBloc : DarkPurple else: colBloc fi fi; draw texto; draw cadre withcolor CoulLignes; ); @@ -2662,7 +2665,7 @@ vardef CameraImage= fill (cc shifted(B+(10,3*k))) withcolor coul[k]; draw (cc shifted(B+(10,3*k))) withcolor 0.95*coul[k]; endfor; - draw ((-3,0)--(-3,18)) withcolor if print : coefprint*white else: StyloTrois fi; + draw ((-3,0)--(-3,18)) withcolor if print : coefprint*White else: StyloTrois fi; pickup pencircle scaled eppen; ); $:=$ scaled 0.8; @@ -2674,7 +2677,7 @@ vardef ImageCamera= picture titi; titi=image( draw CameraImage shifted(-12,-5); - draw (((0,0)--(0,18pt)) shifted(9,-9)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*white else: (69/255,168/255,140/255) fi; + draw (((0,0)--(0,18pt)) shifted(9,-9)) withpen pencircle scaled 1bp withcolor if print: 0.5*coefprint*White else: (69/255,168/255,140/255) fi; ); titi enddef; @@ -2734,7 +2737,7 @@ vardef VideoSur(expr nbpas,xa)= path ta; ta=OvalBox(texto); $=image( - fill ta withcolor if print: coefprint*white else: StyloTrois fi; + fill ta withcolor if print: coefprint*White else: StyloTrois fi; draw ta withcolor CoulLignes; %label(TEX(TTm),center ta) if print=false : withcolor blanc fi; draw texto; @@ -2924,9 +2927,9 @@ vardef OpAdd(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$+$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -2939,9 +2942,9 @@ vardef OpSous(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$-$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -2954,9 +2957,9 @@ vardef OpMul(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$\times$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -2969,9 +2972,9 @@ vardef OpMulS(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$*$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -2984,9 +2987,9 @@ vardef OpDiv(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$\div$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -2999,9 +3002,9 @@ vardef OpDivS(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$/$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3014,9 +3017,9 @@ vardef OpModulo(expr pasun,pasdeux)= LOPop=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"modulo",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3029,9 +3032,9 @@ vardef OpAlea(expr pasun,pasdeux)= LOPop=ColleBoxNew("nombre aléatoire entre",if string pasun : OvalNb(pasun) else: pasun fi,"et",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3044,9 +3047,9 @@ vardef OpRegrouper(expr pasun,pasdeux)= LOPop=ColleBoxNew("regrouper",if string pasun : OvalNb(pasun) else: pasun fi,"et",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3059,9 +3062,9 @@ vardef OpLettre(expr pasun,pasdeux)= LOPop=ColleBoxNew("lettre",if string pasun : OvalNb(pasun) else: pasun fi,"de",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3074,9 +3077,9 @@ vardef OpLongueur(expr pasun)= LOPop=ColleBoxNew("longueur de",if string pasun : OvalNb(pasun) else: pasun fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3089,9 +3092,9 @@ vardef OpArrondi(expr pasun)= LOPop=ColleBoxNew("arrondi de",if string pasun : OvalNb(pasun) else: pasun fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3104,9 +3107,9 @@ vardef OpFonction(expr pasun,pasdeux)= LOPop=ColleBoxNew(RecMenuOp(pasun),"de",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAao=OvalBox(LOPop); Oop=image( - fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAao if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LOPop; - draw TAao if print=false : withcolor coefprint*white fi; + draw TAao if print=false : withcolor coefprint*White fi; ); Oop:=Oop shifted(-center Oop); Oop @@ -3119,9 +3122,9 @@ vardef TestOpSup(expr pasun, pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$>$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3134,9 +3137,9 @@ vardef TestOpInf(expr pasun, pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$<$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3149,9 +3152,9 @@ vardef TestOpEgal(expr pasun, pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"$=$",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3164,9 +3167,9 @@ vardef TestOpEt(expr pasun, pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"et",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3179,9 +3182,9 @@ vardef TestOpOu(expr pasun, pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"ou",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3194,9 +3197,9 @@ vardef TestOpNon(expr pasun)= LTa=ColleBoxNew("non",if string pasun : OvalNb(pasun) else: pasun fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3209,9 +3212,9 @@ vardef TestOpContient(expr pasun,pasdeux)= LTa=ColleBoxNew(if string pasun : OvalNb(pasun) else: pasun fi,"contient",if string pasdeux : OvalNb(pasdeux) else: pasdeux fi,"?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor FondOvalOp else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3224,9 +3227,9 @@ vardef AppCostume(expr pasun)= LTa=ColleBoxNew(RecMenuApp(pasun),"du costume"); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor VioletAppTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor VioletAppTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3239,9 +3242,9 @@ vardef AppAP(expr pasun)= LTa=ColleBoxNew(RecMenuApp(pasun),"de l'arrière-plan"); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor VioletAppTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor VioletAppTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3254,9 +3257,9 @@ vardef CapDistance(expr pasun)= LTa=ColleBoxNew("distance de",OvalCapMenu(pasun)); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3269,9 +3272,9 @@ vardef CapTemps(expr pasun)= LTa=ColleBoxNew(RecMenuCap(pasun),"actuelle"); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3284,9 +3287,9 @@ vardef CapNumero(expr pasun,pasdeux)= LTa=ColleBoxNew(RecMenuCap(pasun),"de",OvalCapMenu(pasdeux)); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3299,9 +3302,9 @@ vardef TestCapToucheObjet(expr pasun)= LTa=ColleBoxNew("touche le",OvalCapMenu(pasun),"?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3314,9 +3317,9 @@ vardef TestCapCouleur(expr pasun)= LTa=ColleBoxNew("couleur",OvalCouleur(redpart(pasun),greenpart(pasun),bluepart(pasun)),"touchée ?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3329,9 +3332,9 @@ vardef TestCapCouleurs(expr pasun,pasdeux)= LTa=ColleBoxNew("couleur",OvalCouleur(redpart(pasun),greenpart(pasun),bluepart(pasun)),"touche",OvalCouleur(redpart(pasdeux),greenpart(pasdeux),bluepart(pasdeux)),"?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3344,9 +3347,9 @@ vardef TestCapTouche(expr pasun)= LTa=ColleBoxNew("touche",OvalMenuCap(pasun),"pressée ?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3359,9 +3362,9 @@ vardef TestCapSouris= LTa=ColleBoxNew("souris pressée ?"); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor CapteurTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3374,9 +3377,9 @@ vardef TestListeContient(expr nbpas,nbbas)= LTa=ColleBoxNew(RecMenuList(nbpas),"contient",if string nbbas:OvalNb(nbbas) else: nbbas fi); TAa=DiamondBox(LTa); $=image( - fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3389,9 +3392,9 @@ vardef ListeElement(expr nbpas,nbbas)= LTa=ColleBoxNew("élément",if string nbpas:OvalNb(nbpas) else: nbpas fi,"de",RecMenuList(nbbas)); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3404,9 +3407,9 @@ vardef ListePosition(expr nbpas,nbbas)= LTa=ColleBoxNew("position de",if string nbpas:OvalNb(nbpas) else: nbpas fi,"de",RecMenuList(nbbas)); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ @@ -3419,9 +3422,9 @@ vardef ListeLongueur(expr nbpas)= LTa=ColleBoxNew("longueur de",RecMenuList(nbpas)); TAa=OvalBox(LTa); $=image( - fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*white fi; + fill TAa if print=false : withcolor OrangeListTrois else : withcolor coefprint*White fi; draw LTa; - draw TAa if print=false : withcolor coefprint*white fi; + draw TAa if print=false : withcolor coefprint*White fi; ); $:=$ shifted(-center $); $ diff --git a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp index 765533109d..5cc17755a1 100644 --- a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp +++ b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp @@ -125,7 +125,8 @@ vardef Projette(expr M)= % (Ypart(M)+0.5*cosd(30)*Xpart(M),Zpart(M)+0.5*sind(30)*Xpart(M))*20%Good avec Theta=-20/Phi=-10 %(Ypart(GCoord(M))+0.5*cosd(-30)*Xpart(GCoord(M)),Zpart(GCoord(M))+0.5*sind(-30)*Xpart(GCoord(M)))*20%Good avec Theta=-20/Phi=-10 % (Xpart(GCoord(M))*cosd(90-30),Ypart(GCoord(M))*sind(90-30)*0.5)*DE%à garder peut-être ? - (Xpart(GCoordcabinet(M)),Ypart(GCoordcabinet(M)))*DE% +% (Xpart(GCoordcabinet(M)),Ypart(GCoordcabinet(M)))*DE%<-last good :) + ((Xpart(GCoordcabinet(M)),Ypart(GCoordcabinet(M)))/Zpart(GCoordcabinet(M)))*DE %(Zpart(GCoord(M))+0.5*cosd(-30)*Ypart(GCoord(M)),Xpart(GCoord(M))+0.5*sind(-30)*Ypart(GCoord(M)))*20 % (0.5*cosd(45)*Xpart(GCoord(M)),0.5*sind(45)*Ypart(GCoord(M)))*unit*DE % (Xpart(GCoord(M)),Ypart(GCoord(M)))*unit*DE |