X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fchar-db-util.el;h=b90ed3dfe1362ae12466bbf3b8528d3e4e9f48f6;hb=c16f4e7ffa69f1b0f31c51792e319a748ea412c9;hp=874722df616538562ce62e6d0b3e9bf343b7ea9d;hpb=8f75cca7b6c19f3648891993007cf1885ba0e9dd;p=chise%2Fxemacs-chise.git- diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 874722d..b90ed3d 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 MORIOKA Tomohiko. +;; 2007, 2008, 2009, 2010, 2011, 2012 MORIOKA Tomohiko. ;; Author: MORIOKA Tomohiko ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE. @@ -114,6 +114,13 @@ cyrillic-iso8859-5 greek-iso8859-7 thai-tis620 + =adobe-japan1-0 + =adobe-japan1-1 + =adobe-japan1-2 + =adobe-japan1-3 + =adobe-japan1-4 + =adobe-japan1-5 + =adobe-japan1-6 =jis-x0208 =jis-x0208@1978 =jis-x0208@1983 @@ -139,14 +146,6 @@ latin-viscii ethiopic-ucs =big5-cdp - =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 @@ -157,11 +156,12 @@ =hanyo-denshi/hg =hanyo-denshi/jt =hanyo-denshi/ks + =gt + =gt-k =daikanwa =daikanwa@rev2 =daikanwa@rev1 =cbeta - =gt-k ideograph-hanziku-1 ideograph-hanziku-2 ideograph-hanziku-3 @@ -174,9 +174,32 @@ ideograph-hanziku-10 ideograph-hanziku-11 ideograph-hanziku-12 + =>>>adobe-japan1-0 + =>>>adobe-japan1-1 + =>>>adobe-japan1-2 + =>>>adobe-japan1-3 + =>>>adobe-japan1-4 + =>>>adobe-japan1-5 + =>>>adobe-japan1-6 =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2 + =>>>hanyo-denshi/ja + =>>>hanyo-denshi/jb + =>>>hanyo-denshi/jc + =>>>hanyo-denshi/ft + =>>>hanyo-denshi/ib + =>>>hanyo-denshi/hg + =>>>hanyo-denshi/jt + =>>>hanyo-denshi/ks + =>>>gt + =>>adobe-japan1-0 + =>>adobe-japan1-1 + =>>adobe-japan1-2 + =>>adobe-japan1-3 + =>>adobe-japan1-4 + =>>adobe-japan1-5 + =>>adobe-japan1-6 =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-1@2000 @@ -184,12 +207,20 @@ =>>jis-x0213-2 =>>jis-x0208@1978 =>>hanyo-denshi/ft + =>>hanyo-denshi/jt =>>hanyo-denshi/ks =>>gt =>>daikanwa =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2 + =+>adobe-japan1-0 + =+>adobe-japan1-1 + =+>adobe-japan1-2 + =+>adobe-japan1-3 + =+>adobe-japan1-4 + =+>adobe-japan1-5 + =+>adobe-japan1-6 =+>jis-x0208@1978 =>jis-x0208 =>jis-x0208@1997 @@ -203,6 +234,7 @@ =>ucs@jis =>ucs@cns =>ucs@ks + =+>ucs@iso =+>ucs@unicode =+>ucs@jis =+>ucs@jis/1990 @@ -222,6 +254,8 @@ =>gt =>big5-cdp =>daikanwa + =>daikanwa/ho + =>cns11643-7 =big5 =big5-eten =>gt-k @@ -249,6 +283,26 @@ (setq char-spec (cons (cons 'name* ret) char-spec)) )) ) + ((encode-char char '=adobe-japan1 'defined-only) + (setq char-spec nil) + (dolist (ccs (charset-list)) + (if (and (or (memq ccs + '(=adobe-japan1-0 + =adobe-japan1-1 + =adobe-japan1-2 + =adobe-japan1-3 + =adobe-japan1-4 + =adobe-japan1-5 + =adobe-japan1-6 + )) + ;; (eq (charset-property ccs 'iso-ir) 177) + (string-match "=ucs@" (symbol-name ccs)) + ) + (setq ccs (charset-name ccs)) + (null (assq ccs char-spec)) + (setq ret (encode-char char ccs 'defined-only))) + (setq char-spec (cons (cons ccs ret) char-spec)))) + ) ((setq ret (catch 'tag (let ((rest char-db-coded-charset-priority-list) @@ -270,7 +324,9 @@ ;; =gt-k =jis-x0208@1997 )) - (string-match "=ucs@" (symbol-name ccs))) + (eq (charset-property ccs 'iso-ir) 177) + ;; (string-match "=ucs@" (symbol-name ccs)) + ) (setq ccs (charset-name ccs)) (null (assq ccs char-spec)) (setq ret (encode-char char ccs 'defined-only))) @@ -478,24 +534,36 @@ ((memq name '(=shinjigen =shinjigen@1ed =shinjigen@rev =shinjigen/+p@rev - =daikanwa/ho)) + =daikanwa/ho =>>daikanwa/ho =>daikanwa/ho)) "(%-18s . %04d)\t; %c") ((eq name '=shinjigen@1ed/24pr) "(%-18s . %04d)\t; %c") ((or (memq name '(=daikanwa =>>daikanwa =>daikanwa =daikanwa@rev1 =daikanwa@rev2 - =daikanwa/+p =daikanwa/+2p + =daikanwa/+p =>>daikanwa/+p + =daikanwa/+2p =>>daikanwa/+2p =gt =>>>gt =>>gt =+>gt =>gt =gt-k =>>gt-k =>gt-k - =adobe-japan1-0 =adobe-japan1-1 =adobe-japan1-2 - =adobe-japan1-3 =adobe-japan1-4 =adobe-japan1-5 - =adobe-japan1-6 =>>adobe-japan1 =+>adobe-japan1 + =adobe-japan1-0 =>>>adobe-japan1-0 + =adobe-japan1-1 =>>>adobe-japan1-1 + =adobe-japan1-2 =>>>adobe-japan1-2 + =adobe-japan1-3 =>>>adobe-japan1-3 + =adobe-japan1-4 =>>>adobe-japan1-4 + =adobe-japan1-5 =>>>adobe-japan1-5 + =adobe-japan1-6 =>>>adobe-japan1-6 + =>>adobe-japan1-0 =+>adobe-japan1-0 + =>>adobe-japan1-1 =+>adobe-japan1-1 + =>>adobe-japan1-2 =+>adobe-japan1-2 + =>>adobe-japan1-3 =+>adobe-japan1-3 + =>>adobe-japan1-4 =+>adobe-japan1-4 + =>>adobe-japan1-5 =+>adobe-japan1-5 + =>>adobe-japan1-6 =+>adobe-japan1-6 =cbeta =>>cbeta =zinbun-oracle =>zinbun-oracle)) ;; (string-match "^=adobe-" (symbol-name name)) ) "(%-18s . %05d)\t; %c") - ((memq name '(=hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo)) + ((memq name '(=hanyo-denshi/ks =>>>hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo)) "(%-18s . %06d)\t; %c") ((>= (charset-dimension name) 2) "(%-18s . #x%04X)\t; %c") @@ -570,7 +638,10 @@ =jis-x0212 =jis-x0208@1983 =jis-x0208@1978 - =shinjigen)))) + =shinjigen + =shinjigen@1ed + =shinjigen@rev + =shinjigen/+p@rev)))) ((eq source 'CN) (setq required-features (union required-features @@ -956,17 +1027,17 @@ (setq strokes value))) (setq attributes (delq 'cns-strokes attributes)) ) - (when (and (memq 'shinjigen-1-radical attributes) - (setq value (get-char-attribute char 'shinjigen-1-radical))) - (unless (eq value radical) - (insert (format "(shinjigen-1-radical . %S)\t; %c%s" - value - (ideographic-radical value) - line-breaking)) - (or radical - (setq radical value))) - (setq attributes (delq 'shinjigen-1-radical attributes)) - ) + ;; (when (and (memq 'shinjigen-1-radical attributes) + ;; (setq value (get-char-attribute char 'shinjigen-1-radical))) + ;; (unless (eq value radical) + ;; (insert (format "(shinjigen-1-radical . %S)\t; %c%s" + ;; value + ;; (ideographic-radical value) + ;; line-breaking)) + ;; (or radical + ;; (setq radical value))) + ;; (setq attributes (delq 'shinjigen-1-radical attributes)) + ;; ) (when (and (memq 'ideographic- attributes) (setq value (get-char-attribute char 'ideographic-))) (insert "(ideographic- ")