(mlm-char-glyph): Fix more rules.

diff --git a/lisp/language/mlm-util.el b/lisp/language/mlm-util.el
index 3d6e1db236006b964d0de5394a0666d6dd35bc7a..a01f3c4a88f8d7e966dc1c916ab89d0ecd11e30f 100644 (file)
--- a/lisp/language/mlm-util.el
+++ b/lisp/language/mlm-util.el
@@ -159,10 +159,12 @@ PATTERN regexp."
     ("\e$,1@5@m@5\e(B" . "\e$,47!\e(B")
     ("\e$,1@5@m@S\e(B" . "\e$,47"\e(B")
     ("\e$,1@5@m@W\e(B" . "\e$,47#\e(B")
-    ("\e$,1@5@m@?\e(B" . "\e$,47N\e(B") ;; ?
+    ("\e$,1@5@m@?\e(B" . "\e$,47N\e(B")
     ("\e$,1@5@m@D\e(B" . "\e$,47`\e(B")
-    ("\e$,1@5@a\e(B" . "\e$,47f\e(B") ;; ? ;; vowel u?
-    ("\e$,1@5@m@5@m@a\e(B" . "\e$,47g\e(B") ;; ? ;; vowel u?
+    ("\e$,1@5@a\e(B" . "\e$,47f\e(B")
+    ("\e$,1@5@m@5@a\e(B" . "\e$,47g\e(B")
+    ("\e$,1@5@a\e(B" . "\e$,47f\e(B")
+    ("\e$,1@5@m@5@a\e(B" . "\e$,47g\e(B")
 
     ("\e$,1@6\e(B" . "\e$,46*\e(B")
 
@@ -177,11 +179,11 @@ PATTERN regexp."
     ("\e$,1@9\e(B" . "\e$,46-\e(B")
     ("\e$,1@9@m@5\e(B" . "\e$,47&\e(B")
     ("\e$,1@9@m@9\e(B" . "\e$,47'\e(B")
-    ("\e$,1@9@m@5@a\e(B" . "\e$,47h\e(B") ;; ? ;; vowel u?
+    ("\e$,1@9@m@5@a\e(B" . "\e$,47h\e(B")
 
     ("\e$,1@:\e(B" . "\e$,46.\e(B")
     ("\e$,1@:@m@:\e(B" . "\e$,47(\e(B") ;; duplicate
-    ("\e$,1@:@m@;\e(B" . "\e$,47Q\e(B") ;; ?
+    ("\e$,1@:@m@;\e(B" . "\e$,47Q\e(B")
 
     ("\e$,1@;\e(B" . "\e$,46/\e(B")
 
@@ -204,12 +206,12 @@ PATTERN regexp."
     ("\e$,1@B\e(B" . "\e$,466\e(B")
 
     ("\e$,1@C\e(B" . "\e$,467\e(B")
-    ("\e$,1@C@m\e(B" . "\e$,47,\e(B") ;; half consonant
+    ("\e$,1@C@a@m\e(B" . "\e$,47,\e(B") ;; half consonant
     ("\e$,1@C@m@?\e(B" . "\e$,47-\e(B")
     ("\e$,1@C@m@C\e(B" . "\e$,47.\e(B")
     ("\e$,1@C@m@N\e(B" . "\e$,47W\e(B")
-    ("\e$,1@C@m@G\e(B" . "\e$,47^\e(B") ;; ?
-    ("\e$,1@C@m@V\e(B" . "\e$,47i\e(B") ;; ?
+    ("\e$,1@C@m@A\e(B" . "\e$,47^\e(B")
+    ("\e$,1@C@a\e(B" . "\e$,47i\e(B")
 
     ("\e$,1@D\e(B" . "\e$,468\e(B")
     ("\e$,1@D@m@D\e(B" . "\e$,47/\e(B")
@@ -217,7 +219,6 @@ PATTERN regexp."
     ("\e$,1@D@m@X\e(B" . "\e$,47U\e(B")
     ("\e$,1@D@m@M\e(B" . "\e$,47[\e(B")
     ("\e$,1@D@m@N\e(B" . "\e$,47_\e(B")
-    ("\e$,1@D@a\e(B" . "\e$,47j\e(B") ;; ? ;; vowel u ?
 
     ("\e$,1@E\e(B" . "\e$,469\e(B")
 
@@ -228,7 +229,7 @@ PATTERN regexp."
     ("\e$,1@G\e(B" . "\e$,46;\e(B")
 
     ("\e$,1@H\e(B" . "\e$,46<\e(B")
-    ("\e$,1@H@m\e(B" . "\e$,473\e(B") ;; half consonant
+    ("\e$,1@H@a@m\e(B" . "\e$,473\e(B") ;; half consonant
     ("\e$,1@H@m@D\e(B" . "\e$,474\e(B")
     ("\e$,1@H@m@F\e(B" . "\e$,475\e(B")
     ("\e$,1@H@m@H\e(B" . "\e$,476\e(B")
@@ -236,8 +237,8 @@ PATTERN regexp."
     ("\e$,1@H@m@G\e(B" . "\e$,47T\e(B")
     ("\e$,1@H@m@E\e(B" . "\e$,47Y\e(B")
     ("\e$,1@H@m@Q\e(B" . "\e$,47b\e(B")
-    ("\e$,1@H@m@V\e(B" . "\e$,47k\e(B") ;; ?
-    ("\e$,1@H@m@H@m@V\e(B" . "\e$,47l\e(B") ;; ?
+    ("\e$,1@H@a\e(B" . "\e$,47k\e(B")
+    ("\e$,1@H@m@H@a\e(B" . "\e$,47l\e(B") 
 
     ("\e$,1@J\e(B" . "\e$,46=\e(B")
     ("\e$,1@J@m@J\e(B" . "\e$,478\e(B") ;; duplicate
@@ -248,8 +249,8 @@ PATTERN regexp."
     ("\e$,1@L\e(B" . "\e$,46?\e(B")
     ("\e$,1@L@m@L\e(B" . "\e$,47:\e(B") ;; duplicate
     ("\e$,1@L@m@R\e(B" . "\e$,47;\e(B") ;; lakar
-    ("\e$,1@L@m@G\e(B" . "\e$,47O\e(B") ;; ?
-    ("\e$,1@L@m@F\e(B" . "\e$,47P\e(B") ;; ?
+    ("\e$,1@L@m@G\e(B" . "\e$,47O\e(B")
+    ("\e$,1@L@m@F\e(B" . "\e$,47P\e(B")
 
     ("\e$,1@M\e(B" . "\e$,46@\e(B")
 
@@ -260,27 +261,28 @@ PATTERN regexp."
 
     ("\e$,1@O\e(B" . "\e$,46B\e(B")
     ("\e$,1@O@m@O\e(B" . "\e$,47?\e(B") ;; duplicate
-    ("\e$,1@O@m@5@m@5\e(B" . "\e$,47m\e(B") ;; ?
+    ("\e$,1@O@m@5@m@5\e(B" . "\e$,47m\e(B")
 
     ("\e$,1@P\e(B" . "\e$,46C\e(B")
-    ("\e$,1@P@m\e(B" . "\e$,47@\e(B")
+    ("\e$,1@P@a@m\e(B" . "\e$,47@\e(B")
+    ("\e$,1@P@a\e(B" . "\e$,47j\e(B")
 
     ("\e$,1@Q\e(B" . "\e$,46D\e(B")
     ("\e$,1@Q@m\e(B" . "\e$,47@\e(B") ;; same glyph as "\e$,1@P@m\e(B"
+    ("\e$,1@Q@a@m\e(B" . "\e$,47@\e(B") ;; same glyph as "\e$,1@P@m\e(B"
     ;;("\e$,1@Q@m@Q\e(B" . "\e$,47A\e(B")
     ("\e$,1@Q@m@Q\e(B" . "\e$,47d\e(B")
 
     ("\e$,1@R\e(B" . "\e$,46E\e(B")
-    ("\e$,1@R@m\e(B" . "\e$,47B\e(B")
+    ("\e$,1@R@a@m\e(B" . "\e$,47B\e(B")
     ("\e$,1@R@m@R\e(B" . "\e$,47C\e(B") ;; lakar
-    ("\e$,1@R@m@J\e(B" . "\e$,47e\e(B") ;; ?
+    ("\e$,1@R@m@J\e(B" . "\e$,47e\e(B")
 
     ("\e$,1@S\e(B" . "\e$,46F\e(B")
-    ("\e$,1@S@m\e(B" . "\e$,47D\e(B")
+    ("\e$,1@S@a@m\e(B" . "\e$,47D\e(B")
     ("\e$,1@S@m@S\e(B" . "\e$,47E\e(B")
 
     ("\e$,1@T\e(B" . "\e$,46G\e(B")
-    ("\e$,1@T@m\e(B" . "\e$,47D\e(B")
 
     ("\e$,1@U\e(B" . "\e$,46H\e(B")
     ("\e$,1@U@m@U\e(B" . "\e$,47F\e(B")
@@ -320,8 +322,8 @@ PATTERN regexp."
     ;; Various signs
     ("\e$,1@m\e(B" . "\e$,46V\e(B")
     ("\e$,1@m@O\e(B" . "\e$,46Y\e(B") ;; yakar
-    ("\e$,1@m@O@a\e(B" . "\e$,46\\e(B") ;; yakar + u ;; ?
-    ("\e$,1@m@O@b\e(B" . "\e$,46]\e(B") ;; yakar + uu ;; ?
+    ("\e$,1@m@O@a\e(B" . "\e$,46\\e(B") ;; yakar + u
+    ("\e$,1@m@O@b\e(B" . "\e$,46]\e(B") ;; yakar + uu
     ("\e$,1@m@U\e(B" . "\e$,46Z\e(B") ;; vakar modifier
     ("\e$,1@m@P\e(B" . "\e$,46[\e(B") ;; rakar modifier is the same to rra modifier.
     ("\e$,1@m@P@m\e(B" . "\e$,46R\e(B") ;; halant + rakar + halant