Big change for supporting backspace well.

diff --git a/vi-telex.mim b/vi-telex.mim
index 38322d9..af6f1bc 100644 (file)
--- a/vi-telex.mim
+++ b/vi-telex.mim
@@ -28,7 +28,11 @@
 
 (title "ắ")
 (map
- (map
+ (map1
+  ("a" "a") ("e" "e") ("i" "i") ("o" "o") ("u" "u") ("y" "y") ("d" "d")
+  ("A" "A") ("E" "E") ("I" "I") ("O" "O") ("U" "U") ("Y" "Y") ("D" "D")
+  ("\\" "\\"))
+ (map2
   ("af" ?à)
   ("AF" ?À)
   ("Af" ?À)
@@ -98,6 +102,49 @@
   ("ar" ?ả)
   ("AR" ?Ả)
   ("Ar" ?Ả)
+  ("ej" ?ẹ)
+  ("EJ" ?Ẹ)
+  ("Ej" ?Ẹ)
+  ("er" ?ẻ)
+  ("ER" ?Ẻ)
+  ("Er" ?Ẻ)
+  ("ex" ?ẽ)
+  ("EX" ?Ẽ)
+  ("Ex" ?Ẽ)
+  ("ir" ?ỉ)
+  ("IR" ?Ỉ)
+  ("Ir" ?Ỉ)
+  ("ij" ?ị)
+  ("IJ" ?Ị)
+  ("Ij" ?Ị)
+  ("oj" ?ọ)
+  ("OJ" ?Ọ)
+  ("Oj" ?Ọ)
+  ("or" ?ỏ)
+  ("OR" ?Ỏ)
+  ("Or" ?Ỏ)
+  ("uj" ?ụ)
+  ("UJ" ?Ụ)
+  ("Uj" ?Ụ)
+  ("ur" ?ủ)
+  ("UR" ?Ủ)
+  ("Ur" ?Ủ)
+  ("yf" ?ỳ)
+  ("YF" ?Ỳ)
+  ("Yf" ?Ỳ)
+  ("yj" ?ỵ)
+  ("YJ" ?Ỵ)
+  ("Yj" ?Ỵ)
+  ("yr" ?ỷ)
+  ("YR" ?Ỷ)
+  ("Yr" ?Ỷ)
+  ("yx" ?ỹ)
+  ("YX" ?Ỹ)
+  ("Yx" ?Ỹ)
+  ("dd" ?đ)
+  ("DD" ?Đ)
+  ("Dd" ?Đ))
+ (map3
   ("aas" ?ấ)
   ("AAS" ?Ấ)
   ("Aas" ?Ấ)
@@ -128,15 +175,6 @@
   ("awj" ?ặ)
   ("AWJ" ?Ặ)
   ("Awj" ?Ặ)
-  ("ej" ?ẹ)
-  ("EJ" ?Ẹ)
-  ("Ej" ?Ẹ)
-  ("er" ?ẻ)
-  ("ER" ?Ẻ)
-  ("Er" ?Ẻ)
-  ("ex" ?ẽ)
-  ("EX" ?Ẽ)
-  ("Ex" ?Ẽ)
   ("ees" ?ế)
   ("EES" ?Ế)
   ("Ees" ?Ế)
@@ -152,18 +190,6 @@
   ("eej" ?ệ)
   ("EEJ" ?Ệ)
   ("Eej" ?Ệ)
-  ("ir" ?ỉ)
-  ("IR" ?Ỉ)
-  ("Ir" ?Ỉ)
-  ("ij" ?ị)
-  ("IJ" ?Ị)
-  ("Ij" ?Ị)
-  ("oj" ?ọ)
-  ("OJ" ?Ọ)
-  ("Oj" ?Ọ)
-  ("or" ?ỏ)
-  ("OR" ?Ỏ)
-  ("Or" ?Ỏ)
   ("oos" ?ố)
   ("OOS" ?Ố)
   ("Oos" ?Ố)
@@ -194,12 +220,6 @@
   ("owj" ?ợ)
   ("OWJ" ?Ợ)
   ("Owj" ?Ợ)
-  ("uj" ?ụ)
-  ("UJ" ?Ụ)
-  ("Uj" ?Ụ)
-  ("ur" ?ủ)
-  ("UR" ?Ủ)
-  ("Ur" ?Ủ)
   ("uws" ?ứ)
   ("UWS" ?Ứ)
   ("Uws" ?Ứ)
@@ -215,23 +235,8 @@
   ("uwj" ?ự)
   ("UWJ" ?Ự)
   ("Uwj" ?Ự)
-  ("yf" ?ỳ)
-  ("YF" ?Ỳ)
-  ("Yf" ?Ỳ)
-  ("yj" ?ỵ)
-  ("YJ" ?Ỵ)
-  ("Yj" ?Ỵ)
-  ("yr" ?ỷ)
-  ("YR" ?Ỷ)
-  ("Yr" ?Ỷ)
-  ("yx" ?ỹ)
-  ("YX" ?Ỹ)
-  ("Yx" ?Ỹ)
-  ("dd" ?đ)
-  ("DD" ?Đ)
-  ("Dd" ?Đ)
 
-  ("aff" (insert "aff"))
+  ("aff" (insert "af"))
   ("AFF" (insert "AF"))
   ("Aff" (insert "Af"))
   ("ass" (insert "as"))
@@ -341,8 +346,8 @@
   ("Yxx" (insert "Yx"))
   ("ddd" (insert "dd"))
   ("DDD" (insert "DD"))
-  ("Ddd" (insert "Dd"))
-
+  ("Ddd" (insert "Dd")))
+ (escape
   ("\\w" ?w)
   ("\\W" ?W)
   ("\\a" ?a)
@@ -369,7 +374,16 @@
 
 (state
  (init
-  (map)
+  (map1 (delete @-) (pushback 1) (shift main)))
+
+ (main
+  (map1 (shift edit))
+  (map2 (shift edit))
+  (map3 (shift init))
+  (escape (shift init))
+  (backspace (shift init)))
+
+ (edit
   (backspace)))
 
 ;; Local Variables: