ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_transformations / applyTransformation.ml

diff --git a/helm/ocaml/cic_transformations/applyTransformation.ml b/helm/ocaml/cic_transformations/applyTransformation.ml
index 6eff8d17bbb0ddfc67b668ace8e50ddd6f1f1807..54402e0bc12372d17207fa16085b605521aaca06 100644 (file)
--- a/helm/ocaml/cic_transformations/applyTransformation.ml
+++ b/helm/ocaml/cic_transformations/applyTransformation.ml
@@ -33,33 +33,38 @@
 (*                                                                         *)
 (***************************************************************************)
 
-let reload_stylesheets = ignore
-;;
-
 let mpres_document pres_box =
-  Ast2pres.add_xml_declaration
-    (Box.box2xml ~obj2xml:Mpresentation.print_mpres pres_box)
+  Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
 
 let mml_of_cic_sequent metasenv sequent =
-  let asequent,ids_to_terms,
-    ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses =
-    Cic2acic.asequent_of_sequent metasenv sequent in
+  let unsh_sequent,(asequent,ids_to_terms,
+    ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses)
+  =
+    Cic2acic.asequent_of_sequent metasenv sequent
+  in
   let content_sequent = Cic2content.map_sequent asequent in 
   let pres_sequent = 
-    (Sequent2pres.sequent2pres ~ids_to_inner_sorts content_sequent) in
+    (Sequent2pres.sequent2pres ~ids_to_inner_sorts content_sequent)
+  in
   let xmlpres = mpres_document pres_sequent in
-  Xml2Gdome.document_of_xml Misc.domImpl xmlpres,
-   (ids_to_terms,ids_to_father_ids,ids_to_hypotheses)
-;;
+  (Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres,
+   unsh_sequent,
+   (asequent,
+    (ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts)))
 
-let mml_of_cic_object ~explode_all uri acic 
-  ids_to_inner_sorts ids_to_inner_types
-=
+let mml_of_cic_object obj =
+  let (annobj, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
+    ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses)
+  =
+    Cic2acic.acic_object_of_cic_object obj
+  in
   let content = 
-    Cic2content.annobj2content ~ids_to_inner_sorts ~ids_to_inner_types acic
+    Cic2content.annobj2content ~ids_to_inner_sorts ~ids_to_inner_types annobj
   in
   let pres = Content2pres.content2pres ~ids_to_inner_sorts content in
   let xmlpres = mpres_document pres in
-  Xml2Gdome.document_of_xml Misc.domImpl xmlpres 
-;;
+  let mathml = Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres in
+  (mathml,(annobj,
+   (ids_to_terms, ids_to_father_ids, ids_to_conjectures, ids_to_hypotheses,
+  ids_to_inner_sorts,ids_to_inner_types)))