X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b90ed3dfe1362ae12466bbf3b8528d3e4e9f48f6;hb=c16f4e7ffa69f1b0f31c51792e319a748ea412c9;hp=8b5dd7472f6a4f0fa2f5a3124ae6f4ddd3dffb7f;hpb=16b269d60888e4754cda00fe75f50e8683d865bf;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 8b5dd74..b90ed3d 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -114,6 +114,13 @@
     cyrillic-iso8859-5
     greek-iso8859-7
     thai-tis620
+    =adobe-japan1-0
+    =adobe-japan1-1
+    =adobe-japan1-2
+    =adobe-japan1-3
+    =adobe-japan1-4
+    =adobe-japan1-5
+    =adobe-japan1-6
     =jis-x0208
     =jis-x0208@1978
     =jis-x0208@1983
@@ -138,13 +145,6 @@
     chinese-gb12345
     latin-viscii
     ethiopic-ucs
-    =adobe-japan1-0
-    =adobe-japan1-1
-    =adobe-japan1-2
-    =adobe-japan1-3
-    =adobe-japan1-4
-    =adobe-japan1-5
-    =adobe-japan1-6
     =big5-cdp
     =hanyo-denshi/ja
     =hanyo-denshi/jb
@@ -174,11 +174,32 @@
     ideograph-hanziku-10
     ideograph-hanziku-11
     ideograph-hanziku-12
+    =>>>adobe-japan1-0
+    =>>>adobe-japan1-1
+    =>>>adobe-japan1-2
+    =>>>adobe-japan1-3
+    =>>>adobe-japan1-4
+    =>>>adobe-japan1-5
+    =>>>adobe-japan1-6
     =>>>jis-x0208
     =>>>jis-x0213-1
     =>>>jis-x0213-2
+    =>>>hanyo-denshi/ja
+    =>>>hanyo-denshi/jb
+    =>>>hanyo-denshi/jc
+    =>>>hanyo-denshi/ft
+    =>>>hanyo-denshi/ib
+    =>>>hanyo-denshi/hg
+    =>>>hanyo-denshi/jt
+    =>>>hanyo-denshi/ks
     =>>>gt
-    =>>>adobe-japan1
+    =>>adobe-japan1-0
+    =>>adobe-japan1-1
+    =>>adobe-japan1-2
+    =>>adobe-japan1-3
+    =>>adobe-japan1-4
+    =>>adobe-japan1-5
+    =>>adobe-japan1-6
     =>>jis-x0208
     =>>jis-x0213-1
     =>>jis-x0213-1@2000
@@ -190,12 +211,17 @@
     =>>hanyo-denshi/ks
     =>>gt
     =>>daikanwa
-    =>>adobe-japan1
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
+    =+>adobe-japan1-0
+    =+>adobe-japan1-1
+    =+>adobe-japan1-2
+    =+>adobe-japan1-3
+    =+>adobe-japan1-4
+    =+>adobe-japan1-5
+    =+>adobe-japan1-6
     =+>jis-x0208@1978
-    =+>adobe-japan1
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
@@ -257,6 +283,26 @@
 			 (setq char-spec (cons (cons 'name* ret) char-spec))
 			 ))
 		  )
