+2004-09-02 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * mule/mule-conf.el (=daikanwa@rev1): Renamed from
+ `=daikanwa-rev1'; specify `=daikanwa' as the mother; define
+ `=daikanwa-rev1' as an alias for `=daikanwa@rev1'.
+ (=daikanwa@rev2): Renamed from `=daikanwa-rev2'; specify
+ `=daikanwa' as the mother; define `=daikanwa-rev2' as an alias for
+ `=daikanwa@rev2'.
+
2004-07-23 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* mule/mule-conf.el (=big5-cdp): Swap DOC-string and long-name.
code-offset #xE00000))
(define-charset-alias 'ideograph-daikanwa '=daikanwa)
- (make-charset '=daikanwa-rev1
+ (make-charset '=daikanwa@rev1
"Daikanwa dictionary (revised version)"
`(long-name "Daikanwa Rev."
chars 256
columns 2
graphic 2
direction l2r
- registry "Daikanwa\\(\\.[0-9]+\\)?-2"))
- (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa-rev1)
+ registry "Daikanwa\\(\\.[0-9]+\\)?-2"
+ mother =daikanwa
+ ))
+ (define-charset-alias 'ideograph-daikanwa-2 '=daikanwa@rev1)
+ (define-charset-alias '=daikanwa-rev1 '=daikanwa@rev1)
- (make-charset '=daikanwa-rev2
+ (make-charset '=daikanwa@rev2
"Daikanwa dictionary (revised version 2)"
`(long-name "Daikanwa"
chars 256
graphic 2
direction l2r
registry "Daikanwa\\(\\.[0-9]+\\)?-3"
- min-code #xE00000
- max-code ,(+ #xE00000 50100)
- code-offset #xE00000))
+ mother =daikanwa
+ min-code 1
+ max-code 49964
+ ;; min-code #xE00000
+ ;; max-code ,(+ #xE00000 50100)
+ ;; code-offset #xE00000
+ ))
+ (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
(make-charset '=big5-pua
"Big5 with private used area"
+2004-09-01 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R037-Big.el: Use `=daikanwa@rev{1|2}' instead of
+ `=daikanwa-rev{1|2}'.
+
+ * char-db-util.el (char-db-make-char-spec): Use `=daikanwa@rev2'
+ instead of `=daikanwa-rev2'.
+ (char-db-insert-ccs-feature): Use `=daikanwa@rev{1|2}' instead of
+ `=daikanwa-rev{1|2}'.
+
2004-08-30 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* Ideograph-R162-Walk.el (U+9054): Changed to abstract character.
(ideographic-radical . 37) ; ⼤
(ideographic-strokes . 5)
(total-strokes . 8)
- (=daikanwa-rev1 . 05898) ; &M-05897;
- (=daikanwa-rev2 . 05897) ; &M-05897;
+ (=daikanwa@rev1 . 05898) ; &M-05897;
+ (=daikanwa@rev2 . 05897) ; &M-05897;
(mojikyo . 005897) ; &MCS-60001709;
))
(define-char
(ideographic-radical . 37) ; ⼤
(ideographic-strokes . 5)
(total-strokes . 8)
- (=daikanwa-rev1 . 05899) ; &M-05898;
- (=daikanwa-rev2 . 05898) ; &M-05898;
+ (=daikanwa@rev1 . 05899) ; &M-05898;
+ (=daikanwa@rev2 . 05898) ; &M-05898;
))
(define-char
'((morohashi-daikanwa 5898 0 0)
(hanyu-dazidian 1 533 3)
(=ucs . #x215FF) ; 𡗿
(=cns11643-6 . #x2A59) ; &I-C6-2A59; [10-57]
- (=daikanwa-rev1 . 05900) ; 𡗿
- (=daikanwa-rev2 . 05899) ; &M-05899;
+ (=daikanwa@rev1 . 05900) ; 𡗿
+ (=daikanwa@rev2 . 05899) ; &M-05899;
(=hanziku-2 . #xBDB2) ; &I-HZK02-BDB2;
(mojikyo . 005899) ; &MCS-6000170B;
))
(=ucs . #x594B) ; 奋
(=gb2312 . #x375C) ; &I-G0-375C; [23-60]
(=cns11643-3 . #x282E) ; &I-C3-282E; [08-14]
- (=daikanwa-rev1 . 05901) ; 奋
- (=daikanwa-rev2 . 05900) ; &M-05900;
+ (=daikanwa@rev1 . 05901) ; 奋
+ (=daikanwa@rev2 . 05900) ; &M-05900;
(=hanziku-2 . #xBDF0) ; &I-HZK02-BDF0;
(mojikyo . 005900) ; &MCS-6000170C;
))
(hanyu-dazidian 1 535 5)
(=ucs . #x21604) ; 𡘄
(=cns11643-6 . #x2A5B) ; &I-C6-2A5B; [10-59]
- (=daikanwa-rev1 . 05902) ; 𡘄
- (=daikanwa-rev2 . 05901) ; &M-05901;
+ (=daikanwa@rev1 . 05902) ; 𡘄
+ (=daikanwa@rev2 . 05901) ; &M-05901;
(=hanziku-2 . #xBDF4) ; &I-HZK02-BDF4;
(mojikyo . 005901) ; &MCS-6000170D;
))
(total-strokes . 8)
(hanyu-dazidian 1 536 1)
(=ucs . #x21605) ; 𡘅
- (=daikanwa-rev1 . 05903) ; 𡘅
- (=daikanwa-rev2 . 05902) ; &M-05902;
+ (=daikanwa@rev1 . 05903) ; 𡘅
+ (=daikanwa@rev2 . 05902) ; &M-05902;
(=hanziku-2 . #xBE51) ; &I-HZK02-BE51;
(mojikyo . 005902) ; &MCS-6000170E;
))
'((ideographic-radical . 37) ; ⼤
(ideographic-strokes . 5)
(total-strokes . 8)
- (=daikanwa-rev1 . 05904) ; &M-05903;
- (=daikanwa-rev2 . 05903) ; &M-05903;
+ (=daikanwa@rev1 . 05904) ; &M-05903;
+ (=daikanwa@rev2 . 05903) ; &M-05903;
))
(define-char
'((ideographic-radical . 37) ; ⼤
(ideographic-strokes . 5)
(total-strokes . 8)
- (=daikanwa-rev1 . 05905) ; &M-05904;
- (=daikanwa-rev2 . 05904) ; &M-05904;
+ (=daikanwa@rev1 . 05905) ; &M-05904;
+ (=daikanwa@rev2 . 05904) ; &M-05904;
))
(define-char
'((ideographic-radical . 37) ; ⼤
(hanyu-dazidian 1 534 1)
(=ucs . #x21602) ; 𡘂
(=cns11643-6 . #x2A5A) ; &I-C6-2A5A; [10-58]
- (=daikanwa-rev1 . 05906) ; 𡘂
- (=daikanwa-rev2 . 05905) ; &M-05905;
+ (=daikanwa@rev1 . 05906) ; 𡘂
+ (=daikanwa@rev2 . 05905) ; &M-05905;
(=hanziku-2 . #xBDD0) ; &I-HZK02-BDD0;
(mojikyo . 005905) ; &MCS-60001711;
))
(total-strokes . 8)
(=ucs . #x3699) ; 㚙
(=jis-x0213-2-2000 . #x2541) ; &I-JX2-2541; [05-33]
- (=daikanwa-rev1 . 05907) ; 㚙
- (=daikanwa-rev2 . 05906) ; &M-05906;
+ (=daikanwa@rev1 . 05907) ; 㚙
+ (=daikanwa@rev2 . 05906) ; &M-05906;
))
(define-char
'((ideographic-radical . 37) ; ⼤
(hanyu-dazidian 1 536 4)
(=ucs . #x21606) ; 𡘆
(=cns11643-4 . #x2579) ; &I-C4-2579; [05-89]
- (=daikanwa-rev1 . 05908) ; 𡘆
- (=daikanwa-rev2 . 05907) ; &M-05907;
+ (=daikanwa@rev1 . 05908) ; 𡘆
+ (=daikanwa@rev2 . 05907) ; &M-05907;
(=hanziku-2 . #xBE54) ; &I-HZK02-BE54;
(mojikyo . 005907) ; &MCS-60001713;
))
(=ucs . #x594C) ; 奌
(=gt . 07438) ; &I-GT-07438;
(=gt-pj-2 . #x672F) ; &I-GT-07438; [71-15]
- (=daikanwa-rev1 . 05909) ; 奌
- (=daikanwa-rev2 . 05908) ; &M-05908;
+ (=daikanwa@rev1 . 05909) ; 奌
+ (=daikanwa@rev2 . 05908) ; &M-05908;
(=jef-china3 . #x48E9) ; &I-JC3-48E9;
(mojikyo . 005908) ; &MCS-60001714;
))
(total-strokes . 9)
(=ucs . #x594A) ; 奊
(=big5 . #xD15A) ; &I-B-D15A;
- (=daikanwa-rev1 . 05897) ; 奊
- (=daikanwa-rev2 . 05909) ; &M-05909;
+ (=daikanwa@rev1 . 05897) ; 奊
+ (=daikanwa@rev2 . 05909) ; &M-05909;
(mojikyo . 005909) ; &MCS-60001715;
))
(define-char
(if (and (or (charset-iso-final-char ccs)
(memq ccs
'(=daikanwa
- =daikanwa-rev2
+ =daikanwa@rev2
;; =gt-k
)))
(setq ret (encode-char char ccs 'defined-only)))
(insert
(format
(cond ((memq name '(=daikanwa
- =daikanwa-rev1 =daikanwa-rev2
+ =daikanwa@rev1 =daikanwa@rev2
=gt =gt-k =cbeta))
"(%-18s . %05d)\t; %c")
((eq name 'mojikyo)
line-breaking))
(setq attributes (delq name attributes))
))
- ;; (dolist (name '(=>ucs-gb =>ucs-cns =>ucs-jis =>ucs-ks =>ucs-big5))
- ;; (when (and (memq name attributes)
- ;; (setq value (get-char-attribute char name)))
- ;; (insert (format "(%-18s . #x%04X)\t; %c%s"
- ;; (intern
- ;; (concat "=>ucs@"
- ;; (substring (symbol-name name) 6)))
- ;; value
- ;; (decode-char (intern
- ;; (concat "=ucs@"
- ;; (substring
- ;; (symbol-name name) 6)))
- ;; value)
- ;; line-breaking))
- ;; (setq attributes (delq name attributes))))
- ;; (when (and (memq '->ucs attributes)
- ;; (setq value (get-char-attribute char '->ucs)))
- ;; (insert (format (if char-db-convert-obsolete-format
- ;; "(=>ucs\t\t. #x%04X)\t; %c%s"
- ;; "(->ucs\t\t. #x%04X)\t; %c%s")
- ;; value (decode-char '=ucs value)
- ;; line-breaking))
- ;; (setq attributes (delq '->ucs attributes))
- ;; )
(dolist (name '(=>daikanwa))
(when (and (memq name attributes)
(setq value (get-char-attribute char name)))
->denotational <-subsumptive ->ucs-unified
->ideographic-component-forms))
(setq attributes (delq ignored attributes))))
- ;; (setq rest ccs-attributes)
- ;; (while (and rest
- ;; (progn
- ;; (setq value (get-char-attribute char (car rest)))
- ;; (if value
- ;; (if (>= (length (symbol-name (car rest))) 19)
- ;; (progn
- ;; (setq has-long-ccs-name t)
- ;; nil)
- ;; t)
- ;; t)))
- ;; (setq rest (cdr rest)))
(while attributes
(setq name (car attributes))
(if (setq value (get-char-attribute char name))
(setq value (get-char-attribute char name))
(setq dest-ccss (cons name dest-ccss))))
(char-db-insert-ccs-feature name value line-breaking)
- ;; (insert
- ;; (format
- ;; (cond ((memq name '(=daikanwa
- ;; =daikanwa-rev1 =daikanwa-rev2
- ;; =gt =gt-k =cbeta))
- ;; (if has-long-ccs-name
- ;; "(%-26s . %05d)\t; %c%s"
- ;; "(%-18s . %05d)\t; %c%s"))
- ;; ((eq name 'mojikyo)
- ;; (if has-long-ccs-name
- ;; "(%-26s . %06d)\t; %c%s"
- ;; "(%-18s . %06d)\t; %c%s"))
- ;; ((>= (charset-dimension name) 2)
- ;; (if has-long-ccs-name
- ;; "(%-26s . #x%04X)\t; %c%s"
- ;; "(%-18s . #x%04X)\t; %c%s"))
- ;; (t
- ;; (if has-long-ccs-name
- ;; "(%-26s . #x%02X)\t; %c%s"
- ;; "(%-18s . #x%02X)\t; %c%s")))
- ;; name
- ;; (if (= (charset-iso-graphic-plane name) 1)
- ;; (logior value
- ;; (cond ((= (charset-dimension name) 1)
- ;; #x80)
- ;; ((= (charset-dimension name) 2)
- ;; #x8080)
- ;; ((= (charset-dimension name) 3)
- ;; #x808080)
- ;; (t 0)))
- ;; value)
- ;; (char-db-decode-isolated-char name value)
- ;; line-breaking))
)
)
((string-match "^=>ucs@" (symbol-name name))
line-breaking)))
))
(setq attributes (cdr attributes)))
- ;; (while ccs-attributes
- ;; (setq name (charset-name (car ccs-attributes)))
- ;; (if (and (not (memq name dest-ccss))
- ;; (prog1
- ;; (setq value (get-char-attribute char name))
- ;; (setq dest-ccss (cons name dest-ccss))))
- ;; (insert
- ;; (format
- ;; (cond ((memq name '(=daikanwa
- ;; =daikanwa-rev1 =daikanwa-rev2
- ;; =gt =gt-k =cbeta))
- ;; (if has-long-ccs-name
- ;; "(%-26s . %05d)\t; %c%s"
- ;; "(%-18s . %05d)\t; %c%s"))
- ;; ((eq name 'mojikyo)
- ;; (if has-long-ccs-name
- ;; "(%-26s . %06d)\t; %c%s"
- ;; "(%-18s . %06d)\t; %c%s"))
- ;; ((>= (charset-dimension name) 2)
- ;; (if has-long-ccs-name
- ;; "(%-26s . #x%04X)\t; %c%s"
- ;; "(%-18s . #x%04X)\t; %c%s"))
- ;; (t
- ;; (if has-long-ccs-name
- ;; "(%-26s . #x%02X)\t; %c%s"
- ;; "(%-18s . #x%02X)\t; %c%s")))
- ;; name
- ;; (if (= (charset-iso-graphic-plane name) 1)
- ;; (logior value
- ;; (cond ((= (charset-dimension name) 1)
- ;; #x80)
- ;; ((= (charset-dimension name) 2)
- ;; #x8080)
- ;; ((= (charset-dimension name) 3)
- ;; #x808080)
- ;; (t 0)))
- ;; value)
- ;; (char-db-decode-isolated-char name value)
- ;; line-breaking)))
- ;; (setq ccs-attributes (cdr ccs-attributes)))
(insert ")")))
(defun insert-char-data (char &optional readable