X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=blobdiff_plain;f=src%2FBloc.mp;h=e6d7ac3f17a0884f994a2380556ebe0f7af861b9;hb=HEAD;hp=5045b5ba5d306c3c51d5e8671cb9c9be94517501;hpb=d1da8f97659ac2b8d9639c5cd930730e9ad0e037;p=mp-scratch.git

diff --git a/src/Bloc.mp b/src/Bloc.mp
index 5045b5b..e6d7ac3 100644
--- a/src/Bloc.mp
+++ b/src/Bloc.mp
@@ -1,23 +1,39 @@
 vardef AffichageB=
   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 DarkPurple;
+      fill cadre withcolor if unknown colBloc : DarkPurple else: colBloc 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 AffichageBlocDef=
   path cadre;
-  cadre=(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb)){dir165}..{dir-165}(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,eb)){dir165}..{dir-165}(ulcorner texto+(-eb,eb))--cycle;
   picture TEXT;
   TEXT=image(
-      fill cadre withcolor DarkPurple;
+      fill cadre withcolor if unknown colBloc : DarkPurple else: colBloc fi;
     draw texto;
-    draw cadre;%(llcorner texto+(-eb,-eb))--(lrcorner texto+(eb,-eb))--(urcorner texto+(eb,eb))--(ulcorner texto+(-eb,eb))--cycle;
+    draw cadre;
     );
   TEXT
 enddef;
@@ -30,6 +46,7 @@ vardef Bloc(expr nombloc)=
   );
 $=AffichageB shifted (if unknown _coinprec:(0,0) else : _coinprec fi - ulcorner AffichageB);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;
 
@@ -37,10 +54,11 @@ vardef NouveauBloc(expr nombloc)=
   save $;
   picture $,texto;
   texto=image(
-      label.lrt(LATEX("\bfseries\color{white} Définir \colorbox{LightPurple}{\textcolor{white}{"&nombloc&"}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
+      label.lrt(LATEX("\bfseries\color{white} définir \colorbox{LightPurple}{\textcolor{white}{"&nombloc&"}}"),if unknown _coinprec:(0,0) else: _coinprec fi);
   );
 $=AffichageBlocDef shifted (if unknown _coinprec:(0,0) else : _coinprec fi - ulcorner AffichageBlocDef);
 _coinprec:=llcorner $;
+_coinprec:=_coinprec+(0,eb);
 $
 enddef;