X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fmatita%2Fmatita.ml;h=0a3f72d4d37d97e6424eb3535147886527b3aef5;hb=5388b96750d501a187a961b802e4b2c533f093c3;hp=93441ed83fc5627e64927a7d33e7c26a54b34905;hpb=00f04989b1a7792a7cf34deed1a4305d290808d0;p=helm.git

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 93441ed83..0a3f72d4d 100644
--- 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)
 
@@ -73,21 +72,34 @@ let _ =
     (MatitaGui.interactive_interp_choice ())
 
 let script =
-  MatitaScript.script 
-    ~buffer:gui#sourceView#buffer
-    ~init:(Lazy.force MatitaEngine.initial_status) 
-    ~mathviewer:(MatitaMathView.mathViewer ())
-    ~urichooser:(fun uris ->
-      try
-        MatitaGui.interactive_uri_choice ~selection_mode:`SINGLE
-        ~title:"Matita: URI chooser" 
-        ~msg:"Select the URI" ~hide_uri_entry:true
-        ~hide_try:true ~ok_label:"_Apply" ~ok_action:`SELECT
-        ~copy_cb:(fun s -> gui#sourceView#buffer#insert ("\n"^s^"\n"))
-        () ~id:"boh?" uris
-      with MatitaTypes.Cancel -> [])
-    ~set_star:gui#setStar
-    ()
+  let s = 
+    MatitaScript.script 
+      ~view:(gui#sourceView :> GText.view)
+      ~init:(Lazy.force MatitaEngine.initial_status) 
+      ~mathviewer:(MatitaMathView.mathViewer ())
+      ~urichooser:(fun uris ->
+        try
+          MatitaGui.interactive_uri_choice ~selection_mode:`SINGLE
+          ~title:"Matita: URI chooser" 
+          ~msg:"Select the URI" ~hide_uri_entry:true
+          ~hide_try:true ~ok_label:"_Apply" ~ok_action:`SELECT
+          ~copy_cb:(fun s -> gui#sourceView#buffer#insert ("\n"^s^"\n"))
+          () ~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
+      ()
+  in
+  gui#sourceView#source_buffer#begin_not_undoable_action ();
+  s#reset (); 
+  s#template (); 
+  gui#sourceView#source_buffer#end_not_undoable_action ();
+  s
+  
 
   (* math viewers *)
 let _ =
@@ -144,12 +156,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,37 +164,23 @@ 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);
-   with Invalid_argument _ -> ());
   if Filename.basename Sys.argv.(0) = "cicbrowser" then begin (* cicbrowser *)
     Helm_registry.set "matita.mode" "cicbrowser";
     let browser = MatitaMathView.cicBrowser () in
@@ -200,6 +192,9 @@ let _ =
     browser#load entry
   end else begin  (* matita *)
     Helm_registry.set "matita.mode" "matita";
+    (try
+       gui#loadScript Sys.argv.(1);
+     with Invalid_argument _ -> ());
     gui#main#mainWin#show ();
   end;
   try