Smart scrolling during script advancement implemented.

[helm.git] / helm / matita / matita.ml

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 93441ed83fc5627e64927a7d33e7c26a54b34905..db0fd2b18e7ec0be350aecbea58d29dc16745933 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -32,16 +32,15 @@ open MatitaMisc
 (** {2 Initialization} *)
 
 let _ =
-  Helm_registry.load_from "matita.conf.xml";  (* read conf *)
+  Helm_registry.load_from BuildTimeConf.matita_conf;
+  CicNotation.load_notation BuildTimeConf.core_notation_script;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-(*  MatitaDb.clean_owner_environment ();
-  MatitaDb.create_owner_environment (); *)
+  MatitaDb.create_owner_environment ();
+  MatitamakeLib.initialize ();
   GtkMain.Rc.add_default_file BuildTimeConf.gtkrc_file; (* loads gtk rc *)
   ignore (GMain.Main.init ());
-
-  (* environment trust *)
-  CicEnvironment.set_trust
+  CicEnvironment.set_trust (* environment trust *)
     (let trust = Helm_registry.get_bool "matita.environment_trust" in
      fun _ -> trust)
 
@@ -74,7 +73,7 @@ let _ =
 
 let script =
   MatitaScript.script 
-    ~buffer:gui#sourceView#buffer
+    ~view:(gui#sourceView :> GText.view)
     ~init:(Lazy.force MatitaEngine.initial_status) 
     ~mathviewer:(MatitaMathView.mathViewer ())
     ~urichooser:(fun uris ->
@@ -87,6 +86,11 @@ let script =
         () ~id:"boh?" uris
       with MatitaTypes.Cancel -> [])
     ~set_star:gui#setStar
+    ~ask_confirmation:
+      (fun ~title ~message -> 
+          MatitaGtkMisc.ask_confirmation ~title ~message 
+          ~parent:gui#main#toplevel ())
+    ~develcreator:gui#createDevelopment
     ()
 
   (* math viewers *)
@@ -144,12 +148,6 @@ let _ =
         (MatitaMathView.sequentViewer_instance ())#get_selected_terms);
     addDebugItem "dump getter settings" (fun _ ->
       prerr_endline (Http_getter_env.env_to_string ()));
-    addDebugItem "getter: update"
-      (fun _ ->
-         ignore (Thread.create (fun () ->
-           MatitaLog.message "Rebuilding getter maps in background ...";
-           Http_getter.update ();
-           MatitaLog.message "Getter maps successfully rebuilt.") ()));
     addDebugItem "getter: getalluris" (fun _ ->
       List.iter prerr_endline (Http_getter.getalluris ()));
     addDebugItem "dump script status" script#dump;
@@ -158,33 +156,22 @@ let _ =
          if script#onGoingProof () then
            MatitaLog.debug (CicMetaSubst.ppmetasenv script#proofMetasenv []));
     addDebugItem "dump coercions Db" (fun _ ->
-      List.iter (
-        fun (s,t,u) -> 
-          MatitaLog.debug (
-            UriManager.name_of_uri u ^ ":" ^ 
-            UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
-      (CoercDb.to_list ())
-    );
+      List.iter
+        (fun (s,t,u) -> 
+          MatitaLog.debug
+            (UriManager.name_of_uri u ^ ":"
+             ^ UriManager.name_of_uri s ^ " -> " ^ UriManager.name_of_uri t))
+        (CoercDb.to_list ()));
     addDebugItem "rotate light bulbs"
       (fun _ ->
          let nb = gui#main#hintNotebook in
-         nb#goto_page ((nb#current_page + 1) mod 3));
-         (*
-    addDebugItem "print (on stdout) \"statement\" grammar entry"
-      (fun _ ->
-        Grammar.print_entry Format.std_formatter
-          (Grammar.Entry.obj CicTextualParser2.statement);
-        Format.pp_print_flush Format.std_formatter ());*)
+         nb#goto_page ((nb#current_page + 1) mod 3))
   end
 
   (** </DEBUGGING> *)
 
 let _ =
-  at_exit
-    (fun () ->
-       Http_getter_logger.log "Sync map tree to disk...";
-       Http_getter.sync_dump_file ();
-       print_endline "\nThanks for using Matita!\n");
+  at_exit (fun () -> print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
   (try
      gui#loadScript Sys.argv.(1);