(lrt-composing-pattern-double-c): Change

chars-in-string to length.
(lrt-generate-quail-map): Change sref to aref, and make second
argument of substring a character index.

diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index e633d02..b3521c9 100644 (file)
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -66,7 +66,7 @@
     ("h" . ?\e(1N\e(B)
     ("nh" . ?\e(1|\e(B)
     ("mh" . ?\e(1}\e(B)
-    ("lh" . "\e0\e(1K\\e1\e(B")
+    ("lh" . "\e0\e(1K\\e(B\e1")
     ))
 
 ;; Semi-vowel-sign-lo is put under the first letter.
@@ -161,7 +161,7 @@
   (let* ((patterns (copy-sequence vowel-pattern))
         (tail patterns)
         (chars (string-to-list
-                (if (= (chars-in-string str) 1)
+                (if (= (length str) 1)
                     (decompose-string str)
                   str)))
         place)
@@ -343,8 +343,8 @@
          (quail-defrule-internal
           (concat (car e1) semi-vowel-key)
           (vector (concat (compose-string
-                           (format "%c%c" (sref (cdr e1) 0) semi-vowel-char))
-                          (substring (cdr e1) (charset-bytes 'lao))))
+                           (format "%c%c" (aref (cdr e1) 0) semi-vowel-char))
+                          (substring (cdr e1) 1)))
           map)
          (setq l2 lrt-vowel-table)
          (while l2