X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b715c08139bf3875a31026d6b8fa790b706b2768;hb=3a739e6aaff06b345399145971a5cd66e196e629;hp=40f60c13dd4351548d42ce05c493b784341958e2;hpb=45d878f7812d85fc0b760081d156a48d05eac829;p=chise%2Fxemacs-chise.git- diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 40f60c1..b715c08 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -1,9 +1,9 @@ -;;; char-db-util.el --- Character Database utility +;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*- ;; Copyright (C) 1998,1999,2000,2001,2002,2003,2004,2005 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko -;; Keywords: CHISE, Character Database, ISO/IEC 10646, Unicode, UCS-4, MULE. +;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE. ;; This file is part of XEmacs CHISE. @@ -69,6 +69,15 @@ (setq i (1+ i))) v)) +(defun ideographic-radical (number) + (aref ideographic-radicals number)) + +(defconst shuowen-radicals + [?一 ?上 ?示 ?三 ?王 ?玉 ?玨 ?气 ?士 ?丨 ?屮 ?艸 ?茻]) + +(defun shuowen-radical (number) + (aref shuowen-radicals (1- number))) + (defvar char-db-file-coding-system 'utf-8-mcs-er) (defvar char-db-feature-domains @@ -359,7 +368,7 @@ (insert (format "%s%s\t%d ; %c%s" separator name value - (aref ideographic-radicals value) + (ideographic-radical value) line-breaking)) (setq separator "")) (t @@ -430,6 +439,101 @@ (- (logand value 255) 32)))) (insert line-breaking)) +(defun char-db-insert-relation-feature (char name value line-breaking + ccss readable) + (insert (format "(%-18s%s " name line-breaking)) + (let ((lbs (concat "\n" (make-string (current-column) ?\ ))) + separator cell sources required-features + ret) + (while (consp value) + (setq cell (car value)) + (if (integerp cell) + (setq cell (decode-char '=ucs cell))) + (cond + ((eq name '->subsumptive) + (when (or (not (some (lambda (atr) + (get-char-attribute cell atr)) + char-db-ignored-attributes)) + (some (lambda (ccs) + (encode-char cell ccs 'defined-only)) + ccss)) + (if separator + (insert lbs)) + (let ((char-db-ignored-attributes + (cons '<-subsumptive + char-db-ignored-attributes))) + (insert-char-attributes cell readable)) + (setq separator lbs)) + ) + ((characterp cell) + (setq sources + (get-char-attribute + char (intern (format "%s*sources" name)))) + (setq required-features nil) + (dolist (source sources) + (cond + ((memq source '(JP JP/Jouyou shinjigen-1)) + (setq required-features + (union required-features + '(=jis-x0208 + =jis-x0208@1990 + =jis-x0213-1-2000 + =jis-x0213-2-2000 + =jis-x0212 + =jis-x0208@1983 + =jis-x0208@1978)))) + ((eq source 'CN) + (setq required-features + (union required-features + '(=gb2312 + =gb12345 + =iso-ir165))))) + (cond + ((find-charset (setq ret (intern (format "=%s" source)))) + (setq required-features + (cons ret required-features))) + (t (setq required-features + (cons source required-features))))) + (cond ((string-match "@JP" (symbol-name name)) + (setq required-features + (union required-features + '(=jis-x0208 + =jis-x0208@1990 + =jis-x0213-1-2000 + =jis-x0213-2-2000 + =jis-x0212 + =jis-x0208@1983 + =jis-x0208@1978)))) + ((string-match "@CN" (symbol-name name)) + (setq required-features + (union required-features + '(=gb2312 + =gb12345 + =iso-ir165))))) + (if separator + (insert lbs)) + (if readable + (insert (format "%S" cell)) + (char-db-insert-char-spec cell readable + nil + required-features)) + (setq separator lbs)) + ((consp cell) + (if separator + (insert lbs)) + (if (consp (car cell)) + (char-db-insert-char-spec cell readable) + (char-db-insert-char-reference cell readable)) + (setq separator lbs)) + (t + (if separator + (insert separator)) + (insert (prin1-to-string cell)) + (setq separator " "))) + (setq value (cdr value))) + (insert ")") + (insert line-breaking))) + (defun insert-char-attributes (char &optional readable attributes column) (unless column (setq column (current-column))) @@ -440,8 +544,7 @@ (concat "\n" (make-string (1+ column) ?\ ))) lbs cell separator ret key al cal - dest-ccss - sources required-features + dest-ccss ; sources required-features ccss) (let (atr-d) (setq attributes @@ -620,10 +723,18 @@ (setq radical value) (insert (format "(ideographic-radical . %S)\t; %c%s" radical - (aref ideographic-radicals radical) + (ideographic-radical radical) line-breaking)) (setq attributes (delq 'ideographic-radical attributes)) ) + (when (and (memq 'shuowen-radical attributes) + (setq value (get-char-attribute char 'shuowen-radical))) + (insert (format "(shuowen-radical\t. %S)\t; %c%s" + value + (shuowen-radical value) + line-breaking)) + (setq attributes (delq 'shuowen-radical attributes)) + ) (let (key) (dolist (domain (append @@ -645,7 +756,7 @@ (insert (format "(%s . %S)\t; %c%s" key radical - (aref ideographic-radicals radical) + (ideographic-radical radical) line-breaking)) (setq attributes (delq key attributes)) ) @@ -695,7 +806,7 @@ (unless (eq value radical) (insert (format "(kangxi-radical\t . %S)\t; %c%s" value - (aref ideographic-radicals value) + (ideographic-radical value) line-breaking)) (or radical (setq radical value))) @@ -716,7 +827,7 @@ (unless (eq value radical) (insert (format "(japanese-radical\t . %S)\t; %c%s" value - (aref ideographic-radicals value) + (ideographic-radical value) line-breaking)) (or radical (setq radical value))) @@ -736,7 +847,7 @@ (setq value (get-char-attribute char 'cns-radical))) (insert (format "(cns-radical\t . %S)\t; %c%s" value - (aref ideographic-radicals value) + (ideographic-radical value) line-breaking)) (setq attributes (delq 'cns-radical attributes)) ) @@ -755,7 +866,7 @@ (unless (eq value radical) (insert (format "(shinjigen-1-radical . %S)\t; %c%s" value - (aref ideographic-radicals value) + (ideographic-radical value) line-breaking)) (or radical (setq radical value))) @@ -907,109 +1018,19 @@ (string-match "^->vulgar" (symbol-name name)) (string-match "^->wrong" (symbol-name name)) (string-match "^->same" (symbol-name name)) + (string-match "^->formed" (symbol-name name)) (string-match "^->original" (symbol-name name)) (string-match "^->ancient" (symbol-name name)) + (string-match "^->Oracle-Bones" (symbol-name name)) )) ) ((or (eq name 'ideographic-structure) (eq name 'ideographic-combination) (eq name 'ideographic-) (string-match "^\\(->\\|<-\\)" (symbol-name name))) - (insert (format "(%-18s%s " name line-breaking)) - (setq lbs (concat "\n" (make-string (current-column) ?\ )) - separator nil) - (while (consp value) - (setq cell (car value)) - (if (integerp cell) - (setq cell (decode-char '=ucs cell))) - (cond ((eq name '->subsumptive) - (when (or (not - (some (lambda (atr) - (get-char-attribute cell atr)) - char-db-ignored-attributes)) - (some (lambda (ccs) - (encode-char cell ccs - 'defined-only)) - ccss)) - (if separator - (insert lbs)) - (let ((char-db-ignored-attributes - (cons '<-subsumptive - char-db-ignored-attributes))) - (insert-char-attributes cell readable)) - (setq separator lbs)) - ) - ((characterp cell) - (setq sources - (get-char-attribute - char - (intern (format "%s*sources" name)))) - (setq required-features nil) - (dolist (source sources) - (cond - ((memq source '(JP JP/Jouyou - shinjigen-1)) - (setq required-features - (union required-features - '(=jis-x0208 - =jis-x0208@1990 - =jis-x0213-1-2000 - =jis-x0213-2-2000 - =jis-x0212 - =jis-x0208@1983 - =jis-x0208@1978)))) - ((eq source 'CN) - (setq required-features - (union required-features - '(=gb2312 - =gb12345 - =iso-ir165))))) - (cond - ((find-charset - (setq ret (intern (format "=%s" source)))) - (setq required-features - (cons ret required-features))) - (t (setq required-features - (cons source required-features))))) - (cond ((string-match "@JP" (symbol-name name)) - (setq required-features - (union required-features - '(=jis-x0208 - =jis-x0208@1990 - =jis-x0213-1-2000 - =jis-x0213-2-2000 - =jis-x0212 - =jis-x0208@1983 - =jis-x0208@1978)))) - ((string-match "@CN" (symbol-name name)) - (setq required-features - (union required-features - '(=gb2312 - =gb12345 - =iso-ir165))))) - (if separator - (insert lbs)) - (if readable - (insert (format "%S" cell)) - (char-db-insert-char-spec cell readable - nil - required-features)) - (setq separator lbs)) - ((consp cell) - (if separator - (insert lbs)) - (if (consp (car cell)) - (char-db-insert-char-spec cell readable) - (char-db-insert-char-reference cell readable)) - (setq separator lbs)) - (t - (if separator - (insert separator)) - (insert (prin1-to-string cell)) - (setq separator " "))) - (setq value (cdr value))) - (insert ")") - (insert line-breaking)) + (char-db-insert-relation-feature char name value + line-breaking + ccss readable)) ((memq name '(ideograph= original-ideograph-of ancient-ideograph-of