X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b1b8cf4d1896cfa618603140841ba675e44c7515;hb=fb0538201312b5414bb1c9ad777c08ebc8ec80a3;hp=66d3995c005a14f3f29aca74337c79124f4e49c5;hpb=089ed852ec10c0af28dc1ec4e5da8a7a30cc140a;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 66d3995..b1b8cf4 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,9 +1,10 @@
-;;; char-db-util.el --- Character Database utility
+;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
-;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009, 2010 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE.
+;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
 
 ;; This file is part of XEmacs CHISE.
 
@@ -69,13 +70,53 @@
       (setq i (1+ i)))
     v))
 
+;;;###autoload
+(defun ideographic-radical (number)
+  "Return character corresponding with Kangxi-radical number."
+  (aref ideographic-radicals number))
+
+(defconst shuowen-radicals
+  [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨 ; 010
+   ?屮 ?艸 ?蓐 ?茻 ?小 ?八 ?釆 ?半 ?牛 ?犛 ; 020
+   ?告 ?口 ?凵 ?吅 ?哭 ?走 ?止 ?癶 ?步 ?此 ; 030
+   ?正 ?是 ?辵 ?彳 ?廴 ?㢟 ?行 ?齒 ?牙 ?足 ; 040
+   ?疋 ?品 ?龠 ?冊 ?㗊 ?舌 ?干 ?谷 ?只 ?㕯 ; 050
+   ?句 ?丩 ?古 ?十 ?卅 ?言 ?誩 ?音 ?䇂 ?丵 ; 060
+   ?菐 ?𠬞 ?廾 ?共 ?異 ?舁 ?𦥑 ?䢅 ?爨 ?革 ; 070
+   ?鬲 ?䰜 ?爪 ?𠃨 ?鬥 ?又 ?𠂇 ?㕜 ?支 ?𦘒 ; 080
+   ?聿 ?畫 ?隶 ?臤 ?臣 ?殳 ?殺 ?𠘧 ?寸 ?皮 ; 090
+   ?㼱 ?攴 ?敎 ?卜 ?用 ?爻 ?㸚 ?𥄎 ?目 ?䀠 ; 100
+   ?眉 ?盾 ?自 ?白 ?鼻 ?皕 ?習 ?羽 ?隹 ?奞 ; 110
+   ?萑 ?𦫳 ?苜 ?羊 ?羴 ?瞿 ?雔 ?雥 ?鳥 ?烏 ; 120
+   ?𠦒 ?冓 ?幺 ?𢆶 ?叀 ?玄 ?予 ?放 ?𠬪 ?𣦼 ; 130
+   ?歺 ?死 ?冎 ?骨 ?肉 ?筋 ?刀 ?刃 ?㓞 ?丰 ; 140
+   ?耒 ?𧢲 ?竹 ?箕 ?丌 ?左 ?工 ?㠭 ?巫 ?甘 ; 150
+   ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?旨 ?喜 ?壴 ; 160
+   ?鼓 ?豈 ?豆 ?豊 ?豐 ?䖒 ?虍 ?虎 ?虤 ?皿 ; 170
+   ?𠙴 ?去 ?血 ?丶 ?丹 ?青 ?井 ?皀 ?鬯 ?食 ; 180
+   ?亼 ?會 ?倉 ?入 ?缶 ?矢 ?高 ?冂 ?𩫏 ?京 ; 190
+   ?亯 ?𣆪 ?畗 ?㐭 ?嗇 ?來 ?麥 ?夊 ?舛 ?䑞 ; 200
+   ?韋 ?弟 ?夂 ?久 ?桀 ?木 ?東 ?林 ?才 ?叒 ; 210
+   ?之 ?帀 ?出 ?𣎵 ?生 ?乇 ?𠂹 ?𠌶 ?華 ?𥝌 ; 220
+   ?稽 ?巢 ?桼 ?束 ?㯻 ?囗 ?員 ?貝 ?邑 ?𨛜 ; 230
+   ?日 ?旦 ?倝 ?㫃 ?冥 ?晶 ?月 ?有 ?明 ?囧 ; 240
+   ?夕 ?多 ?毌 ?𢎘 ?𣐺 ?卣 ?齊 ?朿 ?片 ?鼎 ; 250
+   ?克 ?彔 ?禾 ?秝 ?黍 ?香 ?米 ?毇 ?臼 ?凶 ; 260
+   ?𣎳 ?林 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
+   ?呂 ?穴 ?㝱 ?𤕫 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
+   ?巾 ?巿 ?帛 ?白 ?㡀 ?黹 ?人 ?𠤎 ?匕 ?从 ; 290
+   ])
+
+(defun shuowen-radical (number)
+  (aref shuowen-radicals (1- number)))
+
 (defvar char-db-file-coding-system 'utf-8-mcs-er)
 
 (defvar char-db-feature-domains
-  '(ucs daikanwa cns gt jis jis/alt jis/a jis/b
+  '(ucs ucs/compat daikanwa cns gt jis jis/alt jis/a jis/b
 	jis-x0212 jis-x0213 cdp shinjigen misc unknown))
 
