- added an hack to load sequents viewer's mathml from file

- tried organizing entries of the debug menu

diff --git a/matita/matita.ml b/matita/matita.ml
index a8a031273b309a05f7316449d4ed57e46c8d1f24..5d22f85d579f8aa9f15b2e1e27a7ab061f1e8f5c 100644 (file)
--- a/matita/matita.ml
+++ b/matita/matita.ml
@@ -103,9 +103,10 @@ let _ =
     gui#main#debugMenu#misc#show ();
     let addDebugItem ~label callback =
       let item =
-        GMenu.menu_item ~packing:gui#main#debugMenu_menu#append ~label ()
-      in
-      ignore (item#connect#activate callback)
+        GMenu.menu_item ~packing:gui#main#debugMenu_menu#append ~label () in
+      ignore (item#connect#activate callback) in
+    let addDebugSeparator () =
+      ignore (GMenu.separator_item ~packing:gui#main#debugMenu_menu#append ())
     in
     addDebugItem "dump environment to \"env.dump\"" (fun _ ->
       let oc = open_out "env.dump" in
@@ -124,9 +125,6 @@ let _ =
       List.iter (fun (u,_,_) -> 
         prerr_endline (UriManager.string_of_uri u)) 
         (CicEnvironment.list_obj ()));
-(*     addDebugItem "print selections" (fun () ->
-      let cicMathView = MatitaMathView.cicMathView_instance () in
-      List.iter HLog.debug (cicMathView#string_of_selections)); *)
     addDebugItem "dump script status" script#dump;
     addDebugItem "dump configuration file to ./foo.conf.xml" (fun _ ->
       Helm_registry.save_to "./foo.conf.xml");
@@ -134,24 +132,6 @@ let _ =
       (fun _ ->
          if script#onGoingProof () then
            HLog.debug (CicMetaSubst.ppmetasenv [] script#proofMetasenv));
-    addDebugItem "dump coercions Db" (fun _ ->
-      List.iter
-        (fun (s,t,u) -> 
-          HLog.debug
-            (UriManager.name_of_uri u ^ ":"
-             ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t))
-        (CoercDb.to_list ()));
-    addDebugItem "show coercions graph" (fun _ ->
-      let str = CoercGraph.generate_dot_file () in
-      let filename, oc = Filename.open_temp_file "xx" ".dot" in
-      output_string oc str;
-      close_out oc;
-      let ps = Filename.temp_file "yy" ".png" in
-      ignore (Unix.system ("/usr/bin/dot -Tpng -o" ^ ps ^ " " ^ filename));
-      ignore (Unix.system ("/usr/bin/display " ^ ps));
-      Sys.remove ps;
-      Sys.remove filename);
-        
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
@@ -178,23 +158,46 @@ let _ =
             ["0"; "0"; "0"]; ["0"; "0"; "1"]; ["0"; "1"; "0"]; ["0"; "1"; "1"];
             ["1"; "0"; "0"]; ["1"; "0"; "1"]; ["1"; "1"; "0"]; ["1"; "1"; "1"]]
           ()))); *)
-    addDebugItem "rotate light bulbs"
+(*     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
-         nb#goto_page ((nb#current_page + 1) mod 3));
-    addDebugItem "print runtime dir"
-      (fun _ ->
-        prerr_endline BuildTimeConf.runtime_base_dir);
+         nb#goto_page ((nb#current_page + 1) mod 3)); *)
+    addDebugSeparator ();
     addDebugItem "disable all (pretty printing) notations"
       (fun _ -> CicNotation.set_active_notations []);
     addDebugItem "enable all (pretty printing) notations"
       (fun _ ->
         CicNotation.set_active_notations
           (List.map fst (CicNotation.get_all_notations ())));
+    addDebugSeparator ();
     addDebugItem "enable coercions hiding"
       (fun _ -> TermAcicContent.hide_coercions := true);
     addDebugItem "disable coercions hiding"
       (fun _ -> TermAcicContent.hide_coercions := false);
+    addDebugItem "dump coercions Db" (fun _ ->
+      List.iter
+        (fun (s,t,u) -> 
+          HLog.debug
+            (UriManager.name_of_uri u ^ ":"
+             ^ CoercDb.name_of_carr s ^ " -> " ^ CoercDb.name_of_carr t))
+        (CoercDb.to_list ()));
+    addDebugItem "show coercions graph" (fun _ ->
+      let str = CoercGraph.generate_dot_file () in
+      let filename, oc = Filename.open_temp_file "xx" ".dot" in
+      output_string oc str;
+      close_out oc;
+      let ps = Filename.temp_file "yy" ".png" in
+      ignore (Unix.system ("/usr/bin/dot -Tpng -o" ^ ps ^ " " ^ filename));
+      ignore (Unix.system ("/usr/bin/display " ^ ps));
+      Sys.remove ps;
+      Sys.remove filename);
+    addDebugSeparator ();
+    let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in
+(*     addDebugItem "save (sequent) MathML to matita.xml"
+      (fun _ -> ignore ((Gdome.domImplementation ())#saveDocumentToFile
+        ~doc:(HExtlib.unopt (mview ())#get_document) ~name:"matita.xml" ())); *)
+    addDebugItem "load (sequent) MathML from matita.xml"
+      (fun _ -> (mview ())#load_uri ~filename:"matita.xml");
   end
   (** Debugging }}} *)
 

diff --git a/matita/matitaGuiTypes.mli b/matita/matitaGuiTypes.mli
index 1b9d17cad514f31a5be825878ead76b26405ca78..6457dc0c8d5701cac8d06a58582fe96653f85814 100644 (file)
--- a/matita/matitaGuiTypes.mli
+++ b/matita/matitaGuiTypes.mli
@@ -139,6 +139,8 @@ object
   method load_logo_with_qed: unit
   method load_sequents: GrafiteTypes.incomplete_proof -> unit
   method goto_sequent: int -> unit  (* to be called _after_ load_sequents *)
+
+  method cicMathView: cicMathView
 end
 
 class type cicBrowser =

diff --git a/matita/matitaMathView.ml b/matita/matitaMathView.ml
index e2eb22d5b8f05371ac9f456597360b35668f2c74..8f477bd60278cb869803cf45d8dd5cf577379515 100644 (file)
--- a/matita/matitaMathView.ml
+++ b/matita/matitaMathView.ml
@@ -538,6 +538,8 @@ class sequentsViewer ~(notebook:GPack.notebook) ~(cicMathView:cicMathView) () =
   object (self)
     inherit scriptAccessor
 
+    method cicMathView = cicMathView  (** clickableMathView accessor *)
+
     val mutable pages = 0
     val mutable switch_page_callback = None
     val mutable page2goal = []  (* associative list: page no -> goal no *)