;;; ideograph-util.el --- Ideographic Character Database utility
-;; Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko.
+;; Copyright (C) 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.
;; ((null b) t)
;; (t (< a b))))
+;;;###autoload
(defun char-representative-of-daikanwa (char)
- (if (get-char-attribute char 'ideograph-daikanwa)
+ (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))
m-m m-s pat)
(setq m-m (pop m))
(setq m-s (pop m))
(if (= m-s 0)
- (decode-char 'ideograph-daikanwa m-m)
+ (or (decode-char '=daikanwa-rev2 m-m 'defined-only)
+ (decode-char 'ideograph-daikanwa m-m))
(when m
(setq pat (list m-m m-s))
(map-char-attribute (lambda (c v)
;;;###autoload
(defun char-daikanwa (char)
- (or (get-char-attribute char 'ideograph-daikanwa)
+ (or (encode-char char 'ideograph-daikanwa 'defined-only)
+ (encode-char char '=daikanwa-rev2 'defined-only)
(get-char-attribute char 'morohashi-daikanwa)))
;;;###autoload
(defun char-ucs (char)
- (or (get-char-attribute char 'ucs)
- (get-char-attribute char '=>ucs)
- (get-char-attribute char '->ucs)))
+ (or (encode-char char '=ucs 'defined-only)
+ (get-char-attribute char '=>ucs)))
(defun char-id (char)
(logand (char-int char) #x3FFFFFFF))
ccss (sort ccss #'char-attribute-name<))
(aset ideograph-radical-chars-vector radical chars)
(dolist (char chars)
- (when (some (lambda (ccs)
- (let ((code (encode-char char ccs)))
- (and code
- ;;(not (memq ccs char-db-ignored-attributes))
- ;;(or (not (memq ccs '(ucs))
- (and (<= 0 code)(<= code #x10FFFF)))))
- ccss)
+ (when (or (not (some (lambda (atr)
+ (get-char-attribute char atr))
+ char-db-ignored-attributes))
+ (some (lambda (ccs)
+ (encode-char char ccs 'defined-only))
+ ccss))
(insert-char-data char nil attributes ccss)))))
(defun write-ideograph-radical-char-data (radical file)
file))))
(with-temp-buffer
(insert-ideograph-radical-char-data radical)
- (char-db-update-comment)
(let ((coding-system-for-write 'utf-8))
(write-region (point-min)(point-max) file)
)))