(tibetan-wylie-quote-alist): This variable deleted.

("tibetan-wylie"): State transition table modified.

diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index e6d21a0cfc8e07c9b89f3113895e64e425e37cab..83b2fb8272ab93326449cec2a6543d8fc77da059 100644 (file)
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -66,7 +66,10 @@
 
 ;; Special alist for `\e$(7"A\e(B'.  It must be treated as a subjoined
 ;; consonant if it follows a consonant.
-(defconst tibetan-wylie-quote-alist '(("'" . ?\e$(7"A\e(B)))
+;; * Removed by Tomabechi 2000/06/10 *
+;; 'a chung must be explicitly typed as a vowel ("fa")
+;; \e$(7"A\e(B is now treated as normal base consonants
+;; (defconst tibetan-wylie-quote-alist '(("'" . ?\e$(7"A\e(B)))
 
 ;; Special alist to avoid default stacking.
 (defconst tibetan-wylie-non-stacking-alist
@@ -77,16 +80,16 @@
 
 (defconst tibetan-wylie-punctuation-alist
    '(("."  . " ")
-     (":"  . "\e$(8"`\e(B")
-     (" "  . "\e$(8!;\e(B")
-     ("/"  . "\e$(8!=\e(B")
+     (":"  . "\e$(7"`\e(B")
+     (" "  . "\e$(7!;\e(B")
+     ("/"  . "\e$(7!=\e(B")
      ("//" . "\e$(7!>\e(B")
      ("////" . ["\e$(7!>\e(B \e$(7!>\e(B"])
-     ("$"  . "\e$(8!?\e(B")
-     ("/\"" . "\e$(8!@\e(B")                     ; Not defined in Ext. Wylie.
-     ("&"  . "\e$(8!@\e(B")
-     (";"  . "\e$(8!A\e(B")
-     ("%"  . "\e$(8!D\e(B")
+     ("$"  . "\e$(7!?\e(B")
+     ("/\"" . "\e$(7!@\e(B")                     ; Not defined in Ext. Wylie.
+     ("&"  . "\e$(7!@\e(B")
+     (";"  . "\e$(7!A\e(B")
+     ("%"  . "\e$(7!D\e(B")
      ("!"  . "\e$(7!8\e(B")
      ("<"  . "\e$(7!l\e(B")
      (">"  . "\e$(7!m\e(B")
@@ -114,27 +117,27 @@
      ("-7" . "\e$(7!`\e(B")
      ("-8" . "\e$(7!a\e(B")
      ("-9" . "\e$(7!b\e(B")
-     ("|"  . "\e$(7!1!2!3!9!:!B!C!E!F!G!H!I!J!K!L!M!N!O!d!f!h!j!k!n!o\e(B")))
+     ("|"  . "\e$(7!0!1!2!3!7!9!:!B!C!E!F!G!H!I!J!K!L!M!N!O!d!f!h!j!k!n!o#O#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#`\e(B")))
 
 (quail-define-package "tibetan-wylie" "Tibetan" "TIBw" t
 "Tibetan character input by Extended Wylie key assignment.
 
     +-------------------------------------+
-    |\e$(7"!\e$(8!;\e(B k |\e$(7""\e$(8!;\e(B kh |\e$(7"#\e$(8!;\e(B g  |\e$(7"$\e$(8!;\e(B gh |\e$(7"%\e$(8!;\e(B ng|   \e$(7"S\e(B i          \e$(8!=\e(B        /
-    |\e$(7"&\e$(8!;\e(B c |\e$(7"'\e$(8!;\e(B ch |\e$(7"(\e$(8!;\e(B j  |       |\e$(7"*\e$(8!;\e(B ny|   \e$(7"U\e(B u          \e$(7!>\e(B       //
-    |\e$(7"+\e$(8!;\e(B T |\e$(7",\e$(8!;\e(B TH |\e$(7"-\e$(8!;\e(B D  |\e$(7".\e$(8!;\e(B DH |\e$(7"/\e$(8!;\e(B N |   \e$(7"[\e(B e          \e$(7!>\e(B \e$(7!>\e(B    ////
-    |\e$(7"0\e$(8!;\e(B t |\e$(7"1\e$(8!;\e(B th |\e$(7"2\e$(8!;\e(B d  |\e$(7"3\e$(8!;\e(B dh |\e$(7"4\e$(8!;\e(B n |   \e$(7"]\e(B o          \e$(7!A\e(B       ;
-    |\e$(7"5\e$(8!;\e(B p |\e$(7"6\e$(8!;\e(B ph |\e$(7"7\e$(8!;\e(B b  |\e$(7"8\e$(8!;\e(B bh |\e$(7"9\e$(8!;\e(B m |   \e$(7"\\e(B ai (ee, E) \e$(8!?\e(B        $
-    |\e$(7":\e$(8!;\e(B ts|\e$(7";\e$(8!;\e(B tsh|\e$(7"<\e$(8!;\e(B dz |\e$(7"=\e$(8!;\e(B dzh|\e$(7">\e$(8!;\e(B w |   \e$(7"^\e(B au (oo, O) \e$(8!@\e(B        &
-    |\e$(7"?\e$(8!;\e(B zh|\e$(7"@\e$(8!;\e(B z  |\e$(7"A\e$(8!;\e(B '  |       |\e$(7"B\e$(8!;\e(B y |   \e$(7"a\e(B I          \e$(7#R#S#S\e(B   *
-    |\e$(7"C\e$(8!;\e(B r |\e$(7"D\e$(8!;\e(B l  |\e$(7"E\e$(8!;\e(B sh |\e$(7"F\e$(8!;\e(B SH |\e$(7"G\e$(8!;\e(B s |   \e$(7"`\e(B :          \e$(7#R#S#S#S\e(B #
-    |\e$(7"H\e$(8!;\e(B h |\e$(7"I\e$(8!;\e(B A  |\e$(7"J\e$(8!;\e(B kSH|       |      |   \e$(7"_\e(B M           \e$(7!l\e(B \e$(7!m\e(B   < >
-    +-------------------------------------+   \e$(8!D\e(B  %
-    (The consonant \e$(7"I\e$(8!;\e(B must be typed explicitly.)
+    |\e$(7"!!;\e(B k |\e$(7""!;\e(B kh |\e$(7"#!;\e(B g  |\e$(7"$!;\e(B gh |\e$(7"%!;\e(B ng|   \e$(7"S\e(B i          \e$(7!=\e(B        /
+    |\e$(7"&!;\e(B c |\e$(7"'!;\e(B ch |\e$(7"(!;\e(B j  |       |\e$(7"*!;\e(B ny|   \e$(7"U\e(B u          \e$(7!>\e(B       //
+    |\e$(7"+!;\e(B T |\e$(7",!;\e(B TH |\e$(7"-!;\e(B D  |\e$(7".!;\e(B DH |\e$(7"/!;\e(B N |   \e$(7"[\e(B e          \e$(7!>\e(B \e$(7!>\e(B    ////
+    |\e$(7"0!;\e(B t |\e$(7"1!;\e(B th |\e$(7"2!;\e(B d  |\e$(7"3!;\e(B dh |\e$(7"4!;\e(B n |   \e$(7"]\e(B o          \e$(7!A\e(B       ;
+    |\e$(7"5!;\e(B p |\e$(7"6!;\e(B ph |\e$(7"7!;\e(B b  |\e$(7"8!;\e(B bh |\e$(7"9!;\e(B m |   \e$(7"\\e(B ai (ee, E) \e$(7!?\e(B        $
+    |\e$(7":!;\e(B ts|\e$(7";!;\e(B tsh|\e$(7"<!;\e(B dz |\e$(7"=!;\e(B dzh|\e$(7">!;\e(B w |   \e$(7"^\e(B au (oo, O) \e$(7!@\e(B        &
+    |\e$(7"?!;\e(B zh|\e$(7"@!;\e(B z  |\e$(7"A!;\e(B '  |       |\e$(7"B!;\e(B y |   \e$(7"a\e(B I          \e$(7!4!5\e(B   *
+    |\e$(7"C!;\e(B r |\e$(7"D!;\e(B l  |\e$(7"E!;\e(B sh |\e$(7"F!;\e(B SH |\e$(7"G!;\e(B s |   \e$(7"`\e(B :         \e$(7!4!5!5\e(B  #
+    |\e$(7"H!;\e(B h |\e$(7"I!;\e(B A  |\e$(7"J!;\e(B kSH|       |      |   \e$(7"_\e(B M           \e$(7!l\e(B \e$(7!m\e(B   < >
+    +-------------------------------------+   \e$(7!D\e(B  %
+    (The consonant \e$(7"I!;\e(B must be typed explicitly.)
 
   NOT SPECIFIED IN EXT. WYLIE:
     +--------------------------------------------------------+
-    |\e$(7"c\e(B = ~ |\e$(7"d\e(B = ` |\e$(7"e\e(B = , |\e$(7"f\e(B = @ |\e$(7!g\e(B = _o|\e$(7!e\e(B = _O|\e$(7#R#S!I\e(B = ^|
+    |\e$(7"c\e(B = ~ |\e$(7"d\e(B = ` |\e$(7"e\e(B = , |\e$(7"f\e(B = @ |\e$(7!g\e(B = _o|\e$(7!e\e(B = _O|\e$(7!6\e(B = ^|
     +--------------------------------------------------------+
     |\e$(7"i\e(B = x |\e$(7"j\e(B = X |\e$(7"g\e(B = v |\e$(7"h\e(B = V |\e$(7"k\e(B = q |\e$(7"l\e(B = Q |
     +-----------------------------------------------+
@@ -162,20 +165,26 @@
 ;; V:vowel, M:vowel modifier, S:suffix, s:post suffix.
 ;; In this pattern, the part indicated by "^^^" can be one composition.
 
+;;; modified by Tomabechi 1999/12/10
+;;; modified by Tomabechi 2000/06/08
+;;;             Allows infinite addition of vowels/modifiers
+;;;             as specified in Unicode v.3
 (quail-install-map
  (quail-map-from-table
-  '((base-state (tibetan-consonant-transcription-alist . sq-state)
-               (tibetan-precomposed-transcription-alist . s-state)
-               (tibetan-wylie-non-stacking-alist . sq-state)
+  '((base-state (tibetan-consonant-transcription-alist . svm-state)
+               (tibetan-precomposed-transcription-alist . svm-state)
+               (tibetan-wylie-non-stacking-alist . svm-state)
                tibetan-subjoined-transcription-alist
                tibetan-vowel-transcription-alist
                tibetan-modifier-transcription-alist
                tibetan-wylie-punctuation-alist)
-    (sq-state (tibetan-wylie-quote-alist . s-state)
-             (tibetan-subjoined-transcription-alist . s-state))
-    (s-state (tibetan-subjoined-transcription-alist . s-state)
-            (tibetan-vowel-transcription-alist . m-state))
-    (m-state tibetan-modifier-transcription-alist))))
+    (svm-state ;;(tibetan-wylie-quote-alist . vm-state)
+               (tibetan-vowel-transcription-alist . vm-state)
+               (tibetan-subjoined-transcription-alist . svm-state)
+               (tibetan-modifier-transcription-alist . m-state))
+    (vm-state (tibetan-vowel-transcription-alist . vm-state)
+             (tibetan-modifier-transcription-alist . m-state))
+    (m-state (tibetan-modifier-transcription-alist . m-state)))))
 
 ;;;
 ;;; TibKey key alignment based input method
@@ -306,15 +315,15 @@
 
 (defconst tibetan-punctuation-tibkey-alist
   '(("1" . "\e$(7!Q\e(B")
-    ("!" . ["\e$(7#R#S#S#S\e(B"])                ; nyi zla long
+    ("!" . "\e$(7!4\e(B")                ; nyi zla long
     ("2" . "\e$(7!R\e(B")
-    ("@" . "\e$(7#S\e(B")                        ; nyi zla simple
+    ("@" . "\e$(7!5\e(B")                        ; nyi zla simple
     ("3" . "\e$(7!S\e(B")
 ;;; ("#" )
     ("4" . "\e$(7!T\e(B")
 ;;; ("$" )
     ("5" . "\e$(7!U\e(B")
-    ("%" . "\e$(8!D\e(B")
+    ("%" . "\e$(7!D\e(B")
     ("6" . "\e$(7!V\e(B")
     ("^" . "\e$(7!1\e(B")
     ("7" . "\e$(7!W\e(B")
@@ -327,17 +336,17 @@
 ;;; ("-" ) ; enphatic, not yet supported 
 ;;; ("_" ) ; id.
 ;;; ("=" ) ; special sign, not yet supported
-    ("+" . "\e$(8!A\e(B")
-    ("\\" . "\e$(8!?\e(B")
+    ("+" . "\e$(7!A\e(B")
+    ("\\" . "\e$(7!?\e(B")
     ("|" . "\e$(7!8\e(B")
     ("I" . "\e$(7"f\e(B")                                ; avagraha
-    (":" . "\e$(8"`\e(B")
-;;; (">" ?\e$(8!;\e(B) ; to be assigned to SPC
+    (":" . "\e$(7"`\e(B")
+;;; (">" ?\e$(7!;\e(B) ; to be assigned to SPC
     (">" . " ")
-    ("?" . "\e$(8!=\e(B")
+    ("?" . "\e$(7!=\e(B")
     ("??" . "\e$(7!>\e(B")
     ("????" . ["\e$(7!>\e(B \e$(7!>\e(B"])
-    (" " . "\e$(8!;\e(B")
+    (" " . "\e$(7!;\e(B")
     ))
 
 ;; Convert TibKey string to Tibetan-Roman transcription string.
@@ -401,13 +410,13 @@
   [SHIFTED]
 
   +----------------------------------------------------------+
-  |~\e$(7"c\e(B|!\e$(7#R#S\e(B|@\e$(7#S\e(B|#  |$  |%\e$(8!D\e(B |^\e$(7!1\e(B|&  |*  |(\e$(7!l\e(B|)\e$(7!m\e(B|_  |+\e$(7!A\e(B| |\e$(7!8\e(B|
+  |~\e$(7"c\e(B|!\e$(7!4\e(B|@\e$(7!5\e(B|#  |$  |%\e$(7!D\e(B |^\e$(7!1\e(B|&  |*  |(\e$(7!l\e(B|)\e$(7!m\e(B|_  |+\e$(7!A\e(B| |\e$(7!8\e(B|
   +----------------------------------------------------------+
-     |Q\e$(7"J\e(B|W\e$(7#T\e(B|E  |R  |T\e$(7"a\e(B|Y  |U  |I\e$(7"f\e(B|O\e$(7"+\e(B|P\e$(7",\e(B|{\e$(7"-\e(B|}\e$(7"/\e(B|
+     |Q\e$(7"J\e(B|W  |E  |R  |T\e$(7"a\e(B|Y  |U  |I\e$(7"f\e(B|O\e$(7"+\e(B|P\e$(7",\e(B|{\e$(7"-\e(B|}\e$(7"/\e(B|
      +-----------------------------------------------+
       |A  |S  |D  |F\e$(7"_\e(B|G\e$(7"S\e(B|H\e$(7"e\e(B|J\e$(7"[\e(B|K  |L  |:\e$(7"`\e(B|\"\e$(7#>\e(B|
       +-------------------------------------------+
-         |Z  |X  |C\e$(7#A\e(B|V\e$(7#B\e(B|B\e$(7#C\e(B|N\e$(7#D\e(B|M\e$(7"F\e(B|<  |>  |?\e$(8!=\e(B |
+         |Z  |X  |C\e$(7"R\e(B|V\e$(7#B\e(B|B\e$(7#C\e(B|N\e$(7#D\e(B|M\e$(7"F\e(B|<  |>  |?\e$(7!=\e(B |
          +---------------------------------------+        
 
   DIFFERENCE FROM THE ORIGINAL TIBKEY: