X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.ml;h=658a3ad384bb5d94ee2826b3239c530b94ad2b6f;hb=8de1a75899a83dd31e856804bd448c1bd87d9ab3;hp=fb7ad27bf6244c2a914dfc418957e760feae75ce;hpb=238b544db1786fbc68354fd62aa6b05983906997;p=helm.git

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index fb7ad27bf..658a3ad38 100644
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -81,10 +81,17 @@ 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))));
-  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
-  let sequents_observer _ grafite_status =
+    (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;
     match grafite_status.proof_status with
     | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
@@ -133,7 +140,7 @@ let _ =
       ignore (GMenu.separator_item ~packing:gui#main#debugMenu_menu#append ())
     in
     addDebugItem "dump aliases" (fun _ ->
-      let status = script#lexicon_status in
+      let status = GrafiteTypes.get_lexicon script#grafite_status in
       LexiconEngine.dump_aliases HLog.debug "" status);
 (* FG: DEBUGGING   
     addDebugItem "dump interpretations" (fun _ ->
@@ -206,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 
@@ -294,7 +301,7 @@ let _ =
                    "(" ^ string_of_int saturations ^ ")")
                 ul)) ^ ":"
              ^ CoercDb.string_of_carr s ^ " -> " ^ CoercDb.string_of_carr t))
-        (CoercDb.to_list ()));
+        (CoercDb.to_list (CoercDb.dump ())));
     addDebugSeparator ();
     let mview () = (MatitaMathView.sequentsViewer_instance ())#cicMathView in
 (*     addDebugItem "save (sequent) MathML to matita.xml"