;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;; 2007 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.
?鼓 ?豈 ?豆 ?豊 ?豐 ?䖒 ?虍 ?虎 ?虤 ?皿 ; 170
?𠙴 ?去 ?血 ?丶 ?丹 ?青 ?井 ?皀 ?鬯 ?食 ; 180
?亼 ?會 ?倉 ?入 ?缶 ?矢 ?高 ?冂 ?𩫏 ?京 ; 190
- ?亯 ?𣆪 ?畗 ?㐭 ?𠾂 ?來 ?麥 ?夊 ?舛 ?䑞 ; 200
- ?韋 ?弟 ?夂 ?久 ?桀
+ ?亯 ?𣆪 ?畗 ?㐭 ?嗇 ?來 ?麥 ?夊 ?舛 ?䑞 ; 200
+ ?韋 ?弟 ?夂 ?久 ?桀 ?木 ?東 ?林 ?才 ?叒 ; 210
+ ?之 ?帀 ?出 ?𣎵 ?生 ?乇 ?𠂹 ?𠌶 ?華 ?𥝌 ; 220
+ ?稽 ?巢 ?桼 ?束 ?㯻 ?囗 ?員 ?貝 ?邑 ?𨛜 ; 230
+ ?日 ?旦 ?倝 ?㫃 ?冥 ?晶 ?月 ?有 ?明 ?囧 ; 240
+ ?夕 ?多 ?毌 ?𢎘 ?𣐺 ?卣 ?齊 ?朿 ?片 ?鼎 ; 250
+ ?克 ?彔 ?禾 ?秝 ?黍 ?香 ?米 ?毇 ?臼 ?凶 ; 260
+ ?𣎳 ?林 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
+ ?呂 ?穴 ?㝱 ?𤕫 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
+ ?巾 ?巿 ?帛 ?白 ?㡀 ?黹 ?人 ?𠤎 ?匕 ?从 ; 290
])
(defun shuowen-radical (number)
)
((find-charset ka)
(if (find-charset kb)
- (if (<= (charset-id ka) 1)
- (if (<= (charset-id kb) 1)
+ (if (or (<= (charset-id ka) 1)
+ (and (charset-final ka)
+ (>= (charset-final ka) ?@)))
+ (if (or (<= (charset-id kb) 1)
+ (and (charset-final kb)
+ (>= (charset-final kb) ?@)))
(cond
((= (charset-dimension ka)
(charset-dimension kb))
- (> (charset-id ka)(charset-id kb)))
+ (if (and (<= (charset-id ka) 1)
+ (<= (charset-id kb) 1))
+ (> (charset-id ka)(charset-id kb))
+ (if (and (charset-final ka)
+ (charset-final kb))
+ (cond
+ ((= (charset-final ka)(charset-final kb))
+ (if (<= (charset-id ka) 1)
+ (if (<= (charset-id kb) 1)
+ (> (charset-id ka)(charset-id kb))
+ t)
+ (if (<= (charset-id kb) 1)
+ nil
+ (< (charset-id ka)(charset-id kb))))
+ )
+ ((< (charset-final ka)(charset-final kb))
+ ))
+ (if (<= (charset-id ka) 1)
+ (if (<= (charset-id kb) 1)
+ (> (charset-id ka)(charset-id kb))
+ t)
+ (if (<= (charset-id kb) 1)
+ nil
+ (cond ((and (charset-final ka)
+ (>= (charset-final ka) ?@))
+ t)
+ ((and (charset-final kb)
+ (>= (charset-final kb) ?@))
+ nil)
+ (t
+ (< (charset-id ka)(charset-id kb))
+ ))))))
+ )
(t
(> (charset-dimension ka)
(charset-dimension kb))
))
t)
- (if (<= (charset-id kb) 1)
+ (if (or (<= (charset-id kb) 1)
+ (and (charset-final kb)
+ (>= (charset-final kb) ?@)))
nil
(< (charset-id ka)(charset-id kb))))
nil))
((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))
(string-match "^=adobe-" (symbol-name name)))
(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