tagging rc-1

[helm.git] / matita / matitac.ml

diff --git a/matita/matitac.ml b/matita/matitac.ml
index 34e0639e3aa62ebfd422fb7a02c7a5ac7e5d1d6b..179a0ba8e8e508e413f22958cef5c20cc1039fbc 100644 (file)
--- a/matita/matitac.ml
+++ b/matita/matitac.ml
@@ -27,6 +27,7 @@
 
 module G = GrafiteAst
 module L = LexiconAst
+module H = HExtlib
 
 (* from transcript *)
 
@@ -51,36 +52,43 @@ let out_preamble och (path, lines) =
 
 (* from matitacLib *)
 
-let pp_ast_statement =
+let pp_ast_statement st =
   GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term
-    ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term)
+    ~map_unicode_to_tex:(Helm_registry.get_bool
+      "matita.paste_unicode_as_tex")
+    ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:(CicNotationPp.pp_obj CicNotationPp.pp_term) st
 
 (**)
 
 let dump f =
+   Helm_registry.set_bool "matita.moo" false;
+   let floc = H.dummy_floc in
+   let nl_ast = G.Comment (floc, G.Note (floc, "")) in
    let och = open_out f in
    let atexit () = close_out och in
+   let nl () =  output_string och (pp_ast_statement nl_ast) in
    let rt_base_dir = Filename.dirname Sys.argv.(0) in
    let path = Filename.concat rt_base_dir "matita.ma.templ" in
    let lines = 14 in
    out_preamble och (path, lines);
-   let lexicon_engine_cb = function
-     | L.Include _ as ast -> output_string och (LexiconAstPp.pp_command ast)
-     | _                  -> ()
+   let grafite_parser_cb fname = 
+      let ast = G.Executable (floc, G.Command (floc, G.Include (floc, fname))) in
+      output_string och (pp_ast_statement ast); nl (); nl ()
    in
    let matita_engine_cb = function
       | G.Executable (_, G.Macro (_, G.Inline _)) 
       | G.Executable (_, G.Command (_, G.Include _)) -> ()
-      | ast                                                 ->
-         output_string och (pp_ast_statement ast)
+      | ast                                          ->
+         output_string och (pp_ast_statement ast); nl (); nl ()
    in
    let matitac_lib_cb = output_string och in
-   LexiconEngine.set_callback lexicon_engine_cb;
+   GrafiteParser.set_callback grafite_parser_cb;
    MatitaEngine.set_callback matita_engine_cb;
    MatitacLib.set_callback matitac_lib_cb;
    at_exit atexit
    
 let main () =
+ Helm_registry.set_bool "matita.moo" true;
  match Filename.basename Sys.argv.(0) with
  |"gragrep"    |"gragrep.opt"    |"gragrep.opt.static"    ->Gragrep.main()
  |"matitadep"  |"matitadep.opt"  |"matitadep.opt.static"  ->Matitadep.main()