- no more CSCisms for MathML editor: now use mathml editor debian and

  findlib package

diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile
index 271d204c8d1c68d2fd93b0ca7508b6c277cdcb71..6076d97126f29db76c3e003a255aff940a91828c 100644 (file)
--- a/helm/gTopLevel/Makefile
+++ b/helm/gTopLevel/Makefile
@@ -2,10 +2,9 @@ BIN_DIR = /usr/local/bin
 REQUIRES = lablgtkmathview helm-cic_textual_parser helm-tex_cic_textual_parser \
            helm-cic_proof_checking helm-xml gdome2-xslt helm-cic_unification \
            helm-tactics helm-mathql helm-mathql_interpreter \
-           helm-mquery_generator threads hbugs-client
+           helm-mquery_generator threads hbugs-client mathml-editor
 PREDICATES = "gnome,init,glade"
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o \
-               -I /home/claudio/miohelm/helm/DEVEL/mathml_editor/ocaml
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc -thread $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt -thread $(OCAMLOPTIONS)
@@ -39,10 +38,10 @@ depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
 gTopLevel: $(TOPLEVELOBJS) $(LIBRARIES)
-       $(OCAMLC) -linkpkg -o gTopLevel /home/claudio/miohelm/helm/DEVEL/mathml_editor/src/.libs/libeditex.a mlmathml-editor.cma $(TOPLEVELOBJS)
+       $(OCAMLC) -linkpkg -o gTopLevel $(TOPLEVELOBJS)
 
 gTopLevel.opt: $(TOPLEVELOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
-       $(OCAMLOPT) -linkpkg -o gTopLevel.opt /home/claudio/miohelm/helm/DEVEL/mathml_editor/src/.libs/libeditex.a mlmathml-editor.cmxa $(TOPLEVELOBJS:.cmo=.cmx)
+       $(OCAMLOPT) -linkpkg -o gTopLevel.opt $(TOPLEVELOBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
 .ml.cmo:

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index 2ff1507602b7fcbedfec300026fb3f9c591929f3..1c81ddbbfbc72f6882d67fa5f569c480a87eb9fd 100644 (file)
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -455,11 +455,6 @@ let
 
 (* CALLBACKS *)
 
-(*
-ignore(domImpl#saveDocumentToFile ~doc:sequent_doc
- ~name:"/home/galata/miohelm/guruguru1" ~indent:true ()) ;
-*)
-
 exception OpenConjecturesStillThere;;
 exception WrongProof;;
 

diff --git a/helm/gTopLevel/texTermEditor.ml b/helm/gTopLevel/texTermEditor.ml
index fc4af3cdebf2cd059cf0c12628ceeca2c12a88b6..56ed54f4117db3391c32f1fd7618e9f61dc80309 100644 (file)
--- a/helm/gTopLevel/texTermEditor.ml
+++ b/helm/gTopLevel/texTermEditor.ml
@@ -65,19 +65,15 @@ module Make(C:Disambiguate.Callbacks) =
     let drawing_area = mmlwidget#get_drawing_area in
     let _ = drawing_area#misc#set_can_focus true in
     let _ = drawing_area#misc#grab_focus () in
-    let dictionary =
-     Misc.domImpl#createDocumentFromURI
-      "/home/claudio/miohelm/helm/DEVEL/mathml_editor/dictionary-tex.xml" () in
-    let mml_style =
-     Misc.domImpl#createDocumentFromURI
-      "/home/claudio/miohelm/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl" () in
-    let tex_style =
-     Misc.domImpl#createDocumentFromURI
-      "/home/claudio/miohelm/helm/DEVEL/mathml_editor/xsl/tml-tex.xsl" () in
     let logger =
      fun l s -> prerr_endline ("TERM_EDITOR (" ^ string_of_int l ^ "): " ^ s) in
     let tex_editor =
-     Mathml_editor.create dictionary mml_style tex_style logger in
+     Mathml_editor.create
+      Mathml_editor.default_dictionary_path
+      Mathml_editor.default_mathml_stylesheet_path
+      Mathml_editor.default_tex_stylesheet_path
+      logger
+    in
     let _ =
      (new GObj.event_ops mmlwidget#coerce#as_widget)#connect#button_press
       ~callback:(fun _ -> drawing_area#misc#grab_focus () ; true) in