From 719eb6cd26fffa6de3ca194de310a58fd4834558 Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Wed, 29 Oct 2003 09:38:09 +0000 Subject: [PATCH] * this implements the new instantiation for gtkmathview --- helm/gTopLevel/termViewer.ml | 21 ++++++++++++++++++++- helm/gTopLevel/termViewer.mli | 12 ++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/helm/gTopLevel/termViewer.ml b/helm/gTopLevel/termViewer.ml index da7b6bdca..b782237d0 100644 --- a/helm/gTopLevel/termViewer.ml +++ b/helm/gTopLevel/termViewer.ml @@ -65,6 +65,7 @@ class sequent_viewer obj = (* returns the list of selected terms *) (* selections which are not terms are ignored *) method get_selected_terms = + prerr_endline (string_of_int (List.length self#get_selections)) ; let selections = self#get_selections in list_map_fail (function node -> @@ -73,6 +74,7 @@ class sequent_viewer obj = ~namespaceURI:Misc.helmns ~localName:(Gdome.domString "xref"))#to_string in + prerr_endline ("YAHHHHHHHHHH " ^ xpath) ; if xpath = "" then assert false (* "ERROR: No xref found!!!" *) else match current_infos with @@ -111,11 +113,19 @@ class sequent_viewer obj = ApplyStylesheets.mml_of_cic_sequent metasenv sequent in self#load_doc ~dom:sequent_mml ; +Misc.domImpl#saveDocumentToFile ~name:"/tmp/pippo" ~doc:sequent_mml () ; current_infos <- Some (ids_to_terms,ids_to_father_ids,ids_to_hypotheses) end ;; +let sequent_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity = + GtkBase.Container.make_params ~cont:( + OgtkMathViewProps.pack_return + (fun p -> OgtkMathViewProps.set_params (new sequent_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) [] +;; + +(* let sequent_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager ?border_width ?width ?height ?packing ?show () = let w = @@ -138,7 +148,7 @@ let sequent_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager end; mathview ;; - +*) (** A widget to render proofs **) @@ -160,6 +170,7 @@ class proof_viewer obj = ~namespaceURI:Misc.helmns ~localName:(Gdome.domString "xref"))#to_string in + prerr_endline ("YAEEEEEEEEEEEEEEEEEEE " ^ xpath) ; if xpath = "" then assert false (* "ERROR: No xref found!!!" *) else begin @@ -266,6 +277,13 @@ class proof_viewer obj = end ;; +let proof_viewer ?hadjustment ?vadjustment ?font_size ?log_verbosity = + GtkBase.Container.make_params ~cont:( + OgtkMathViewProps.pack_return + (fun p -> OgtkMathViewProps.set_params (new proof_viewer (GtkMathViewProps.MathView.create p)) ~font_size ~log_verbosity)) [] +;; + +(* let proof_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager ?border_width ?width ?height ?packing ?show () = let w = @@ -288,6 +306,7 @@ let proof_viewer ?adjustmenth ?adjustmentv ?font_size ?font_manager end; mathview ;; +*) let _ = Cexpr2pres_hashtbl.init Cexpr2pres.cexpr2pres Cexpr2pres.cexpr2pres_charcount diff --git a/helm/gTopLevel/termViewer.mli b/helm/gTopLevel/termViewer.mli index 5a5105035..db4c05899 100644 --- a/helm/gTopLevel/termViewer.mli +++ b/helm/gTopLevel/termViewer.mli @@ -54,10 +54,10 @@ class sequent_viewer : end val sequent_viewer : - ?adjustmenth:GData.adjustment -> - ?adjustmentv:GData.adjustment -> + ?hadjustment:GData.adjustment -> + ?vadjustment:GData.adjustment -> ?font_size:int -> - ?font_manager:[ `font_manager_gtk | `font_manager_t1] -> + ?log_verbosity:int -> ?border_width:int -> ?width:int -> ?height:int -> @@ -90,10 +90,10 @@ class proof_viewer : end val proof_viewer : - ?adjustmenth:GData.adjustment -> - ?adjustmentv:GData.adjustment -> + ?hadjustment:GData.adjustment -> + ?vadjustment:GData.adjustment -> ?font_size:int -> - ?font_manager:[ `font_manager_gtk | `font_manager_t1] -> + ?log_verbosity:int -> ?border_width:int -> ?width:int -> ?height:int -> -- 2.39.2