From: tomo <tomo>
Date: Wed, 4 Aug 2010 11:38:18 +0000 (+0000)
Subject: (char-db-coded-charset-priority-list): Add `=>ucs@iso',
X-Git-Tag: chise-base-0_25-1^20~353
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1e352eaeca3a5345360ae0e2a41898b4fb4abe62;p=chise%2Fxemacs-chise.git

(char-db-coded-charset-priority-list): Add `=>ucs@iso',
`=>ucs@unicode' and `=>daikanwa'.
(char-db-insert-ccs-feature): Treat `=>daikanwa' as the same as
`=daikanwa'.
(insert-char-attributes): Delete special code for `=>daikanwa'.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 5395803..51f38b2 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -156,9 +156,11 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =>ucs@iso
+    =>ucs@unicode
+    =>>ucs@unicode
     =ucs@iso
     =ucs@unicode
-    =>>ucs@unicode
     =>>gt
     =>>jis-x0208
     =>>jis-x0213-1
@@ -176,6 +178,7 @@
     =>jis-x0213-2
     =>gt
     =>big5-cdp
+    =>daikanwa
     =big5
     =big5-eten
     =zinbun-oracle
@@ -431,6 +434,7 @@
 	   "(%-18s . %04d)\t; %c")
 	  ((or (memq name '(=daikanwa
 			    =daikanwa@rev1 =daikanwa@rev2
+			    =>daikanwa
 			    =gt =>>gt =>gt =gt-k =>>gt-k =cbeta
 			    =zinbun-oracle =>zinbun-oracle))
 	       (string-match "^=adobe-" (symbol-name name)))
@@ -648,21 +652,21 @@
 			line-breaking))
 	(setq attributes (delq name attributes))
 	))
-    (dolist (name '(=>daikanwa))
-      (when (and (memq name attributes)
-		 (setq value (get-char-attribute char name)))
-	(insert
-	 (if (integerp value)
-	     (format "(%-18s . %05d)\t; %c%s"
-		     name value (decode-char '=daikanwa value)
-		     line-breaking)
-	   (format "(%-18s %s)\t; %c%s"
-		   name
-		   (mapconcat (function prin1-to-string)
-			      value " ")
-		   (char-representative-of-daikanwa char)
-		   line-breaking)))
-	(setq attributes (delq name attributes))))
+    ;; (dolist (name '(=>daikanwa))
+    ;;   (when (and (memq name attributes)
+    ;;              (setq value (get-char-attribute char name)))
+    ;;     (insert
+    ;;      (if (integerp value)
+    ;;          (format "(%-18s . %05d)\t; %c%s"
+    ;;                  name value (decode-char '=daikanwa value)
+    ;;                  line-breaking)
+    ;;        (format "(%-18s %s)\t; %c%s"
+    ;;                name
+    ;;                (mapconcat (function prin1-to-string)
+    ;;                           value " ")
+    ;;                (char-representative-of-daikanwa char)
+    ;;                line-breaking)))
+    ;;     (setq attributes (delq name attributes))))
     (when (and (memq 'general-category attributes)
 	       (setq value (get-char-attribute char 'general-category)))
       (insert (format