run check_if_goal_is_solved on all goals (active+passive)

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

diff --git a/helm/software/matita/applyTransformation.ml b/helm/software/matita/applyTransformation.ml
index 27725882e8d867f6f8acbe34c31c4df7e80c1e7c..9f5f5c311f7196441db3e6626416c86432766814 100644 (file)
--- a/helm/software/matita/applyTransformation.ml
+++ b/helm/software/matita/applyTransformation.ml
@@ -45,6 +45,7 @@ module GE = GrafiteEngine
 module LS = LibrarySync
 module Ds = CicDischarge
 module PO = ProceduralOptimizer
+module N = CicNotationPt
 
 let mpres_document pres_box =
   Xml.add_xml_declaration (CicNotationPres.print_box pres_box)
@@ -65,9 +66,9 @@ let mml_of_cic_sequent metasenv sequent =
     (ids_to_terms,ids_to_father_ids,ids_to_hypotheses,ids_to_inner_sorts)))
 
 let nmml_of_cic_sequent metasenv subst sequent =
-  let content_sequent = NTermCicContent.map_sequent sequent in 
+  let content_sequent = NTermCicContent.nmap_sequent ~subst sequent in 
   let pres_sequent = 
-   Sequent2pres.nsequent2pres content_sequent in
+   Sequent2pres.nsequent2pres subst content_sequent in
   let xmlpres = mpres_document pres_sequent in
    Xml2Gdome.document_of_xml DomMisc.domImpl xmlpres
 
@@ -176,6 +177,13 @@ let term2pres ~map_unicode_to_tex n ids_to_inner_sorts annterm =
    let s = BoxPp.render_to_string ~map_unicode_to_tex render n mpres in
    remove_closed_substs s
 
+let enable_notations = function
+   | true -> 
+      CicNotation.set_active_notations
+         (List.map fst (CicNotation.get_all_notations ()))
+   | false ->
+      CicNotation.set_active_notations []
+
 let txt_of_cic_object 
  ~map_unicode_to_tex ?skip_thm_and_qed ?skip_initial_lambdas
  n style ?flavour prefix obj 
@@ -205,13 +213,14 @@ let txt_of_cic_object
           Content2pres.content2pres 
             ?skip_initial_lambdas ?skip_thm_and_qed ~ids_to_inner_sorts cobj 
         in
-        remove_closed_substs ("\n\n" ^
+        remove_closed_substs (
            BoxPp.render_to_string ~map_unicode_to_tex
             (function _::x::_ -> x | _ -> assert false) n
             (CicNotationPres.mpres_of_box bobj)
-        )
+        ^ "\n\n" )
      | G.Procedural depth ->
-(*
+(*     
+        PO.debug := true;
         PO.critical := false;
        Acic2Procedural.tex_formatter := Some Format.std_formatter;     
        let _ = ProceduralTeX.tex_of_obj Format.std_formatter obj in
@@ -224,14 +233,24 @@ let txt_of_cic_object
         let term_pp = term2pres ~map_unicode_to_tex (n - 8) ids_to_inner_sorts in
         let lazy_term_pp = term_pp in
         let obj_pp = CicNotationPp.pp_obj term_pp in
-        let aux = GrafiteAstPp.pp_statement
-         ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp in
+        let stm_pp =         
+          GrafiteAstPp.pp_statement
+              ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp
+        in
+       let aux = function
+          | G.Executable (_, G.Command (_, G.Obj (_, N.Inductive _))) as stm
+                -> 
+             enable_notations false;
+             let str = stm_pp stm in enable_notations true; str
+(* FG: we disable notation for Inductive to avoid recursive notation *) 
+          | stm -> stm_pp stm 
+       in
         let script = 
            Acic2Procedural.procedural_of_acic_object 
               ~ids_to_inner_sorts ~ids_to_inner_types ~info
              ?depth ?flavour prefix aobj 
   in
-        "\n\n" ^ String.concat "" (List.map aux script)
+        String.concat "" (List.map aux script) ^ "\n\n"
 
 let cic_prefix = Str.regexp_string "cic:/"
 let matita_prefix = Str.regexp_string "cic:/matita/"