val mutable _only_directory = false
val mutable font_size = default_font_size
val mutable similarsymbols = []
+ val mutable similarsymbols_orig = []
val clipboard = GData.clipboard Gdk.Atom.clipboard
val primary = GData.clipboard Gdk.Atom.primary
method private reset_similarsymbols =
similarsymbols <- [];
+ similarsymbols_orig <- [];
try source_buffer#delete_mark similarsymbols_tag
with GText.No_such_mark _ -> ()
connect_menu_item main#ligatureButton self#nextSimilarSymbol;
ignore(source_buffer#connect#after#insert_text
~callback:(fun iter str ->
- if main#menuitemAutoAltL#active && str = " " then
- ignore(self#expand_virtual_if_any iter " ")));
+ if main#menuitemAutoAltL#active && (str = " " || str = "\n") then
+ ignore(self#expand_virtual_if_any iter str)));
ignore (findRepl#findEntry#connect#activate find_forward);
(* interface lockers *)
let lock_world _ =
MultiPassDisambiguator.use_library := saved_use_library;
unlock_world ()
| exc ->
- notify_exn exc;
+ (try notify_exn exc with Sys.Break as e -> notify_exn e);
unlock_world ()
in
(*thread_main ();*)
true
with Virtuals.Not_a_virtual -> false
+ val similar_memory = Hashtbl.create 97
+ val mutable old_used_memory = false
+
method private nextSimilarSymbol () =
let write_similarsymbol s =
let s = Glib.Utf8.from_unichar s in
in
(match Virtuals.similar_symbols last_symbol with
| [] -> ()
- | hd :: next ::tl ->
+ | eqclass ->
+ similarsymbols_orig <- eqclass;
+ let is_used =
+ try Hashtbl.find similar_memory similarsymbols_orig
+ with Not_found ->
+ let is_used = List.map (fun x -> x,false) eqclass in
+ Hashtbl.add similar_memory eqclass is_used;
+ is_used
+ in
+ let hd, next, tl =
+ let used, unused =
+ List.partition (fun s -> List.assoc s is_used) eqclass
+ in
+ match used @ unused with a::b::c -> a,b,c | _ -> assert false
+ in
let hd, tl =
if hd = last_symbol then next, tl @ [hd] else hd, (next::tl)
in
+ old_used_memory <- List.assoc hd is_used;
+ let is_used =
+ (hd,true) :: List.filter (fun (x,_) -> x <> hd) is_used
+ in
+ Hashtbl.replace similar_memory similarsymbols_orig is_used;
write_similarsymbol hd;
- similarsymbols <- tl @ [ hd ]
- | _ -> assert false)) (* singleton eq classes are a non sense *)
+ similarsymbols <- tl @ [ hd ]))
else
match similarsymbols with
| [] -> ()
| hd :: tl ->
+ let is_used = Hashtbl.find similar_memory similarsymbols_orig in
+ let last = HExtlib.list_last tl in
+ let old_used_for_last = old_used_memory in
+ old_used_memory <- List.assoc hd is_used;
+ let is_used =
+ (hd, true) :: (last,old_used_for_last) ::
+ List.filter (fun (x,_) -> x <> last && x <> hd) is_used
+ in
+ Hashtbl.replace similar_memory similarsymbols_orig is_used;
similarsymbols <- tl @ [ hd ];
write_similarsymbol hd