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

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

diff --git a/src/Variable.mp b/src/Variable.mp
index b191e71..17c1e01 100644 (file)
--- a/src/Variable.mp
+++ b/src/Variable.mp
@@ -1,23 +1,43 @@
 vardef AffichageVar=
   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 Orange;
+    fill cadre withcolor if unknown colVar : Orange else: colVar 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 AffichageLis=
   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 DarkOrange;
+      fill cadre withcolor if unknown colList : DarkOrange else: colList 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;
@@ -26,10 +46,11 @@ vardef MettreVar(expr nomvar,nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Mettre \colorbox{DarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} à "&if numeric nbpas : "\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi&""),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}mettre \colorbox{DarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} à "&if numeric nbpas : "\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi&""),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageVar shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -37,10 +58,11 @@ vardef AjouterVar(expr nomvar,nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Ajouter à \colorbox{DarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} "&if numeric nbpas : "\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi &""),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}ajouter à \colorbox{DarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} "&if numeric nbpas : "\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&"}}" else: nbpas fi &""),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageVar shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -48,10 +70,11 @@ vardef MontrerVar(expr nomvar)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Montrer la variable \colorbox{DarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}montrer la variable \colorbox{DarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageVar shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -59,10 +82,11 @@ vardef CacherVar(expr nomvar)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Cacher la variable \colorbox{DarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}cacher la variable \colorbox{DarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageVar shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -70,10 +94,11 @@ vardef AjouterList(expr nomvar,nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Ajouter "&nomvar&" à \colorbox{dDarkOrange}{\textcolor{white}{"&nbpas&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}ajouter "&nomvar&" à \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nbpas&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -81,10 +106,11 @@ vardef SupprimerList(expr nomvar,nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Supprimer l'élément "&if numeric nomvar : "\colorbox{white}{\textcolor{black}{"&decimal(nomvar)&" \tiny$\blacktriangledown$}}" else : nomvar fi&" de la liste \colorbox{dDarkOrange}{\textcolor{white}{"&nbpas&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}supprimer l'élément "&if numeric nomvar : "\colorbox{white}{\textcolor{black}{"&decimal(nomvar)&" \tiny$\blacktriangledown$}}" else : nomvar fi&" de la liste \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nbpas&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -92,10 +118,11 @@ vardef InsererList(expr nomelmt,nbpas,nomvar)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Insérer "&nomelmt&" en position "&if numeric nbpas:"\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&" \tiny$\blacktriangledown$}}" else: nbpas fi&" de la liste \colorbox{dDarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}insérer "&nomelmt&" en position "&if numeric nbpas:"\colorbox{white}{\textcolor{black}{"&decimal(nbpas)&" \tiny$\blacktriangledown$}}" else: nbpas fi&" de la liste \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -103,10 +130,11 @@ vardef RemplacerList(expr nomelmt,nomvar,nbpas)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Remplacer l'élément "&if numeric nomelmt:"\colorbox{white}{\textcolor{black}{"&decimal(nomelmt)&" \tiny$\blacktriangledown$}}" else: nomelmt fi&" de la liste \colorbox{dDarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} par "&nbpas&""),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}remplacer l'élément "&if numeric nomelmt:"\colorbox{white}{\textcolor{black}{"&decimal(nomelmt)&" \tiny$\blacktriangledown$}}" else: nomelmt fi&" de la liste \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}} par "&nbpas&""),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -114,10 +142,11 @@ vardef MontrerList(expr nomvar)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Montrer la liste \colorbox{dDarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}montrer la liste \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
@@ -125,11 +154,12 @@ vardef CacherList(expr nomvar)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white}Cacher la liste \colorbox{dDarkOrange}{\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white}cacher la liste \colorbox{dDarkOrange}{\normalfont\textcolor{white}{"&nomvar&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageLis shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner Affichage);
-  _coinprec:=llcorner $;
+_coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
   $
 enddef;
 
-
+endinput;