X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=aecf026aa6609a50d8359597e0638f449048ed0e;hb=ec0b4acecb86886baf5f785da270fd60e7910b32;hp=247e07d7a7912ac7652e7e282ca7a8c3fa0626e2;hpb=13bfd154ade0996d34e7e723398ac7ab76a51717;p=helm.git

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index 247e07d7a..aecf026aa 100644
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -67,6 +67,8 @@ let script =
             ~parent:gui#main#toplevel ())
       ()
   in
+  Predefined_virtuals.load_predefined_virtuals ();
+  Predefined_virtuals.load_predefined_classes ();
   gui#sourceView#source_buffer#begin_not_undoable_action ();
   s#reset (); 
   s#template (); 
@@ -97,7 +99,21 @@ let _ =
            sequents_viewer#goto_sequent goal
         with Failure _ -> script#setGoal None);
     | Proof proof -> sequents_viewer#load_logo_with_qed
-    | No_proof -> sequents_viewer#load_logo
+    | No_proof ->
+       (match grafite_status.ng_status with
+           ProofMode nstatus ->
+            sequents_viewer#nload_sequents nstatus;
+            (try
+              script#setGoal (Some (Continuationals.Stack.find_goal nstatus.NTacStatus.gstatus));
+              let goal =
+               match script#goal with
+                  None -> assert false
+                | Some n -> n
+              in
+               sequents_viewer#goto_sequent goal
+            with Failure _ -> script#setGoal None);
+         | CommandMode _ -> sequents_viewer#load_logo
+       )
     | Intermediate _ -> assert false (* only the engine may be in this state *)
   in
   script#addObserver sequents_observer;
@@ -118,7 +134,10 @@ let _ =
     in
     addDebugItem "dump aliases" (fun _ ->
       let status = script#lexicon_status in
-      HLog.debug (DisambiguatePp.pp_environment status.LexiconEngine.aliases));
+      HLog.debug (String.concat "\n"
+       (DisambiguateTypes.Environment.fold
+         (fun _ x l -> (LexiconAstPp.pp_alias x)::l)
+         status.LexiconEngine.aliases [])));
     addDebugItem "dump environment to \"env.dump\"" (fun _ ->
       let oc = open_out "env.dump" in
       CicEnvironment.dump_to_channel oc;
@@ -152,7 +171,7 @@ let _ =
         (fun cmd ->
           prerr_endline
            (GrafiteAstPp.pp_command
-             ~term_pp:(fun _ -> assert false)
+             ~term_pp:(fun t -> CicPp.ppterm t)
              ~obj_pp:(fun _ -> assert false)
              cmd))
         (List.rev moo));
@@ -275,8 +294,9 @@ let _ =
         ~doc:(HExtlib.unopt (mview ())#get_document) ~name:"matita.xml" ())); *)
     addDebugItem "load (sequent) MathML from matita.xml"
       (fun _ -> (mview ())#load_uri ~filename:"matita.xml");
-    addDebugItem "autoWin"
-    (fun _ -> MatitaAutoGui.auto_dialog Auto.get_auto_status);
+    addDebugSeparator ();
+    addDebugItem "Expand virtuals"
+    (fun _ -> (MatitaScript.current ())#expandAllVirtuals);
   end
   (** Debugging }}} *)