MQueryInterpreter: interface updated

[helm.git] / helm / gTopLevel / texTermEditor.ml

diff --git a/helm/gTopLevel/texTermEditor.ml b/helm/gTopLevel/texTermEditor.ml
index fc4af3cdebf2cd059cf0c12628ceeca2c12a88b6..b8375b3eab0a9a861d8841c35a8cef17f4c714ed 100644 (file)
--- a/helm/gTopLevel/texTermEditor.ml
+++ b/helm/gTopLevel/texTermEditor.ml
@@ -56,6 +56,7 @@ module Make(C:Disambiguate.Callbacks) =
    module Disambiguate' = Disambiguate.Make(C);;
 
    class term_editor_impl
+    mqi_handle
     ?packing ?width ?height
     ?isnotempty_callback ?share_id_to_uris_with () : term_editor
    =
@@ -65,19 +66,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
@@ -122,8 +119,10 @@ module Make(C:Disambiguate.Callbacks) =
          else if key = GdkKeysyms._u then
           begin
            mmlwidget#freeze ;
+           ignore (Mathml_editor.freeze tex_editor) ;
            Mathml_editor.reset tex_editor ;
            Mathml_editor.push tex_editor '$' ;
+           ignore (Mathml_editor.thaw tex_editor) ;
            mmlwidget#thaw
           end
          else if key = GdkKeysyms._BackSpace then
@@ -160,8 +159,10 @@ module Make(C:Disambiguate.Callbacks) =
       method coerce = mmlwidget#coerce
       method reset =
        mmlwidget#freeze ;
+       ignore (Mathml_editor.freeze tex_editor) ;
        Mathml_editor.reset tex_editor ;
        Mathml_editor.push tex_editor '$' ;
+       ignore (Mathml_editor.thaw tex_editor) ;
        mmlwidget#thaw
 
       method set_term txt =
@@ -191,7 +192,7 @@ module Make(C:Disambiguate.Callbacks) =
            ~context:name_context ~metasenv TexCicTextualLexer.token lexbuf
          in
           let id_to_uris',metasenv,expr =
-           Disambiguate'.disambiguate_input
+           Disambiguate'.disambiguate_input mqi_handle 
             context metasenv dom mk_metasenv_and_expr ~id_to_uris:!id_to_uris
           in
            id_to_uris := id_to_uris' ;