ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_notation / cicNotationPres.mli

diff --git a/helm/ocaml/cic_notation/cicNotationPres.mli b/helm/ocaml/cic_notation/cicNotationPres.mli
index d7fcb9ea3b316949947dcae6d0f8d3e8f5c06e51..04411df2b3d2e5ed394d04f33c74ac1ae5d05ace 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationPres.mli
+++ b/helm/ocaml/cic_notation/cicNotationPres.mli
@@ -28,12 +28,25 @@ and boxml_markup = mathml_markup Box.box
 
 type markup = mathml_markup
 
-(** @param ids_to_uris mapping id -> uri for hyperlinking *)
-val render: (Cic.id, string) Hashtbl.t -> CicNotationPt.term -> markup
+(** {2 Markup conversions} *)
 
+val mpres_of_box: boxml_markup -> mathml_markup
+val box_of_mpres: mathml_markup -> boxml_markup
+
+(** {2 Rendering} *)
+
+(** level 1 -> level 0
+ * @param ids_to_uris mapping id -> uri for hyperlinking *)
+val render: (Cic.id, UriManager.uri) Hashtbl.t -> CicNotationPt.term -> markup
+
+(** level 0 -> xml stream *)
+val print_xml: markup -> Xml.token Stream.t
+
+(* |+* level 1 -> xml stream
+ * @param ids_to_uris +|
 val render_to_boxml:
-  (Cic.id, string) Hashtbl.t -> CicNotationPt.term -> Xml.token Stream.t
+  (Cic.id, string) Hashtbl.t -> CicNotationPt.term -> Xml.token Stream.t *)
 
-(* val render_to_mathml:
-  (Cic.id, string) Hashtbl.t -> CicNotationPt.term -> mathml_markup *)
+val print_box:    boxml_markup -> Xml.token Stream.t
+val print_mpres:  mathml_markup -> Xml.token Stream.t