X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=d88b2b79817d1f478adabc58bec1948a298ca297;hb=4feea6e4a70c333e457476adda278e811690ea72;hp=77ce5bac730e964b0df7dcec09bd286698e6c6fb;hpb=353cc1aa00addded5d33270e8bdd01a089862ac6;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 77ce5ba..d88b2b7 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -160,9 +160,28 @@
     =hanyo-denshi/ks
     =gt
     =gt-k
+    ==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
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
+    ==daikanwa
     =cbeta
     ideograph-hanziku-1
     ideograph-hanziku-2
@@ -176,25 +195,25 @@
     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-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-0
     =>>adobe-japan1-1
     =>>adobe-japan1-2
@@ -213,6 +232,7 @@
     =>>hanyo-denshi/ks
     =>>gt
     =>>daikanwa
+    =>>cbeta
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
@@ -248,8 +268,19 @@
     =>>ucs@cns
     =>>>ucs@iso
     =>>>ucs@unicode
+    ==ucs@iso
+    ==ucs@unicode
+    ==gb2312
+    ==ks-x1001
+    ==cns11643-1
+    ==cns11643-2
+    ==cns11643-3
+    ==gt
+    ==jis-x0208@1990
+    ==gt-k
     =ucs@iso
     =ucs@unicode
+    =ucs@cns
     =>>big5-cdp
     =>>gt-k
     =+>gt
@@ -307,6 +338,26 @@
 			     (setq ret (encode-char char ccs 'defined-only)))
 			(setq char-spec (cons (cons ccs 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)
@@ -504,6 +555,8 @@
     (setq ret
 	  (cond ((eq ccs 'arabic-iso8859-6)
 		 (decode-char ccs code-point))
+                ;; ((eq ccs '=gt)
+                ;;  (decode-builtin-char '==gt code-point))
 		((and (memq ccs '(=gt-pj-1
 				  =gt-pj-2
 				  =gt-pj-3
@@ -535,26 +588,31 @@
     (insert
      (format
       (cond
-       ((memq name '(=shinjigen
-		     =shinjigen@1ed
-		     =shinjigen@rev =shinjigen/+p@rev
+       ((memq name '(==shinjigen
+		     =shinjigen
+		     =shinjigen@1ed ==shinjigen@1ed
+		     =shinjigen@rev ==shinjigen@rev
+		     =shinjigen/+p@rev ==shinjigen/+p@rev
+		     ==daikanwa/ho
 		     =daikanwa/ho =>>daikanwa/ho =>daikanwa/ho))
 	"(%-18s .  %04d)\t; %c")
        ((eq name '=shinjigen@1ed/24pr)
 	"(%-18s . %04d)\t; %c")
-       ((or (memq name '(=daikanwa =>>daikanwa =>daikanwa
+       ((or (memq name '(==daikanwa
+			 =daikanwa =>>daikanwa =>daikanwa
 			 =daikanwa@rev1 =daikanwa@rev2
-			 =daikanwa/+p =>>daikanwa/+p
+			 =daikanwa/+p ==daikanwa/+p =>>daikanwa/+p
 			 =daikanwa/+2p =>>daikanwa/+2p
-			 =gt =>>>gt =>>gt =+>gt =>gt
-			 =gt-k =>>gt-k =>gt-k
-			 =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
+			 =gt ==gt ; =>>>gt
+			 =>>gt =+>gt =>gt
+			 =gt-k ==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-0 =+>adobe-japan1-0
 			 =>>adobe-japan1-1 =+>adobe-japan1-1
 			 =>>adobe-japan1-2 =+>adobe-japan1-2
@@ -568,7 +626,8 @@
 	    )
 	"(%-18s . %05d)\t; %c")
        ((memq name '(=hanyo-denshi/ks
-		     =>>>hanyo-denshi/ks =>>hanyo-denshi/ks
+		     ==hanyo-denshi/ks ; =>>>hanyo-denshi/ks
+		     =>>hanyo-denshi/ks
 		     =zihai mojikyo))
 	"(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)