X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=src%2FControle.mp;h=34141a9b46418ba5221236c6bc244213a7032524;hb=350918270324d171c9b7fc6bfb9ffc0c1302eef7;hp=3283194bd9a704ade5514d0d018ec86d0073ba1a;hpb=d1da8f97659ac2b8d9639c5cd930730e9ad0e037;p=mp-scratch.git

diff --git a/src/Controle.mp b/src/Controle.mp
index 3283194..34141a9 100644
--- a/src/Controle.mp
+++ b/src/Controle.mp
@@ -1,10 +1,36 @@
 vardef AffiControle=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+  cadre=(llcorner texto+(-eb,-eb))--%(llcorner texto+(0,-eb))--
+    (llcorner texto+(0.875cm,0)+(-eb,-eb))--
+    (llcorner texto+(0.875cm,0)+(0,-2eb))--
+    (llcorner texto+(1.125cm,0)+(0,-2eb))--
+    (llcorner texto+(1.125cm,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 LightOrange;
-    draw (llcorner texto+(-eb,-eb))--(ulcorner texto+(-eb,eb))--(urcorner texto+(eb,eb))--(lrcorner texto+(eb,-eb))--(llcorner texto+(0.5cm-eb,-eb));
+      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))--
+    (ulcorner texto+(0.375cm,0)+(-eb,eb))--
+    (ulcorner texto+(0.375cm,0))--
+    (ulcorner texto+(0.625cm,0))--
+    (ulcorner texto+(0.625cm,0)+(eb,eb))--
+    (urcorner texto+(0,eb))--
+    (urcorner texto+(eb,0))--
+    (lrcorner texto+(eb,0))--
+    (lrcorner texto+(0,-eb))--
+    (llcorner texto+(1.125cm,0)+(eb,-eb))--
+    (llcorner texto+(1.125cm,0)+(0,-2eb))--
+    (llcorner texto+(0.875cm,0)+(0,-2eb))--
+    (llcorner texto+(0.875cm,0)+(-eb,-eb))--
+    (llcorner texto+(0.5cm,-eb));
     if bloctest=true:
       draw texto;% withcolor white;
     fi;
@@ -14,24 +40,63 @@ enddef;
 
 vardef AffichageCN=
   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 LightOrange;
+      fill cadre withcolor if unknown colControle : LightOrange else : colControle 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 AffichageStop=
+  path cadre;
+  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 if unknown colControle : LightOrange else : colControle fi;
+    draw texto;
+    draw cadre;
     );
   TEXT
 enddef;
 
 vardef AffichageEC=
   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 LightOrange;
+    fill cadre withcolor if unknown colControle : LightOrange else : colControle 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;
@@ -43,11 +108,12 @@ vardef Repeter[](expr tps)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Répéter "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" fois"),(0,0));
+    label(LATEX("\bfseries\color{white}répéter "&if numeric tps:"\colorbox{white}{\textcolor{black}{"&decimal(tps)&"}}" else: tps fi&" fois"),(0,0));
   );
 $=AffiControle shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffiControle);
 _coinprec:=(llcorner $)+(0.5cm,0);
-coindebutbloc@:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+coindebutbloc@:=(llcorner $)+(0,eb);
  $
 enddef;
 
@@ -56,11 +122,12 @@ vardef RepeterI[]=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Répéter indéfiniment"),(0,0));
+    label(LATEX("\bfseries\color{white}répéter indéfiniment"),(0,0));
   );
 $=AffiControle shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffiControle);
 _coinprec:=(llcorner $)+(0.5cm,0);
-coindebutbloc@:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+coindebutbloc@:=(llcorner $)+(0,eb);
  $
 enddef;
 
@@ -69,11 +136,12 @@ vardef RepeterJ[](expr test)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Répéter jusqu'à "&test&""),(0,0));
+    label(LATEX("\bfseries\color{white}répéter jusqu'à "&test&""),(0,0));
   );
 $=AffiControle shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffiControle);
 _coinprec:=(llcorner $)+(0.5cm,0);
-coindebutbloc@:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+coindebutbloc@:=(llcorner $)+(0,eb);
  $
 enddef;
 
