snapshot, notably history no longer remember annotations: they are

[helm.git] / helm / matita / matita.ml

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index bf57dc8d91b1d7470117001c1893336550bf4844..fb163aa9cfac9f0e0dc03db0874d562078b079eb 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -70,40 +70,36 @@ let proof_viewer =
   MatitaMathView.proof_viewer ~show:true ~packing:(frame#add) ()
 let sequent_viewer = MatitaMathView.sequent_viewer ~show:true ()
 let sequents_viewer =
+  let set_goal goal =
+    debug_print (sprintf "Setting goal %d" goal);
+    if not (has_proof ()) then assert false;
+    (get_proof ())#set_goal goal
+  in
   MatitaMathView.sequents_viewer ~notebook:gui#main#sequentsNotebook
-    ~sequent_viewer ()
+    ~sequent_viewer ~set_goal ()
 
 let new_proof (proof: MatitaTypes.proof) =
   let xmldump_observer _ _ =  print_endline proof#toString in
-  let proof_observer _ (status, (proof_metadata, _)) =
+  let proof_observer _ (status, ()) =
     debug_print "proof_observer";
-    let (acic, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts,
-        ids_to_inner_types, ids_to_conjectures, ids_to_hypotheses) =
-      proof_metadata
-    in
     let ((uri_opt, _, _, _), _) = status in
     let uri = MatitaTypes.unopt_uri uri_opt in
     debug_print "apply transformation";
-    let mathml =
-      ApplyTransformation.mml_of_cic_object
-        ~explode_all:true uri acic ids_to_inner_sorts ids_to_inner_types
-    in
-    if BuildTimeConf.debug then save_dom ~doc:mathml ~dest:"/tmp/matita.xml";
-    proof_viewer#load_proof mathml proof_metadata;
+    proof_viewer#load_proof status;
     debug_print "/proof_observer"
   in
-  let sequents_observer _ ((proof, goal_opt), (_, sequents_metadata)) =
+  let sequents_observer _ (((_, metasenv, _, _), goal_opt), ()) =
     sequents_viewer#reset;
     (match goal_opt with
     | None -> ()
     | Some goal ->
-        sequents_viewer#load_sequents sequents_metadata;
+        sequents_viewer#load_sequents metasenv;
         sequents_viewer#goto_sequent goal)
   in
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      sequents_observer);
+    sequents_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
-      proof_observer);
+    proof_observer);
   ignore (proof#attach_observer ~interested_in:StatefulProofEngine.all_events
     xmldump_observer);
   proof#notify;
@@ -125,6 +121,7 @@ let abort_proof () =
 let proof_handler =
   { MatitaTypes.get_proof = get_proof;
     MatitaTypes.abort_proof = abort_proof;
+    MatitaTypes.set_proof = set_proof;
     MatitaTypes.has_proof = has_proof;
     MatitaTypes.new_proof = new_proof;
     MatitaTypes.quit = quit;