# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1098857023 0
# Node ID 8ce088246974f3113746f27a33e7e44b79141350
# Parent  c3945be39e093caef1d63ecd13dc23901595b2a2
Use utf-translate-cjk-substitutable-p.

diff -r c3945be39e09 -r 8ce088246974 lisp/international/subst-big5.el
--- a/lisp/international/subst-big5.el	Wed Oct 27 06:01:59 2004 +0000
+++ b/lisp/international/subst-big5.el	Wed Oct 27 06:03:43 2004 +0000
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
 	 (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-	     (and (>= unicode #xff00) (<= unicode #xffef)))
-	 (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+	 (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa7 ?¡±)
    (#xaf ?¡Â)
diff -r c3945be39e09 -r 8ce088246974 lisp/international/subst-gb2312.el
--- a/lisp/international/subst-gb2312.el	Wed Oct 27 06:01:59 2004 +0000
+++ b/lisp/international/subst-gb2312.el	Wed Oct 27 06:03:43 2004 +0000
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
 	 (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-	     (and (>= unicode #xff00) (<= unicode #xffef)))
-	 (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+	 (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa4 ?¡è)
    (#xa7 ?¡ì)
diff -r c3945be39e09 -r 8ce088246974 lisp/international/subst-jis.el
--- a/lisp/international/subst-jis.el	Wed Oct 27 06:01:59 2004 +0000
+++ b/lisp/international/subst-jis.el	Wed Oct 27 06:03:43 2004 +0000
@@ -45,11 +45,11 @@
 (mapc
  (lambda (pair)
    (let ((unicode (car pair))
-	 (char (cadr pair)))
-     ;; exclude non-CJK components from decode table
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-	     (and (>= unicode #xff00) (<= unicode #xffef)))
-	 (puthash unicode  char ucs-unicode-to-mule-cjk))
+	 (char (cadr pair))
+	 (tail utf-translate-cjk-unicode-range))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+	 (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '(
    ;; jisx0208
diff -r c3945be39e09 -r 8ce088246974 lisp/international/subst-ksc.el
--- a/lisp/international/subst-ksc.el	Wed Oct 27 06:01:59 2004 +0000
+++ b/lisp/international/subst-ksc.el	Wed Oct 27 06:03:43 2004 +0000
@@ -31,9 +31,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
 	 (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-	     (and (>= unicode #xff00) (<= unicode #xffef)))
-	 (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+	 (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa1 ?¢®)
    (#xa4 ?¢´)