X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMathView.ml;h=b637eb8dc37b9b7a06bb547ecb63fa5f8bae4445;hb=6b38b8f5c675570ca5a70e917cf77c783ef2d092;hp=7a54049a87a251c4b6f99328f067e4a9698fc8c8;hpb=c1f74c5fe5c69d3d830f6a58bc0e20c99d1fa8f7;p=helm.git diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml index 7a54049a8..b637eb8dc 100644 --- a/helm/matita/matitaMathView.ml +++ b/helm/matita/matitaMathView.ml @@ -25,7 +25,7 @@ open Printf -open MatitaTypes +open GrafiteTypes open MatitaGtkMisc module Stack = Continuationals.Stack @@ -341,7 +341,7 @@ object (self) | Some ((None, _, _, _, _, _) as info) -> (* building a dummy sequent for obj *) let t = self#find_obj_conclusion id in - MatitaLog.debug (CicPp.ppterm t); + HLog.debug (CicPp.ppterm t); info, (~-1, [], t) | None -> assert false in @@ -397,7 +397,7 @@ object (self) ids_to_terms, ids_to_hypotheses, ids_to_father_ids, Hashtbl.create 1, None)); let name = "sequent_viewer.xml" in - MatitaLog.debug ("load_sequent: dumping MathML to ./" ^ name); + HLog.debug ("load_sequent: dumping MathML to ./" ^ name); ignore (domImpl#saveDocumentToFile ~name ~doc:mathml ()); self#load_root ~root:mathml#get_documentElement @@ -417,7 +417,7 @@ object (self) self#thaw | _ -> let name = "cic_browser.xml" in - MatitaLog.debug ("cic_browser: dumping MathML to ./" ^ name); + HLog.debug ("cic_browser: dumping MathML to ./" ^ name); ignore (domImpl#saveDocumentToFile ~name ~doc:mathml ()); self#load_root ~root:mathml#get_documentElement; current_mathml <- Some mathml); @@ -849,7 +849,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) self#_loadList l method private setEntry entry = - win#browserUri#entry#set_text (string_of_entry entry); + win#browserUri#entry#set_text (MatitaTypes.string_of_entry entry); current_entry <- entry method private _loadObj obj = @@ -892,10 +892,11 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) | txt when is_uri txt -> `Uri (UriManager.uri_of_string (fix_uri txt)) | txt when is_dir txt -> `Dir (MatitaMisc.normalize_dir txt) | txt -> - (try - entry_of_string txt + (try + MatitaTypes.entry_of_string txt with Invalid_argument _ -> - command_error (sprintf "unsupported uri: %s" txt)) + raise + (GrafiteTypes.Command_error(sprintf "unsupported uri: %s" txt))) in self#_load entry; self#_historyAdd entry