Merge consonants, vowels and remainder maps into one as suggested by Takahashi.

diff --git a/im/si-phonetic-dynamic.mim b/im/si-phonetic-dynamic.mim
index eaedbfa..fbe7008 100644 (file)
--- a/im/si-phonetic-dynamic.mim
+++ b/im/si-phonetic-dynamic.mim
@@ -18,7 +18,7 @@
 
 ;; m17n Keymap file for Sinhala (Sri Lanka) (2007-07-08)
 ;; Maintainer: Harshula Jayasuriya <harshula@gmail.com>
-;; Last Updated: 2008-09-10
+;; Last Updated: 2008-12-26
 ;; This is a phonetic dynamic mapping for a standard US-English keyboard
 ;; (qwerty)
 ;; http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_4.html
@@ -80,7 +80,29 @@
 )
 
 (map
- (consonants
+ (phon
+  ((A-n) "ං")                ; 0x0d82 - anusvaraya (anusvara)
+  ("H" "ඃ")          ; 0x0d83 - visargaya (visarga)
+
+  ("a" (set c 0x0D85) (insert-vowel))  ; 0x0d85 - ayanna (a)
+  ("A" (set c 0x0D86) (insert-vowel))  ; 0x0d86 - aayanna (aa)
+  ("w" (set c 0x0D87) (insert-vowel))  ; 0x0d87 - aeyanna (ae)
+  ("W" (set c 0x0D88) (insert-vowel))  ; 0x0d88 - aeeyanna (aee)
+  ("i" (set c 0x0D89) (insert-vowel))  ; 0x0d89 - iyanna (i)
+  ("I" (set c 0x0D8A) (insert-vowel))  ; 0x0d8a - iiyanna (ii)
+  ("u" (set c 0x0D8B) (insert-vowel))  ; 0x0d8b - uyanna (u)
+  ("U" (set c 0x0D8C) (insert-vowel))  ; 0x0d8c - uuyanna (uu)
+  ("q" (set c 0x0D8D) (insert-vowel))  ; 0x0d8d - iruyanna (iru)
+  ("Q" (set c 0x0D8E) (insert-vowel))  ; 0x0d8e - iruuyanna (iruu)
+  ((A-l) (set c 0x0D8F) (insert-vowel))        ; 0x0d8f - iluyanna (ilu)
+  ((A-L) (set c 0x0D90) (insert-vowel))        ; 0x0d90 - iluuyanna (iluu)
+  ("e" (set c 0x0D91) (insert-vowel))  ; 0x0d91 - eyanna (e)
+  ("E" (set c 0x0D92) (insert-vowel))  ; 0x0d92 - eeyanna (ee)
+  ((A-e) (set c 0x0D93) (insert-vowel))        ; 0x0d93 - aiyanna (ai)
+  ("o" (set c 0x0D94) (insert-vowel))  ; 0x0d94 - oyanna (o)
+  ("O" (set c 0x0D95) (insert-vowel))  ; 0x0d95 - ooyanna (oo)
+  ((A-o) (set c 0x0D96) (insert-vowel))        ; 0x0d96 - auyanna (au)
+
   ("k" "ක")          ; 0x0d9a - alpapraana kayanna (ka)
   ("K" "ඛ")          ; 0x0d9b - mahaapraana kayanna (kha)
   ("g" "ග")          ; 0x0d9c - alpapraana gayanna (ga)
@@ -122,33 +144,9 @@
   ("h" "හ")          ; 0x0dc4 - hayanna (ha)
   ("L" "ළ")          ; 0x0dc5 - muurdhaja layanna (lla)
   ("f" "ෆ")          ; 0x0dc6 - fayanna (fa)
- )
 
- (vowels
-  ("a" (set c 0x0D85) (insert-vowel))  ; 0x0d85 - ayanna (a)
-  ("A" (set c 0x0D86) (insert-vowel))  ; 0x0d86 - aayanna (aa)
-  ("w" (set c 0x0D87) (insert-vowel))  ; 0x0d87 - aeyanna (ae)
-  ("W" (set c 0x0D88) (insert-vowel))  ; 0x0d88 - aeeyanna (aee)
-  ("i" (set c 0x0D89) (insert-vowel))  ; 0x0d89 - iyanna (i)
-  ("I" (set c 0x0D8A) (insert-vowel))  ; 0x0d8a - iiyanna (ii)
-  ("u" (set c 0x0D8B) (insert-vowel))  ; 0x0d8b - uyanna (u)
-  ("U" (set c 0x0D8C) (insert-vowel))  ; 0x0d8c - uuyanna (uu)
-  ("q" (set c 0x0D8D) (insert-vowel))  ; 0x0d8d - iruyanna (iru)
-  ("Q" (set c 0x0D8E) (insert-vowel))  ; 0x0d8e - iruuyanna (iruu)
-  ((A-l) (set c 0x0D8F) (insert-vowel))        ; 0x0d8f - iluyanna (ilu)
-  ((A-L) (set c 0x0D90) (insert-vowel))        ; 0x0d90 - iluuyanna (iluu)
-  ("e" (set c 0x0D91) (insert-vowel))  ; 0x0d91 - eyanna (e)
-  ("E" (set c 0x0D92) (insert-vowel))  ; 0x0d92 - eeyanna (ee)
-  ((A-e) (set c 0x0D93) (insert-vowel))        ; 0x0d93 - aiyanna (ai)
-  ("o" (set c 0x0D94) (insert-vowel))  ; 0x0d94 - oyanna (o)
-  ("O" (set c 0x0D95) (insert-vowel))  ; 0x0d95 - ooyanna (oo)
-  ((A-o) (set c 0x0D96) (insert-vowel))        ; 0x0d96 - auyanna (au)
- )
-
- (remainder
-  ((A-n) "ං")                ; 0x0d82 - anusvaraya (anusvara)
-  ("H" "ඃ")          ; 0x0d83 - visargaya (visarga)
   ((A-.) "෴")                ; 0x0df4 - kunddaliya (punctuation)
+
   ("R" "්‍ර")            ;  0x0dca,0x200d,0x0dbb - rakaaranshaya
   ("Y" "්‍ය")            ;  0x0dca,0x200d,0x0dba - yansaya
   ((A-r) "ර්‍")          ;  0x0dbb,0x0dca,0x200d - repaya
@@ -181,13 +179,10 @@
    )
   )
  )
-
 )
 
 (state
  (init
-  (consonants)
-  (vowels)
-  (remainder)
+  (phon)
  )
 )