;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;; 2007, 2008 MORIOKA Tomohiko.
+;; 2007, 2008, 2009 MORIOKA Tomohiko.
;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
)
((find-charset ka)
(if (find-charset kb)
- (if (<= (charset-id ka) 1)
- (if (<= (charset-id kb) 1)
- (cond
- ((= (charset-dimension ka)
- (charset-dimension kb))
- (> (charset-id ka)(charset-id kb)))
- (t
- (> (charset-dimension ka)
- (charset-dimension kb))
- ))
- t)
- (if (<= (charset-id kb) 1)
- nil
- (< (charset-id ka)(charset-id kb))))
- nil))
- ((find-charset kb)
- t)
+ (let (a-ir b-ir)
+ (if (setq a-ir (charset-property ka 'iso-ir))
+ (if (setq b-ir (charset-property kb 'iso-ir))
+ (cond
+ ((= a-ir b-ir)
+ (< (charset-id ka)(charset-id kb))
+ )
+ ((= a-ir 177)
+ t)
+ ((= b-ir 177)
+ nil)
+ ((< a-ir
+ b-ir)
+ ))
+ t)
+ (if (charset-property kb 'iso-ir)
+ nil
+ (< (charset-id ka)(charset-id kb)))))
+ nil)
+ )
+ ((find-charset kb))
((symbolp ka)
(cond ((symbolp kb)
(string< (symbol-name ka)
=daikanwa@rev2
;; =gt-k
=jis-x0208@1997
- )))
+ ))
+ (string-match "=ucs@" (symbol-name ccs)))
(setq ccs (charset-name ccs))
(null (assq ccs char-spec))
(setq ret (encode-char char ccs 'defined-only)))
((setq ret (get-char-attribute char 'name*))
(setq char-spec (cons (cons 'name* ret) char-spec))
))
+ )
+ ((setq ret (get-char-attribute
+ char 'ideographic-combination))
+ (setq char-spec
+ (cons (cons 'ideographic-combination ret)
+ char-spec))
))
char-spec)
((consp char)
(defun char-db-insert-ccs-feature (name value line-breaking)
(insert
(format
- (cond ((or (memq name '(=daikanwa
+ (cond ((memq name '(=shinjigen
+ =shinjigen@1ed
+ =shinjigen@rev =shinjigen/+p@rev))
+ "(%-18s . %04d)\t; %c")
+ ((eq name '=shinjigen@1ed/24pr)
+ "(%-18s . %04d)\t; %c")
+ ((or (memq name '(=daikanwa
=daikanwa@rev1 =daikanwa@rev2
- =gt =gt-k =cbeta =zinbun-oracle))
+ =gt <=>gt =gt-k =cbeta =zinbun-oracle))
(string-match "^=adobe-" (symbol-name name)))
"(%-18s . %05d)\t; %c")
((eq name 'mojikyo)
(setq required-features nil)
(dolist (source sources)
(cond
- ((memq source '(JP JP/Jouyou shinjigen-1))
+ ((memq source '(JP
+ JP/Jouyou
+ shinjigen shinjigen@1ed shinjigen@rev))
(setq required-features
(union required-features
'(=jis-x0208
=jis-x0213-2-2000
=jis-x0212
=jis-x0208@1983
- =jis-x0208@1978))))
+ =jis-x0208@1978
+ =shinjigen))))
((eq source 'CN)
(setq required-features
(union required-features