;;; char-db-util.el --- Character Database utility
-;; Copyright (C) 1998,1999,2000,2001,2002 MORIOKA Tomohiko.
+;; Copyright (C) 1998,1999,2000,2001,2002,2003 MORIOKA Tomohiko.
;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
;; Keywords: UTF-2000, ISO/IEC 10646, Unicode, UCS-4, MULE.
(let ((v (make-vector 215 nil))
(i 1))
(while (< i 215)
- (aset v i (int-char (+ #x2EFF i)))
+ (aset v i (decode-char 'ucs (+ #x2EFF i)))
(setq i (1+ i)))
- (unless (charset-iso-final-char (car (split-char (aref v 34))))
- (aset v 34 (make-char 'chinese-gb2312 #x62 #x3A)))
+ ;; (unless (charset-iso-final-char (car (split-char (aref v 34))))
+ ;; (aset v 34 (make-char 'chinese-gb2312 #x62 #x3A)))
v))
(defvar char-db-ignored-attributes nil)
arabic-digit
arabic-1-column
arabic-2-column)))
+ ((string-match "^ideograph-cbeta" (symbol-name (car rest))))
+ ((string-match "^china3-jef" (symbol-name (car rest))))
((string-match "^chinese-big5" (symbol-name (car rest))))
((string-match "^ideograph-gt-pj-" (symbol-name (car rest)))
(unless (memq 'ideograph-gt dest)
(setq dest (cons (car rest) dest)))))
(setq rest (cdr rest)))
(append (sort dest #'char-attribute-name<)
- '(chinese-big5-cdp chinese-big5-eten chinese-big5))))
+ '(chinese-big5-cdp ideograph-cbeta china3-jef
+ chinese-big5-eten chinese-big5))))
(defun char-db-make-char-spec (char)
(let (ret char-spec)
(cond ((and (setq ret (get-char-attribute char 'ucs))
(not (and (<= #xE000 ret)(<= ret #xF8FF))))
(setq char-spec (list (cons 'ucs ret)))
- (if (setq ret (get-char-attribute char 'name))
- (setq char-spec (cons (cons 'name ret) char-spec)))
+ (cond ((setq ret (get-char-attribute char 'name))
+ (setq char-spec (cons (cons 'name ret) char-spec))
+ )
+ ((setq ret (get-char-attribute char 'name*))
+ (setq char-spec (cons (cons 'name* ret) char-spec))
+ ))
)
((setq ret
- (let ((default-coded-charset-priority-list
- char-db-coded-charset-priority-list))
- (split-char char)))
+ (catch 'tag
+ (let ((rest char-db-coded-charset-priority-list))
+ (while rest
+ (if (setq ret
+ (get-char-attribute char (car rest)))
+ (throw 'tag (cons (car rest) ret)))
+ (setq rest (cdr rest))))))
(setq char-spec (list ret))
(dolist (ccs (delq (car ret) (charset-list)))
(if (or (and (charset-iso-final-char ccs)
(setq char-spec (cons (cons ccs ret) char-spec))))
(if (null char-spec)
(setq char-spec (split-char char)))
- (if (setq ret (get-char-attribute char 'name))
- (setq char-spec (cons (cons 'name ret) char-spec)))
+ (cond ((setq ret (get-char-attribute char 'name))
+ (setq char-spec (cons (cons 'name ret) char-spec))
+ )
+ ((setq ret (get-char-attribute char 'name*))
+ (setq char-spec (cons (cons 'name* ret) char-spec))
+ ))
))
char-spec)
((consp char)
(setq column (current-column)))
(let (char-spec ret al cal key temp-char)
(setq char-spec (char-db-make-char-spec char))
- ;; (cond ((characterp char)
- ;; (cond ((and (setq ret (get-char-attribute char 'ucs))
- ;; (not (and (<= #xE000 ret)(<= ret #xF8FF))))
- ;; (setq char-spec (list (cons 'ucs ret)))
- ;; (if (setq ret (get-char-attribute char 'name))
- ;; (setq char-spec (cons (cons 'name ret) char-spec)))
- ;; )
- ;; ((setq ret
- ;; (let ((default-coded-charset-priority-list
- ;; char-db-coded-charset-priority-list))
- ;; (split-char char)))
- ;; (setq char-spec (list ret))
- ;; (dolist (ccs (delq (car ret) (charset-list)))
- ;; (if (or (and (charset-iso-final-char ccs)
- ;; (setq ret (get-char-attribute char ccs)))
- ;; (eq ccs 'ideograph-daikanwa))
- ;; (setq char-spec (cons (cons ccs ret) char-spec))))
- ;; (if (null char-spec)
- ;; (setq char-spec (split-char char)))
- ;; (if (setq ret (get-char-attribute char 'name))
- ;; (setq char-spec (cons (cons 'name ret) char-spec)))
- ;; )))
- ;; ((consp char)
- ;; (setq char-spec char)
- ;; (setq char nil)))
(unless (or (characterp char) ; char
(condition-case nil
(setq char (find-char char-spec))
value line-breaking))
(setq attributes (delq 'name attributes))
)
+ (when (and (memq 'name* attributes)
+ (setq value (get-char-attribute char 'name*)))
+ (insert (format
+ (if (> (+ (current-column) (length value)) 48)
+ "(name* . %S)%s"
+ "(name* . %S)%s")
+ value line-breaking))
+ (setq attributes (delq 'name* attributes))
+ )
(when (and (memq 'script attributes)
(setq value (get-char-attribute char 'script)))
(insert (format "(script\t\t%s)%s"
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
(cond ((memq name '(ideograph-daikanwa-2
ideograph-daikanwa
ideograph-gt
+ ideograph-gt-k
ideograph-cbeta))
(if has-long-ccs-name
"(%-26s . %05d)\t; %c%s"
(if has-long-ccs-name
"(%-26s . %06d)\t; %c%s"
"(%-18s . %06d)\t; %c%s"))
- ((eq name 'ucs)
+ ((>= (charset-dimension name) 2) ; (eq name 'ucs)
(if has-long-ccs-name
"(%-26s . #x%04X)\t; %c%s"
"(%-18s . #x%04X)\t; %c%s"))