fixed bug regarding developments. paths given with -I are now made absolute

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

diff --git a/helm/software/matita/matitaScript.ml b/helm/software/matita/matitaScript.ml
index 91182d6ad44aa1aa0ed0dac991d101889eb82035..718ea7a23f64091e05642560ff4ce094d122b857 100644 (file)
--- a/helm/software/matita/matitaScript.ml
+++ b/helm/software/matita/matitaScript.ml
@@ -129,11 +129,11 @@ let wrap_with_developments guistuff f arg =
         (ActionCancelled 
           ("Internal error: "^f_pwd^" exists but I'm unable to include it!"))
   in
-  let handle_with_devel d lexiconfile exc =
+  let handle_with_devel d lexiconfile mafile exc =
     let name = MatitamakeLib.name_for_development d in
     let title = "Unable to include " ^ lexiconfile in
     let message = 
-      lexiconfile ^ " is handled by development <b>" ^ name ^ "</b>.\n\n" ^
+      mafile ^ " is handled by development <b>" ^ name ^ "</b>.\n\n" ^
       "<i>Should I compile it and Its dependencies?</i>"
     in
     (match guistuff.ask_confirmation ~title ~message with
@@ -170,7 +170,7 @@ let wrap_with_developments guistuff f arg =
        * but was unable to get the compilation output 'xfilename' *)
       match MatitamakeLib.development_for_dir (Filename.dirname mafilename) with
       | None -> handle_without_devel mafilename exn
-      | Some d -> handle_with_devel d xfilename exn
+      | Some d -> handle_with_devel d xfilename mafilename exn
 ;;
     
 let eval_with_engine
@@ -288,8 +288,6 @@ let rec eval_macro include_paths (buffer : GText.buffer) guistuff lexicon_status
       let t_and_ty = Cic.Cast (term,ty) in
       guistuff.mathviewer#show_entry (`Cic (t_and_ty,metasenv));
       [], parsed_text_length
-  (* TODO *)
-  | TA.Quit _ -> failwith "not implemented"
                                 
 and eval_executable include_paths (buffer : GText.buffer) guistuff
 lexicon_status grafite_status user_goal unparsed_text skipped_txt nonskipped_txt
@@ -585,6 +583,11 @@ object (self)
     let grafite_status = self#grafite_status in
     List.iter (fun o -> o lexicon_status grafite_status) observers
 
+  method loadFromString s =
+    buffer#set_text s;
+    self#reset_buffer;
+    buffer#set_modified true
+
   method loadFromFile f =
     buffer#set_text (HExtlib.input_file f);
     self#reset_buffer;