(* *)
(******************************************************************************)
-let use_stylesheets = ref true;;(* false performs the transformations in OCaml*)
+let use_stylesheets = ref false;;(* false performs the transformations in OCaml*)
(* List utility functions *)
exception Skip;;
Cic.ACurrentProof (id,idbody,n,conjectures,bo,ty,params) ->
let time1 = Sys.time () in
let content =
- Cic2content.acic2content
- (ref 0) ~name:(Some "prova") ~ids_to_inner_sorts
- ~ids_to_inner_types bo in
- let content2pres =
- (Content2pres.proof2pres
- (function p ->
- (Cexpr2pres.cexpr2pres_charcount
- (Content_expressions.acic2cexpr ids_to_inner_sorts p)))) in
- let pres = content2pres content in
+ Cic2content.annobj2content
+ ~ids_to_inner_sorts ~ids_to_inner_types acic in
+ let pres = Content2pres.content2pres ~ids_to_inner_sorts content in
let time2 = Sys.time () in
(* prerr_endline ("Fine trasformazione:" ^ (string_of_float (time2 -. time1))); *)
- let xmlpres =
- Xml.xml_nempty "math"
- ["xmlns","http://www.w3.org/1998/Math/MathML" ;
- "xmlns:helm","http://www.cs.unibo.it/helm" ;
- "xmlns:xlink","http://www.w3.org/1999/xlink"
- ] (Mpresentation.print_mpres pres) in
+ let xmlpres = Mpresentation.print_mpres pres in
let time25 = Sys.time () in
(*
prerr_endline ("FINE printing to stream:" ^ (string_of_float (time25 -. time2)));
prerr_endline ("FINE valutazione e printing dello stream:" ^ (string_of_float (time3 -. time25)));
*)
(try
- (* prerr_endline "(******** INIZIO DOM **********)"; *)
- let mml = Xml2Gdomexmath.document_of_xml Misc.domImpl xmlpres in
+ prerr_endline "(******** INIZIO DOM **********)";
+ let mml = Xml2Gdome.document_of_xml Misc.domImpl xmlpres in
let time3 = Sys.time () in
(* ignore (Misc.domImpl#saveDocumentToFile mml "tmp1" ()); *)
- (* prerr_endline "(******** FINE DOM **********)"; *)
+ prerr_endline "(******** FINE DOM **********)";
self#load_doc ~dom:mml;
prerr_endline ("Fine loading:" ^ (string_of_float (time3 -. time2)))
(*