From 524d98c48e119440423b449127ae05415ee48753 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Fri, 4 Apr 2003 14:11:02 +0000 Subject: [PATCH] - no more CSCisms for MathML editor: now use mathml editor debian and findlib package --- helm/gTopLevel/Makefile | 9 ++++----- helm/gTopLevel/gTopLevel.ml | 5 ----- helm/gTopLevel/texTermEditor.ml | 16 ++++++---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/helm/gTopLevel/Makefile b/helm/gTopLevel/Makefile index 271d204c8..6076d9712 100644 --- 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 2ff150760..1c81ddbbf 100644 --- 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 fc4af3cde..56ed54f41 100644 --- 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 -- 2.39.2