matitacLib: bugfix in .moo generation

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

diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml
index 7a6d48663927cf590837a30b3516b7677a5f11b8..6c3749db3e13cca73850b0a9421ccd8e44d5c072 100644 (file)
--- a/helm/software/matita/matitacLib.ml
+++ b/helm/software/matita/matitacLib.ml
@@ -31,10 +31,6 @@ open GrafiteTypes
 
 exception AttemptToInsertAnAlias of LexiconEngine.status
 
-let out = ref ignore 
-let set_callback f = out := f
-
-
 let slash_n_RE = Pcre.regexp "\\n" ;;
 
 let pp_ast_statement grafite_status stm =
@@ -60,7 +56,6 @@ let dump f =
    let module G = GrafiteAst in
    let module L = LexiconAst in
    let module H = HExtlib in
-   Helm_registry.set_bool "matita.moo" false;
    let floc = H.dummy_floc in
    let nl_ast = G.Comment (floc, G.Note (floc, "")) in
    let pp_statement stm =
@@ -75,33 +70,31 @@ let dump f =
    let nl () =  output_string och (pp_statement nl_ast) in
    MatitaMisc.out_preamble och;
    let grafite_parser_cb status = function
-      | G.Executable (_, G.Macro (_, G.Inline _)) -> ()
-      | stm                                       ->
+      | G.Executable (_, G.Macro (_, G.Inline (_, style, uri, prefix, flavour))) ->
+         let str =
+            ApplyTransformation.txt_of_inline_macro style prefix uri
+               ?flavour
+              ~map_unicode_to_tex:
+                 (Helm_registry.get_bool "matita.paste_unicode_as_tex")
+        in
+         output_string och str
+      | stm ->
          output_string och (pp_statement stm); nl (); nl ()
    in
    let lexicon_parser_cb status cmd =
          output_string och (pp_lexicon cmd); nl (); nl ()
    in
-(*
-   let matita_engine_cb = function
-      | G.Executable (_, G.Macro (_, G.Inline _)) 
-      | G.Executable (_, G.Command (_, G.Include _)) -> ()
-      | ast                                          ->
-*)
-   let matitac_lib_cb = output_string och in
    begin fun () ->
+      Helm_registry.set_bool "matita.moo" false;
       GrafiteParser.set_grafite_callback grafite_parser_cb;
-      GrafiteParser.set_lexicon_callback lexicon_parser_cb;
-(*   
-      MatitaEngine.set_callback matita_engine_cb;
-*)   
-      set_callback matitac_lib_cb
+      GrafiteParser.set_lexicon_callback lexicon_parser_cb
    end, 
    begin fun x ->
       close_out och;
       GrafiteParser.set_grafite_callback (fun _ _ -> ());
       GrafiteParser.set_lexicon_callback (fun _ _ -> ());
-      set_callback ignore; x
+      Helm_registry.set_bool "matita.moo" true;
+      x
    end
 ;;
 
@@ -243,18 +236,19 @@ let compile atstart options fname =
       | [] -> lexicon_status, grafite_status
       | ((grafite,lexicon),None)::_ -> lexicon, grafite
       | ((_,l),Some _)::_ -> raise (AttemptToInsertAnAlias l)
-
      with MatitaEngine.EnrichedWithStatus 
             (GrafiteEngine.Macro (floc, f), lexicon, grafite) as exn ->
             match f (get_macro_context (Some grafite)) with 
             | _, GrafiteAst.Inline (_, style, suri, prefix, flavour) ->
-              let str =
+(*              
+             let str =
                ApplyTransformation.txt_of_inline_macro style prefix suri
                 ?flavour
                ~map_unicode_to_tex:(Helm_registry.get_bool
                   "matita.paste_unicode_as_tex")
              in
               !out str;
+*)
               aux_for_dump x lexicon grafite
             |_-> raise exn
      in
@@ -275,8 +269,7 @@ let compile atstart options fname =
 *)
      clean_exit baseuri false)
     else
-     (if not (Helm_registry.get_bool "matita.moo" && 
-              Filename.check_suffix fname ".mma") then begin
+     (if Helm_registry.get_bool "matita.moo" then begin
         (* FG: we do not generate .moo when dumping .mma files *)
         GrafiteMarshal.save_moo moo_fname moo_content_rev;
         LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev;