X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2FmatitaGui.ml;h=7db4d5af12bcb3a5bbf8074f69a09282d41d5e60;hb=48ccd3ca2b890b89775f1fbf7827bf617cf7aa19;hp=f0bd8acc027f42e076eb143a8b155ae2f7150fee;hpb=7a060397679753a0233139b1ba83ac83c2c49949;p=helm.git diff --git a/helm/software/matita/matitaGui.ml b/helm/software/matita/matitaGui.ml index f0bd8acc0..7db4d5af1 100644 --- a/helm/software/matita/matitaGui.ml +++ b/helm/software/matita/matitaGui.ml @@ -651,7 +651,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 false && str = " " then + ignore(self#expand_virtual_if_any iter " "))); ignore (findRepl#findEntry#connect#activate find_forward); (* interface lockers *) let lock_world _ = @@ -1107,8 +1108,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 +1132,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 | [] -> ()