@@ -84,18 +152,94 @@ vardef FinBlocRepeter[](expr tps)=
   drawoptions();
   texto=image(
       labeloffset:=0;
-    label.lrt(LATEX("\bfseries\color{white}Répéter \colorbox{white}{\textcolor{white}{"&decimal(tps)&"}} fois"),if unknown _coinprec: (0,0) else:_coinprec fi);
+    label.lrt(LATEX("\bfseries\color{white}répéter \colorbox{white}{\textcolor{white}{"&decimal(tps)&"}} fois"),if unknown _coinprec: (0,0) else:_coinprec fi);
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm,0))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--cycle;
+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))--
+  (urcorner texto+(-eb,0))--
+  (urcorner texto+(0,-eb))--
+  (lrcorner texto+(0,eb))--
+  (lrcorner texto+(-eb,0))--
+  (llcorner texto+(0.125+0.625cm,0)+(2eb,0))--
+  (llcorner texto+(0.125+0.625cm,0)+(eb,-eb))--
+  (llcorner texto+(0.125+0.375cm,0)+(eb,-eb))--
+  (llcorner texto+(0.125+0.375cm,0))--
+  (llcorner texto+(0.125,0)+(eb,0))--
+  (llcorner texto+(0.125,0)+(0,eb))--  
+  cycle;
 bloctest:=false;
 $=image(
-    fill cadre withcolor LightOrange;
+    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,0))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,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))--
+    (urcorner texto+(-eb,0))--
+    (urcorner texto+(0,-eb))--
+    (lrcorner texto+(0,eb))--
+    (lrcorner texto+(-eb,0))--
+    (llcorner texto+(0.125+0.625cm,0)+(2eb,0))--
+    (llcorner texto+(0.125+0.625cm,0)+(eb,-eb))--
+    (llcorner texto+(0.125+0.375cm,0)+(eb,-eb))--
+    (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.25));
   );
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+$
+enddef;
+
+vardef FinBlocRepeterI[](expr tps)=
+  save $;
+  picture $,texto;
+  _coinprec:=_coinprec-(0.5cm,0);
+  drawoptions();
+  texto=image(
+      labeloffset:=0;
+    label.lrt(LATEX("\bfseries\color{white}répéter \colorbox{white}{\textcolor{white}{"&decimal(tps)&"}} fois"),if unknown _coinprec: (0,0) else:_coinprec fi);
+  labeloffset:=3;
+  );
+path cadre;
+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))--
+  (urcorner texto+(-eb,0))--
+  (urcorner texto+(0,-eb))--
+  (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.125+0.5cm+eb,0.1875))--
+    (coindebutbloc@+(0.5cm,-eb))--
+    (ulcorner texto+(0.5cm,eb))--
+    (ulcorner texto+(0.5cm+eb,0))--
+    (urcorner texto+(-eb,0))--
+  (urcorner texto+(0,-eb))--
+  (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.25));
+  );
+_coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -104,11 +248,12 @@ vardef Si[](expr tps)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Si "&tps&" alors"),(0,0));
+    label(LATEX("\bfseries\color{white}si "&tps&" alors"),(0,0));
   );
 $=AffiControle shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffiControle);
 _coinprec:=(llcorner $)+(0.5cm,0);
-coindebutbloc@:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+coindebutbloc@:=(llcorner $)+(0,eb);
  $
 enddef;
 
