(defun char-db-insert-char-spec (char &optional readable column)
(unless column
(setq column (current-column)))
- (let (char-spec ret al cal key)
+ (let (char-spec ret al cal key temp-char)
(cond ((characterp char)
- (cond ((setq ret (get-char-attribute char 'ucs))
+ (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 (split-char char))
(setq char-spec (list ret))
(dolist (ccs (delq (car ret) (charset-list)))
- (if (and (>= (charset-iso-final-char ccs) ?0)
- (setq ret (get-char-attribute char ccs)))
+ (if (or (and (>= (charset-iso-final-char ccs) ?0)
+ (setq ret (get-char-attribute char ccs)))
+ (eq ccs 'ideograph-daikanwa))
(setq char-spec (cons (cons ccs ret) char-spec))))
(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)))
- (if (or char
- (setq char (condition-case nil
- (define-char char-spec)
- (error nil))))
- (progn
- (setq al nil
- cal nil)
- (while char-spec
- (setq key (car (car char-spec)))
- (if (find-charset key)
- (setq cal (cons key cal))
- (setq al (cons key al)))
- (setq char-spec (cdr char-spec)))
- (insert-char-attributes char
- readable
- (or al 'none) cal))
- (insert (prin1-to-string char-spec)))))
+ (unless (or char
+ (condition-case nil
+ (setq char (find-char char-spec))
+ (error nil)))
+ ;; define temporary character
+ ;; Current implementation is dirty.
+ (setq temp-char (define-char (cons '(ideograph-daikanwa . 0)
+ char-spec)))
+ (remove-char-attribute temp-char 'ideograph-daikanwa)
+ (setq char temp-char))
+ (setq al nil
+ cal nil)
+ (while char-spec
+ (setq key (car (car char-spec)))
+ (if (find-charset key)
+ (setq cal (cons key cal))
+ (setq al (cons key al)))
+ (setq char-spec (cdr char-spec)))
+ (insert-char-attributes char
+ readable
+ (or al 'none) cal)
+ (when temp-char
+ ;; undefine temporary character
+ ;; Current implementation is dirty.
+ (setq char-spec (char-attribute-alist temp-char))
+ (while char-spec
+ (remove-char-attribute temp-char (car (car char-spec)))
+ (setq char-spec (cdr char-spec))))))
(defun char-db-insert-alist (alist &optional readable column)
(unless column
(cond ((eq name 'char)
(insert "(char . ")
(if (setq ret (condition-case nil
- (define-char value)
+ (find-char value)
(error nil)))
(progn
(setq al nil
(if (and (consp cell)
(consp (car cell))
(setq ret (condition-case nil
- (define-char cell)
+ (find-char cell)
(error nil)))
)
(progn
(setq value (pop plist))
(cond ((eq name :char)
(insert ":char\t")
+ (cond ((numberp value)
+ (setq value (decode-char 'ucs value)))
+ ;; ((consp value)
+ ;; (setq value (or (find-char value)
+ ;; value)))
+ )
(char-db-insert-char-spec value readable)
(insert line-breaking))
(t
(when (and (memq 'name attributes)
(setq value (get-char-attribute char 'name)))
(insert (format
- (if (> (length value) 47)
+ (if (> (+ (current-column) (length value)) 48)
"(name . %S)%s"
"(name . %S)%s")
value line-breaking))
->ancient-ideograph <-ancient-ideograph
->original-ideograph <-original-ideograph
->simplified-ideograph <-simplified-ideograph
+ ->wrong-ideograph <-wrong-ideograph
->same-ideograph
->ideographic-variants
+ ->synonyms
->radical <-radical
- ->bopomofo ->ideograph
- ->ideographic <-ideographic))
+ ->bopomofo <-bopomofo
+ ->ideographic <-ideographic
+ ideographic-structure))
(insert (format "(%-18s%s " name line-breaking))
(setq lbs (concat "\n" (make-string (current-column) ?\ ))
separator nil)
(if (and (consp cell)
(consp (car cell))
(setq ret (condition-case nil
- (define-char cell)
+ (find-char cell)
(error nil))))
(progn
(setq rest cell
(setq value (get-char-attribute char name)))
(insert
(format
- (cond ((memq name '(ideograph-daikanwa ideograph-gt))
+ (cond ((memq name '(ideograph-daikanwa ideograph-gt
+ ideograph-cbeta))
(if has-long-ccs-name
"(%-26s . %05d)\t; %c%s"
"(%-18s . %05d)\t; %c%s"))