-(defvar char-db-ignored-attributes nil)
+(defvar char-db-ignored-attributes '(ideographic-products))
 
 (defun char-attribute-name< (ka kb)
   (cond
@@ -87,25 +128,56 @@
     nil)
    ((eq '->subsumptive ka)
     nil)
+   ((and (symbolp ka)
+	 (string-match "^->" (symbol-name ka)))
+    (cond ((and (symbolp kb)
+		(string-match "^->" (symbol-name kb)))
+	   (string< (symbol-name ka)
+		    (symbol-name kb))
+	   ))
+    )
+   ((and (symbolp kb)
+	 (string-match "^->" (symbol-name kb)))
+    t)
+   ((and (symbolp ka)
+	 (string-match "^<-" (symbol-name ka)))
+    (cond ((symbolp kb)
+	   (cond ((string-match "^<-" (symbol-name kb))
+		  (string< (symbol-name ka)
+			   (symbol-name kb))
+		  )
+                 ;; ((string-match "^->" (symbol-name kb))
+                 ;;  t)
+		 )))
+    )
+   ((and (symbolp kb)
+	 (string-match "^<-" (symbol-name kb)))
+    t
+    ;; (not (string-match "^->" (symbol-name ka)))
+    )
    ((find-charset ka)
     (if (find-charset kb)
-	(if (<= (charset-id ka) 1)
-	    (if (<= (charset-id kb) 1)
-		(cond
-		 ((= (charset-dimension ka)
-		     (charset-dimension kb))
-		  (> (charset-id ka)(charset-id kb)))
-		 (t
-		  (> (charset-dimension ka)
-		     (charset-dimension kb))
-		  ))
-	      t)
-	  (if (<= (charset-id kb) 1)
-	      nil
-	    (< (charset-id ka)(charset-id kb))))
-      nil))
-   ((find-charset kb)
-    t)
+	(let (a-ir b-ir)
+	  (if (setq a-ir (charset-property ka 'iso-ir))
+	      (if (setq b-ir (charset-property kb 'iso-ir))
+		  (cond
+		   ((= a-ir b-ir)
+		    (< (charset-id ka)(charset-id kb))
+		    )
+		   ((= a-ir 177)
+		    t)
+		   ((= b-ir 177)
+		    nil)
+		   ((< a-ir
+		       b-ir)
+		    ))
+		t)
+	    (if (charset-property kb 'iso-ir)
+		nil
+	      (< (charset-id ka)(charset-id kb)))))
+      nil)
+    )
+   ((find-charset kb))
    ((symbolp ka)
     (cond ((symbolp kb)
 	   (string< (symbol-name ka)
@@ -131,6 +203,7 @@
     =jis-x0208@1983
     japanese-jisx0212
     chinese-gb2312
+    =jis-x0208@1990
     chinese-cns11643-1
     chinese-cns11643-2
     chinese-cns11643-3
@@ -138,9 +211,10 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0208@1990
-    =jis-x0213-1-2000
-    =jis-x0213-2-2000
+    =jis-x0213-1
+    =jis-x0213-1@2000
+    =jis-x0213-1@2004
+    =jis-x0213-2
     korean-ksc5601
     chinese-isoir165
     katakana-jisx0201
@@ -150,6 +224,8 @@
     ethiopic-ucs
     =big5-cdp
     =gt
+    =>>gt
+    =>gt
     ideograph-daikanwa-2
     ideograph-daikanwa
     =cbeta
@@ -166,11 +242,27 @@
     ideograph-hanziku-11
     ideograph-hanziku-12
     =gt-k
+    =ucs@iso
     =ucs@unicode
+    =>>jis-x0208
+    =>>jis-x0213-1
+    =>>jis-x0213-1@2000
+    =>>jis-x0213-1@2004
+    =>>jis-x0213-2
+    =>>jis-x0208@1978
+    =>jis-x0208
+    =>jis-x0208@1997
+    =>jis-x0213-1
+    =>jis-x0213-1@2000
+    =>jis-x0213-1@2004
+    =>jis-x0213-2
     =big5
     =big5-eten
-    =jis-x0208@1997
-    =jef-china3))
+    =zinbun-oracle
+    =>zinbun-oracle
+    =ruimoku-v6
+    =jef-china3
+    =shinjigen))
 
 (defun char-db-make-char-spec (char)
   (let (ret char-spec)
@@ -204,7 +296,9 @@
 				       '(=daikanwa
 					 =daikanwa@rev2
 					 ;; =gt-k
-					 )))
+					 =jis-x0208@1997
+					 ))
+				 (string-match "=ucs@" (symbol-name ccs)))
 			     (setq ccs (charset-name ccs))
 			     (null (assq ccs char-spec))
 			     (setq ret (encode-char char ccs 'defined-only)))
@@ -217,6 +311,12 @@
 			((setq ret (get-char-attribute char 'name*))
 			 (setq char-spec (cons (cons 'name* ret) char-spec))
 			 ))
+		  )
+		 ((setq ret (get-char-attribute
+			     char 'ideographic-combination))
+		  (setq char-spec
+			(cons (cons 'ideographic-combination ret)
+			      char-spec))
 		  ))
 	   char-spec)
 	  ((consp char)
@@ -357,7 +457,7 @@
 	     (insert (format "%s%s\t%d ; %c%s"
 			     separator
 			     name value
-			     (aref ideographic-radicals value)
+			     (ideographic-radical value)
 			     line-breaking))
 	     (setq separator ""))
             (t
@@ -399,9 +499,17 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(=daikanwa
-			=daikanwa@rev1 =daikanwa@rev2
-			=gt =gt-k =cbeta))
+    (cond ((memq name '(=shinjigen
+			=shinjigen@1ed
+			=shinjigen@rev =shinjigen/+p@rev))
+	   "(%-18s .  %04d)\t; %c")
+	  ((eq name '=shinjigen@1ed/24pr)
+	   "(%-18s . %04d)\t; %c")
+	  ((or (memq name '(=daikanwa
+			    =daikanwa@rev1 =daikanwa@rev2
+			    =gt =>>gt =>gt =gt-k =cbeta
+			    =zinbun-oracle =>zinbun-oracle))
+	       (string-match "^=adobe-" (symbol-name name)))
 	   "(%-18s . %05d)\t; %c")
 	  ((eq name 'mojikyo)
 	   "(%-18s . %06d)\t; %c")
@@ -428,6 +536,104 @@
 		      (- (logand value 255) 32))))
   (insert line-breaking))
 
+(defun char-db-insert-relation-feature (char name value line-breaking
+					     ccss readable)
+  (insert (format "(%-18s%s " name line-breaking))
+  (let ((lbs (concat "\n" (make-string (current-column) ?\ )))
+	separator cell sources required-features
+	ret)
+    (while (consp value)
+      (setq cell (car value))
+      (if (integerp cell)
+	  (setq cell (decode-char '=ucs cell)))
+      (cond
+       ((eq name '->subsumptive)
+	(when (or (not (some (lambda (atr)
+			       (get-char-attribute cell atr))
+			     char-db-ignored-attributes))
+		  (some (lambda (ccs)
+			  (encode-char cell ccs 'defined-only))
+			ccss))
+	  (if separator
+	      (insert lbs))
+	  (let ((char-db-ignored-attributes
+		 (cons '<-subsumptive
+		       char-db-ignored-attributes)))
+	    (insert-char-attributes cell readable))
+	  (setq separator lbs))
+	)
+       ((characterp cell)
+	(setq sources
+	      (get-char-attribute
+	       char (intern (format "%s*sources" name))))
+	(setq required-features nil)
+	(dolist (source sources)
+	  (cond
+	   ((memq source '(JP
+			   JP/Jouyou
+			   shinjigen shinjigen@1ed shinjigen@rev))
+	    (setq required-features
+		  (union required-features
+			 '(=jis-x0208
+			   =jis-x0208@1990
+			   =jis-x0213-1-2000
+			   =jis-x0213-2-2000
+			   =jis-x0212
+			   =jis-x0208@1983
+			   =jis-x0208@1978
+			   =shinjigen))))
+	   ((eq source 'CN)
+	    (setq required-features
+		  (union required-features
+			 '(=gb2312
+			   =gb12345
+			   =iso-ir165)))))
+	  (cond
+	   ((find-charset (setq ret (intern (format "=%s" source))))
+	    (setq required-features
+		  (cons ret required-features)))
+	   (t (setq required-features
+		    (cons source required-features)))))
+	(cond ((string-match "@JP" (symbol-name name))
+	       (setq required-features
+		     (union required-features
+			    '(=jis-x0208
+			      =jis-x0208@1990
+			      =jis-x0213-1-2000
+			      =jis-x0213-2-2000
+			      =jis-x0212
+			      =jis-x0208@1983
+			      =jis-x0208@1978))))
+	      ((string-match "@CN" (symbol-name name))
+	       (setq required-features
+		     (union required-features
+			    '(=gb2312
+			      =gb12345
+			      =iso-ir165)))))
+	(if separator
+	    (insert lbs))
+	(if readable
+	    (insert (format "%S" cell))
+	  (char-db-insert-char-spec cell readable
+				    nil
+				    required-features))
+	(setq separator lbs))
+       ((consp cell)
+	(if separator
+	    (insert lbs))
+	(if (consp (car cell))
+	    (char-db-insert-char-spec cell readable)
+	  (char-db-insert-char-reference cell readable))
+	(setq separator lbs))
+       (t
+	(if separator
+	    (insert separator))
+	(insert (prin1-to-string cell))
+	(setq separator " ")))
+      (setq value (cdr value)))
+    (insert ")")
+    (insert line-breaking)))
+
 (defun insert-char-attributes (char &optional readable attributes column)
   (unless column
     (setq column (current-column)))
@@ -438,8 +644,7 @@
 	 (concat "\n" (make-string (1+ column) ?\ )))
 	lbs cell separator ret
 	key al cal
-	dest-ccss
-	sources required-features
+	dest-ccss ; sources required-features
 	ccss)
     (let (atr-d)
       (setq attributes
@@ -460,6 +665,19 @@
 		    atr-d)
 		  #'char-attribute-name<)))
     (insert "(")
+    (when (memq '<-subsumptive attributes)
+      (when readable
+	(when (setq value (get-char-attribute char '<-subsumptive))
+	  (char-db-insert-relation-feature char '<-subsumptive value
+					   line-breaking
+					   ccss readable)))
+      (setq attributes (delq '<-subsumptive attributes)))
+    (when (and (memq '<-denotational attributes)
+	       (setq value (get-char-attribute char '<-denotational)))
+      (char-db-insert-relation-feature char '<-denotational value
+				       line-breaking
+				       ccss readable)
+      (setq attributes (delq '<-denotational attributes)))
     (when (and (memq 'name attributes)
 	       (setq value (get-char-attribute char 'name)))
       (insert (format
@@ -486,14 +704,6 @@
 		      line-breaking))
       (setq attributes (delq 'script attributes))
       )
-    ;; (when (and (memq '<-denotational attributes)
-    ;;            (setq value (get-char-attribute char '<-denotational))
-    ;;            (null (cdr value))
-    ;;            (setq value (encode-char (car value) 'ucs 'defined-only)))
-    ;;   (insert (format "(%-18s . #x%04X)\t; %c%s"
-    ;;                   '=>ucs value (decode-char 'ucs value)
-    ;;                   line-breaking))
-    ;;   (setq attributes (delq '<-denotational attributes)))
     (dolist (name '(=>ucs =>ucs*))
       (when (and (memq name attributes)
 		 (setq value (get-char-attribute char name)))
@@ -618,10 +828,18 @@
       (setq radical value)
       (insert (format "(ideographic-radical . %S)\t; %c%s"
 		      radical
-		      (aref ideographic-radicals radical)
+		      (ideographic-radical radical)
 		      line-breaking))
       (setq attributes (delq 'ideographic-radical attributes))
       )
+    (when (and (memq 'shuowen-radical attributes)
+	       (setq value (get-char-attribute char 'shuowen-radical)))
+      (insert (format "(shuowen-radical\t. %S)\t; %c%s"
+		      value
+		      (shuowen-radical value)
+		      line-breaking))
+      (setq attributes (delq 'shuowen-radical attributes))
+      )
     (let (key)
       (dolist (domain
 	       (append
@@ -643,7 +861,7 @@
 	  (insert (format "(%s . %S)\t; %c%s"
 			  key
 			  radical
-			  (aref ideographic-radicals radical)
+			  (ideographic-radical radical)
 			  line-breaking))
 	  (setq attributes (delq key attributes))
 	  )
@@ -693,7 +911,7 @@
       (unless (eq value radical)
 	(insert (format "(kangxi-radical\t . %S)\t; %c%s"
 			value
-			(aref ideographic-radicals value)
+			(ideographic-radical value)
 			line-breaking))
 	(or radical
 	    (setq radical value)))
@@ -714,7 +932,7 @@
       (unless (eq value radical)
 	(insert (format "(japanese-radical\t . %S)\t; %c%s"
 			value
-			(aref ideographic-radicals value)
+			(ideographic-radical value)
 			line-breaking))
 	(or radical
 	    (setq radical value)))
@@ -734,7 +952,7 @@
 	       (setq value (get-char-attribute char 'cns-radical)))
       (insert (format "(cns-radical\t . %S)\t; %c%s"
 		      value
-		      (aref ideographic-radicals value)
+		      (ideographic-radical value)
 		      line-breaking))
       (setq attributes (delq 'cns-radical attributes))
       )
@@ -753,7 +971,7 @@
       (unless (eq value radical)
 	(insert (format "(shinjigen-1-radical . %S)\t; %c%s"
 			value
-			(aref ideographic-radicals value)
+			(ideographic-radical value)
 			line-breaking))
 	(or radical
 	    (setq radical value)))
@@ -813,26 +1031,26 @@
 		      line-breaking))
       (setq attributes (delq '->ideograph attributes))
       )
-    (when (and (memq '->decomposition attributes)
-	       (setq value (get-char-attribute char '->decomposition)))
-      (insert (format "(->decomposition\t%s)%s"
-		      (mapconcat (lambda (code)
-				   (cond ((symbolp code)
-					  (symbol-name code))
-					 ((characterp code)
-					  (if readable
-					      (format "%S" code)
-					    (format "#x%04X"
-						    (char-int code))
-					    ))
-					 ((integerp code)
-					  (format "#x%04X" code))
-					 (t
-					  (format "%s%S" line-breaking code))))
-				 value " ")
-		      line-breaking))
-      (setq attributes (delq '->decomposition attributes))
-      )
+    ;; (when (and (memq '->decomposition attributes)
+    ;;            (setq value (get-char-attribute char '->decomposition)))
+    ;;   (insert (format "(->decomposition\t%s)%s"
+    ;;                   (mapconcat (lambda (code)
+    ;;                                (cond ((symbolp code)
+    ;;                                       (symbol-name code))
+    ;;                                      ((characterp code)
+    ;;                                       (if readable
+    ;;                                           (format "%S" code)
+    ;;                                         (format "#x%04X"
+    ;;                                                 (char-int code))
+    ;;                                         ))
+    ;;                                      ((integerp code)
+    ;;                                       (format "#x%04X" code))
+    ;;                                      (t
+    ;;                                       (format "%s%S" line-breaking code))))
+    ;;                              value " ")
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '->decomposition attributes))
+    ;;   )
     (if (equal (get-char-attribute char '->titlecase)
 	       (get-char-attribute char '->uppercase))
 	(setq attributes (delq '->titlecase attributes)))
@@ -887,126 +1105,54 @@
 				 name value
 				 line-breaking))
 		 )
-		((and (not readable)
-		      (null (get-char-attribute
-			     char
-			     (intern (format "%s*sources" name))))
-		      (not (string-match "\\*sources$" (symbol-name name)))
-		      (or (eq name '<-identical)
-			  (string-match "^->halfwidth" (symbol-name name))
-			  (and
-			   (string-match "^->fullwidth" (symbol-name name))
-			   (not
-			    (and (consp value)
-				 (characterp (car value))
-				 (encode-char
-				  (car value) '=ucs 'defined-only))))
-			  (string-match "^->simplified" (symbol-name name))
-			  (string-match "^->vulgar" (symbol-name name))
-			  (string-match "^->wrong" (symbol-name name))
-			  (string-match "^->same" (symbol-name name))
-			  (string-match "^->original" (symbol-name name))
-			  (string-match "^->ancient" (symbol-name name))
-			  ))
+		((and
+		  (not readable)
+		  (not (eq name '->subsumptive))
+		  (not (eq name '->uppercase))
+		  (not (eq name '->lowercase))
+		  (not (eq name '->titlecase))
+		  (not (eq name '->canonical))
+		  (not (eq name '->Bopomofo))
+		  (not (eq name '->mistakable))
+		  (not (eq name '->ideographic-variants))
+		  (null (get-char-attribute
+			 char (intern (format "%s*sources" name))))
+		  (not (string-match "\\*sources$" (symbol-name name)))
+		  (null (get-char-attribute
+			 char (intern (format "%s*note" name))))
+		  (not (string-match "\\*note$" (symbol-name name)))
+		  (or (eq name '<-identical)
+		      (eq name '<-uppercase)
+		      (eq name '<-lowercase)
+		      (eq name '<-titlecase)
+		      (eq name '<-canonical)
+		      (eq name '<-ideographic-variants)
+                      ;; (eq name '<-synonyms)
+		      (string-match "^<-synonyms" (symbol-name name))
+		      (eq name '<-mistakable)
+		      (when (string-match "^->" (symbol-name name))
+			(cond
+			 ((string-match "^->fullwidth" (symbol-name name))
+			  (not (and (consp value)
+				    (characterp (car value))
+				    (encode-char
+				     (car value) '=ucs 'defined-only)))
+			  )
+			 (t)))
+		      ))
 		 )
 		((or (eq name 'ideographic-structure)
+		     (eq name 'ideographic-combination)
 		     (eq name 'ideographic-)
-		     (string-match "^\\(->\\|<-\\)" (symbol-name name)))
-		 (insert (format "(%-18s%s " name line-breaking))
-		 (setq lbs (concat "\n" (make-string (current-column) ?\ ))
-		       separator nil)
-		 (while (consp value)
-		   (setq cell (car value))
-                   (if (integerp cell)
-		       (setq cell (decode-char '=ucs cell)))
-		   (cond ((eq name '->subsumptive)
-			  (when (or (not
-				     (some (lambda (atr)
-					     (get-char-attribute cell atr))
-					   char-db-ignored-attributes))
-				    (some (lambda (ccs)
-					    (encode-char cell ccs
-							 'defined-only))
-					  ccss))
-			    (if separator
-				(insert lbs))
-			    (let ((char-db-ignored-attributes
-				   (cons '<-subsumptive
-					 char-db-ignored-attributes)))
-			      (insert-char-attributes cell readable))
-			    (setq separator lbs))
-			  )
-			 ((characterp cell)
-			  (setq sources
-				(get-char-attribute
-				 char
-				 (intern (format "%s*sources" name))))
-			  (setq required-features nil)
-			  (dolist (source sources)
-			    (cond
-			     ((memq source '(JP JP/Jouyou
-						shinjigen-1))
-			      (setq required-features
-				    (union required-features
-					   '(=jis-x0208
-					     =jis-x0208@1990
-					     =jis-x0213-1-2000
-					     =jis-x0213-2-2000
-					     =jis-x0212
-					     =jis-x0208@1983
-					     =jis-x0208@1978))))
-			     ((eq source 'CN)
-			      (setq required-features
-				    (union required-features
-					   '(=gb2312
-					     =gb12345
-					     =iso-ir165)))))
-			    (cond
-			     ((find-charset
-			       (setq ret (intern (format "=%s" source))))
-			      (setq required-features
-				    (cons ret required-features)))
-			     (t (setq required-features
-				      (cons source required-features)))))
-			  (cond ((string-match "@JP" (symbol-name name))
-				 (setq required-features
-				       (union required-features
-					      '(=jis-x0208
-						=jis-x0208@1990
-						=jis-x0213-1-2000
-						=jis-x0213-2-2000
-						=jis-x0212
-						=jis-x0208@1983
-						=jis-x0208@1978))))
-				((string-match "@CN" (symbol-name name))
-				 (setq required-features
-				       (union required-features
-					      '(=gb2312
-						=gb12345
-						=iso-ir165)))))
-			  (if separator
-			      (insert lbs))
-			  (if readable
-			      (insert (format "%S" cell))
-			    (char-db-insert-char-spec cell readable
-						      nil
-						      required-features))
-			  (setq separator lbs))
-			 ((consp cell)
-			  (if separator
-			      (insert lbs))
-			  (if (consp (car cell))
-			      (char-db-insert-char-spec cell readable)
-			    (char-db-insert-char-reference cell readable))
-			  (setq separator lbs))
-			 (t
-			  (if separator
-			      (insert separator))
-			  (insert (prin1-to-string cell))
-			  (setq separator " ")))
-		   (setq value (cdr value)))
-		 (insert ")")
-		 (insert line-breaking))
+		     (eq name '=decomposition)
+		     (string-match "^=>decomposition" (symbol-name name))
+		     (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name name))
+		     (string-match "^\\(->\\|<-\\)[^*]*\\*sources$"
+				   (symbol-name name))
+		     )
+		 (char-db-insert-relation-feature char name value
+						  line-breaking
+						  ccss readable))
 		((memq name '(ideograph=
 			      original-ideograph-of
 			      ancient-ideograph-of
@@ -1076,9 +1222,18 @@
 		 (insert ")")
 		 (insert line-breaking))
 		(t
-		 (insert (format "(%-18s . %S)%s"
-				 name value
-				 line-breaking)))
+                 (insert (format "(%-18s" name))
+		 (setq ret (prin1-to-string value))
+		 (unless (< (+ (current-column)
+			       (length ret)
+			       3)
+			    76)
+		   (insert line-breaking))
+		 (insert " . " ret ")" line-breaking)
+		 ;; (insert (format "(%-18s . %S)%s"
+                 ;;                 name value
+                 ;;                 line-breaking))
+		 )
 		))
       (setq attributes (cdr attributes)))
     (insert ")")))
@@ -1109,14 +1264,14 @@
 					   no-ucs-unified
 					   script excluded-script)
   (insert-char-data char printable)
-  (let ((variants (or (char-variants char)
-		      (let ((ucs (get-char-attribute char '->ucs)))
-			(if ucs
-			    (delete char (char-variants (int-char ucs)))))))
+  (let ((variants (char-variants char))
+	rest
 	variant vs ret)
     (setq variants (sort variants #'<))
-    (while variants
-      (setq variant (car variants))
+    (setq rest variants)
+    (setq variants (cons char variants))
+    (while rest
+      (setq variant (car rest))
       (unless (get-char-attribute variant '<-subsumptive)
 	(if (and (or (null script)
 		     (null (setq vs (get-char-attribute variant 'script)))
@@ -1130,9 +1285,9 @@
 		  (while ret
 		    (or (memq (car ret) variants)
                         ;; (get-char-attribute (car ret) '<-subsumptive)
-			(setq variants (append variants (list (car ret)))))
+			(setq rest (nconc rest (list (car ret)))))
 		    (setq ret (cdr ret)))))))
-      (setq variants (cdr variants)))))
+      (setq rest (cdr rest)))))
 
 (defun insert-char-range-data (min max &optional script excluded-script)
   (let ((code min)