Reformatted.

[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 77ce5ba..7ba6f97 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011, 2012, 2013 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -116,13 +116,14 @@
     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
+    ;; =mj
+    ;; =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
@@ -158,11 +159,31 @@
     =hanyo-denshi/hg
     =hanyo-denshi/jt
     =hanyo-denshi/ks
+    ;; ==mj
+    ;; ==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
     =gt-k
     =daikanwa
     =daikanwa@rev2
     =daikanwa@rev1
+    ==daikanwa
     =cbeta
     ideograph-hanziku-1
     ideograph-hanziku-2
@@ -176,25 +197,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 +234,7 @@
     =>>hanyo-denshi/ks
     =>>gt
     =>>daikanwa
+    =>>cbeta
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
@@ -231,6 +253,7 @@
     =>jis-x0213-1@2004
     =>jis-x0213-2
     ==>ucs@bucs
+    =>ucs@hanyo-denshi
     =>ucs@iso
     =>ucs@unicode
     =>ucs@jis
@@ -248,8 +271,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
@@ -287,6 +321,30 @@
                         (setq char-spec (cons (cons 'name* ret) char-spec))
                         ))
                  )
+                ((encode-char char '=mj 'defined-only)
+                 (setq char-spec nil)
+                 (dolist (ccs (charset-list))
+                   (if (and (or (eq ccs '=mj)
+                                 ;; (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))))
+                 )
+                ((encode-char char '==mj 'defined-only)
+                 (setq char-spec nil)
+                 (dolist (ccs (charset-list))
+                   (if (and (or (eq ccs '==mj)
+                                 ;; (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))))
+                 )
                 ((encode-char char '=adobe-japan1 'defined-only)
                  (setq char-spec nil)
                  (dolist (ccs (charset-list))
@@ -307,6 +365,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 +582,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 +615,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 +653,10 @@
            )
        "(%-18s . %05d)\t; %c")
        ((memq name '(=hanyo-denshi/ks
-                    =>>>hanyo-denshi/ks =>>hanyo-denshi/ks
+                    ==hanyo-denshi/ks ; =>>>hanyo-denshi/ks
+                    =>>hanyo-denshi/ks
+                    =koseki
+                    =mj ==mj =>>mj
                     =zihai mojikyo))
        "(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)