some improvements

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

diff --git a/helm/software/matita/matita.ml b/helm/software/matita/matita.ml
index 5a638b48d79bb86fd39188b0c9cbe753aead9e63..a23558aa85e0ff83ca12707b4c732a4ba6db829c 100644 (file)
--- a/helm/software/matita/matita.ml
+++ b/helm/software/matita/matita.ml
@@ -167,22 +167,22 @@ let _ =
             (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
             with
             | GrafiteTypes.No_proof -> (Cic.Implicit None)
-            | Incomplete_proof i -> let _,_,p,_ = i.GrafiteTypes.proof in p
-            | Proof p -> let _,_,p,_ = p in p
+            | Incomplete_proof i -> let _,_,p,_, _ = i.GrafiteTypes.proof in p
+            | Proof p -> let _,_,p,_, _ = p in p
             | Intermediate _ -> assert false)));
      addDebugItem "Print current proof (natural language) to stderr" 
        (fun _ -> 
         prerr_endline 
-          (ObjPp.obj_to_string 120 GrafiteAst.Declarative "" 
+          (ApplyTransformation.txt_of_cic_object 120 GrafiteAst.Declarative "" 
             (match 
             (MatitaScript.current ())#grafite_status.GrafiteTypes.proof_status
             with
             | GrafiteTypes.No_proof -> assert false
             | Incomplete_proof i -> 
-                let _,m,p,ty = i.GrafiteTypes.proof in 
-                Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],[])
-            | Proof (_,m,p,ty) -> 
-                Cic.CurrentProof ("current proof",m,p,ty,[],[])
+                let _,m,p,ty, attrs = i.GrafiteTypes.proof in 
+                Cic.CurrentProof ("current (incomplete) proof",m,p,ty,[],attrs)
+            | Proof (_,m,p,ty, attrs) -> 
+                Cic.CurrentProof ("current proof",m,p,ty,[],attrs)
             | Intermediate _ -> assert false)));
 (*     addDebugItem "ask record choice"
       (fun _ ->
@@ -214,22 +214,30 @@ let _ =
     );
     addDebugSeparator ();
 *)
+    addDebugItem "disable high level pretty printer"
+      (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := true);
+    addDebugItem "enable high level pretty printer"
+      (fun _ -> CicMetaSubst.use_low_level_ppterm_in_context := false);
+(* ZACK moved to the View menu
     addDebugItem "disable all (pretty printing) notations"
       (fun _ -> CicNotation.set_active_notations []);
     addDebugItem "enable all (pretty printing) notations"
       (fun _ ->
         CicNotation.set_active_notations
           (List.map fst (CicNotation.get_all_notations ())));
+*)
     addDebugSeparator ();
     addDebugItem "enable multiple disambiguation passes (default)"
       (fun _ -> GrafiteDisambiguator.only_one_pass := false);
     addDebugItem "enable only one disambiguation pass"
       (fun _ -> GrafiteDisambiguator.only_one_pass := true);
     addDebugSeparator ();
+(* ZACK moved to the View menu
     addDebugItem "enable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := true);
     addDebugItem "disable coercions hiding"
       (fun _ -> Acic2content.hide_coercions := false);
+*)
     addDebugItem "show coercions graph" (fun _ ->
       let c = MatitaMathView.cicBrowser () in
       c#load (`About `Coercions));