X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=2cdd3f9eb5a89916dec0dd83b86c0cb2743678bc;hb=ece47a0efe1526c65bf5e71136886425e05f85d9;hp=429acff4effa4bd3aef68482c657d21f533adb6b;hpb=09ec3c4de253ab2ef985482aba9cbf4fe3b663f9;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 429acff..2cdd3f9 100644
--- 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 MORIOKA Tomohiko.
+;;   2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -185,10 +185,12 @@
     ==hanyo-denshi/jb
     ==hanyo-denshi/jc
     ==hanyo-denshi/ft
+    ==hanyo-denshi/ia
     ==hanyo-denshi/ib
     ==hanyo-denshi/hg
     ==hanyo-denshi/jt
     ==hanyo-denshi/ks
+    ==hanyo-denshi/tk
     =gt
     =gt-k
     =daikanwa
@@ -266,7 +268,7 @@
     =>jis-x0213-2
     ==>ucs@bucs
     =>iwds-1
-    =>ucs@hanyo-denshi
+    ;; =>ucs@hanyo-denshi
     =>ucs@iso
     =>ucs@unicode
     =>ucs@jis
@@ -309,6 +311,7 @@
     =>>big5-cdp
     =>>gt-k
     =+>gt
+    =+>big5-cdp
     =>gt
     =>mj
     =>big5-cdp
@@ -331,6 +334,9 @@
     =ucs-var-002
     =ucs-var-003
     =ucs-var-004
+    =ucs-var-005
+    =ucs-var-006
+    =ucs-var-008
     =ucs-var-010
     =ucs-itaiji-001
     =ucs-itaiji-002
@@ -338,12 +344,40 @@
     =ucs-itaiji-004
     =ucs-itaiji-005
     =ucs-itaiji-006
+    =ucs-itaiji-007
     =ucs-itaiji-008
+    =ucs-itaiji-009
+    =ucs-itaiji-010
+    =ucs-itaiji-011
+    =>ucs-itaiji-001
+    =>ucs-itaiji-002
+    =>ucs-itaiji-003
+    =>ucs-itaiji-004
+    =>ucs-itaiji-005
+    =>ucs-itaiji-006
+    =>ucs-itaiji-007
+    =>ucs-itaiji-009
+    =big5-cdp-var-001
+    =big5-cdp-var-002
     =big5-cdp-var-003
     =big5-cdp-var-004
     =big5-cdp-var-005
+    =big5-cdp-var-010
+    =big5-cdp-itaiji-001
+    =big5-cdp-itaiji-002
+    =big5-cdp-itaiji-003
+    =>big5-cdp-itaiji-001
     =>ucs@iwds-1
-    ==ucs@gb))
+    =>ucs@cognate
+    =>ucs@component
+    =>ucs-itaiji-001@iwds-1
+    =>big5-cdp@iwds-1
+    =>big5-cdp@component
+    =>big5-cdp@cognate
+    ==ucs@gb
+    =ucs@gb
+    ==ucs-var-002
+    =ucs@JP/hanazono))
 
 
 ;;; @ char-db formatters
@@ -447,7 +481,8 @@
 					 ;; =gt-k
 					 =jis-x0208@1997
 					 ))
-                                 (eq (charset-property ccs 'iso-ir) 177)
+				 (and (eq (charset-property ccs 'iso-ir) 177)
+				      (not (eq (charset-name ccs) '=ucs@big5)))
 				 ;; (string-match "=ucs@" (symbol-name ccs))
 				 )
 			     (setq ccs (charset-name ccs))
@@ -1287,24 +1322,24 @@
 		      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))
-      )
+    ;; (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