Register thai-composition-function in

composition-function-table for Thai vowels and tones.
(thai-tis620): Don't use thai-post-read-conversion.

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 754fb2e3f51d016e29872b90b2d21df7d5170fe1..858814ea3fbc850c57600eaf9bb4559e8432fc20 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -50,16 +50,10 @@
          (features thai-util)
          (sample-text 
           . (thai-compose-string
-             (copy-sequence "Thai (\e,T@RIRd7B\e(B)              \e,TJ\e0GQ\e1J\e04U\e1$\e0CQ\e1:\e(B, \e,TJ\e0GQ\e1J\e04U\e1\e0$h\e1P\e(B")))
+             (copy-sequence "Thai (\e,T@RIRd7B\e(B)              \e,TJGQJ4U$CQ:\e(B, \e,TJGQJ4U$hP\e(B")))
          (documentation . t)))
 
 
-;; Register a function to compose Thai characters.
-(set-char-table-range composition-function-table
-                     '(#x0E00 . #x0E7F)
-                     '(("\\c0\\c4\\|\\c0\\(\\c2\\|\\c3\\)\\c4?"
-                        . thai-composition-function)))
-
 (define-coding-system 'cp874
   "DOS codepage 874 (Thai)"
   :coding-type 'charset
@@ -76,6 +70,12 @@ This is the same as `thai-tis620' with the addition of no-break-space."
   :mime-charset 'iso-8859-11 ; not actually registered as of 2002-05-24
   :charset-list '(iso-8859-11))
 
+;; For automatic composition.
+(let ((chars "\e,TQTUVWXYZghijklmn\e(B"))
+  (dotimes (i (length chars))
+    (aset composition-function-table (aref chars i)
+         'thai-composition-function)))
+
 (provide 'thai)
 
 ;;; thai.el ends here