X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b6b1b14bcc747e4a53cf261784417179ca0c90c1;hb=682c03212c9aa9220d54cd4f76385778ff7bb9a9;hp=7538f477eda3278b09603ea80a18d4b01770915a;hpb=14a312d78d30b533aded25c16208e8a5823be59c;p=chise%2Fxemacs-chise.git diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 7538f47..b6b1b14 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 MORIOKA Tomohiko. +;; 2007, 2008, 2009, 2010, 2011 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE. @@ -25,8 +25,8 @@ ;;; Code: -(require 'alist) (require 'chise-subr) +(require 'ideograph-subr) (defconst unidata-normative-category-alist '(("Lu" letter uppercase) @@ -63,19 +63,6 @@ ("So" symbol other) )) -(defconst ideographic-radicals - (let ((v (make-vector 215 nil)) - (i 1)) - (while (< i 215) - (aset v i (decode-char '=ucs (+ #x2EFF i))) - (setq i (1+ i))) - v)) - -;;;###autoload -(defun ideographic-radical (number) - "Return character corresponding with Kangxi-radical number." - (aref ideographic-radicals number)) - (defconst shuowen-radicals [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨 ; 010 ?屮 ?艸 ?蓐 ?茻 ?小 ?八 ?釆 ?半 ?牛 ?犛 ; 020 @@ -113,10 +100,6 @@ (defvar char-db-file-coding-system 'utf-8-mcs-er) -(defvar char-db-feature-domains - '(ucs ucs/compat daikanwa cns gt jis jis/alt jis/a jis/b - jis-x0212 jis-x0213 cdp shinjigen misc unknown)) - (defvar char-db-ignored-attributes '(ideographic-products)) (defvar char-db-coded-charset-priority-list @@ -157,11 +140,25 @@ ethiopic-ucs =big5-cdp =gt - =>>gt - =>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 + =hanyo-denshi/jd + =hanyo-denshi/ft + =hanyo-denshi/ia + =hanyo-denshi/ib + =hanyo-denshi/hg ideograph-daikanwa-2 ideograph-daikanwa =cbeta + =gt-k ideograph-hanziku-1 ideograph-hanziku-2 ideograph-hanziku-3 @@ -174,27 +171,52 @@ ideograph-hanziku-10 ideograph-hanziku-11 ideograph-hanziku-12 - =gt-k - =ucs@iso - =ucs@unicode - =>>ucs@unicode + =>>>jis-x0208 + =>>>jis-x0213-1 =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-1@2000 =>>jis-x0213-1@2004 =>>jis-x0213-2 =>>jis-x0208@1978 + =>>hanyo-denshi/ft + =>>hanyo-denshi/ks + =>>gt + =>jis-x0208@usual =>jis-x0208 =>jis-x0208@1997 =>jis-x0213-1 =>jis-x0213-1@2000 =>jis-x0213-1@2004 + =>jis-x0213-2@usual =>jis-x0213-2 + ==>ucs@bucs + =>ucs@iso + =>ucs@unicode + =>ucs@jis + =>ucs@JP + =>ucs@cns + =>ucs@ks + =>>ucs@iso + =>>ucs@unicode + =>>ucs@jis + =>>ucs@cns + =>>>ucs@iso + =>>>ucs@unicode + =ucs@iso + =ucs@unicode + =>>big5-cdp + =>>gt-k + =>gt + =>big5-cdp + =>daikanwa =big5 =big5-eten + =>gt-k =zinbun-oracle =>zinbun-oracle =ruimoku-v6 + =>>ruimoku-v6 =jef-china3 =shinjigen)) @@ -439,17 +461,20 @@ (format (cond ((memq name '(=shinjigen =shinjigen@1ed - =shinjigen@rev =shinjigen/+p@rev)) + =shinjigen@rev =shinjigen/+p@rev + =daikanwa/ho)) "(%-18s . %04d)\t; %c") ((eq name '=shinjigen@1ed/24pr) "(%-18s . %04d)\t; %c") ((or (memq name '(=daikanwa =daikanwa@rev1 =daikanwa@rev2 - =gt =>>gt =>gt =gt-k =cbeta + =daikanwa/+p =daikanwa/+2p + =>>daikanwa =>daikanwa + =gt =>>gt =>gt =gt-k =>>gt-k =>gt-k =cbeta =zinbun-oracle =>zinbun-oracle)) (string-match "^=adobe-" (symbol-name name))) "(%-18s . %05d)\t; %c") - ((eq name 'mojikyo) + ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo)) "(%-18s . %06d)\t; %c") ((>= (charset-dimension name) 2) "(%-18s . #x%04X)\t; %c") @@ -514,8 +539,9 @@ (union required-features '(=jis-x0208 =jis-x0208@1990 - =jis-x0213-1-2000 - =jis-x0213-2-2000 + =jis-x0213-1@2000 + =jis-x0213-1@2004 + =jis-x0213-2 =jis-x0212 =jis-x0208@1983 =jis-x0208@1978 @@ -649,7 +675,7 @@ name value (decode-char '=ucs value) line-breaking)) (setq attributes (delq name attributes)))) - (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5)) + (dolist (name '(=>ucs@gb =>ucs@big5)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -662,21 +688,21 @@ line-breaking)) (setq attributes (delq name attributes)) )) - (dolist (name '(=>daikanwa)) - (when (and (memq name attributes) - (setq value (get-char-attribute char name))) - (insert - (if (integerp value) - (format "(%-18s . %05d)\t; %c%s" - name value (decode-char '=daikanwa value) - line-breaking) - (format "(%-18s %s)\t; %c%s" - name - (mapconcat (function prin1-to-string) - value " ") - (char-representative-of-daikanwa char) - line-breaking))) - (setq attributes (delq name attributes)))) + ;; (dolist (name '(=>daikanwa)) + ;; (when (and (memq name attributes) + ;; (setq value (get-char-attribute char name))) + ;; (insert + ;; (if (integerp value) + ;; (format "(%-18s . %05d)\t; %c%s" + ;; name value (decode-char '=daikanwa value) + ;; line-breaking) + ;; (format "(%-18s %s)\t; %c%s" + ;; name + ;; (mapconcat (function prin1-to-string) + ;; value " ") + ;; (char-representative-of-daikanwa char) + ;; line-breaking))) + ;; (setq attributes (delq name attributes)))) (when (and (memq 'general-category attributes) (setq value (get-char-attribute char 'general-category))) (insert (format @@ -1083,7 +1109,8 @@ (eq name 'ideographic-combination) (eq name 'ideographic-) (eq name '=decomposition) - (string-match "^=>decomposition" (symbol-name name)) + (string-match "^=>*decomposition\\(@[^*]+\\)?$" + (symbol-name name)) (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name name)) (string-match "^\\(->\\|<-\\)[^*]*\\*sources$" (symbol-name name))