(A-GT-K02930): New abstract node; unify A-U+21D5D-itaiji-001.

[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 2a0f888..380639b 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,2014,2015,2016,2017,2018 MORIOKA Tomohiko.
+;;   2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -195,10 +195,12 @@
     =gt
     =gt-k
     =daikanwa
+    =daijiten
     =daikanwa@rev2
     =daikanwa@rev1
     =daikanwa/+p
     ==daikanwa
+    ==daijiten
     =cbeta
     ideograph-hanziku-1
     ideograph-hanziku-2
@@ -268,6 +270,7 @@
     =>jis-x0213-1@2004
     =>jis-x0213-2
     ==>ucs@bucs
+    ==>daijiten
     =>iwds-1
     ;; =>ucs@hanyo-denshi
     =>ucs@iso
@@ -350,6 +353,7 @@
     =ucs-itaiji-009
     =ucs-itaiji-010
     =ucs-itaiji-011
+    =ucs-itaiji-012
     =>ucs-itaiji-001
     =>ucs-itaiji-002
     =>ucs-itaiji-003
@@ -734,20 +738,24 @@
                 =>>adobe-japan1-6 =+>adobe-japan1-6
                 =>cbeta =cbeta =>>cbeta ==cbeta ===cbeta
                 =zinbun-oracle =>zinbun-oracle
+                =daijiten ==daijiten ===daijiten ==>daijiten
                 ===hng-jou ===hng-keg ===hng-dng ===hng-mam
                 ===hng-drt ===hng-kgk ===hng-myz ===hng-kda
-                ===hng-khi ===hng-khm ===hng-hok ===hng-kyd ===hng-sok
+                ===hng-khi ===hng-khm ===hng-fhs ===hng-hok
+                ===hng-kyd ===hng-sok
                 ===hng-yhk ===hng-kak ===hng-kar ===hng-kae
                 ===hng-sys ===hng-tsu ===hng-tzj
-                ===hng-hos ===hng-nak ===hng-jhk
+                ===hng-hos ===hng-kkh ===hng-nak ===hng-jhk
                 ===hng-hod ===hng-gok ===hng-ink ===hng-nto
-                ===hng-nkm ===hng-k24 ===hng-nkk
+                ===hng-nkm ===hng-k24 ===hng-ini ===hng-nkk
                 ===hng-kcc ===hng-kcj ===hng-kbk ===hng-sik
                 ===hng-skk ===hng-kyu ===hng-ksk ===hng-wan
                 ===hng-okd ===hng-wad ===hng-kmi
-                ===hng-zkd ===hng-doh ===hng-jyu
-                ===hng-tzs ===hng-kss ===hng-kyo
-                ===hng-smk
+                ===hng-zkd ===hng-doh ===hng-jyu ===hng-tzs
+                ===hng-sai ===hng-kad ===hng-kss
+                ===hng-kyo ===hng-ykk ===hng-saa
+                ===hng-sab ===hng-wks ===hng-wke ===hng-smk
+                ===hng-sgs ===hng-sts
                 =shuowen-jiguge ===shuowen-jiguge4 ===shuowen-jiguge5))
         ;; (string-match "^=adobe-" (symbol-name name))
         )
@@ -941,6 +949,12 @@
                                       line-breaking
                                       ccss readable)
       (setq attributes (delq '<-denotational@component attributes)))
+    (when (and (memq '<-denotational@usage attributes)
+              (setq value (get-char-attribute char '<-denotational@usage)))
+      (char-db-insert-relation-feature char '<-denotational@usage value
+                                      line-breaking
+                                      ccss readable)
+      (setq attributes (delq '<-denotational@usage attributes)))
     (when (and (memq 'name attributes)
               (setq value (get-char-attribute char 'name)))
       (insert (format
@@ -1229,17 +1243,6 @@
            (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 'ideographic- attributes)
     ;;            (setq value (get-char-attribute char 'ideographic-)))
     ;;   (insert "(ideographic-       ")
@@ -1324,28 +1327,11 @@
                      line-breaking))
       (setq attributes (delq '->mojikyo attributes))
       )
-    ;; (when (and (memq 'hanyu-dazidian-vol attributes)
-    ;;            (setq value (get-char-attribute char 'hanyu-dazidian-vol)))
-    ;;   (insert (format "(hanyu-dazidian-vol  . %d)%s"
-    ;;                   value line-breaking))
-    ;;   (setq attributes (delq 'hanyu-dazidian-vol attributes))
-    ;;   )
-    ;; (when (and (memq 'hanyu-dazidian-page attributes)
-    ;;            (setq value (get-char-attribute char 'hanyu-dazidian-page)))
-    ;;   (insert (format "(hanyu-dazidian-page . %d)%s"
-    ;;                   value line-breaking))
-    ;;   (setq attributes (delq 'hanyu-dazidian-page attributes))
-    ;;   )
-    ;; (when (and (memq 'hanyu-dazidian-char attributes)
-    ;;            (setq value (get-char-attribute char 'hanyu-dazidian-char)))
-    ;;   (insert (format "(hanyu-dazidian-char . %d)%s"
-    ;;                   value line-breaking))
-    ;;   (setq attributes (delq 'hanyu-dazidian-char attributes))
-    ;;   )
     (unless readable
       (dolist (ignored '(composition
                         ->denotational <-subsumptive ->ucs-unified
-                        ->ideographic-component-forms))
+                        ;; ->ideographic-component-forms
+                        ))
        (setq attributes (delq ignored attributes))))
     (while attributes
       (setq name (car attributes))