X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMathView.ml;h=479891fec0e41a24eed945b75444f3244b58e4c9;hb=301c308c53e3d47d0c924731717c6d075273961e;hp=13035b02b5ca8be6e57ab626f7551796fabf0728;hpb=55e646b795e4a7beedf1263ea734477bd4762931;p=helm.git diff --git a/helm/matita/matitaMathView.ml b/helm/matita/matitaMathView.ml index 13035b02b..479891fec 100644 --- a/helm/matita/matitaMathView.ml +++ b/helm/matita/matitaMathView.ml @@ -28,17 +28,6 @@ open Printf open MatitaTypes open MatitaGtkMisc -let add_trailing_slash = - let rex = Pcre.regexp "/$" in - fun s -> - if Pcre.pmatch ~rex s then s - else s ^ "/" - -let strip_blanks = - let rex = Pcre.regexp "^\\s*([^\\s]*)\\s*$" in - fun s -> - (Pcre.extract ~rex s).(1) - (** inherit from this class if you want to access current script *) class scriptAccessor = object (self) @@ -75,7 +64,7 @@ let href_ds = Gdome.domString "href" let xref_ds = Gdome.domString "xref" (* ids_to_terms should not be passed here, is just for debugging *) -let find_root_id annobj id ids_to_father_ids ids_to_terms = +let find_root_id annobj id ids_to_father_ids ids_to_terms ids_to_inner_types = let find_parent id ids = let rec aux id = (* (prerr_endline (sprintf "id %s = %s" id @@ -98,13 +87,20 @@ let find_root_id annobj id ids_to_father_ids ids_to_terms = | Some parent_id -> parent_id in let mk_ids terms = List.map CicUtil.id_of_annterm terms in + let inner_types = + Hashtbl.fold + (fun _ types acc -> + match types.Cic2acic.annexpected with + None -> types.Cic2acic.annsynthesized :: acc + | Some ty -> ty :: types.Cic2acic.annsynthesized :: acc + ) ids_to_inner_types [] in match annobj with | Cic.AConstant (_, _, _, Some bo, ty, _, _) | Cic.AVariable (_, _, Some bo, ty, _, _) | Cic.ACurrentProof (_, _, _, _, bo, ty, _, _) -> - return_father id (mk_ids [ty; bo]) + return_father id (mk_ids (ty :: bo :: inner_types)) | Cic.AConstant (_, _, _, None, ty, _, _) - | Cic.AVariable (_, _, None, ty, _, _) -> return_father id (mk_ids [ty]) + | Cic.AVariable (_, _, None, ty, _, _) -> return_father id (mk_ids (ty::inner_types)) | Cic.AInductiveDefinition _ -> assert false (* TODO *) @@ -133,18 +129,15 @@ object (self) val mutable selection_changed = false method private selection_get_cb ctxt ~info ~time = -(* prerr_endline "selection_get_cb"; *) (match self#get_selections with | [] -> () | node :: _ -> ctxt#return (self#string_of_node node)) method private selection_clear_cb sel_event = -(* prerr_endline "selection_clear_cb"; *) self#remove_selections; false method private button_press_cb gdk_button = -(* prerr_endline "button_press_cb"; *) let button = GdkEvent.Button.button gdk_button in if button = left_button then begin button_press_x <- GdkEvent.Button.x gdk_button; @@ -155,7 +148,6 @@ object (self) false method private popup_contextual_menu time = -(* prerr_endline "popup_contextual_menu"; *) match self#string_of_selection with | None -> () | Some s -> @@ -244,7 +236,7 @@ object (self) method update_font_size = self#set_font_size !current_font_size method private get_term_by_id context cic_info id = - let ids_to_terms, ids_to_hypotheses, _, _ = cic_info in + let ids_to_terms, ids_to_hypotheses, _, _, _ = cic_info in try `Term (Hashtbl.find ids_to_terms id) with Not_found -> @@ -257,10 +249,12 @@ object (self) method private find_obj_conclusion id = match self#cic_info with | None - | Some (_, _, _, None) -> assert false - | Some (ids_to_terms, _, ids_to_father_ids, Some annobj) -> - let id = find_root_id annobj id ids_to_father_ids ids_to_terms in - (try Hashtbl.find ids_to_terms id with Not_found -> assert false) + | Some (_, _, _, _, None) -> assert false + | Some (ids_to_terms, _, ids_to_father_ids, ids_to_inner_types, Some annobj) -> + let id = + find_root_id annobj id ids_to_father_ids ids_to_terms ids_to_inner_types + in + (try Hashtbl.find ids_to_terms id with Not_found -> assert false) method private string_of_node node = let get_id (node: Gdome.element) = @@ -349,7 +343,7 @@ object (self) ApplyTransformation.mml_of_cic_sequent metasenv sequent in self#set_cic_info - (Some (ids_to_terms, ids_to_hypotheses, ids_to_father_ids, None)); + (Some (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); ignore (DomMisc.domImpl#saveDocumentToFile ~name ~doc:mathml ()); @@ -358,12 +352,12 @@ object (self) method load_object obj = let use_diff = false in (* ZACK TODO use XmlDiff when re-rendering? *) let (mathml, - (annobj, (ids_to_terms, ids_to_father_ids, _, ids_to_hypotheses, _, _))) + (annobj, (ids_to_terms, ids_to_father_ids, _, ids_to_hypotheses, _, ids_to_inner_types))) = ApplyTransformation.mml_of_cic_object obj in self#set_cic_info - (Some (ids_to_terms, ids_to_hypotheses, ids_to_father_ids, Some annobj)); + (Some (ids_to_terms, ids_to_hypotheses, ids_to_father_ids, ids_to_inner_types, Some annobj)); (match current_mathml with | Some current_mathml when use_diff -> self#freeze; @@ -389,8 +383,13 @@ class sequentsViewer ~(notebook:GPack.notebook) ~(cicMathView:cicMathView) () = val mutable _metasenv = [] val mutable scrolledWin: GBin.scrolled_window option = None (* scrolled window to which the sequentViewer is currently attached *) - val logo = (GMisc.image ~file:"logo/matita_medium.png" () :> GObj.widget) - val logo_with_qed = (GMisc.image ~file:"logo/matita_small.png" () :> GObj.widget) + val logo = (GMisc.image + ~file:(BuildTimeConf.runtime_base_dir ^ "/logo/matita_medium.png") () + :> GObj.widget) + + val logo_with_qed = (GMisc.image + ~file:(BuildTimeConf.runtime_base_dir ^ "/logo/matita_small.png") () + :> GObj.widget) method load_logo = notebook#set_show_tabs false; @@ -519,12 +518,6 @@ type term_source = | `String of string ] -let reloadable = function - | `About `Current_proof - | `Dir _ -> - true - | _ -> false - class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) () = @@ -605,7 +598,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) ignore (win#browserHomeButton#connect#clicked (handle_error' (fun () -> self#load (`About `Current_proof)))); ignore (win#browserRefreshButton#connect#clicked - (handle_error' self#refresh)); + (handle_error' (self#refresh ~force:true))); ignore (win#browserBackButton#connect#clicked (handle_error' self#back)); ignore (win#browserForwardButton#connect#clicked (handle_error' self#forward)); @@ -627,7 +620,6 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) toplevel#show () val mutable current_entry = `About `Blank - val mutable current_infos = None val model = new MatitaGtkMisc.taggedStringListModel tags win#whelpResultTreeview @@ -685,9 +677,10 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) (* loads a uri which can be a cic uri or an about:* uri * @param uri string *) - method private _load entry = + method private _load ?(force=false) entry = try - if entry <> current_entry || reloadable entry then begin + if entry <> current_entry || entry = `About `Current_proof || force then + begin (match entry with | `About `Current_proof -> self#home () | `About `Blank -> self#blank () @@ -776,7 +769,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) (** this is what the browser does when you enter a string an hit enter *) method loadInput txt = - let txt = strip_blanks txt in + let txt = MatitaMisc.trim_blanks txt in let fix_uri txt = UriManager.string_of_uri (UriManager.strip_xpointer (UriManager.uri_of_string txt)) @@ -788,7 +781,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) let entry = match txt with | txt when is_uri txt -> `Uri (UriManager.uri_of_string (fix_uri txt)) - | txt when is_dir txt -> `Dir (add_trailing_slash txt) + | txt when is_dir txt -> `Dir (MatitaMisc.normalize_dir txt) | txt -> (try entry_of_string txt @@ -808,8 +801,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) method win = win method history = history method currentEntry = current_entry - method refresh () = - if reloadable current_entry then self#_load current_entry + method refresh ~force () = self#_load ~force current_entry end @@ -864,7 +856,8 @@ let mathViewer () = (self#get_browser reuse)#load entry end -let refresh_all_browsers () = List.iter (fun b -> b#refresh ()) !cicBrowsers +let refresh_all_browsers () = + List.iter (fun b -> b#refresh ~force:false ()) !cicBrowsers let update_font_sizes () = List.iter (fun b -> b#updateFontSize) !cicBrowsers;