X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=9a519773de59fe0226a84b2daad5ecc24c2b8610;hb=005371fde02f599eb2ef73dd7b53600e758cf3ef;hp=09eb84ef5ffa5e9806bdf834ea9b4c5dd572e002;hpb=d08569b591742bc91c6384a1b66089cd747971b3;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 09eb84e..9a51977 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -107,6 +107,22 @@
    ((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)
@@ -151,6 +167,7 @@
     =jis-x0208@1983
     japanese-jisx0212
     chinese-gb2312
+    =jis-x0208@1990
     chinese-cns11643-1
     chinese-cns11643-2
     chinese-cns11643-3
@@ -158,7 +175,6 @@
     chinese-cns11643-5
     chinese-cns11643-6
     chinese-cns11643-7
-    =jis-x0208@1990
     =jis-x0213-1-2000
     =jis-x0213-2-2000
     korean-ksc5601
@@ -227,6 +243,7 @@
 				       '(=daikanwa
 					 =daikanwa@rev2
 					 ;; =gt-k
+					 =jis-x0208@1997
 					 )))
 			     (setq ccs (charset-name ccs))
 			     (null (assq ccs char-spec))
@@ -422,9 +439,10 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((memq name '(=daikanwa
-			=daikanwa@rev1 =daikanwa@rev2
-			=gt =gt-k =cbeta =zinbun-oracle))
+    (cond ((or (memq name '(=daikanwa
+			    =daikanwa@rev1 =daikanwa@rev2
+			    =gt =gt-k =cbeta =zinbun-oracle))
+	       (string-match "^=adobe-" (symbol-name name)))
 	   "(%-18s . %05d)\t; %c")
 	  ((eq name 'mojikyo)
 	   "(%-18s . %06d)\t; %c")
@@ -1020,14 +1038,23 @@
 		((and
 		  (not readable)
 		  (not (eq name '->subsumptive))
-		  (not (eq name '->bopomofo))
+		  (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))
-		  (not (eq name '->canonical))
 		  (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)
@@ -1049,7 +1076,10 @@
 		     (eq name 'ideographic-)
 		     (eq name '=decomposition)
 		     (string-match "^=>decomposition" (symbol-name name))
-		     (string-match "^\\(->\\|<-\\)" (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))
@@ -1122,9 +1152,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 ")")))