@@ -119,17 +264,48 @@ vardef FinBlocSi[]=
   drawoptions();
   texto=image(
       labeloffset:=0;
-    label.lrt(LATEX("\bfseries\color{white}Répéter \colorbox{white}{\textcolor{black}{titi=10}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+    label.lrt(LATEX("\bfseries\color{white}répéter \colorbox{white}{\textcolor{black}{titi=10}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm,0))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--cycle;
+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))--
+  (urcorner texto+(-eb,0))--
+  (urcorner texto+(0,-eb))--
+  (lrcorner texto+(0,eb))--
+  (lrcorner texto+(-eb,0))--
+  (llcorner texto+(0.125+0.625cm,0)+(2eb,0))--
+  (llcorner texto+(0.125+0.625cm,0)+(eb,-eb))--
+  (llcorner texto+(0.125+0.375cm,0)+(eb,-eb))--
+  (llcorner texto+(0.125+0.375cm,0))--
+  (llcorner texto+(0.125,0)+(eb,0))--
+  (llcorner texto+(0.125,0)+(0,eb))--  
+  cycle;
 bloctest:=false;
 $=image(
-    fill cadre withcolor LightOrange;
-  draw (coindebutbloc@+(0.5cm,0))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0));
+    fill cadre withcolor if unknown colControle : LightOrange else : colControle fi;
+  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))--
+    (urcorner texto+(-eb,0))--
+    (urcorner texto+(0,-eb))--
+    (lrcorner texto+(0,eb))--
+    (lrcorner texto+(-eb,0))--
+    (llcorner texto+(0.125+0.625cm,0)+(2eb,0))--
+    (llcorner texto+(0.125+0.625cm,0)+(eb,-eb))--
+    (llcorner texto+(0.125+0.375cm,0)+(eb,-eb))--
+    (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.25));
   );
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -140,20 +316,48 @@ vardef Sinon[]=
   drawoptions();
   texto=image(
       labeloffset:=0;
-    label.lrt(LATEX("\bfseries\color{white}\,Sinon\phantom{\colorbox{white}{\textcolor{black}{\hbox to2cm{t}}}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
+    label.lrt(LATEX("\bfseries\color{white}\,sinon\phantom{\colorbox{white}{\textcolor{black}{\hbox to2cm{t}}}}"),if unknown _coinprec: (0,0) else:_coinprec fi);
   labeloffset:=3;
   );
 path cadre;
-cadre=(llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0))--(coindebutbloc@+(0.5cm,0))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--cycle;
+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))--
+  (urcorner texto+(-eb,0))--
+  (urcorner texto+(0,-eb))--
+  (lrcorner texto+(0,eb))--
+  (lrcorner texto+(-eb,0))--
+  (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))--  
+  cycle;
 bloctest:=false;
 $=image(
-    fill cadre withcolor LightOrange;
+    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))--(ulcorner texto+(0.5cm,0))--(urcorner texto)--(lrcorner texto)--(llcorner texto+(0.5cm,0));
-  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0));
+  draw (coindebutbloc@+(0.5cm,0)+(eb,0))--
+    (coindebutbloc@+(0.5cm,0)+(0,-eb))--
+    (ulcorner texto+(0.5cm,0)+(0,eb))--
+    (ulcorner texto+(0.5cm,0)+(eb,0))--
+    (urcorner texto+(-eb,0))--
+    (urcorner texto+(0,-eb))--
+    (lrcorner texto+(0,eb))--
+    (lrcorner texto+(-eb,0))--
+    (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))--
+    (llcorner texto+(eb+0.5cm,0));
+  draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0.125));
   );
 _coinprec:=(llcorner $)+(0.5cm,0);
-coindebutbloc[@]:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
+coindebutbloc[@]:=(llcorner $)+(0,eb+0.125);
 $
 enddef;
 
@@ -162,10 +366,11 @@ vardef Attendre(expr test)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Attendre "&if numeric test:"\colorbox{white}{\textcolor{black}{"&decimal(test)&"}}" else: test fi &" seconde(s)"),(0,0));
+    label(LATEX("\bfseries\color{white}attendre "&if numeric test:"\colorbox{white}{\textcolor{black}{"&decimal(test)&"}}" else: test fi &" seconde(s)"),(0,0));
   );
 $=AffichageCN shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageCN);
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
  $
 enddef;
 
@@ -174,10 +379,11 @@ vardef AttendreJ(expr test)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Attendre jusqu'à "&test&""),(0,0));
+    label(LATEX("\bfseries\color{white}attendre jusqu'à "&test&""),(0,0));
   );
 $=AffichageCN shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageCN);
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
  $
 enddef;
 
@@ -186,22 +392,24 @@ vardef Stop(expr test)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Stop \colorbox{DarkOrange}{\textcolor{white}{"&test&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),(0,0));
+    label(LATEX("\bfseries\color{white}stop \colorbox{cDarkOrange}{\normalfont\textcolor{white}{"&test&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),(0,0));
   );
-$=AffichageCN shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageCN);
+$=AffichageStop shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageStop);
 _coinprec:=(llcorner $);
+%_coinprec:=_coinprec+(0,eb);
  $
 enddef;
 
 vardef CommencerClone=
   save $;
   picture $,texto;
-  bloctest:=true;
+  %bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Quand je commence comme un clone"),(0,0));
+    label(LATEX("\bfseries\color{white}quand je commence comme un clone"),(0,0));
   );
 $=AffichageEC shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageEC);
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
  $
 enddef;
 
@@ -210,10 +418,11 @@ vardef CreerClone(expr test)=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Créer un clone de \colorbox{DarkOrange}{\textcolor{white}{"&test&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),(0,0));
+    label(LATEX("\bfseries\color{white}créer un clone de \colorbox{cDarkOrange}{\normalfont\textcolor{white}{"&test&" \tiny\textcolor{black}{$\blacktriangledown$}}}"),(0,0));
   );
 $=AffichageCN shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageCN);
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
  $
 enddef;
 
@@ -222,9 +431,10 @@ vardef SupprimerClone=
   picture $,texto;
   bloctest:=true;
   texto=image(
-    label(LATEX("\bfseries\color{white}Supprimer ce clone"),(0,0));
+    label(LATEX("\bfseries\color{white}supprimer ce clone"),(0,0));
   );
 $=AffichageCN shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner AffichageCN);
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
  $
 enddef;