X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=19d49adc680b615c7ac61bbffb57bea566dceb69;hb=cbbde686e652981a0ff662d61d35356172b327de;hp=93cbb202f31a1ef709f4cca6ac9aaae3b660c2e4;hpb=61f7c45ceb936ed0d4c21960ae6c324fed21421d;p=chise%2Fxemacs-chise.git- diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 93cbb20..19d49ad 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -73,7 +73,7 @@ (defvar char-db-feature-domains '(ucs daikanwa cns gt jis jis/alt jis/a jis/b - jis-x0213 cdp shinjigen misc unknown)) + jis-x0212 jis-x0213 cdp shinjigen misc unknown)) (defvar char-db-ignored-attributes nil) @@ -168,6 +168,7 @@ =big5 =big5-eten =gt-k + =jis-x0208@1997 =jef-china3)) (defun char-db-make-char-spec (char) @@ -200,7 +201,7 @@ (if (and (or (charset-iso-final-char ccs) (memq ccs '(=daikanwa - =daikanwa-rev2 + =daikanwa@rev2 ;; =gt-k ))) (setq ret (encode-char char ccs 'defined-only))) @@ -396,7 +397,7 @@ (insert (format (cond ((memq name '(=daikanwa - =daikanwa-rev1 =daikanwa-rev2 + =daikanwa@rev1 =daikanwa@rev2 =gt =gt-k =cbeta)) "(%-18s . %05d)\t; %c") ((eq name 'mojikyo) @@ -510,30 +511,6 @@ line-breaking)) (setq attributes (delq name 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 attributes) - ;; (setq value (get-char-attribute char '->ucs))) - ;; (insert (format (if char-db-convert-obsolete-format - ;; "(=>ucs\t\t. #x%04X)\t; %c%s" - ;; "(->ucs\t\t. #x%04X)\t; %c%s") - ;; value (decode-char '=ucs value) - ;; line-breaking)) - ;; (setq attributes (delq '->ucs attributes)) - ;; ) (dolist (name '(=>daikanwa)) (when (and (memq name attributes) (setq value (get-char-attribute char name))) @@ -643,7 +620,19 @@ (setq attributes (delq 'ideographic-radical attributes)) ) (let (key) - (dolist (domain char-db-feature-domains) + (dolist (domain + (append + char-db-feature-domains + (let (dest domain) + (dolist (feature (char-attribute-list)) + (setq feature (symbol-name feature)) + (when (string-match + "\\(radical\\|strokes\\)@\\([^@*]+\\)\\(\\*\\|$\\)" + feature) + (setq domain (intern (match-string 2 feature))) + (unless (memq domain dest) + (setq dest (cons domain dest))))) + (sort dest #'string<)))) (setq key (intern (format "%s@%s" 'ideographic-radical domain))) (when (and (memq key attributes) (setq value (get-char-attribute char key))) @@ -872,21 +861,8 @@ (unless readable (dolist (ignored '(composition ->denotational <-subsumptive ->ucs-unified - ->ideographic-component-forms - <-same)) + ->ideographic-component-forms)) (setq attributes (delq ignored attributes)))) - ;; (setq rest ccs-attributes) - ;; (while (and rest - ;; (progn - ;; (setq value (get-char-attribute char (car rest))) - ;; (if value - ;; (if (>= (length (symbol-name (car rest))) 19) - ;; (progn - ;; (setq has-long-ccs-name t) - ;; nil) - ;; t) - ;; t))) - ;; (setq rest (cdr rest))) (while attributes (setq name (car attributes)) (if (setq value (get-char-attribute char name)) @@ -896,41 +872,7 @@ (prog1 (setq value (get-char-attribute char name)) (setq dest-ccss (cons name dest-ccss)))) - (char-db-insert-ccs-feature name value line-breaking) - ;; (insert - ;; (format - ;; (cond ((memq name '(=daikanwa - ;; =daikanwa-rev1 =daikanwa-rev2 - ;; =gt =gt-k =cbeta)) - ;; (if has-long-ccs-name - ;; "(%-26s . %05d)\t; %c%s" - ;; "(%-18s . %05d)\t; %c%s")) - ;; ((eq name 'mojikyo) - ;; (if has-long-ccs-name - ;; "(%-26s . %06d)\t; %c%s" - ;; "(%-18s . %06d)\t; %c%s")) - ;; ((>= (charset-dimension name) 2) - ;; (if has-long-ccs-name - ;; "(%-26s . #x%04X)\t; %c%s" - ;; "(%-18s . #x%04X)\t; %c%s")) - ;; (t - ;; (if has-long-ccs-name - ;; "(%-26s . #x%02X)\t; %c%s" - ;; "(%-18s . #x%02X)\t; %c%s"))) - ;; name - ;; (if (= (charset-iso-graphic-plane name) 1) - ;; (logior value - ;; (cond ((= (charset-dimension name) 1) - ;; #x80) - ;; ((= (charset-dimension name) 2) - ;; #x8080) - ;; ((= (charset-dimension name) 3) - ;; #x808080) - ;; (t 0))) - ;; value) - ;; (char-db-decode-isolated-char name value) - ;; line-breaking)) - ) + (char-db-insert-ccs-feature name value line-breaking)) ) ((string-match "^=>ucs@" (symbol-name name)) (insert (format "(%-18s . #x%04X)\t; %c%s" @@ -948,10 +890,20 @@ (intern (format "%s*sources" name)))) (not (string-match "\\*sources$" (symbol-name name))) (or (eq name '<-identical) + (string-match "^->halfwidth" (symbol-name name)) + (and + (string-match "^->fullwidth" (symbol-name name)) + (not + (and (consp value) + (characterp (car value)) + (encode-char + (car value) '=ucs 'defined-only)))) (string-match "^->simplified" (symbol-name name)) - (string-match "^<-same" (symbol-name name)) (string-match "^->vulgar" (symbol-name name)) (string-match "^->wrong" (symbol-name name)) + (string-match "^->same" (symbol-name name)) + (string-match "^->original" (symbol-name name)) + (string-match "^->ancient" (symbol-name name)) )) ) ((or (eq name 'ideographic-structure) @@ -994,12 +946,12 @@ (setq required-features (union required-features '(=jis-x0208 - =jis-x0208-1990 + =jis-x0208@1990 =jis-x0213-1-2000 =jis-x0213-2-2000 =jis-x0212 - =jis-x0208-1983 - =jis-x0208-1978)))) + =jis-x0208@1983 + =jis-x0208@1978)))) ((eq source 'CN) (setq required-features (union required-features @@ -1017,12 +969,12 @@ (setq required-features (union required-features '(=jis-x0208 - =jis-x0208-1990 + =jis-x0208@1990 =jis-x0213-1-2000 =jis-x0213-2-2000 =jis-x0212 - =jis-x0208-1983 - =jis-x0208-1978)))) + =jis-x0208@1983 + =jis-x0208@1978)))) ((string-match "@CN" (symbol-name name)) (setq required-features (union required-features @@ -1126,46 +1078,6 @@ line-breaking))) )) (setq attributes (cdr attributes))) - ;; (while ccs-attributes - ;; (setq name (charset-name (car ccs-attributes))) - ;; (if (and (not (memq name dest-ccss)) - ;; (prog1 - ;; (setq value (get-char-attribute char name)) - ;; (setq dest-ccss (cons name dest-ccss)))) - ;; (insert - ;; (format - ;; (cond ((memq name '(=daikanwa - ;; =daikanwa-rev1 =daikanwa-rev2 - ;; =gt =gt-k =cbeta)) - ;; (if has-long-ccs-name - ;; "(%-26s . %05d)\t; %c%s" - ;; "(%-18s . %05d)\t; %c%s")) - ;; ((eq name 'mojikyo) - ;; (if has-long-ccs-name - ;; "(%-26s . %06d)\t; %c%s" - ;; "(%-18s . %06d)\t; %c%s")) - ;; ((>= (charset-dimension name) 2) - ;; (if has-long-ccs-name - ;; "(%-26s . #x%04X)\t; %c%s" - ;; "(%-18s . #x%04X)\t; %c%s")) - ;; (t - ;; (if has-long-ccs-name - ;; "(%-26s . #x%02X)\t; %c%s" - ;; "(%-18s . #x%02X)\t; %c%s"))) - ;; name - ;; (if (= (charset-iso-graphic-plane name) 1) - ;; (logior value - ;; (cond ((= (charset-dimension name) 1) - ;; #x80) - ;; ((= (charset-dimension name) 2) - ;; #x8080) - ;; ((= (charset-dimension name) 3) - ;; #x808080) - ;; (t 0))) - ;; value) - ;; (char-db-decode-isolated-char name value) - ;; line-breaking))) - ;; (setq ccs-attributes (cdr ccs-attributes))) (insert ")"))) (defun insert-char-data (char &optional readable @@ -1198,20 +1110,26 @@ (let ((ucs (get-char-attribute char '->ucs))) (if ucs (delete char (char-variants (int-char ucs))))))) - variant vs) + variant vs ret) (setq variants (sort variants #'<)) (while variants (setq variant (car variants)) - (if (and (or (null script) - (null (setq vs (get-char-attribute variant 'script))) - (memq script vs)) - (or (null excluded-script) - (null (setq vs (get-char-attribute variant 'script))) - (not (memq excluded-script vs)))) - (or (and no-ucs-unified (get-char-attribute variant '=ucs)) - (insert-char-data variant printable))) - (setq variants (cdr variants)) - ))) + (unless (get-char-attribute variant '<-subsumptive) + (if (and (or (null script) + (null (setq vs (get-char-attribute variant 'script))) + (memq script vs)) + (or (null excluded-script) + (null (setq vs (get-char-attribute variant 'script))) + (not (memq excluded-script vs)))) + (unless (and no-ucs-unified (get-char-attribute variant '=ucs)) + (insert-char-data variant printable) + (if (setq ret (char-variants variant)) + (while ret + (or (memq (car ret) variants) + ;; (get-char-attribute (car ret) '<-subsumptive) + (setq variants (append variants (list (car ret))))) + (setq ret (cdr ret))))))) + (setq variants (cdr variants))))) (defun insert-char-range-data (min max &optional script excluded-script) (let ((code min)