X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=9c71739006c5bce7744f367e6f0efccee379c48a;hb=c47c15236cb7f64ca0564efa5cde0c7dd8be6ec1;hp=3ff6ba9ace3052bfe8aa1d70703fec7f961dadcd;hpb=0e9ef32f9f0d3c301711d1858722080cf4a959e9;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 3ff6ba9..9c71739 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 MORIOKA Tomohiko. +;; 2008,2009,2010,2011,2012,2013,2014,2015,2016 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE. @@ -180,6 +180,7 @@ ==jis-x0208 ==jis-x0213-1 ==jis-x0213-2 + ==jis-x0212 ==hanyo-denshi/ja ==hanyo-denshi/jb ==hanyo-denshi/jc @@ -309,6 +310,7 @@ =>>gt-k =+>gt =>gt + =>mj =>big5-cdp =>daikanwa =>daikanwa/ho @@ -328,15 +330,28 @@ =ucs-var-001 =ucs-var-002 =ucs-var-003 + =ucs-var-004 + =ucs-var-006 + =ucs-var-008 + =ucs-var-010 =ucs-itaiji-001 =ucs-itaiji-002 =ucs-itaiji-003 =ucs-itaiji-004 =ucs-itaiji-005 + =ucs-itaiji-006 =ucs-itaiji-008 - =big5-cdp-var-3 - =big5-cdp-var-5 - =>ucs@iwds-1)) + =ucs-itaiji-009 + =>big5-cdp-itaiji-001 + =big5-cdp-itaiji-001 + =big5-cdp-itaiji-002 + =big5-cdp-itaiji-003 + =big5-cdp-var-003 + =big5-cdp-var-004 + =big5-cdp-var-005 + =>ucs@iwds-1 + ==ucs@gb + =ucs@JP/hanazono)) ;;; @ char-db formatters @@ -712,10 +727,10 @@ ==hanyo-denshi/ks ===hanyo-denshi/ks =>>hanyo-denshi/ks =koseki ==koseki - =mj ==mj ===mj =>>mj + =mj ==mj ===mj =>>mj =>mj =zihai mojikyo)) "(%-18s . %06d)\t; %c") - ((memq name '(=hanyo-denshi/tk)) + ((memq name '(=hanyo-denshi/tk ==hanyo-denshi/tk)) "(%-18s . %08d)\t; %c") ((>= (charset-dimension name) 2) "(%-18s . #x%04X)\t; %c") @@ -1146,17 +1161,17 @@ (setq strokes value))) (setq attributes (delq 'kangxi-strokes attributes)) ) - (when (and (memq 'japanese-radical attributes) - (setq value (get-char-attribute char 'japanese-radical))) - (unless (eq value radical) - (insert (format "(japanese-radical\t . %S)\t; %c%s" - value - (ideographic-radical value) - line-breaking)) - (or radical - (setq radical value))) - (setq attributes (delq 'japanese-radical attributes)) - ) + ;; (when (and (memq 'japanese-radical attributes) + ;; (setq value (get-char-attribute char 'japanese-radical))) + ;; (unless (eq value radical) + ;; (insert (format "(japanese-radical\t . %S)\t; %c%s" + ;; value + ;; (ideographic-radical value) + ;; line-breaking)) + ;; (or radical + ;; (setq radical value))) + ;; (setq attributes (delq 'japanese-radical attributes)) + ;; ) (when (and (memq 'japanese-strokes attributes) (setq value (get-char-attribute char 'japanese-strokes))) (unless (eq value strokes) @@ -1196,38 +1211,38 @@ ;; (setq radical value))) ;; (setq attributes (delq 'shinjigen-1-radical attributes)) ;; ) - (when (and (memq 'ideographic- attributes) - (setq value (get-char-attribute char 'ideographic-))) - (insert "(ideographic- ") - (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 ((characterp cell) - (if separator - (insert lbs)) - (if readable - (insert (format "%S" cell)) - (char-db-insert-char-spec cell readable)) - (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) - (setq attributes (delq 'ideographic- attributes))) + ;; (when (and (memq 'ideographic- attributes) + ;; (setq value (get-char-attribute char 'ideographic-))) + ;; (insert "(ideographic- ") + ;; (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 ((characterp cell) + ;; (if separator + ;; (insert lbs)) + ;; (if readable + ;; (insert (format "%S" cell)) + ;; (char-db-insert-char-spec cell readable)) + ;; (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) + ;; (setq attributes (delq 'ideographic- attributes))) (when (and (memq 'total-strokes attributes) (setq value (get-char-attribute char 'total-strokes))) (insert (format "(total-strokes . %S)%s" @@ -1235,21 +1250,21 @@ line-breaking)) (setq attributes (delq 'total-strokes attributes)) ) - (when (and (memq '->ideograph attributes) - (setq value (get-char-attribute char '->ideograph))) - (insert (format "(->ideograph\t%s)%s" - (mapconcat (lambda (code) - (cond ((symbolp code) - (symbol-name code)) - ((integerp code) - (format "#x%04X" code)) - (t - (format "%s %S" - line-breaking code)))) - value " ") - line-breaking)) - (setq attributes (delq '->ideograph attributes)) - ) + ;; (when (and (memq '->ideograph attributes) + ;; (setq value (get-char-attribute char '->ideograph))) + ;; (insert (format "(->ideograph\t%s)%s" + ;; (mapconcat (lambda (code) + ;; (cond ((symbolp code) + ;; (symbol-name code)) + ;; ((integerp code) + ;; (format "#x%04X" code)) + ;; (t + ;; (format "%s %S" + ;; line-breaking code)))) + ;; value " ") + ;; line-breaking)) + ;; (setq attributes (delq '->ideograph attributes)) + ;; ) ;; (when (and (memq '->decomposition attributes) ;; (setq value (get-char-attribute char '->decomposition))) ;; (insert (format "(->decomposition\t%s)%s" @@ -1280,24 +1295,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 @@ -1361,7 +1376,7 @@ ) ((or (eq name 'ideographic-structure) (eq name 'ideographic-combination) - (eq name 'ideographic-) + ;; (eq name 'ideographic-) (eq name '=decomposition) (char-feature-base-name= '=decomposition name) (char-feature-base-name= '=>decomposition name) @@ -1374,34 +1389,34 @@ (char-db-insert-relation-feature char name value line-breaking ccss readable)) - ((memq name '(ideograph= - original-ideograph-of - ancient-ideograph-of - vulgar-ideograph-of - wrong-ideograph-of - ;; simplified-ideograph-of - ideographic-variants - ;; ideographic-different-form-of - )) - (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 (and (consp cell) - (consp (car cell))) - (progn - (if separator - (insert lbs)) - (char-db-insert-alist cell readable) - (setq separator lbs)) - (if separator - (insert separator)) - (insert (prin1-to-string cell)) - (setq separator " ")) - (setq value (cdr value))) - (insert ")") - (insert line-breaking)) + ;; ((memq name '(ideograph= + ;; original-ideograph-of + ;; ancient-ideograph-of + ;; vulgar-ideograph-of + ;; wrong-ideograph-of + ;; ;; simplified-ideograph-of + ;; ideographic-variants + ;; ;; ideographic-different-form-of + ;; )) + ;; (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 (and (consp cell) + ;; (consp (car cell))) + ;; (progn + ;; (if separator + ;; (insert lbs)) + ;; (char-db-insert-alist cell readable) + ;; (setq separator lbs)) + ;; (if separator + ;; (insert separator)) + ;; (insert (prin1-to-string cell)) + ;; (setq separator " ")) + ;; (setq value (cdr value))) + ;; (insert ")") + ;; (insert line-breaking)) ((consp value) (insert (format "(%-18s " name)) (setq lbs (concat "\n" (make-string (current-column) ?\ ))