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

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

diff --git a/src/Sons.mp b/src/Sons.mp
index e290e59..a657873 100644 (file)
--- a/src/Sons.mp
+++ b/src/Sons.mp
@@ -1,11 +1,21 @@
 vardef AffichageSon=
   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 DarkPink;
+      fill cadre withcolor if unknown colSon : DarkPink else: colSon 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 Jouer(expr phrase)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Jouer le son \colorbox{LightPink}{\textcolor{white}{"&phrase&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}jouer le son {\colorbox{LightPink}{\normalfont\textcolor{white}{"&phrase&" \tiny\textcolor{black}{$\blacktriangledown$}}}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -25,10 +36,11 @@ vardef JouerT(expr phrase)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Jouer le son \colorbox{LightPink}{\textcolor{white}{"&phrase&" \tiny\textcolor{black}{$\blacktriangledown$}}} jusqu'au bout"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}jouer le son {\normalfont\colorbox{LightPink}{\textcolor{white}{"&phrase&" \tiny\textcolor{black}{$\blacktriangledown$}}}} jusqu'au bout"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -36,10 +48,11 @@ vardef ArreterSon=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Arrêter tous les sons"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}arrêter tous les sons"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -47,10 +60,11 @@ vardef Tambour(expr nb,tps)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Jouer du tambour "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny$\blacktriangledown$}}" else: nb fi&" pendant "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}jouer du tambour "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny$\blacktriangledown$}}" else: nb fi&" pendant "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -58,10 +72,11 @@ vardef Pause(expr tps)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Faire une pause pour "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}faire une pause pour "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -69,10 +84,11 @@ vardef JouerNote(expr nb,tps)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Jouer la note "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny\textcolor{black}{$\blacktriangledown$}}}" else : nb fi&" pendant "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}jouer la note "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny\textcolor{black}{$\blacktriangledown$}}}" else : nb fi&" pendant "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" temps"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -80,10 +96,11 @@ vardef ChoisirInstrument(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Choisir l'instrument \no "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny$\blacktriangledown$}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}choisir l'instrument \no "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&" \tiny$\blacktriangledown$}}" else: nb fi&""),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -91,10 +108,11 @@ vardef AjouterVol(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Ajouter "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&" au volume"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}ajouter "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&" au volume"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -102,10 +120,11 @@ vardef MettreVol(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Mettre le volume au niveau "&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 le volume au niveau "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&"~\%"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -113,10 +132,11 @@ vardef AjouterTempo(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Ajouter "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&" au tempo"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}ajouter "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&" au tempo"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -124,10 +144,11 @@ vardef MettreTempo(expr nb)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Mettre le tempo à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&"~bpm"),if unknown _coinprec: (0,0) else:_coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}mettre le tempo à "&if numeric nb:"\colorbox{white}{\textcolor{black}{"&decimal(nb)&"}}" else: nb fi&"~bpm"),if unknown _coinprec: (0,0) else:_coinprec fi);
   );
 $=AffichageSon shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageSon);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;