(let (ret)
(or (catch 'tag
(dolist (domain char-db-feature-domains)
- (if (and (setq ret (get-char-attribute
+ (if (and (setq ret (char-feature
char
(intern
(format "%s@%s"
(or (eq ret radical)
(null radical)))
(throw 'tag ret))))
- (get-char-attribute char 'ideographic-radical)
+ (char-feature char 'ideographic-radical)
(progn
(setq ret
(or (get-char-attribute char 'daikanwa-radical)
(let (ret)
(catch 'tag
(dolist (domain domains)
- (if (and (setq ret (or (get-char-attribute
+ (if (and (setq ret (or (char-feature
char
(intern
(format "%s@%s"
'ideographic-radical domain)))
- (get-char-attribute
+ (char-feature
char 'ideographic-radical)))
(or (eq ret radical)
(null radical))
- (setq ret (get-char-attribute
+ (setq ret (char-feature
char
(intern
(format "%s@%s"
(let (ret)
(or (char-ideographic-strokes-from-domains
char preferred-domains radical)
- (get-char-attribute char 'ideographic-strokes)
+ (char-feature char 'ideographic-strokes)
(char-ideographic-strokes-from-domains
char char-db-feature-domains radical)
(catch 'tag
(defun update-ideograph-radical-table ()
(interactive)
(let (ret radical script)
- (dolist (domain char-db-feature-domains)
+ (dolist (feature
+ (cons 'ideographic-radical
+ (mapcar
+ (lambda (domain)
+ (intern (format "%s@%s" 'ideographic-radical domain)))
+ char-db-feature-domains)))
(map-char-attribute
- (lambda (char radical)
- (when (and radical
- (or (null (setq script (get-char-attribute char 'script)))
- (memq 'Ideograph script)))
- (unless (memq char
- (setq ret
- (aref ideograph-radical-chars-vector radical)))
- (char-ideographic-strokes char)
- (aset ideograph-radical-chars-vector radical
- (cons char ret))))
+ (lambda (chr radical)
+ (dolist (char (cons chr
+ (get-char-attribute chr '->denotational)))
+ (when (and radical
+ (or (null (setq script
+ (get-char-attribute char 'script)))
+ (memq 'Ideograph script)))
+ (unless (memq char
+ (setq ret
+ (aref ideograph-radical-chars-vector
+ radical)))
+ (char-ideographic-strokes char)
+ (aset ideograph-radical-chars-vector radical
+ (cons char ret)))))
nil)
- (intern (format "%s@%s" 'ideographic-radical domain))))
- (map-char-attribute
- (lambda (char radical)
- (when (and radical
- (or (null (setq script (get-char-attribute char 'script)))
- (memq 'Ideograph script)))
- (unless (memq char
- (setq ret
- (aref ideograph-radical-chars-vector radical)))
- (char-ideographic-strokes char)
- (aset ideograph-radical-chars-vector radical
- (cons char ret))))
- nil)
- 'ideographic-radical)
+ feature))
(map-char-attribute
(lambda (char data)
(dolist (cell data)
(if (or (encode-char char 'ideograph-daikanwa 'defined-only)
(encode-char char '=daikanwa-rev2 'defined-only))
char
- (let ((m (get-char-attribute char 'morohashi-daikanwa))
+ (let ((m (char-feature char '=>daikanwa))
m-m m-s pat)
- (or (when m
+ (or (and (integerp m)
+ (or (decode-char '=daikanwa-rev2 m 'defined-only)
+ (decode-char 'ideograph-daikanwa m)))
+ (when (or m
+ (setq m (get-char-attribute char 'morohashi-daikanwa)))
(setq m-m (pop m))
(setq m-s (pop m))
(if (= m-s 0)
(defun char-daikanwa (char)
(or (encode-char char 'ideograph-daikanwa 'defined-only)
(encode-char char '=daikanwa-rev2 'defined-only)
+ (let ((ret (char-feature char '=>daikanwa)))
+ (and ret
+ (if (or (get-char-attribute char '<-subsumptive)
+ (get-char-attribute char '<-denotational))
+ (list ret 0)
+ ret)))
(get-char-attribute char 'morohashi-daikanwa)))
;;;###autoload