Affichage amélioré des boucles et tests.

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

diff --git a/src/Controle.mp b/src/Controle.mp
index 88c7814..34141a9 100644 (file)
--- a/src/Controle.mp
+++ b/src/Controle.mp
@@ -156,7 +156,8 @@ vardef FinBlocRepeter[](expr tps)=
   labeloffset:=3;
   );
 path cadre;
-cadre=(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm+eb,0))--
+cadre=(coindebutbloc@+(0.125,0.125))--
+  (coindebutbloc@+(0.0625+0.5cm+eb,0.125))--
   (coindebutbloc@+(0.5cm,-eb))--
   (ulcorner texto+(0.5cm,eb))--
   (ulcorner texto+(0.5cm+eb,0))--
@@ -176,7 +177,7 @@ $=image(
     fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   label.lft(LATEX("$\color{white}\raisebox{-0.5pt}{\hbox{$\bm{\_\!\_}$}}\!\!\!\!\bm{\uparrow}$"),0.5[lrcorner texto,urcorner texto]);
-  draw (coindebutbloc@+(0.5cm+eb,0))--
+  draw (coindebutbloc@+(0.125+0.5cm+eb,0.1875))--
     (coindebutbloc@+(0.5cm,-eb))--
     (ulcorner texto+(0.5cm,eb))--
     (ulcorner texto+(0.5cm+eb,0))--
@@ -190,7 +191,7 @@ $=image(
     (llcorner texto+(0.125+0.375cm,0))--
     (llcorner texto+(0.125,0)+(eb,0))--
     (llcorner texto+(0.125,0)+(0,eb))--
-    (coindebutbloc@+(0.125,0));
+    (coindebutbloc@+(0.125,0.25));
   );
 _coinprec:=(llcorner $);
 _coinprec:=_coinprec+(0,eb);
@@ -208,7 +209,8 @@ vardef FinBlocRepeterI[](expr tps)=
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0)+(0,eb))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm+eb,0))--
+cadre=(coindebutbloc@+(0.125,0.125))--
+  (coindebutbloc@+(0.0625+0.5cm+eb,0.125))--
   (coindebutbloc@+(0.5cm,-eb))--
   (ulcorner texto+(0.5cm,eb))--
   (ulcorner texto+(0.5cm+eb,0))--
@@ -217,13 +219,14 @@ cadre=(llcorner texto+(0.125,0)+(0,eb))--(coindebutbloc@+(0.125,0))--(coindebutb
   (lrcorner texto+(0,eb))--
   (lrcorner texto+(-eb,0))--
   (llcorner texto+(0.125,0)+(eb,0))--
+  (llcorner texto+(0.125,0)+(0,eb))--
   cycle;
 bloctest:=false;
 $=image(
     fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   label.lft(LATEX("$\color{white}\raisebox{-0.5pt}{\hbox{$\bm{\_\!\_}$}}\!\!\!\!\bm{\uparrow}$"),0.5[lrcorner texto,urcorner texto]);
-  draw (coindebutbloc@+(0.5cm+eb,0))--
+  draw (coindebutbloc@+(0.125+0.5cm+eb,0.1875))--
     (coindebutbloc@+(0.5cm,-eb))--
     (ulcorner texto+(0.5cm,eb))--
     (ulcorner texto+(0.5cm+eb,0))--
@@ -232,7 +235,8 @@ $=image(
   (lrcorner texto+(0,eb))--
   (lrcorner texto+(-eb,0))--
   (llcorner texto+(0.125,0)+(eb,0))--
-  (llcorner texto+(0.125,0)+(0,eb))--(coindebutbloc@+(0.125,0));
+    (llcorner texto+(0.125,0)+(0,eb))--
+    (coindebutbloc@+(0.125,0.25));
   );
 _coinprec:=(llcorner $);
 _coinprec:=_coinprec+(0,eb);
@@ -264,7 +268,8 @@ vardef FinBlocSi[]=
   labeloffset:=3;
   );
 path cadre;
-cadre=(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm+eb,0))--
+cadre=(coindebutbloc@+(0.125,0.125))--
+  (coindebutbloc@+(0.0625+0.5cm+eb,0.125))--
   (coindebutbloc@+(0.5cm,-eb))--
   (ulcorner texto+(0.5cm,eb))--
   (ulcorner texto+(0.5cm+eb,0))--
@@ -283,7 +288,7 @@ bloctest:=false;
 $=image(
     fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
-  draw (coindebutbloc@+(0.5cm+eb,0))--
+  draw (coindebutbloc@+(0.125+0.5cm+eb,0.1875))--
     (coindebutbloc@+(0.5cm,-eb))--
     (ulcorner texto+(0.5cm,eb))--
     (ulcorner texto+(0.5cm+eb,0))--
@@ -297,7 +302,7 @@ $=image(
     (llcorner texto+(0.125+0.375cm,0))--
     (llcorner texto+(0.125,0)+(eb,0))--
     (llcorner texto+(0.125,0)+(0,eb))--
-    (coindebutbloc@+(0.125,0));
+    (coindebutbloc@+(0.125,0.25));
   );
 _coinprec:=(llcorner $);
 _coinprec:=_coinprec+(0,eb);
@@ -315,8 +320,9 @@ vardef Sinon[]=
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--
-  (coindebutbloc@+(0.5cm,0)+(eb,0))--
+cadre=(llcorner texto+(0.125,0))--
+  (coindebutbloc@+(0.125,0.125))--
+  (coindebutbloc@+(0.0625+0.5cm,0)+(eb,0.125))--
   (coindebutbloc@+(0.5cm,0)+(0,-eb))--
   (ulcorner texto+(0.5cm,0)+(0,eb))--
   (ulcorner texto+(0.5cm,0)+(eb,0))--
@@ -347,7 +353,7 @@ $=image(
     (llcorner texto+(0.125+0.875cm,0)+(eb,-eb))--
     (llcorner texto+(0.125+0.875cm,0))--
     (llcorner texto+(eb+0.5cm,0));
-  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0));
+  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0.125));
   );
 _coinprec:=(llcorner $)+(0.5cm,0);
 _coinprec:=_coinprec+(0,eb);