X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=9aa1fb2f1c3db6f04c493434edf6df0760cc1c43;hb=be2a030746e20744f9a317a31c7053bcfbb6e505;hp=b3963bf0272d9f9330284a8314ba2ce3fcb473e8;hpb=84e6cbe962c9a534be48542c098d7bb0d90be9a1;p=helm.git

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index b3963bf02..9aa1fb2f1 100644
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -81,8 +81,15 @@ let _ =
   let sequents_viewer = MatitaMathView.sequentsViewer_instance () in
   sequents_viewer#load_logo;
   cic_math_view#set_href_callback
-    (Some (fun uri -> (MatitaMathView.cicBrowser ())#load
-      (`Uri (UriManager.uri_of_string uri))));
+    (Some (fun uri ->
+      let uri =
+       try
+        `Uri (UriManager.uri_of_string uri)
+       with
+        UriManager.IllFormedUri _ ->
+         `NRef (NReference.reference_of_string uri)
+      in
+      (MatitaMathView.cicBrowser ())#load uri));
   let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
   let sequents_observer _ grafite_status =
     sequents_viewer#reset;
@@ -99,7 +106,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;
@@ -120,10 +141,18 @@ let _ =
     in
     addDebugItem "dump aliases" (fun _ ->
       let status = script#lexicon_status in
+      LexiconEngine.dump_aliases HLog.debug "" status);
+(* FG: DEBUGGING   
+    addDebugItem "dump interpretations" (fun _ ->
+      let status = script#lexicon_status in
+      let filter = 
+       List.filter (function LexiconAst.Interpretation _ -> true | _ -> false)
+      in
       HLog.debug (String.concat "\n"
-       (DisambiguateTypes.Environment.fold
-         (fun _ x l -> (LexiconAstPp.pp_alias x)::l)
-         status.LexiconEngine.aliases [])));
+       (List.fold_right
+         (fun x l -> (LexiconAstPp.pp_command x)::l)
+         (filter status.LexiconEngine.lexicon_content_rev) [])));
+*)
     addDebugItem "dump environment to \"env.dump\"" (fun _ ->
       let oc = open_out "env.dump" in
       CicEnvironment.dump_to_channel oc;
@@ -184,7 +213,7 @@ let _ =
      addDebugItem "Print current proof (natural language) to stderr" 
        (fun _ -> 
         prerr_endline 
-          (ApplyTransformation.txt_of_cic_object 120 GrafiteAst.Declarative "" 
+          (ApplyTransformation.txt_of_cic_object 120 [] 
             ~map_unicode_to_tex:(Helm_registry.get_bool
               "matita.paste_unicode_as_tex")
             (match