X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaGui.ml;h=7965b20e4549e9d23c263339ac81ff178953370a;hb=6d14064e2494072f6c60c984a8c4419f07cdf723;hp=f0bd8acc027f42e076eb143a8b155ae2f7150fee;hpb=7a060397679753a0233139b1ba83ac83c2c49949;p=helm.git

diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml
index f0bd8acc0..7965b20e4 100644
--- a/helm/software/matita/matitaGui.ml
+++ b/helm/software/matita/matitaGui.ml
@@ -201,6 +201,7 @@ class interpErrorModel =
         tree_store#get ~row:iter ~column:interp_no_col
     end
 
+exception UseLibrary;;
 
 let rec interactive_error_interp ~all_passes
   (source_buffer:GSourceView.source_buffer) notify_exn offset errorll filename
@@ -347,9 +348,7 @@ let rec interactive_error_interp ~all_passes
             return ()
         );
        connect_button dialog#disambiguationErrorsMoreErrors
-        (fun _ -> return () ;
-          interactive_error_interp ~all_passes:true source_buffer
-           notify_exn offset errorll filename);
+        (fun _ -> return () ; raise UseLibrary);
        connect_button dialog#disambiguationErrorsCancelButton fail;
        dialog#disambiguationErrors#show ();
        GtkThread.main ()
@@ -651,7 +650,8 @@ class gui () =
       connect_menu_item main#ligatureButton self#nextSimilarSymbol;
       ignore(source_buffer#connect#after#insert_text 
        ~callback:(fun iter str -> 
-          if false && str = " " then self#expand_virtual_if_any iter " "));
+          if main#menuitemAutoAltL#active && str = " " then 
+            ignore(self#expand_virtual_if_any iter " ")));
       ignore (findRepl#findEntry#connect#activate find_forward);
         (* interface lockers *)
       let lock_world _ =
@@ -701,8 +701,11 @@ class gui () =
        let thread_main =
         fun () -> 
           lock_world ();
+          let saved_use_library= !MultiPassDisambiguator.use_library in
           try
+           MultiPassDisambiguator.use_library := !all_disambiguation_passes;
            f ();
+           MultiPassDisambiguator.use_library := saved_use_library;
            unlock_world ()
           with
            | MultiPassDisambiguator.DisambiguationError (offset,errorll) ->
@@ -711,7 +714,17 @@ class gui () =
                  ~all_passes:!all_disambiguation_passes source_buffer
                  notify_exn offset errorll (s())#filename
                with
-                exc -> notify_exn exc);
+                | UseLibrary ->
+                   MultiPassDisambiguator.use_library := true;
+                   (try f ()
+                    with
+                    | MultiPassDisambiguator.DisambiguationError (offset,errorll) ->
+                       interactive_error_interp ~all_passes:true source_buffer
+                        notify_exn offset errorll (s())#filename
+                    | exc ->
+                       notify_exn exc);
+                | exc -> notify_exn exc);
+              MultiPassDisambiguator.use_library := saved_use_library;
               unlock_world ()
            | exc ->
               notify_exn exc;
@@ -1107,8 +1120,9 @@ class gui () =
          ~stop:(iter#copy#backward_chars
            (MatitaGtkMisc.utf8_string_length inplaceof + len));
        source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT) 
-         (if inplaceof.[0] = '\\' then s else (s ^ tok))
-      with Virtuals.Not_a_virtual -> ()
+         (if inplaceof.[0] = '\\' then s else (s ^ tok));
+       true
+      with Virtuals.Not_a_virtual -> false
          
     method private nextSimilarSymbol () = 
       let write_similarsymbol s =
@@ -1130,21 +1144,20 @@ class gui () =
         with GText.No_such_mark _ -> true
       in
       if new_similarsymbol then
+        (if not(self#expand_virtual_if_any (source_buffer#get_iter_at_mark `INSERT) "")then
           let last_symbol = 
             let i = source_buffer#get_iter_at_mark `INSERT in
             Glib.Utf8.first_char (i#get_slice ~stop:(i#copy#backward_chars 1))
           in
           (match Virtuals.similar_symbols last_symbol with
-          | [] -> 
-              let i = source_buffer#get_iter_at_mark `INSERT in
-              self#expand_virtual_if_any i ""
+          | [] ->  ()
           | hd :: next ::tl ->
               let hd, tl = 
                 if hd = last_symbol then next, tl @ [hd] else hd, (next::tl)
               in
               write_similarsymbol hd;
               similarsymbols <- tl @ [ hd ]
-          | _ -> assert false) (* singleton eq classes are a non sense *)
+          | _ -> assert false)) (* singleton eq classes are a non sense *)
       else 
         match similarsymbols with
         | [] -> ()