From: Enrico Tassi <enrico.tassi@inria.fr>
Date: Thu, 24 Sep 2009 14:46:57 +0000 (+0000)
Subject: ...
X-Git-Tag: make_still_working~3437
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=b8cd3b086938bb4e042975a30e82b74a38b72476;p=helm.git

...
---

diff --git a/helm/software/matita/matitaMathView.ml b/helm/software/matita/matitaMathView.ml
index f772a84ed..b966de073 100644
--- a/helm/software/matita/matitaMathView.ml
+++ b/helm/software/matita/matitaMathView.ml
@@ -1588,7 +1588,7 @@ let mathViewer () =
        w#show ();
        let filenames = 
         HExtlib.list_mapi
-         (fun sequent i ->
+         (fun (mno,_ as sequent) i ->
             let mathml = 
               ApplyTransformation.nmml_of_cic_sequent 
                 status metasenv subst sequent
@@ -1601,24 +1601,29 @@ let mathViewer () =
               filename ^ "-raw" ^ string_of_int i ^ ".png" 
             in
             GdkPixbuf.save ~filename ~typ:"png" pixbuf;
-            filename)
+            filename,mno)
          sequents
        in
        let items = 
-         List.map (fun x -> 
-           Printf.sprintf 
-             " '(' -trim -border 3 -bordercolor white %s ')' "
-             (Filename.quote x))
+         List.map (fun (x,mno) -> 
+           ignore(Sys.command
+             (Printf.sprintf
+              ("convert "^^
+              " '(' -gravity west -bordercolor grey -border 1 label:%d ')' "^^
+              " '(' -trim -bordercolor white -border 5 "^^
+                " -bordercolor grey -border 1 %s ')' -append %s ")
+              mno
+              (Filename.quote x)
+              (Filename.quote (x ^ ".label.png"))));
+             x ^ ".label.png")
          filenames
        in
        ignore(Sys.command (Printf.sprintf 
          "convert %s +append  %s" 
-         (String.concat (" '(' -gravity center -size 9x150 xc: "^
-         "-draw \"line 5,0 5,48\" "^
-         "-draw \"line 5,52 5,98\" " ^
-         "-draw \"line 5,102 5,150\" " ^ " ')'") items)
+         (String.concat (" '(' -gravity center -size 10x10 xc: ')' ") items)
          (Filename.quote (ofn ^ ".png")))); 
-       List.iter Sys.remove filenames;
+       List.iter (fun x,_ -> Sys.remove x) filenames;
+       List.iter Sys.remove items;
        w#destroy ();
   end
 
diff --git a/helm/software/matita/nlibrary/topology/preamble.xml b/helm/software/matita/nlibrary/topology/preamble.xml
index a85be4fc6..3864f2e19 100644
--- a/helm/software/matita/nlibrary/topology/preamble.xml
+++ b/helm/software/matita/nlibrary/topology/preamble.xml
@@ -12,9 +12,6 @@
 	    margin-left: auto; 
 	    margin-right: auto; 
 	    display: block;
-	    border-style: solid;
-	    border-width: 2px;
-	    border-color: grey;
 	  }
   </style>
   <script type="text/javascript" src="sh_main.js"></script>