+		 ((encode-char char '=adobe-japan1 'defined-only)
+		  (setq char-spec nil)
+		  (dolist (ccs (charset-list))
+		    (if (and (or (memq ccs
+				       '(=adobe-japan1-0
+					 =adobe-japan1-1
+					 =adobe-japan1-2
+					 =adobe-japan1-3
+					 =adobe-japan1-4
+					 =adobe-japan1-5
+					 =adobe-japan1-6
+					 ))
+                                 ;; (eq (charset-property ccs 'iso-ir) 177)
+				 (string-match "=ucs@" (symbol-name ccs))
+				 )
+			     (setq ccs (charset-name ccs))
+			     (null (assq ccs char-spec))
+			     (setq ret (encode-char char ccs 'defined-only)))
+			(setq char-spec (cons (cons ccs ret) char-spec))))
+		  )
 		 ((setq ret
 			(catch 'tag
 			  (let ((rest char-db-coded-charset-priority-list)
@@ -278,7 +324,9 @@
 					 ;; =gt-k
 					 =jis-x0208@1997
 					 ))
-				 (string-match "=ucs@" (symbol-name ccs)))
+                                 (eq (charset-property ccs 'iso-ir) 177)
+				 ;; (string-match "=ucs@" (symbol-name ccs))
+				 )
 			     (setq ccs (charset-name ccs))
 			     (null (assq ccs char-spec))
 			     (setq ret (encode-char char ccs 'defined-only)))
@@ -496,14 +544,20 @@
 			 =daikanwa/+2p =>>daikanwa/+2p
 			 =gt =>>>gt =>>gt =+>gt =>gt
 			 =gt-k =>>gt-k =>gt-k
-			 =adobe-japan1-0 =>>>adobe-japan1-0 =>>adobe-japan1-0
-			 =adobe-japan1-1 =>>>adobe-japan1-1 =>>adobe-japan1-1
-			 =adobe-japan1-2 =>>>adobe-japan1-2 =>>adobe-japan1-2
-			 =adobe-japan1-3 =>>>adobe-japan1-3 =>>adobe-japan1-3
-			 =adobe-japan1-4 =>>>adobe-japan1-4 =>>adobe-japan1-4
-			 =adobe-japan1-5 =>>>adobe-japan1-5 =>>adobe-japan1-5
-			 =adobe-japan1-6 =>>>adobe-japan1-6 =>>adobe-japan1-6
-			 =+>adobe-japan1
+			 =adobe-japan1-0 =>>>adobe-japan1-0
+			 =adobe-japan1-1 =>>>adobe-japan1-1
+			 =adobe-japan1-2 =>>>adobe-japan1-2
+			 =adobe-japan1-3 =>>>adobe-japan1-3
+			 =adobe-japan1-4 =>>>adobe-japan1-4
+			 =adobe-japan1-5 =>>>adobe-japan1-5
+			 =adobe-japan1-6 =>>>adobe-japan1-6
+			 =>>adobe-japan1-0 =+>adobe-japan1-0
+			 =>>adobe-japan1-1 =+>adobe-japan1-1
+			 =>>adobe-japan1-2 =+>adobe-japan1-2
+			 =>>adobe-japan1-3 =+>adobe-japan1-3
+			 =>>adobe-japan1-4 =+>adobe-japan1-4
+			 =>>adobe-japan1-5 =+>adobe-japan1-5
+			 =>>adobe-japan1-6 =+>adobe-japan1-6
 			 =cbeta =>>cbeta
 			 =zinbun-oracle =>zinbun-oracle))
             ;; (string-match "^=adobe-" (symbol-name name))
@@ -584,7 +638,10 @@
 			   =jis-x0212
 			   =jis-x0208@1983
 			   =jis-x0208@1978
-			   =shinjigen))))
+			   =shinjigen
+			   =shinjigen@1ed
+			   =shinjigen@rev
+			   =shinjigen/+p@rev))))
 	   ((eq source 'CN)
 	    (setq required-features
 		  (union required-features
@@ -970,17 +1027,17 @@
 	    (setq strokes value)))
       (setq attributes (delq 'cns-strokes attributes))
       )
-    (when (and (memq 'shinjigen-1-radical attributes)
-	       (setq value (get-char-attribute char 'shinjigen-1-radical)))
-      (unless (eq value radical)
-	(insert (format "(shinjigen-1-radical . %S)\t; %c%s"
-			value
-			(ideographic-radical value)
-			line-breaking))
-	(or radical
-	    (setq radical value)))
-      (setq attributes (delq 'shinjigen-1-radical attributes))
-      )
+    ;; (when (and (memq 'shinjigen-1-radical attributes)
+    ;;            (setq value (get-char-attribute char 'shinjigen-1-radical)))
+    ;;   (unless (eq value radical)
+    ;;     (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
+    ;;                     value
+    ;;                     (ideographic-radical value)
+    ;;                     line-breaking))
+    ;;     (or radical
+    ;;         (setq radical value)))
+    ;;   (setq attributes (delq 'shinjigen-1-radical attributes))
+    ;;   )
     (when (and (memq 'ideographic- attributes)
 	       (setq value (get-char-attribute char 'ideographic-)))
       (insert "(ideographic-       ")