Correction de bugs d'affichage

diff --git a/doc/figures/CommandeControle.mp b/doc/figures/CommandeControle.mp
index e5c5cad..56e49fc 100644 (file)
--- a/doc/figures/CommandeControle.mp
+++ b/doc/figures/CommandeControle.mp
@@ -17,13 +17,13 @@ beginfig(3);
 endfig;
 
 beginfig(4);
-  draw Si1("\opOp{$\opSimple{10}\bm{+}\opMouv{Abscisse x}\bm{=}\opSimple{20}$}");
+  draw Si1("\hspace{1em}\opOp{$\opSimple{10}\bm{+}\opMouv{Abscisse x}\bm{=}\opSimple{20}$}");
   draw LigneVide("Bonjour");
   draw FinBlocSi1;
 endfig;
 
 beginfig(5);
-  draw Si1("\opOp{$\opSimple{10}\bm{+}\opMouv{Abscisse x}\bm{=}\opSimple{20}$}");
+  draw Si1("\hspace{1em}\opOp{$\opSimple{10}\bm{+}\opMouv{Abscisse x}\bm{=}\opSimple{20}$}");
   draw LigneVide("Bonjour");
   draw Sinon1;
   draw LigneVide("Bonjour");

diff --git a/doc/mp-scratch.pdf b/doc/mp-scratch.pdf
index a5a28b2..77cf0c4 100644 (file)
Binary files a/doc/mp-scratch.pdf and b/doc/mp-scratch.pdf differ

diff --git a/src/Controle.mp b/src/Controle.mp
index e1a756a..88c7814 100644 (file)
--- 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,7 @@ 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))--(coindebutbloc@+(0.5cm+eb,0))--
   (coindebutbloc@+(0.5cm,-eb))--
   (ulcorner texto+(0.5cm,eb))--
   (ulcorner texto+(0.5cm+eb,0))--
@@ -173,6 +174,7 @@ 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))--
     (coindebutbloc@+(0.5cm,-eb))--
@@ -219,6 +221,7 @@ cadre=(llcorner texto+(0.125,0)+(0,eb))--(coindebutbloc@+(0.125,0))--(coindebutb
 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))--
     (coindebutbloc@+(0.5cm,-eb))--
@@ -232,6 +235,7 @@ $=image(
   (llcorner texto+(0.125,0)+(0,eb))--(coindebutbloc@+(0.125,0));
   );
 _coinprec:=(llcorner $);
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -260,7 +264,7 @@ 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))--(coindebutbloc@+(0.5cm+eb,0))--
   (coindebutbloc@+(0.5cm,-eb))--
   (ulcorner texto+(0.5cm,eb))--
   (ulcorner texto+(0.5cm+eb,0))--
@@ -278,6 +282,7 @@ 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;
   draw (coindebutbloc@+(0.5cm+eb,0))--
     (coindebutbloc@+(0.5cm,-eb))--
     (ulcorner texto+(0.5cm,eb))--
@@ -327,6 +332,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 +345,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));
+    (llcorner texto+(0.125+0.875cm,0))--
+    (llcorner texto+(eb+0.5cm,0));
   draw (llcorner texto+(0.125,0))--(coindebutbloc@+(0.125,0));
   );
 _coinprec:=(llcorner $)+(0.5cm,0);
 _coinprec:=_coinprec+(0,eb);
-coindebutbloc[@]:=(llcorner $)+(0,eb);
+coindebutbloc[@]:=(llcorner $)+(0,eb+0.125);
 $
 enddef;
 
@@ -383,7 +390,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;