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

[m17n/m17n-contrib.git] / im / si-trans.mim

diff --git a/im/si-trans.mim b/im/si-trans.mim
index 9139349..dca1be7 100644 (file)
--- a/im/si-trans.mim
+++ b/im/si-trans.mim
@@ -1,7 +1,24 @@
 ;; si-trans.mim -- Sinhala transliteration keymap
+;; Copyright (C) 2007-2008  Harshula Jayasuriya <harshula@gmail.com>
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 2
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA  02110-1301, USA.
+
 ;; m17n Keymap file for Sinhala (Sri Lanka) (2007-07-08)
 ;; Maintainer: Harshula Jayasuriya <harshula@gmail.com>
-;; Last Updated: 2007-11-10
+;; Last Updated: 2008-09-10
 ;; This is a transliteration mapping for a standard US-English keyboard
 ;; (qwerty)
 ;; http://www.nongnu.org/sinhala/doc/transliteration/sinhala-transliteration_5.html
@@ -23,25 +40,31 @@
   ("gH" "ඝ්")              ; 0x0d9d - mahaapraana gayanna (gha)
   ("NG" "ඞ්")              ; 0x0d9e - kantaja naasikyaya (nga)
   ("Mg" "ඟ්")              ; 0x0d9f - sanyaka gayanna (nnga)
+  ((A-n g) "ඟ්")           ; AS ABOVE
   ("c" "ච්")               ; 0x0da0 - alpapraana cayanna (ca)
   ("cH" "ඡ්")              ; 0x0da1 - mahaapraana cayanna (cha)
   ("j" "ජ්")               ; 0x0da2 - alpapraana jayanna (ja)
   ("jH" "ඣ්")              ; 0x0da3 - mahaapraana jayanna (jha)
-  ("MJ" "ඤ්")              ; 0x0da4 - taaluja naasikyaya (nya)
-  ("jqMJ" "ඥ්")            ; 0x0da5 - taaluja sanyooga naasikyaya (jnya)
+  ("My" "ඤ්")              ; 0x0da4 - taaluja naasikyaya (nya)
+  ((A-n y) "ඤ්")           ; AS ABOVE
+  ("jqMy" "ඥ්")            ; 0x0da5 - taaluja sanyooga naasikyaya (jnya)
+  ((j q A-n y) "ඥ්")               ; AS ABOVE
   ("Mj" "ඦ්")              ; 0x0da6 - sanyaka jayanna (nyja)
+  ((A-n j) "ඦ්")           ; AS ABOVE
   ("T" "ට්")               ; 0x0da7 - alpapraana ttayanna (tta)
   ("TH" "ඨ්")              ; 0x0da8 - mahaapraana ttayanna (ttha)
   ("D" "ඩ්")               ; 0x0da9 - alpapraana ddayanna (dda)
   ("DH" "ඪ්")              ; 0x0daa - mahaapraana ddayanna (ddha)
   ("N" "ණ්")               ; 0x0dab - muurdhaja nayanna (nna)
   ("MD" "ඬ්")              ; 0x0dac - sanyaka ddayanna (nndda)
+  ((A-n D) "ඬ්")           ; AS ABOVE
   ("t" "ත්")               ; 0x0dad - alpapraana tayanna (ta)
   ("tH" "ථ්")              ; 0x0dae - mahaapraana tayanna (tha)
   ("d" "ද්")               ; 0x0daf - alpapraana dayanna (da)
   ("dH" "ධ්")              ; 0x0db0 - mahaapraana dayanna (dha)
   ("n" "න්")               ; 0x0db1 - dantaja nayanna (na)
   ("Md" "ඳ්")              ; 0x0db3 - sanyaka dayanna (nda)
+  ((A-n d) "ඳ්")           ; AS ABOVE
   ("p" "ප්")               ; 0x0db4 - alpapraana payanna (pa)
   ("pH" "ඵ්")              ; 0x0db5 - mahaapraana payanna (pha)
   ("b" "බ්")               ; 0x0db6 - alpapraana bayanna (ba)
@@ -80,7 +103,8 @@
   ("oo" "ඕ")         ; 0x0d95 - ooyanna (oo)
   ("au" "ඖ")         ; 0x0d96 - auyanna (au)
   ("nG" "ං")         ; 0x0d82 - anusvaraya (anusvara)
-  ("H" "ඃ")          ; TODO - 0x0d83 - visargaya (visarga)
+  ("H" "ඃ")          ; 0x0d83 - visargaya (visarga)
+  ((A-h) "ඃ")                ; AS ABOVE
   ((A-.) "෴")                ; 0x0df4 - kunddaliya (punctuation)
   ;; Shift-space and Alt-space
   ((S-\ ) " ")                ; 0x00a0 - no-break space
@@ -123,7 +147,8 @@
   (independent)
  )
  (second
+  (consonants)
   (dependent (shift init))
-  (rakyan (shift second))
+  (rakyan)
  )
 )