(tibetan-composable-pattern): More

characters included.
(tibetan-consonant-transcription-alist): Rule for "R" added.
(tibetan-subjoined-transcription-alist): Rules for "+W", "+Y", and
"+R" added.
(tibetan-base-to-subjoined-alist): Rule for "RA" added.

1 files changed, 25 insertions, 21 deletions

diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 23ba2985d11..2cf3eb43dbb 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -38,7 +38,7 @@
 ;;; I hope I can add missing characters later.
 ;;;
 ;;;     00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
-;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ;
+;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5)
 ;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations,
 ;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and
 ;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs.
@@ -51,25 +51,17 @@
 ;;;2240 $(7"@(B $(7"A(B $(7"B(B $(7"C(B $(7"D(B $(7"E(B $(7"F(B $(7"G(B $(7"H(B $(7"I(B $(7"J(B $(7"K(B $(7"L(B $(7"M(B $(7"N(B $(7"O(B ; Vowel signs.
 ;;;2250 $(7"P(B $(7"Q(B $(7"R(B $(7"S(B $(7"T(B $(7"U(B $(7"V(B $(7"W(B $(7"X(B $(7"Y(B $(7"Z(B $(7"[(B $(7"\(B $(7"](B $(7"^(B $(7"_(B ; (\x2251 = vowel a)
 ;;;2260 $(7"`(B $(7"a(B $(7"b(B $(7"c(B $(7"d(B $(7"e(B $(7"f(B $(7"g(B $(7"h(B $(7"i(B $(7"j(B $(7"k(B $(7"l(B $(7"m(B $(7"n(B $(7"o(B ; Long vowels and
-;;;2270 $(7"p(B $(7"q(B $(7"r(B $(7"s(B $(7"t(B $(7"u(B $(7"v(B $(7"w(B $(7"x(B $(7"y(B $(7"z(B $(7"{(B $(7"|(B $(7"}(B $(7"~(B // ; vocalic r, l are
-;;;                                                     ; not atomically
+;;;2270 $(7"p(B $(7"q(B $(7"r(B $(7"s(B $(7"t(B $(7"u(B $(7"v(B $(7"w(B $(7"x(B $(7"y(B $(7"z(B $(7"{(B $(7"|(B $(7"}(B $(7"~(B // ; vocalic r, l ARE
+;;;                                                     ; atomically
 ;;;                                                     ; encoded. 
 ;;;     00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
 ;;;2320 // $(7#!(B $(7#"(B $(7##(B $(7#$(B $(7#%(B $(7#&(B $(7#'(B $(7#((B $(7#)(B $(7#*(B $(7#+(B $(7#,(B $(7#-(B $(7#.(B $(7#/(B ; Subjoined consonants
 ;;;2330 $(7#0(B $(7#1(B $(7#2(B $(7#3(B $(7#4(B $(7#5(B $(7#6(B $(7#7(B $(7#8(B $(7#9(B $(7#:(B $(7#;(B $(7#<(B $(7#=(B $(7#>(B $(7#?(B ;
-;;;2340 $(7#@(B $(7#A(B $(7#B(B $(7#C(B $(7#D(B $(7#E(B $(7#F(B $(7#G(B $(7#H(B $(7#I(B $(7#J(B $(7#K(B $(7#L(B $(7#M(B $(7#N(B $(7#O(B ; 'a chung (\x2341)is
-;;;                                                     ; here,
-;;;                                                     ; while in Unicode
-;;;                                                     ; it is classified
-;;;                                                     ; as a vowel sign
-;;;                                                     ; (\x0f71).
-;;;
+;;;2340 $(7#@(B $(7#A(B $(7#B(B $(7#C(B $(7#D(B $(7#E(B $(7#F(B $(7#G(B $(7#H(B $(7#I(B $(7#J(B $(7#K(B $(7#L(B $(7#M(B $(7#N(B $(7#O(B ;
 ;;;2350 $(7#P(B $(7#Q(B $(7#R(B $(7#S(B $(7#T(B $(7#U(B $(7#V(B $(7#W(B $(7#X(B $(7#Y(B $(7#Z(B $(7#[(B $(7#\(B $(7#](B $(7#^(B $(7#_(B ; Hereafter, the chars
 ;;;2360 $(7#`(B $(7#a(B $(7#b(B $(7#c(B $(7#d(B $(7#e(B $(7#f(B $(7#g(B $(7#h(B $(7#i(B $(7#j(B $(7#k(B $(7#l(B $(7#m(B $(7#n(B $(7#o(B ; are not specified
 ;;;2370 $(7#p(B $(7#q(B $(7#r(B $(7#s(B $(7#t(B $(7#u(B $(7#v(B $(7#w(B $(7#x(B $(7#y(B $(7#z(B $(7#{(B $(7#|(B $(7#}(B $(7#~(B // ; in Unicode.
-;;;                                                     ; The character \x2351
-;;;                                                     ; is not used in our
-;;;                                                     ; implementation.
+;;;
 ;;;     00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
 ;;;2420 // $(7$!(B $(7$"(B $(7$#(B $(7$$(B $(7$%(B $(7$&(B $(7$'(B $(7$((B $(7$)(B $(7$*(B $(7$+(B $(7$,(B $(7$-(B $(7$.(B $(7$/(B ; Precomposed
 ;;;2430 $(7$0(B $(7$1(B $(7$2(B $(7$3(B $(7$4(B $(7$5(B $(7$6(B $(7$7(B $(7$8(B $(7$9(B $(7$:(B $(7$;(B $(7$<(B $(7$=(B $(7$>(B $(7$?(B ; consonants for
@@ -107,13 +99,14 @@
              (features tibet-util)
              (documentation . t)
              (sample-text .
-"Tibetan (4$(7"7r'"]0"7"]1"2$(8!;4$(7%Px!"Q0%P"Q1"2$(8!;(B) 4$(7#Rv##Sv##S0#R#S#S1!>"74$Px!"Q0$P"Q1$(8!;4$(7"Er'"S0"E"S1"G$(8!;$(7"74"2r'"[0"2"[1$(8!;4$(7"Dr'"[0"D"[1"#"G!>4"Ir'"]r'"_0"I"]"_1$(8!;4$(7"9x!"Q0"9"Q1$(8!;4$(7"/r'"S0"/"S1$(8!;4$(7"5x!"Q0"5"Q14#2x!#9r'"[0#2#9"[1$(8!;4$(7"Hx!#Ax!"Ur'"c0"H#A"U"c1!>(B")))
+"Tibetan (4$(7"7r'"]0"7"]14"20"21!;4%P0"G#!"Q14"20"21!;(B) $(7!4!5!5!>4"70"714$P0"!#C"Q1!;4"Er'"S0"E"S14"G0"G1!;4"70"714"2r'"[0"2"[1!;4"Dr'"[0"D"[14"#0"#14"G0"G1!>4"Ir'"]r'"_0"I"]"_1!;4"90"9"Q1!;4"/r'"S0"/"S1!;4"50"5"Q1#2#9"[!;4"Hx!"Rx!"Ur'"c0"H"A"U"c1!>(B")))
 
 
 ;; `$(7"A(B' is included in the pattern for subjoined consonants because we
 ;; treat it specially in tibetan-add-components.
+;; modified by Tomabechi 1999/12/10
 (defconst tibetan-composable-pattern
-  "[$(7"!(B-$(7"J(B][$(7"A#!(B-$(7#J(B]*[$(7"Q(B-$(7"^"a"e(B]?[$(7"_"c"d"g(B-$(7"l!I!e!g(B]?"
+  "[$(7"!(B-$(7"J"K(B][$(7"A#!(B-$(7#J#K#L#M(B]*$(7"R(B?[$(7"Q"S(B-$(7"^"a"e(B]?[$(7"_"c"d"g(B-$(7"l!I!e!g(B]*"
   "Regexp matching a composable sequence of Tibetan characters.")
 
 ;; Register a function to compose Tibetan characters.
@@ -169,7 +162,10 @@
     ("s" . "$(7"G(B")
     ("h" . "$(7"H(B")
     ("H" . "$(7"H(B")
-    ("A" . "$(7"I(B")))
+    ("A" . "$(7"I(B")
+    ;; Added by Tomabechi 1999/12/10
+    ("R" . "$(7"K(B") ;; fixed form RA
+    ))
 
 
 (defconst tibetan-vowel-transcription-alist
@@ -267,7 +263,7 @@
     ("brng" . "$(7"7%#(B")
     ("brj" . "$(7"7%$(B")
     ("brny" . "$(7"7%%(B")
-    ("brt" . "$(7"7%&(B")
+    ("brt" .  "$(7"7%&(B")
     ("brd" . "$(7"7%'(B")
     ("brn" . "$(7"7%((B")
     ("brts" . "$(7"7%+(B")
@@ -311,7 +307,9 @@
     ("sn" . "$(7%V(B")
     ("sp" . "$(7%W(B")
     ("sb" . "$(7%X(B")
-    ("sm" . "$(7%Y(B")))
+    ("sm" . "$(7%Y(B"))
+  )
+
 
 (defconst tibetan-subjoined-transcription-alist
   (sort '(("+k"  . "$(7#!(B")
@@ -355,7 +353,11 @@
           ("+h"  . "$(7#H(B")
           ("+A"  . "$(7#I(B")
           ("+kSH" . "$(7#J(B")
-          ("+R"   . "$(7#P(B"))
+          ;; Added by Tomabechi 1999/12/10
+          ("+W" . "$(7#K(B") ;; fixed form subscribed WA
+          ("+Y" . "$(7#L(B") ;; fixed form subscribed YA
+          ("+R" . "$(7#M(B") ;; fixed form subscribed RA
+          )
         (lambda (x y) (> (length (car x)) (length (car y))))))
 
 ;;;
@@ -402,8 +404,10 @@
     ("$(7"G(B" . "$(7#G(B")
     ("$(7"H(B" . "$(7#H(B")
     ("$(7"I(B" . "$(7#I(B")
-    ("$(7"J(B" . "$(7#J(B")))
-
+    ("$(7"J(B" . "$(7#J(B")
+    ;; Added by Tomabechi 1999/12/10
+    ("$(7"K(B" . "$(7#M(B") ;; Fixed form RA (224B->234D)
+    ))
 ;;;
 ;;; alist for Tibetan consonantic components <-> precomposed glyph conversion.
 ;;; (includes some punctuation conversion rules)