projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git]
/
lisp
/
utf-2000
/
char-db-util.el
diff --git
a/lisp/utf-2000/char-db-util.el
b/lisp/utf-2000/char-db-util.el
index
1027c20
..
def4915
100644
(file)
--- a/
lisp/utf-2000/char-db-util.el
+++ b/
lisp/utf-2000/char-db-util.el
@@
-122,7
+122,11
@@
(let (char-spec ret al cal key)
(cond ((characterp char)
(cond ((setq ret (get-char-attribute char 'ucs))
(let (char-spec ret al cal key)
(cond ((characterp char)
(cond ((setq ret (get-char-attribute char 'ucs))
- (setq char-spec (list (cons 'ucs ret)))
+ (unless (and (<= #xE000 ret)(<= ret #xF8FF))
+ (setq char-spec (list (cons 'ucs ret))))
+ (if (setq ret (get-char-attribute char 'chinese-big5-cdp))
+ (setq char-spec (cons (cons 'chinese-big5-cdp ret)
+ char-spec)))
(if (setq ret (get-char-attribute char 'name))
(setq char-spec (cons (cons 'name ret) char-spec)))
)
(if (setq ret (get-char-attribute char 'name))
(setq char-spec (cons (cons 'name ret) char-spec)))
)
@@
-140,7
+144,7
@@
(setq char nil)))
(if (or char
(setq char (condition-case nil
(setq char nil)))
(if (or char
(setq char (condition-case nil
- (define-char char-spec)
+ (find-char char-spec)
(error nil))))
(progn
(setq al nil
(error nil))))
(progn
(setq al nil
@@
-171,7
+175,7
@@
(cond ((eq name 'char)
(insert "(char . ")
(if (setq ret (condition-case nil
(cond ((eq name 'char)
(insert "(char . ")
(if (setq ret (condition-case nil
- (define-char value)
+ (find-char value)
(error nil)))
(progn
(setq al nil
(error nil)))
(progn
(setq al nil
@@
-196,7
+200,7
@@
(if (and (consp cell)
(consp (car cell))
(setq ret (condition-case nil
(if (and (consp cell)
(consp (car cell))
(setq ret (condition-case nil
- (define-char cell)
+ (find-char cell)
(error nil)))
)
(progn
(error nil)))
)
(progn
@@
-241,6
+245,8
@@
(setq value (pop plist))
(cond ((eq name :char)
(insert ":char\t")
(setq value (pop plist))
(cond ((eq name :char)
(insert ":char\t")
+ (if (numberp value)
+ (setq value (decode-char 'ucs value)))
(char-db-insert-char-spec value readable)
(insert line-breaking))
(t
(char-db-insert-char-spec value readable)
(insert line-breaking))
(t
@@
-306,7
+312,7
@@
(when (and (memq 'name attributes)
(setq value (get-char-attribute char 'name)))
(insert (format
(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))
"(name . %S)%s"
"(name . %S)%s")
value line-breaking))
@@
-586,9
+592,14
@@
->ancient-ideograph <-ancient-ideograph
->original-ideograph <-original-ideograph
->simplified-ideograph <-simplified-ideograph
->ancient-ideograph <-ancient-ideograph
->original-ideograph <-original-ideograph
->simplified-ideograph <-simplified-ideograph
+ ->wrong-ideograph <-wrong-ideograph
->same-ideograph
->same-ideograph
+ ->ideographic-variants
+ ->synonyms
+ ->radical <-radical
+ ->bopomofo <-bopomofo
->ideographic <-ideographic
->ideographic <-ideographic
- ->bopomofo ->ideograph))
+ ideographic-structure))
(insert (format "(%-18s%s " name line-breaking))
(setq lbs (concat "\n" (make-string (current-column) ?\ ))
separator nil)
(insert (format "(%-18s%s " name line-breaking))
(setq lbs (concat "\n" (make-string (current-column) ?\ ))
separator nil)
@@
-666,7
+677,7
@@
(if (and (consp cell)
(consp (car cell))
(setq ret (condition-case 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
(error nil))))
(progn
(setq rest cell