X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=5fa93c35245a081f554579951be3d5f0ca994936;hb=2f8277c1cb1d72cd41e66e95246657924e2a4b7b;hp=2199bff15497b1259335dfb8b5f8bdc7eb1bc449;hpb=eeedc012fb3636a9a369b6342c6b8b313184ad34;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 2199bff..5fa93c3 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -141,19 +141,17 @@ chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-7 + =jis-x0208-1990 =jis-x0213-1-2000 =jis-x0213-2-2000 korean-ksc5601 chinese-isoir165 katakana-jisx0201 hebrew-iso8859-8 - =jis-x0208-1990 chinese-gb12345 latin-viscii ethiopic-ucs =gt - =big5-cdp - =gt-k ideograph-daikanwa-2 ideograph-daikanwa =cbeta @@ -169,10 +167,11 @@ ideograph-hanziku-10 ideograph-hanziku-11 ideograph-hanziku-12 - =cbeta - =jef-china3 + =big5 =big5-eten - =big5)) + =big5-cdp + =gt-k + =jef-china3)) (defun char-db-make-char-spec (char) (let (ret char-spec) @@ -189,11 +188,15 @@ ) ((setq ret (catch 'tag - (let ((rest char-db-coded-charset-priority-list)) + (let ((rest char-db-coded-charset-priority-list) + ccs) (while rest + (setq ccs (charset-name + (find-charset (car rest)))) (if (setq ret - (get-char-attribute char (car rest))) - (throw 'tag (cons (car rest) ret))) + (encode-char char ccs + 'defined-only)) + (throw 'tag (cons ccs ret))) (setq rest (cdr rest)))))) (setq char-spec (list ret)) (dolist (ccs (delq (car ret) (charset-list))) @@ -203,7 +206,7 @@ =daikanwa-rev2 ;; =gt-k ))) - (setq ret (get-char-attribute char ccs))) + (setq ret (encode-char char ccs 'defined-only))) (setq char-spec (cons (cons ccs ret) char-spec)))) (if (null char-spec) (setq char-spec (split-char char))) @@ -239,7 +242,7 @@ (setq key (car (car char-spec))) (unless (memq key char-db-ignored-attributes) (if (find-charset key) - (if (get-char-attribute char key) + (if (encode-char char key 'defined-only) (setq cal (cons key cal))) (setq al (cons key al)))) (setq char-spec (cdr char-spec))) @@ -393,7 +396,7 @@ =gt-pj-10 =gt-pj-11)) (setq ret (decode-char ccs code-point)) - (setq ret (get-char-attribute ret '=gt))) + (setq ret (encode-char ret '=gt 'defined-only))) (decode-builtin-char '=gt ret)) (t (decode-builtin-char ccs code-point)))) @@ -489,7 +492,7 @@ ;; line-breaking)) ;; (setq attributes (delq '=>ucs* attributes)) ;; ) - (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis)) + (dolist (name '(=>ucs@gb =>ucs@cns =>ucs@jis =>ucs@ks =>ucs@big5)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -502,41 +505,56 @@ line-breaking)) (setq attributes (delq name attributes)) )) - (when (and (memq '=>ucs-gb attributes) - (setq value (get-char-attribute char '=>ucs-gb))) - (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s" - value (decode-char '=ucs@gb value) - line-breaking)) - (setq attributes (delq '=>ucs-gb attributes)) - ) - (when (and (memq '=>ucs-cns attributes) - (setq value (get-char-attribute char '=>ucs-cns))) - (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s" - value (decode-char '=ucs@cns value) - line-breaking)) - (setq attributes (delq '=>ucs-cns attributes)) - ) - (when (and (memq '=>ucs-big5 attributes) - (setq value (get-char-attribute char '=>ucs-big5))) - (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s" - value (decode-char 'ucs-big5 value) - line-breaking)) - (setq attributes (delq '=>ucs-big5 attributes)) - ) - (when (and (memq '=>ucs-jis attributes) - (setq value (get-char-attribute char '=>ucs-jis))) - (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s" - value (decode-char '=ucs@jis value) - line-breaking)) - (setq attributes (delq '=>ucs-jis attributes)) - ) - (when (and (memq '=>ucs-ks attributes) - (setq value (get-char-attribute char '=>ucs-ks))) - (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s" - value (decode-char 'ucs-ks value) - line-breaking)) - (setq attributes (delq '=>ucs-ks attributes)) - ) + (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks =>ucs-big5)) + (when (and (memq name attributes) + (setq value (get-char-attribute char name))) + (insert (format "(%-18s . #x%04X)\t; %c%s" + (intern + (concat "=>ucs@" + (substring (symbol-name name) 6))) + value + (decode-char (intern + (concat "=ucs@" + (substring + (symbol-name name) 6))) + value) + line-breaking)) + (setq attributes (delq name attributes)))) + ;; (when (and (memq '=>ucs-gb attributes) + ;; (setq value (get-char-attribute char '=>ucs-gb))) + ;; (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s" + ;; value (decode-char '=ucs@gb value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-gb attributes)) + ;; ) + ;; (when (and (memq '=>ucs-cns attributes) + ;; (setq value (get-char-attribute char '=>ucs-cns))) + ;; (insert (format "(=>ucs@cns\t\t. #x%04X)\t; %c%s" + ;; value (decode-char '=ucs@cns value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-cns attributes)) + ;; ) + ;; (when (and (memq '=>ucs-big5 attributes) + ;; (setq value (get-char-attribute char '=>ucs-big5))) + ;; (insert (format "(=>ucs-big5\t\t. #x%04X)\t; %c%s" + ;; value (decode-char 'ucs-big5 value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-big5 attributes)) + ;; ) + ;; (when (and (memq '=>ucs-jis attributes) + ;; (setq value (get-char-attribute char '=>ucs-jis))) + ;; (insert (format "(=>ucs@jis\t\t. #x%04X)\t; %c%s" + ;; value (decode-char '=ucs@jis value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-jis attributes)) + ;; ) + ;; (when (and (memq '=>ucs-ks attributes) + ;; (setq value (get-char-attribute char '=>ucs-ks))) + ;; (insert (format "(=>ucs-ks\t\t. #x%04X)\t; %c%s" + ;; value (decode-char 'ucs-ks value) + ;; line-breaking)) + ;; (setq attributes (delq '=>ucs-ks attributes)) + ;; ) (when (and (memq '->ucs attributes) (setq value (get-char-attribute char '->ucs))) (insert (format (if char-db-convert-obsolete-format