X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=MIM%2Flo-lrt.mim;h=05e57c055b6ac9d71d01471a06b36a513e6189c7;hb=485c2e43cbe365458c8c0110a33eedbe6d115f45;hp=2f0a98a12584e80590f6a2fcceb487ce025d8da6;hpb=f0d77ad033d0b99b0f0259e501ffb0984a1c5f9b;p=m17n%2Fm17n-db.git

diff --git a/MIM/lo-lrt.mim b/MIM/lo-lrt.mim
index 2f0a98a..05e57c0 100644
--- a/MIM/lo-lrt.mim
+++ b/MIM/lo-lrt.mim
@@ -73,13 +73,14 @@
   ("r" (move 1) "ຼ" (move @>)))
 
  (vowel-simple
+  ("hya" "ຽ")
   ("ar" "າ")
-  ("i" "ິ" (mark @tone))
-  ("ii" "ີ" (mark @tone))
-  ("eu" "ຶ" (mark @tone))
-  ("ur" "ື" (mark @tone))
-  ("u" "ຸ" (mark @tone))
-  ("uu" "ູ" (mark @tone))
+  ("i" "ິ" (mark TONE))
+  ("ii" "ີ" (mark TONE))
+  ("eu" "ຶ" (mark TONE))
+  ("ur" "ື" (mark TONE))
+  ("u" "ຸ" (mark TONE))
+  ("uu" "ູ" (mark TONE))
   ("aM" "ຳ")
 
   ("ee" (move @-) (move @-) "ເ" (move @+) (move @+))
@@ -88,11 +89,11 @@
   ("ai" (move @-) (move @-) "ໄ" (move @+) (move @+))
   ("ei" (move @-) (move @-) "ໃ" (move @+) (move @+))
 
-  ("er" (move @-) (move @-) "ເ" (move @+) (move @+) "ິ" (mark @tone))
-  ("ir" (move @-) (move @-) "ເ" (move @+) (move @+) "ີ" (mark @tone))
-  ("ea" (move @-) (move @-) "ເ" (move @+) (move @+) "ຶ" (mark @tone) "ອ")
-  ("eaa" (move @-) (move @-) "ເ" (move @+) (move @+) "ື" (mark @tone) "ອ")
-  ("ao" (move @-) (move @-) "ເ" (move @+) (move @+) "ົ" (mark @tone) "າ"))
+  ("er" (move @-) (move @-) "ເ" (move @+) (move @+) "ິ" (mark TONE))
+  ("ir" (move @-) (move @-) "ເ" (move @+) (move @+) "ີ" (mark TONE))
+  ("ea" (move @-) (move @-) "ເ" (move @+) (move @+) "ຶ" (mark TONE) "ອ")
+  ("eaa" (move @-) (move @-) "ເ" (move @+) (move @+) "ື" (mark TONE) "ອ")
+  ("ao" (move @-) (move @-) "ເ" (move @+) (move @+) "ົ" (mark TONE) "າ"))
 
  (vowel-a-e-ae
   ("a" "ະ")
@@ -106,19 +107,19 @@
   ("o" (move @-) (move @-) "ໂ" (move @+) (move @+) "ະ"))
 
  (vowel-or
-  ("or" "ໍ" (mark @tone)))
+  ("or" "ໍ" (mark TONE)))
 
  (vowel-ua
-  ("ua" "ົ" (mark @tone) "ວະ"))
+  ("ua" "ົ" (mark TONE) "ວະ"))
 
  (vowel-uaa
-  ("uaa" "ົ" (mark @tone) "ວ"))
+  ("uaa" "ົ" (mark TONE) "ວ"))
 
  (vowel-ie
-  ("ie" (move @-) (move @-) "ເ" (move @+) (move @+) "ັ" (mark @tone) "ຽະ"))
+  ("ie" (move @-) (move @-) "ເ" (move @+) (move @+) "ັ" (mark TONE) "ຽະ"))
 
  (vowel-ia
-  ("ia" (move @-) (move @-) "ເ" (move @+) (move @+) "ັ" (mark @tone) "ຽ"))
+  ("ia" (move @-) (move @-) "ເ" (move @+) (move @+) "ັ" (mark TONE) "ຽ"))
 
  (maa-sakod
   ("k" "ກ")
@@ -145,11 +146,11 @@
   ("m" "ມ"))
 
  (tone
-  ("'" (move @tone) "່" (move @>))
-  ("\"" (move @tone) "້" (move @>))
-  ("^" (move @tone) "໊" (move @>))
-  ("+" (move @tone) "໋" (move @>))
-  ("~" (move @tone) "໌" (move @>)))
+  ("'" (move TONE) "່" (move @>))
+  ("\"" (move TONE) "້" (move @>))
+  ("^" (move TONE) "໊" (move @>))
+  ("+" (move TONE) "໋" (move @>))
+  ("~" (move TONE) "໌" (move @>)))
 
  (punctuation
   ("\\0" "໐")
@@ -167,7 +168,7 @@
 
 (state
  (init
-  (consonant (move 1) (mark @tone) (move @>) (shift c-state))
+  (consonant (move 1) (mark TONE) (move @>) (shift c-state))
   (vowel-simple)
   (vowel-a-e-ae)
   (vowel-oe)
@@ -201,19 +202,19 @@
   (nil (shift csvm-state)))
 
  (csv-a-e-ae-state
-  (maa-sakod (move @-) (delete @-) "ັ" (mark @tone) (move @>)
+  (maa-sakod (move @-) (delete @-) "ັ" (mark TONE) (move @>)
 	     (shift csvm-state))
   (nil (shift csvm-state)))
 
  (csv-oe-state
-  (maa-sakod (move @-) (delete @-) (delete @-) "ັ" (mark @tone) "ອ" (move @>)
+  (maa-sakod (move @-) (delete @-) (delete @-) "ັ" (mark TONE) "ອ" (move @>)
 	     (shift csvm-state))
   (nil (shift csvm-state)))
 
  (csv-o-state
-  (maa-sakod-y-v (move @-) (delete @-) "ັ" (mark @tone) (move @>)
+  (maa-sakod-y-v (move @-) (delete @-) "ັ" (mark TONE) (move @>)
 		 (shift csvm-state))
-  (maa-sakod-non-y-v (move @-) (delete @-) "ົ" (mark @tone)
+  (maa-sakod-non-y-v (move @-) (delete @-) "ົ" (mark TONE)
 		     (move 0) (delete @+) (move @>)
 		     (shift csvm-state))
   (nil (shift csvm-state)))