Modifications (couleurs, chanfreins...) pour un rapprochement vers Scratch

[mp-scratch.git] / src / Evenements.mp

diff --git a/src/Evenements.mp b/src/Evenements.mp
index 0a5438d..3630d0a 100644 (file)
--- a/src/Evenements.mp
+++ b/src/Evenements.mp
@@ -1,36 +1,60 @@
 vardef AffichageE=
   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 LightMarron;
+    fill cadre withcolor if unknown colEvenements : LightMarron else: colEvenements 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;
 
 vardef AffichageED=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--1/4[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir120}..{dir-120}(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))--
+    1/2[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir150}..{dir-150}(ulcorner texto+(-eb,eb))--cycle;
   picture TEXT;
   TEXT=image(
-    fill cadre withcolor LightMarron;
+    fill cadre withcolor if unknown colEvenements : LightMarron else: colEvenements fi;
     draw texto;
     draw DrapeauImage shifted((llcorner texto+(1.45cm,0.125cm))-(72.000000,699));
-    draw (llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--1/4[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir120}..{dir-120}(ulcorner texto+(-eb,eb))--cycle;
+    draw cadre;
     );
   TEXT
 enddef;
 
 vardef AffichageEA=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--1/4[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir120}..{dir-120}(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))--
+    1/2[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir150}..{dir-150}(ulcorner texto+(-eb,eb))--cycle;
   picture TEXT;
   TEXT=image(
-    fill cadre withcolor LightMarron;
+    fill cadre withcolor if unknown colEvenements : LightMarron else: colEvenements fi;
     draw texto;
-    draw (llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--1/4[ulcorner texto+(-eb,eb),urcorner texto+(eb,eb)]{dir120}..{dir-120}(ulcorner texto+(-eb,eb))--cycle;
+    draw cadre;
     );
   TEXT
 enddef;
@@ -39,65 +63,71 @@ vardef Drapeau=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries{\color{white}Quand }\includegraphics{Drapeau.1} {\color{white}est cliqué}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries{\color{white}quand}\raisebox{-0.6em}{\hbox{\includegraphics{Drapeau.1}}}\hbox to1em{} {\color{white}est cliqué}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageED shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageED);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-vardef Presse(expr touche)=
+vardef QPresse(expr touche)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Quand \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} est pressé"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}quand \colorbox{DarkMarron}{\normalfont\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} est pressé"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageEA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEA);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-vardef LutinPresse=
+vardef QLutinPresse=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Quand ce lutin est cliqué"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}quand ce lutin est cliqué"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageEA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEA);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-vardef BasculeAR(expr touche)=
+vardef QBasculeAR(expr touche)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Quand l'arrière-plan bascule sur \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}quand l'arrière-plan bascule sur \colorbox{DarkMarron}{\normalfont\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageEA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEA);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-vardef VolumeSup(expr touche,vol)=
+vardef QVolumeSup(expr touche,vol)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Quand \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} $\,\bm{>}\,$ "&if numeric vol:"\colorbox{white}{\textcolor{black}{"&decimal(vol)&"}}" else: vol fi&""),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}quand \colorbox{DarkMarron}{\textcolor{white}{\normalfont "&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} $\,\bm{>}\,$ "&if numeric vol:"\colorbox{white}{\textcolor{black}{"&decimal(vol)&"}}" else: vol fi&""),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageEA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEA);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-vardef RecevoirMessage(expr touche)=
+vardef QRecevoirMessage(expr touche)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Quand je reçois \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}quand je reçois \colorbox{DarkMarron}{\textcolor{white}{\normalfont "&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageEA shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEA);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -105,10 +135,11 @@ vardef EnvoyerMessage(expr touche)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Envoyer à tous \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}envoyer à tous \colorbox{DarkMarron}{\textcolor{white}{\normalfont "&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageE shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageE);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -116,10 +147,11 @@ vardef EnvoyerMessageA(expr touche)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Envoyer à tous \colorbox{DarkMarron}{\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} et attendre"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}envoyer à tous \colorbox{DarkMarron}{\normalfont\textcolor{white}{"&touche&" \tiny\textcolor{black}{$\blacktriangledown$}}} et attendre"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageE shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageE);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;