(M-11551): Map to U-00022998.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 6dea14f..5b982a3 100644 (file)
--- 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
@@ -139,14 +146,6 @@
     latin-viscii
     ethiopic-ucs
     =big5-cdp
-    =gt
-    =adobe-japan1-0
-    =adobe-japan1-1
-    =adobe-japan1-2
-    =adobe-japan1-3
-    =adobe-japan1-4
-    =adobe-japan1-5
-    =adobe-japan1-6
     =hanyo-denshi/ja
     =hanyo-denshi/jb
     =hanyo-denshi/jc
@@ -157,11 +156,12 @@
     =hanyo-denshi/hg
     =hanyo-denshi/jt
     =hanyo-denshi/ks
+    =gt
+    =gt-k
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
     =cbeta
-    =gt-k
     ideograph-hanziku-1
     ideograph-hanziku-2
     ideograph-hanziku-3
@@ -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)))
@@ -493,23 +541,29 @@
        ((or (memq name '(=daikanwa =>>daikanwa =>daikanwa
                         =daikanwa@rev1 =daikanwa@rev2
                         =daikanwa/+p =>>daikanwa/+p
-                        =daikanwa/+2p
+                        =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))
            )
        "(%-18s . %05d)\t; %c")
-       ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
+       ((memq name '(=hanyo-denshi/ks =>>>hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
        "(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)
        "(%-18s . #x%04X)\t; %c")