X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaInit.ml;h=7ffb67d9f8cf8d15413f8ec2a7b2e438e04d9dc8;hb=9376f52b7f5890d924ae7d93bcae2af9e516126d;hp=a2a5b93fa316e5a41066a0d1f1d4079481425e19;hpb=bc76b4d2f3c380894259b45fad52cf85ae6cee18;p=helm.git

diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml
index a2a5b93fa..7ffb67d9f 100644
--- a/helm/software/matita/matitaInit.ml
+++ b/helm/software/matita/matitaInit.ml
@@ -45,14 +45,14 @@ let already_configured s l =
 let conffile = ref BuildTimeConf.matita_conf
 
 let registry_defaults = [
-  "db.nodb",                  "false";
-  "matita.debug",             "false";
-  "matita.external_editor",   "gvim -f -c 'go %p' %f";
-  "matita.preserve",          "false";
-  "matita.profile",           "true";
-  "matita.system",            "false";
-  "matita.verbosity",         "1";
-  "matita.bench",              "false";
+  "matita.debug",                "false";
+  "matita.external_editor",      "gvim -f -c 'go %p' %f";
+  "matita.preserve",             "false";
+  "matita.profile",              "true";
+  "matita.system",               "false";
+  "matita.verbosity",            "1";
+  "matita.bench",                "false";
+  "matita.paste_unicode_as_tex", "false"
     (** verbosity level: 1 is the default, 0 is intuitively "quiet", > 1 is
      * intuitively verbose *)
 ]
@@ -76,6 +76,17 @@ let load_configuration init_status =
         let login = (Unix.getpwuid (Unix.getuid ())).Unix.pw_name in
         Helm_registry.set "user.name" login
       end;
+      let home = Helm_registry.get_string "matita.basedir" in
+      let user_conf_file = home ^ "/matita.conf.xml" in
+      if HExtlib.is_regular user_conf_file then
+        begin
+          HLog.message ("Loading additional conf file from " ^ user_conf_file);
+          try
+            Helm_registry.load_from user_conf_file
+          with exn -> 
+            HLog.error
+              ("While loading conf file: " ^ snd (MatitaExcPp.to_string exn))
+        end;
       ConfigurationFile::init_status 
     end
   else
@@ -215,10 +226,15 @@ let add_cmdline_spec l = extra_cmdline_specs := l @ !extra_cmdline_specs
 
 let parse_cmdline init_status =
   if not (already_configured [CmdLine] init_status) then begin
-    let includes = ref [ 
+    let includes = ref [] in
+    let default_includes = [ 
+      ".";
       BuildTimeConf.stdlib_dir_devel;
       BuildTimeConf.stdlib_dir_installed ; ] 
     in
+    let absolutize s =
+      if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd() ^"/"^s
+    in
     let args = ref [] in
     let add_l l = fun s -> l := s :: !l in
     let reduce_verbosity () =
@@ -239,9 +255,6 @@ let parse_cmdline init_status =
         "-force",
             Arg.Unit (fun () -> Helm_registry.set_bool "matita.force" true),
             ("Force actions that would not be executed per default");
-        "-nodb", Arg.Unit (fun () -> Helm_registry.set_bool "db.nodb" true),
-            ("Avoid using external database connection"
-             ^ "\n    WARNING: disable many features");
         "-noprofile", 
           Arg.Unit (fun () -> Helm_registry.set_bool "matita.profile" false),
           "Turns off profiling printings";
@@ -273,11 +286,13 @@ let parse_cmdline init_status =
       std_arg_spec @ debug_arg_spec @ !extra_cmdline_specs
     in
     let set_list ~key l =
-      Helm_registry.set_list Helm_registry.of_string ~key ~value:(List.rev !l)
+      Helm_registry.set_list Helm_registry.of_string ~key ~value:l
     in
     Arg.parse arg_spec (add_l args) (usage ());
+    let includes = 
+      List.map absolutize ((List.rev !includes) @ default_includes) in
     set_list ~key:"matita.includes" includes;
-    args := List.filter (fun x -> x <> "") !args;
+    let args = List.rev (List.filter (fun x -> x <> "") !args) in
     set_list ~key:"matita.args" args;
     HExtlib.set_profiling_printings 
       (fun s ->