Interface change: the get_as_string and set_term methods of the term-editors

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

diff --git a/helm/gTopLevel/texTermEditor.ml b/helm/gTopLevel/texTermEditor.ml
index 56ed54f4117db3391c32f1fd7618e9f61dc80309..18c2215b5f1be654f7ddf0cc36b734be2a3375ac 100644 (file)
--- a/helm/gTopLevel/texTermEditor.ml
+++ b/helm/gTopLevel/texTermEditor.ml
@@ -38,11 +38,13 @@
 class type term_editor =
  object
    method coerce : GObj.widget
+   (* get_as_string returns the unquoted string *)
    method get_as_string : string
    method get_metasenv_and_term :
      context:Cic.context ->
      metasenv:Cic.metasenv -> Cic.metasenv * Cic.term
    method reset : unit
+   (* The input of set_term is unquoted *)
    method set_term : string -> unit
    method id_to_uris : Disambiguate.domain_and_interpretation ref
  end
@@ -56,6 +58,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
    =
@@ -118,8 +121,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
@@ -156,22 +161,28 @@ 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
 
+      (* The input of set_term is unquoted *)
       method set_term txt =
        mmlwidget#freeze ;
        ignore (Mathml_editor.freeze tex_editor) ;
        self#reset ;
-       (* we need to remove the initial and final '$' *)
-       let txt' = String.sub txt 1 (String.length txt - 2) in
+       let txt' = Str.global_replace (Str.regexp "_") "\\_" txt in
         String.iter (fun ch -> Mathml_editor.push tex_editor ch) txt' ;
         ignore (Mathml_editor.thaw tex_editor) ;
         mmlwidget#thaw
 
+      (* get_as_string returns the unquoted string *)
       method get_as_string =
-       Mathml_editor.get_tex tex_editor
+       let term = Mathml_editor.get_tex tex_editor in
+        Str.global_replace (Str.regexp "^\\$\\$?") ""
+         (Str.global_replace (Str.regexp "\\$\\$?$") ""
+           (Str.global_replace (Str.regexp "\\\\_") "_" term))
 
       method get_metasenv_and_term ~context ~metasenv =
        let name_context =
@@ -181,13 +192,13 @@ module Make(C:Disambiguate.Callbacks) =
            | None -> None
          ) context
        in
-        let lexbuf = Lexing.from_string self#get_as_string in
+        let lexbuf = Lexing.from_string (Mathml_editor.get_tex tex_editor) in
          let dom,mk_metasenv_and_expr =
           TexCicTextualParserContext.main
            ~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' ;