ocaml 3.09 transition

[helm.git] / helm / gTopLevel / termViewer.mli

diff --git a/helm/gTopLevel/termViewer.mli b/helm/gTopLevel/termViewer.mli
index 5a510503577f63c4084c3cad64947d2d30c5da6f..f391363ebdf48730caac1dcbb9b0138a06589322 100644 (file)
--- a/helm/gTopLevel/termViewer.mli
+++ b/helm/gTopLevel/termViewer.mli
@@ -33,11 +33,32 @@
 (*                                                                            *)
 (******************************************************************************)
 
-(** A widget to render sequents **)
+type mml_of_cic_sequent =
+ Cic.metasenv ->
+ int * Cic.context * Cic.term ->
+ Gdome.document * 
+ (Cic.annconjecture *
+  ((Cic.id, Cic.term) Hashtbl.t *
+   (Cic.id, Cic.id option) Hashtbl.t *
+   (string, Cic.hypothesis) Hashtbl.t *
+   (Cic.id, string) Hashtbl.t))
+   
+
+type mml_of_cic_object =
+  Cic.obj ->
+  Gdome.document * 
+  (Cic.annobj * 
+   ((Cic.id, Cic.term) Hashtbl.t * 
+    (Cic.id, Cic.id option) Hashtbl.t *
+    (Cic.id, Cic.conjecture) Hashtbl.t * 
+    (Cic.id, Cic.hypothesis) Hashtbl.t *
+    (Cic.id, string) Hashtbl.t *   
+    (Cic.id, Cic2acic.anntypes) Hashtbl.t))
 
-val use_stylesheets: bool ref;; (* false performs the transformations in OCaml*)
+(** A widget to render sequents **)
 
 class sequent_viewer :
+  mml_of_cic_sequent:mml_of_cic_sequent ->
   Gtk_mathview.math_view Gtk.obj ->
   object
     inherit GMathViewAux.multi_selection_math_view
@@ -54,11 +75,11 @@ class sequent_viewer :
   end
 
 val sequent_viewer :
-  ?adjustmenth:GData.adjustment ->
-  ?adjustmentv:GData.adjustment ->
+  mml_of_cic_sequent:mml_of_cic_sequent ->
+  ?hadjustment:GData.adjustment ->
+  ?vadjustment:GData.adjustment ->
   ?font_size:int ->
-  ?font_manager:[ `font_manager_gtk | `font_manager_t1] ->
-  ?border_width:int ->
+  ?log_verbosity:int ->
   ?width:int ->
   ?height:int ->
   ?packing:(GObj.widget -> unit) ->
@@ -68,6 +89,7 @@ val sequent_viewer :
 (** A widget to render proofs **)
 
 class proof_viewer :
+  mml_of_cic_object:mml_of_cic_object ->
   Gtk_mathview.math_view Gtk.obj ->
   object
     inherit GMathViewAux.single_selection_math_view
@@ -83,20 +105,21 @@ class proof_viewer :
     (* load_proof also returns the annotated cic term and the *)
     (* ids_to_inner_types and ids_to_inner_sorts maps.        *)
     method load_proof :
-     UriManager.uri -> Cic.obj ->
+     Cic.obj ->
       Cic.annobj * (Cic.id, Cic2acic.anntypes) Hashtbl.t *
        (Cic.id, string) Hashtbl.t
 
   end
 
 val proof_viewer :
-  ?adjustmenth:GData.adjustment ->
-  ?adjustmentv:GData.adjustment ->
+  mml_of_cic_object:mml_of_cic_object ->
+  ?hadjustment:GData.adjustment ->
+  ?vadjustment:GData.adjustment ->
   ?font_size:int ->
-  ?font_manager:[ `font_manager_gtk | `font_manager_t1] ->
-  ?border_width:int ->
+  ?log_verbosity:int ->
   ?width:int ->
   ?height:int ->
   ?packing:(GObj.widget -> unit) ->
   ?show:bool ->
   unit -> proof_viewer
+