X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=src%2FControle.mp;h=34141a9b46418ba5221236c6bc244213a7032524;hb=8d8c8c55e311b3a860346b65b90ca7984390c81c;hp=e1a756a2dbe0aa0c0c5639066ec06534848ed043;hpb=98510de4ba0aff4f5d97eb29ee7779abe9c6b47c;p=mp-scratch.git

diff --git a/src/Controle.mp b/src/Controle.mp
index e1a756a..34141a9 100644
--- a/src/Controle.mp
+++ b/src/Controle.mp
@@ -13,7 +13,8 @@ vardef AffiControle=
     (ulcorner texto+(0,eb))--(ulcorner texto+(-eb,0))--cycle;
   picture TEXT;
   TEXT=image(
-    fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
+      fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
+    draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   draw (llcorner texto+(-eb,-eb))--
     (ulcorner texto+(-eb,0))--
     (ulcorner texto+(0,eb))--
@@ -155,7 +156,8 @@ vardef FinBlocRepeter[](expr tps)=
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(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))--
@@ -173,8 +175,9 @@ cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0
 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))--
@@ -188,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);
@@ -206,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))--
@@ -215,12 +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))--
@@ -229,9 +235,11 @@ $=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);
 $
 enddef;
 
@@ -260,7 +268,8 @@ vardef FinBlocSi[]=
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(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))--
@@ -278,7 +287,8 @@ cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0
 bloctest:=false;
 $=image(
     fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
-  draw (coindebutbloc@+(0.5cm+eb,0))--
+  draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
+  draw (coindebutbloc@+(0.125+0.5cm+eb,0.1875))--
     (coindebutbloc@+(0.5cm,-eb))--
     (ulcorner texto+(0.5cm,eb))--
     (ulcorner texto+(0.5cm+eb,0))--
@@ -292,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);
@@ -310,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))--
@@ -327,6 +338,7 @@ cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--
 bloctest:=false;
 $=image(
     fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
+  draw cadre withcolor if unknown colControle : LightOrange else : colControle fi;
   draw texto;
   draw (coindebutbloc@+(0.5cm,0)+(eb,0))--
     (coindebutbloc@+(0.5cm,0)+(0,-eb))--
@@ -339,12 +351,13 @@ $=image(
     (llcorner texto+(0.125+1.125cm,0)+(2eb,0))--
     (llcorner texto+(0.125+1.125cm,0)+(eb,-eb))--
     (llcorner texto+(0.125+0.875cm,0)+(eb,-eb))--
-    (llcorner texto+(0.125+0.875cm,0));
-  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0));
+    (llcorner texto+(0.125+0.875cm,0))--
+    (llcorner texto+(eb+0.5cm,0));
+  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0.125));
   );
 _coinprec:=(llcorner $)+(0.5cm,0);
 _coinprec:=_coinprec+(0,eb);
-coindebutbloc[@]:=(llcorner $)+(0,eb);
+coindebutbloc[@]:=(llcorner $)+(0,eb+0.125);
 $
 enddef;
 
@@ -383,7 +396,7 @@ vardef Stop(expr test)=
   );
 $=AffichageStop shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageStop);
 _coinprec:=(llcorner $);
-_coinprec:=_coinprec+(0,eb);
+%_coinprec:=_coinprec+(0,eb);
  $
 enddef;