X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=17049aa0e7004b2a6b43e825877eb51aa3709905;hb=b3f6e5a496412855a44cb9aa34f2de22b3c6ba14;hp=a5ac6e8ad50c591d0f88e389f62152074627294a;hpb=79230a29d51848e7cb2965bdf09b6a1dd0099014;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index a5ac6e8..17049aa 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -96,6 +96,17 @@
     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)
    ((find-charset ka)
     (if (find-charset kb)
 	(if (<= (charset-id ka) 1)
@@ -566,7 +577,7 @@
 		  #'char-attribute-name<)))
     (insert "(")
     (when (memq '<-subsumptive attributes)
-      (unless readable
+      (when readable
 	(when (setq value (get-char-attribute char '<-subsumptive))
 	  (char-db-insert-relation-feature char '<-subsumptive value
 					   line-breaking
@@ -1011,9 +1022,11 @@
 			     (intern (format "%s*sources" name))))
 		      (not (string-match "\\*sources$" (symbol-name name)))
 		      (or (eq name '<-identical)
+			  (eq name '<-canonical)
 			  (eq name '->superscript)
 			  (eq name '->subscript)
 			  (eq name '->circled)
+			  (string-match "^->font" (symbol-name name))
 			  (string-match "^->compat" (symbol-name name))
 			  (string-match "^->halfwidth" (symbol-name name))
 			  (and