(tibetan-composable-pattern): Fix previous change.

(tibetan-vowel-transcription-alist): More rules added.
(tibetan-composite-vowel-alist): New variable.
(tibetan-precomposition-rule-alist): More rules added.

diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 2cf3eb43dbb281306cf9391fb27fe89a32ff64b1..f8d5992a59cc442436952f8e6f2071bb469bf71a 100644 (file)
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -99,14 +99,19 @@
             (features tibet-util)
             (documentation . t)
             (sample-text .
-"Tibetan (\e4\e$(7"7r'"]\e0"7"]\e1\e4"2\e0"2\e1!;\e4%P\e0"G#!"Q\e1\e4"2\e0"2\e1!;\e(B) \e$(7!4!5!5!>\e4"7\e0"7\e1\e4$P\e0"!#C"Q\e1!;\e4"Er'"S\e0"E"S\e1\e4"G\e0"G\e1!;\e4"7\e0"7\e1\e4"2r'"[\e0"2"[\e1!;\e4"Dr'"[\e0"D"[\e1\e4"#\e0"#\e1\e4"G\e0"G\e1!>\e4"Ir'"]r'"_\e0"I"]"_\e1!;\e4"9\e0"9"Q\e1!;\e4"/r'"S\e0"/"S\e1!;\e4"5\e0"5"Q\e1#2#9"[!;\e4"Hx!"Rx!"Ur'"c\e0"H"A"U"c\e1!>\e(B")))
+"Tibetan (\e4\e$(7"7r'"]\e0"7"]\e1\e4"2\e0"2\e1!;\e4%P\e0"G#!"Q\e1\e4"2\e0"2\e1!;\e(B) \e$(7!4!5!5!>\e4"7\e0"7\e1\e4$P\e0"!#C"Q\e1!;\e4"Er'"S\e0"E"S\e1\e4"G\e0"G\e1!;\e4"7\e0"7\e1\e4"2r'"[\e0"2"[\e1!;\e4"Dr'"[\e0"D"[\e1\e4"#\e0"#\e1\e4"G\e0"G\e1!>\e4"Ir'"]r'"_\e0"I"]"_\e1!;\e4"9\e0"9"Q\e1!;\e4"/r'"S\e0"/"S\e1!;\e4"5\e0"5"Q\e1\e4#2x!#9r'"[\e0"2#9"[\e1!;\e4"Hx!"Rx!"Ur'"c\e0"H"A"U"c\e1!>\e(B")))
 
 
 ;; `\e$(7"A\e(B' is included in the pattern for subjoined consonants because we
 ;; treat it specially in tibetan-add-components.
 ;; modified by Tomabechi 1999/12/10
+;; modified by Tomabechi 2000/06/08
+;;          To allow infinite addition of vowels/modifiers
+;;          as specified in Unicode v.3
+;; \e$(7"A\e(B is removed from the class of subjoined. Tomabechi 2000/06/08
+;; (for Unicode support)
 (defconst tibetan-composable-pattern
-  "[\e$(7"!\e(B-\e$(7"J"K\e(B][\e$(7"A#!\e(B-\e$(7#J#K#L#M\e(B]*\e$(7"R\e(B?[\e$(7"Q"S\e(B-\e$(7"^"a"e\e(B]?[\e$(7"_"c"d"g\e(B-\e$(7"l!I!e!g\e(B]*"
+  "[\e$(7"!\e(B-\e$(7"J"K\e(B][\e$(7#!\e(B-\e$(7#J#K#L#M\e(B]*[\e$(7"Q"R"S\e(B-\e$(7"^"a"b"e\e(B]*[\e$(7"_"c"d"g\e(B-\e$(7"l!I!e!g\e(B]*"
   "Regexp matching a composable sequence of Tibetan characters.")
 
 ;; Register a function to compose Tibetan characters.
@@ -169,7 +174,19 @@
 
 
 (defconst tibetan-vowel-transcription-alist
-  '(("ai" . "\e$(7"\\e(B")
+  '(
+    ;; Composite Vowels
+    ;; Added by Tomabechi 2000/06/08
+    ("frr" . "\e$(7"X\e(B")
+    ("fll" . "\e$(7"Z\e(B")
+    ("fa" . "\e$(7"R\e(B")
+    ("fi" . "\e$(7"T\e(B")
+    ("fu" . "\e$(7"V\e(B")
+    ("fr" . "\e$(7"W\e(B")
+    ("fl" . "\e$(7"Y\e(B")
+    ("fI" . "\e$(7"b\e(B")
+    ;; Normal Vowels
+    ("ai" . "\e$(7"\\e(B")
     ("au" . "\e$(7"^\e(B")
     ("ee" . "\e$(7"\\e(B")
     ("oo" . "\e$(7"^\e(B")
@@ -408,6 +425,30 @@
     ;; Added by Tomabechi 1999/12/10
     ("\e$(7"K\e(B" . "\e$(7#M\e(B") ;; Fixed form RA (224B->234D)
     ))
+
+;;; alist for Tibetan composite vowels (long i, vocalic r, etc.)
+;;; New varialble. created by Tomabechi 2000/06/08
+(defconst tibetan-composite-vowel-alist
+  '(;; LONG A
+    ;; ("\e$(7"R\e(B" . ((bc . tc) ?\e$(7"R\e(B))
+    ;; LONG I
+    ("\e$(7"T\e(B" . (?\e$(7"R\e(B (tc . bc) ?\e$(7"S\e(B))
+    ;; LONG U
+    ("\e$(7"V\e(B" . (?\e$(7"R\e(B (bc . tc) ?\e$(7"U\e(B))
+    ;; VOCALIC R
+    ("\e$(7"W\e(B" . (?\e$(7#C\e(B (tc . bc) ?\e$(7"a\e(B))
+    ;; LONG VOCALIC R
+    ("\e$(7"X\e(B" . (?\e$(7#C\e(B (bc . tc) ?\e$(7"R\e(B (tc . bc) ?\e$(7"a\e(B))
+    ;; VOCALIC L
+    ("\e$(7"Y\e(B" . (?\e$(7#D\e(B (tc . bc) ?\e$(7"a\e(B))
+    ;;\e$(7!;\e(BLONG VOCALIC L
+    ("\e$(7"Z\e(B" . (?\e$(7#D\e(B (bc . tc) ?\e$(7"R\e(B (tc . bc) ?\e$(7"a\e(B))
+    ;; LONG REVERSE I
+    ("\e$(7"b\e(B" . (?\e$(7"R\e(B (tc . bc) ?\e$(7"a\e(B))
+    ))
+
+
+
 ;;;
 ;;; alist for Tibetan consonantic components <-> precomposed glyph conversion.
 ;;; (includes some punctuation conversion rules)
@@ -493,6 +534,7 @@
     ("\e$(7"C#9\e(B" . "\e$(7%*\e(B")
     ("\e$(7"D#!\e(B" . "\e$(7%@\e(B")
     ("\e$(7"D##\e(B" . "\e$(7%A\e(B")
+    ("\e$(7"D#4\e(B" . "\e$(7!!\e(B") ; dummy 0x2121 added 2000/06/08 for transition l -> lng
     ("\e$(7"D#&\e(B" . "\e$(7%C\e(B")
     ("\e$(7"D#(\e(B" . "\e$(7%D\e(B")
     ("\e$(7"D#0\e(B" . "\e$(7%E\e(B")