(U+653C): Use `->subsumptive'; integrate H4-D4B6.

[chise/xemacs-chise.git-] / 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 c8093d3..232904a 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 MORIOKA Tomohiko.
+;;   2007, 2008, 2009 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -102,6 +102,7 @@
    ?克 ?彔 ?禾 ?秝 ?黍 ?香 ?米 ?毇 ?臼 ?凶 ; 260
    ?𣎳 ?林 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
    ?呂 ?穴 ?㝱 ?𤕫 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
+   ?巾 ?巿 ?帛 ?白 ?㡀 ?黹 ?人 ?𠤎 ?匕 ?从 ; 290
    ])
 
 (defun shuowen-radical (number)
@@ -154,18 +155,56 @@
     )
    ((find-charset ka)
     (if (find-charset kb)
-       (if (<= (charset-id ka) 1)
-           (if (<= (charset-id kb) 1)
+       (if (or (<= (charset-id ka) 1)
+               (and (charset-final ka)
+                    (>= (charset-final ka) ?@)))
+           (if (or (<= (charset-id kb) 1)
+                   (and (charset-final kb)
+                        (>= (charset-final kb) ?@)))
                (cond
                 ((= (charset-dimension ka)
                     (charset-dimension kb))
-                 (> (charset-id ka)(charset-id kb)))
+                 (if (and (<= (charset-id ka) 1)
+                          (<= (charset-id kb) 1))
+                     (> (charset-id ka)(charset-id kb))
+                   (if (and (charset-final ka)
+                            (charset-final kb))
+                       (cond
+                        ((= (charset-final ka)(charset-final kb))
+                         (if (<= (charset-id ka) 1)
+                             (if (<= (charset-id kb) 1)
+                                 (> (charset-id ka)(charset-id kb))
+                               t)
+                           (if (<= (charset-id kb) 1)
+                               nil
+                             (< (charset-id ka)(charset-id kb))))
+                         )
+                        ((< (charset-final ka)(charset-final kb))
+                         ))
+                     (if (<= (charset-id ka) 1)
+                         (if (<= (charset-id kb) 1)
+                             (> (charset-id ka)(charset-id kb))
+                           t)
+                       (if (<= (charset-id kb) 1)
+                           nil
+                         (cond ((and (charset-final ka)
+                                     (>= (charset-final ka) ?@))
+                                t)
+                               ((and (charset-final kb)
+                                     (>= (charset-final kb) ?@))
+                                nil)
+                               (t
+                                (< (charset-id ka)(charset-id kb))
+                                ))))))
+                 )
                 (t
                  (> (charset-dimension ka)
                     (charset-dimension kb))
                  ))
              t)
-         (if (<= (charset-id kb) 1)
+         (if (or (<= (charset-id kb) 1)
+                 (and (charset-final kb)
+                      (>= (charset-final kb) ?@)))
              nil
            (< (charset-id ka)(charset-id kb))))
       nil))
@@ -286,6 +325,12 @@
                        ((setq ret (get-char-attribute char 'name*))
                         (setq char-spec (cons (cons 'name* ret) char-spec))
                         ))
+                 )
+                ((setq ret (get-char-attribute
+                            char 'ideographic-combination))
+                 (setq char-spec
+                       (cons (cons 'ideographic-combination ret)
+                             char-spec))
                  ))
           char-spec)
          ((consp char)
@@ -468,7 +513,13 @@
 (defun char-db-insert-ccs-feature (name value line-breaking)
   (insert
    (format
-    (cond ((or (memq name '(=daikanwa
+    (cond ((memq name '(=shinjigen
+                       =shinjigen@1ed
+                       =shinjigen@rev =shinjigen/+p@rev))
+          "(%-18s .  %04d)\t; %c")
+         ((eq name '=shinjigen@1ed/24pr)
+          "(%-18s . %04d)\t; %c")
+         ((or (memq name '(=daikanwa
                            =daikanwa@rev1 =daikanwa@rev2
                            =gt =gt-k =cbeta =zinbun-oracle))
               (string-match "^=adobe-" (symbol-name name)))
@@ -531,7 +582,9 @@
        (setq required-features nil)
        (dolist (source sources)
          (cond
-          ((memq source '(JP JP/Jouyou shinjigen-1))
+          ((memq source '(JP
+                          JP/Jouyou
+                          shinjigen shinjigen@1ed shinjigen@rev))
            (setq required-features
                  (union required-features
                         '(=jis-x0208
@@ -540,7 +593,8 @@
                           =jis-x0213-2-2000
                           =jis-x0212
                           =jis-x0208@1983
-                          =jis-x0208@1978))))
+                          =jis-x0208@1978
+                          =shinjigen))))
           ((eq source 'CN)
            (setq required-features
                  (union required-features