X-Git-Url: https://melusine.eu.org/syracuse/G/git/?p=mp-scratch.git;a=blobdiff_plain;f=src%2FApparence.mp;h=ed7a6d83f1c623334f9acd8c0dc92d224507794a;hp=c2fef6506aefdd2cc6210666e401cbe94ad3db3d;hb=98510de4ba0aff4f5d97eb29ee7779abe9c6b47c;hpb=45b57c4a264c463c8a0d5cd71ba351c6782804b3

diff --git a/src/Apparence.mp b/src/Apparence.mp
index c2fef65..ed7a6d8 100644
--- a/src/Apparence.mp
+++ b/src/Apparence.mp
@@ -1,11 +1,21 @@
 vardef AffichageA=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+  cadre=(llcorner texto+(-eb,0))--(llcorner texto+(0,-eb))--
+    (llcorner texto+(0.375cm,0)+(-eb,-eb))--
+    (llcorner texto+(0.375cm,0)+(0,-2eb))--
+    (llcorner texto+(0.625cm,0)+(0,-2eb))--
+    (llcorner texto+(0.625cm,0)+(eb,-eb))--
+    (lrcorner texto+(0,-eb))--(lrcorner texto+(eb,0))--(urcorner texto+(eb,0))--(urcorner texto+(0,eb))--
+    (ulcorner texto+(0.625cm,0)+(eb,eb))--
+    (ulcorner texto+(0.625cm,0))--
+    (ulcorner texto+(0.375cm,0))--
+    (ulcorner texto+(0.375cm,0)+(-eb,eb))--
+    (ulcorner texto+(0,eb))--(ulcorner texto+(-eb,0))--cycle;
   picture TEXT;
   TEXT=image(
-      fill cadre withcolor LightViolet;
+      fill cadre withcolor if unknown colAp : LightViolet else: colAp fi;
     draw texto;
-    draw (llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+    draw cadre;
     );
   TEXT
 enddef;
@@ -14,10 +24,11 @@ vardef DireT(expr phrase,tps)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Dire \colorbox{white}{\textcolor{black}{"&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}dire \colorbox{white}{\textcolor{black}{\normalfont "&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -25,10 +36,11 @@ vardef Dire(expr phrase)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Dire \colorbox{white}{\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}dire \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -36,10 +48,11 @@ vardef PenserT(expr phrase,tps)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Penser \colorbox{white}{\textcolor{black}{"&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}penser \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}} pendant \colorbox{white}{\textcolor{black}{"&if numeric tps:decimal(tps)&"}}" else: tps fi&" secondes"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -47,10 +60,11 @@ vardef Penser(expr phrase)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Penser \colorbox{white}{\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}penser \colorbox{white}{\normalfont\textcolor{black}{"&phrase&"}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -58,10 +72,11 @@ vardef Montrer=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Montrer"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} montrer"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -69,10 +84,11 @@ vardef Cacher=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Cacher"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} cacher"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -80,10 +96,11 @@ vardef Basculer(expr costume)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Basculer sur le costume "&costume&""),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} basculer sur le costume "&costume&""),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -91,10 +108,11 @@ vardef CostumeSuivant=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Costume suivant"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} costume suivant"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -102,10 +120,11 @@ vardef BasculerAR(expr costume)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Basculer sur l'arrière-plan "&costume&""),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} basculer sur l'arrière-plan "&costume&""),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -113,10 +132,11 @@ vardef AjouterEffet(expr costume,nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Ajouter à l'effet "&costume&" "& if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} ajouter à l'effet "&costume&" "& if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -124,10 +144,11 @@ vardef MettreEffet(expr costume,nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Mettre l'effet "&costume&" à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} mettre l'effet "&costume&" à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -135,10 +156,11 @@ vardef AnnulerEffet=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Annuler les effets graphiques"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} annuler les effets graphiques"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -146,10 +168,11 @@ vardef AjouterTaille(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Ajouter \colorbox{white}{\textcolor{black}{"&if numeric nb:decimal(nb)&"}}" else:nb fi&" à la taille"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} ajouter \colorbox{white}{\textcolor{black}{"&if numeric nb:decimal(nb)&"}}" else:nb fi&" à la taille"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -157,10 +180,11 @@ vardef MettreA(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Mettre à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&"~\%\ de la taille initiale"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} mettre à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&"~\%\ de la taille initiale"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -168,10 +192,11 @@ vardef AllerPPlan=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Aller au premier plan"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} aller au premier plan"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -179,10 +204,11 @@ vardef DeplacerAP(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Déplacer de "&      if numeric nb:&"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb&" plans arrière"),if unknown _coinprec: (0,0) else:_coinprec fi
+      label.lrt(LATEX("\bfseries\color{white} déplacer de "&      if numeric nb:&"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb&" plans arrière"),if unknown _coinprec: (0,0) else:_coinprec fi
 	);
     );
   $=AffichageA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageA);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;