+2008-10-17 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * mule/mule-charset.el (default-coded-charset-priority-list):
+ Prefer `=jis-x0213-{1|2}-2000' to `japanese-jisx0212'.
+
+ * mule/mule-conf.el (=ucs@jis/2004): New coded-charset for XEmacs
+ CHISE.
+ (=ucs@JP): Use `=ucs@jis/2004' instead of `=ucs@jis' as the
+ mother.
+
2008-09-14 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* mule/mule-conf.el (=jis-x0208@1978): New coded-charset [moved
chinese-gb2312
japanese-jisx0208
=jis-x0208-1990
- japanese-jisx0212
japanese-jisx0208-1978
=gt-pj-2
=gt-pj-3
chinese-big5
=jis-x0213-1-2000
=jis-x0213-2-2000
+ japanese-jisx0212
;; chinese-gb12345
=gt-pj-1
=jis-x0208@1997
mother ucs-jis))
(define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
(define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
+ (make-charset '=ucs@jis/2004
+ "ISO/IEC 10646 for JIS X 0213:2004"
+ '(long-name "UCS for JIS:2004"
+ chars 256
+ dimension 3
+ columns 2
+ graphic 2
+ direction l2r
+ mother ucs-jis))
(make-charset '=ucs@JP
"UCS for common glyphs used in Japan"
'(long-name "UCS for Japan"
columns 2
graphic 2
direction l2r
- mother =ucs@jis/2000))
+ mother =ucs@jis/2004))
(define-charset-alias '=ucs@jp '=ucs@JP)
(make-charset '=ucs@ks
"ISO/IEC 10646 for Korean Standards"
+2008-10-21 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R053-Dotted-Cliff.el (U+3892): Use `->subsumptive'.
+ (U+5ECF): Use `->denotational' and `->subsumptive'.
+ (GT-11902): Use `<-denotational' for U+5ECF; use `=shinjigen'
+ instead of `=shinjigen@1ed' for S1-2207.
+ (GT-11901): Separate S1-2209.
+ (S1-2209): Unify S2-2209.
+
+2008-10-19 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R162-Walk.el (U+8FC2): Add J97-312A.
+ (J78-312A): Unify JX3-312A.
+ (J90-312A): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-312A.
+ (U+8FE6): Add J97-3260.
+ (J78-3260): Unify JX3-3260.
+ (J90-3260): Use `=jis-x0213-1@2000' instead of =jis-x0213-1' for
+ JX1-3260.
+
+ * Ideograph-R092-Fang.el (U+7259): Add J97-3267; move B-A4FA from
+ UU+7259.
+ (M-19909): Separate C1-455B; integrate JX3-3267.
+ (J0-3267): Use `<-subsumptive' to separate K0-6433 and JC3-58C5;
+ use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for JX1-3267;
+ use `=ucs@jis/1990' and `=ucs@jis/2000' instead of `=ucs@jis' for
+ J00U+7259.
+
+ * Ideograph-R061-Heart.el (U+6062): Use `->denotational' instead
+ of `->subsumptive'; separate JX1-327A and JX3-327A.
+
+ * Ideograph-R059-Bristle.el (U+5F63): Use `->subsumptive'.
+ (U+5F64): Use `->subsumptive'.
+
+ * Ideograph-R030-Mouth.el (J78-313D): Unify JX3-313D.
+ (J90-313D): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-313D; use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+ `=ucs@jis' for J00U+5642.
+
+ * Ideograph-R009-Man.el (B-C9B7): Moved to U+4F22.
+
+2008-10-18 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * Ideograph-R195-Fish.el (U+9C2F): Add J97-3073.
+ (J78-3073): Unify JX3-3073.
+ (J90-3073): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-3073.
+
+ * Ideograph-R190-Hair.el (U+9B1C): Use `->subsumptive'.
+ (U+9B1D): Use `=>daikanwa' instead of `morohashi-daikanwa'.
+
+ * Ideograph-R184-Eat.el (U+990C): Add J97-3142.
+ (Mother of J78-3142): Integrate JX3-3142.
+ (J90-3142): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-3142; use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+ `=ucs@jis' for J00U+990C.
+
+ * Ideograph-R145-Clothes.el (J78-3228): Unify JX3-3228.
+ (J90-3228): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-3228; Use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+ `=ucs@jis' for J00U+8956.
+
+ * Ideograph-R142-Insect.el (U+87F9): Unify B-C3C9.
+ (K0-7A2F): Use `<-subsumptive' to separate J0-332A, JX1-332A and
+ S-7274; unify JX3-332A.
+ (U+880F): Use `->denotational'.
+
+ * Ideograph-R085-Water.el (U+6DEB): Unify J97-307C.
+ (J78-307C): Unify JX3-307C.
+ (J90-307C): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1'.
+
+ * Ideograph-R072-Sun.el (J78-3322): Unify JX3-3322.
+ (J90-3322): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-3322; use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+ `=ucs@jis' for J00U+6666.
+
+ * Ideograph-R054-Long-Stride.el (J0-3276): Use `=jis-x0213-1@2000'
+ instead of `=jis-x0213-1' for JX1-3276; use `=ucs@jis/1990' and
+ `=ucs@jis/2000' instead of `=ucs@jis' for J00U+5EFB.
+ (C3-2C4C): Unify JX3-3276.
+
+2008-10-17 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * read-maps.el (mapping-table-ccs-setting-alist): Map
+ `=jis-x0208@1990' to `=ucs@jis/1990' instead of `=ucs@jis'.
+
+ * Ideograph-R027-Cliff.el (GT-03811): Use `<-subsumptive' to
+ separate S-2208 and integrate JX3-3139.
+ (J90-3139): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for
+ JX1-3139; use `=ucs@jis/1990' and `=ucs@jis/2000' instead of
+ `=ucs@jis' for J00U+53A9.
+
+2008-10-16 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * maps-conf.el: Don't add `=gt-pj-1' for J90-332A.
+
2008-09-25 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* ideograph-util.el (char-id): Add autoload cookie.
(total-strokes . 6)
(hanyu-dazidian 1 120 6)
(=ucs . #x4F22) ; 伢
+ (=big5 . #xC9B7) ; &I-B-C9B7;
(->subsumptive
((ideographic-structure
((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
((=gb2312 . #x5140) ; &G0-5140; [49-32]
))
(=gb2312 . #x5873) ; &G0-5873; [56-83]
- (=big5 . #xC9B7) ; &I-B-C9B7;
(=ucs@unicode . #x4F22) ; &G0-5873;
(mojikyo . 053031) ; &MCS-6000CF27;
)
((name . "CJK RADICAL PERSON")
(=ucs . #x2E85) ; ⺅
)
- ((=cns11643-1 . #x455B) ; &M-19909; [37-59]
- (=daikanwa . 19909) ; &I-M-19909;
+ ((=cns11643-1 . #x455B) ; &C1-455B; [37-59]
))
(=cns11643-2 . #x2176) ; &C2-2176; [01-86]
(=jef-china3 . #x8DEC) ; &I-JC3-8DEC;
)
((=ucs . #x51AB) ; 冫
)
- ((=cns11643-1 . #x455B) ; &M-19909; [37-59]
- (=daikanwa . 19909) ; &I-M-19909;
+ ((=cns11643-1 . #x455B) ; &C1-455B; [37-59]
))
(=cns11643-3 . #x227C) ; &C3-227C; [02-92]
))
((=ucs . #x53A9) ; 厩
))
(ideographic-radical . 27) ; ⼚
- (ideographic-strokes . 11)
- (total-strokes . 13)
- (ideographic-structure
- ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
- (=ucs . #x2FF8) ; ⿸
+ (->subsumptive
+ ((ideographic-strokes . 11)
+ (total-strokes . 13)
+ (ideographic-structure
+ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
+ (=ucs . #x2FF8) ; ⿸
+ )
+ ((=ucs . #x5382) ; 厂
+ )
+ ((=daikanwa . 13725) ; &M-13725;
+ ))
+ (=gt . 03811) ; >-03811;
+ (=gt-pj-11 . #x3B44) ; >-03811; [27-36]
)
- ((=ucs . #x5382) ; 厂
+ ((ideographic-strokes . 11)
+ (total-strokes . 13)
+ (=shinjigen . 2208) ; &SJG2-2208;
+ (<-vulgar
+ ((=gt . 11902) ; >-11902;
+ (=shinjigen . 2207) ; >-11902;
+ ))
+ (<-vulgar*sources
+ shinjigen)
)
- ((=daikanwa . 13725) ; &M-13725;
- ))
- (=gt . 03811) ; >-03811;
- (=gt-pj-11 . #x3B44) ; >-03811; [27-36]
- (=shinjigen . 2208) ; >-03811;
- (<-vulgar
- ((=gt . 11902) ; >-11902;
- (=shinjigen@1ed . 2207) ; >-11902;
+ ((ideographic-strokes . 12)
+ (total-strokes . 14)
+ (=jis-x0213-1@2004 . #x3139) ; &JX3-3139; [17-25]
+ (=ucs@jis/2004 . #x53A9) ; &JX3-3139;
))
- (<-vulgar*sources
- shinjigen@1ed)
))
(define-char
'((<-denotational
((ideographic-strokes . 10)
(total-strokes . 12)
(=jis-x0208@1990 . #x3139) ; >-03790; [17-25]
- (=jis-x0213-1 . #x3139) ; &I-JX1-3139; [17-25]
+ (=jis-x0213-1@2000 . #x3139) ; &I-JX1-3139; [17-25]
(=gt . 03790) ; &I-GT-03790;
(=gt-pj-1 . #x3139) ; &I-GT-03790; [17-25]
(=jef-china3 . #x45E4) ; &I-JC3-45E4;
- (=ucs@jis . #x53A9) ; >-03790;
+ (=ucs@jis/1990 . #x53A9) ; >-03790;
+ (=ucs@jis/2000 . #x53A9) ; >-03790;
)
((ideographic-strokes . 10)
(total-strokes . 12)
)
((=ucs . #x53E3) ; 口
)
- ((=cns11643-1 . #x455B) ; &M-19909; [37-59]
- (=daikanwa . 19909) ; &I-M-19909;
+ ((=cns11643-1 . #x455B) ; &C1-455B; [37-59]
))
(=cns11643-1 . #x4954) ; &C1-4954; [41-52]
))
((=ucs . #x53E3) ; 口
)
((=jis-x0208 . #x3267) ; >-25560; [18-71]
- (=ks-x1001 . #x6433) ; &I-K0-6433; [68-19]
- (=jis-x0213-1 . #x3267) ; &I-JX1-3267; [18-71]
+ (=jis-x0213-1@2000 . #x3267) ; &I-JX1-3267; [18-71]
))
(mojikyo . 055154) ; &MCS-6000D772;
))
((=ks-x1001 . #x706E) ; >-09378; [80-78]
))
(=jis-x0208@1978 . #x313D) ; >-05417; [17-29]
+ (=jis-x0213-1@2004 . #x313D) ; &I-JX3-313D; [17-29]
(=gt . 05417) ; &I-GT-05417;
(=gt-pj-2 . #x5751) ; &I-GT-05417; [55-49]
+ (=ucs@jis/2004 . #x5642) ; >-05417;
))
))
(define-char
))
(=jis-x0208@1983 . #x313D) ; >-05418; [17-29]
(=jis-x0208@1990 . #x313D) ; &I-J90-313D; [17-29]
- (=jis-x0213-1 . #x313D) ; &I-JX1-313D; [17-29]
+ (=jis-x0213-1@2000 . #x313D) ; &I-JX1-313D; [17-29]
(=gt . 05418) ; &I-GT-05418;
(=gt-pj-1 . #x313D) ; &I-GT-05418; [17-29]
- (=ucs@jis . #x5642) ; >-05418;
+ (=ucs@jis/1990 . #x5642) ; >-05418;
+ (=ucs@jis/2000 . #x5642) ; >-05418;
)
((ideographic-structure
((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
(ideographic-strokes . 11)
(total-strokes . 14)
(=ucs . #x3892) ; 㢒
- (=cns11643-4 . #x4336) ; &I-C4-4336; [35-22]
- (=daikanwa . 09452) ; &I-M-09452;
- (=cbeta . 03027) ; &I-CB03027;
+ (->subsumptive
+ ((=daikanwa . 09452) ; &M-09452;
+ (=cbeta . 03027) ; &I-CB03027;
+ )
+ ((=ucs@unicode . #x3892) ; &UU+3892;
+ )
+ ((=cns11643-4 . #x4336) ; &C4-4336; [35-22]
+ ))
))
(define-char
- '((=>ucs . #x5ECF) ; 廏
- (ideographic-radical . 53) ; ⼴
+ '((ideographic-radical . 53) ; ⼴
(ideographic-strokes . 11)
(total-strokes . 14)
- (=jis-x0208 . #x567E) ; >-11899; [54-94]
- (=jis-x0213-1 . #x567E) ; &I-JX1-567E; [54-94]
- (=gt . 11899) ; &I-GT-11899;
- (=gt-pj-1 . #x567E) ; &I-GT-11899; [54-94]
- (=daikanwa . 09453) ; &I-M-09453;
- (=ucs@jis . #x5ECF) ; >-11899;
+ (=ucs . #x5ECF) ; 廏
))
(define-char
- '((morohashi-daikanwa 9453 0 0)
+ '((<-denotational
+ ((=ucs . #x5ECF) ; 廏
+ ))
(ideographic-radical . 53) ; ⼴
(ideographic-strokes . 11)
(total-strokes . 14)
- (=ucs . #x5ECF) ; 廏
- (=cns11643-3 . #x4661) ; &I-C3-4661; [38-65]
+ (->subsumptive
+ ((=jis-x0208 . #x567E) ; >-11899; [54-94]
+ (=jis-x0213-1 . #x567E) ; &I-JX1-567E; [54-94]
+ (=gt . 11899) ; &I-GT-11899;
+ (=gt-pj-1 . #x567E) ; &I-GT-11899; [54-94]
+ (=daikanwa . 09453) ; &I-M-09453;
+ (=ucs@jis . #x5ECF) ; >-11899;
+ )
+ ((=ucs@unicode . #x5ECF) ; &UU+5ECF;
+ )
+ ((=cns11643-3 . #x4661) ; &C3-4661; [38-65]
+ ))
))
(define-char
- '((=>ucs . #x5ECF) ; 廏
- (morohashi-daikanwa 9453 0 2)
+ '((<-denotational
+ ((=ucs . #x5ECF) ; 廏
+ ))
(ideographic-radical . 53) ; ⼴
(ideographic-strokes . 11)
(total-strokes . 14)
(=gt . 11902) ; >-11902;
(=gt-pj-11 . #x3B54) ; >-11902; [27-52]
- (=shinjigen@1ed . 2207) ; >-11902;
+ (=shinjigen . 2207) ; >-11902;
(mojikyo . 050989) ; &MCS-6000C72D;
))
(define-char
(total-strokes . 14)
(=gt . 11901) ; >-11901;
(=gt-pj-9 . #x4C55) ; >-11901; [44-53]
- (=shinjigen@1ed . 2209) ; >-11901;
+ )
+ ((ideographic-strokes . 11)
+ (total-strokes . 14)
+ (=shinjigen . 2209) ; &SJG2-2209;
(<-vulgar
((=gt . 11902) ; >-11902;
- (=shinjigen@1ed . 2207) ; >-11902;
+ (=shinjigen . 2207) ; >-11902;
))
(<-vulgar*sources
- shinjigen@1ed)
+ shinjigen)
)
- ((ideographic-strokes . 10)
- (total-strokes . 13)
+ ((ideographic-strokes . 12)
+ (total-strokes . 15)
(=cbeta . 00636) ; &CB00636;
))
))
(->subsumptive
((=jis-x0208 . #x3276) ; >-12063; [18-86]
(=ks-x1001 . #x7C5F) ; &I-K0-7C5F; [92-63]
- (=jis-x0213-1 . #x3276) ; &I-JX1-3276; [18-86]
+ (=jis-x0213-1@2000 . #x3276) ; &I-JX1-3276; [18-86]
(=gt . 12063) ; &I-GT-12063;
(=gt-pj-1 . #x3276) ; &I-GT-12063; [18-86]
(=daikanwa . 09575) ; &I-M-09575;
(=shinjigen@rev . 2239) ; >-12063;
(=cbeta . 00327) ; &I-CB00327;
- (=ucs@jis . #x5EFB) ; >-12063;
+ (=ucs@jis/1990 . #x5EFB) ; >-12063;
+ (=ucs@jis/2000 . #x5EFB) ; >-12063;
)
- ((=cns11643-3 . #x2C4C) ; &C3-2C4C; [12-44]
- (=ucs@unicode . #x5EFB) ; &C3-2C4C;
+ ((=cns11643-3 . #x2C4C) ; &JX3-3276; [12-44]
+ (=jis-x0213-1@2004 . #x3276) ; &I-JX3-3276; [18-86]
+ (=ucs@unicode . #x5EFB) ; &JX3-3276;
))
))
(define-char
(=hanziku-3 . #xABBD) ; &I-HZK03-ABBD;
))
(define-char
- '((=>ucs . #x5F63) ; 彣
- (ideographic-radical . 59) ; ⼺
- (ideographic-strokes . 4)
- (total-strokes . 7)
- (=jis-x0212 . #x3C7C) ; &M-09971; [28-92]
- (=jis-x0213-2 . #x2C33) ; &I-JX2-2C33; [12-19]
- (=daikanwa . 09971) ; &I-M-09971;
- (=ucs@jis . #x5F63) ; &M-09971;
- ))
-(define-char
- '((morohashi-daikanwa 9971 0 0)
- (ideographic-radical . 59) ; ⼺
+ '((ideographic-radical . 59) ; ⼺
(ideographic-strokes . 4)
(total-strokes . 7)
(=ucs . #x5F63) ; 彣
- (=cns11643-3 . #x2572) ; &I-C3-2572; [05-82]
- (=jef-china3 . #x4DA4) ; &I-JC3-4DA4;
- ))
-(define-char
- '((=>ucs . #x5F64) ; 彤
- (ideographic-radical . 59) ; ⼺
- (ideographic-strokes . 4)
- (total-strokes . 7)
- (=jis-x0212 . #x3C7D) ; &M-09972; [28-93]
- (=cns11643-1 . #x4A2F) ; &I-C1-4A2F; [42-15]
- (=jis-x0213-1 . #x743D) ; &I-JX1-743D; [84-29]
- (=big5 . #xA7CD) ; &I-B-A7CD;
- (=daikanwa . 09972) ; &I-M-09972;
- (=jef-china3 . #x4DA5) ; &I-JC3-4DA5;
- (=ucs@jis . #x5F64) ; &M-09972;
- (=ucs@big5 . #x5F64) ; &M-09972;
+ (->subsumptive
+ ((=jis-x0212 . #x3C7C) ; &CDP-894E; [28-92]
+ (=jis-x0213-2 . #x2C33) ; &I-JX2-2C33; [12-19]
+ (=big5-cdp . #x894E) ; &I-CDP-894E;
+ (=daikanwa . 09971) ; &I-M-09971;
+ (=ucs@jis . #x5F63) ; &CDP-894E;
+ )
+ ((=jef-china3 . #x4DA4) ; &JC3-4DA4;
+ )
+ ((=cns11643-3 . #x2572) ; &C3-2572; [05-82]
+ (=ucs@unicode . #x5F63) ; &C3-2572;
+ ))
))
(define-char
- '((morohashi-daikanwa 9972 0 0)
- (ideographic-radical . 59) ; ⼺
+ '((ideographic-radical . 59) ; ⼺
(ideographic-strokes . 4)
(total-strokes . 7)
(=ucs . #x5F64) ; 彤
- (=gb2312 . #x4D2E) ; &I-G0-4D2E; [45-14]
+ (=big5 . #xA7CD) ; &I-B-A7CD;
+ (->subsumptive
+ ((=jis-x0212 . #x3C7D) ; &M-09972; [28-93]
+ (=cns11643-1 . #x4A2F) ; &I-C1-4A2F; [42-15]
+ (=jis-x0213-1 . #x743D) ; &I-JX1-743D; [84-29]
+ (=daikanwa . 09972) ; &I-M-09972;
+ (=jef-china3 . #x4DA5) ; &I-JC3-4DA5;
+ (=ucs@jis . #x5F64) ; &M-09972;
+ )
+ ((=gb2312 . #x4D2E) ; &G0-4D2E; [45-14]
+ (=ucs@unicode . #x5F64) ; &G0-4D2E;
+ ))
))
(define-char
'((ideographic-radical . 59) ; ⼺
(ideographic-strokes . 6)
(total-strokes . 9)
(=ucs . #x6062) ; 恢
+ (=jis-x0208@1997 . #x327A) ; 恢 [18-90]
+ ))
+(define-char
+ '((<-denotational
+ ((=ucs . #x6062) ; 恢
+ ))
+ (ideographic-radical . 61) ; ⼼
+ (ideographic-strokes . 6)
+ (total-strokes . 9)
+ (=big5 . #xABEC) ; &B-ABEC;
(->subsumptive
- ((=gb2312 . #x3B56) ; &M-10577; [27-54]
- (=big5 . #xABEC) ; &I-B-ABEC;
+ ((=jis-x0208@1978 . #x327A) ; &M-10577; [18-90]
(=daikanwa . 10577) ; &I-M-10577;
- (=ucs@unicode . #x6062) ; &M-10577;
)
- ((=ks-x1001 . #x7C61) ; &K0-7C61; [92-65]
+ ((=gb2312 . #x3B56) ; &G0-3B56; [27-54]
+ (=ucs@unicode . #x6062) ; &G0-3B56;
)
- ((=cns11643-1 . #x5130) ; &C1-5130; [49-16]
+ ((=ks-x1001 . #x7C61) ; &JX3-327A; [92-65]
+ (=jis-x0213-1@2004 . #x327A) ; &I-JX3-327A; [18-90]
+ (=ucs@jis/2004 . #x6062) ; &JX3-327A;
)
- ((=jis-x0208@1983 . #x327A) ; >-13227; [18-90]
- (=jis-x0208@1990 . #x327A) ; &I-J90-327A; [18-90]
- (=jis-x0213-1 . #x327A) ; &I-JX1-327A; [18-90]
- (=gt . 13227) ; &I-GT-13227;
- (=gt-pj-1 . #x327A) ; &I-GT-13227; [18-90]
- (=jef-china3 . #x4EEA) ; &I-JC3-4EEA;
- (=ucs@jis . #x6062) ; >-13227;
+ ((=cns11643-1 . #x5130) ; &C1-5130; [49-16]
+ ))
+ ))
+(define-char
+ '((<-denotational
+ ((=ucs . #x6062) ; 恢
))
+ (ideographic-radical . 61) ; ⼼
+ (ideographic-strokes . 6)
+ (total-strokes . 9)
+ (=jis-x0208@1983 . #x327A) ; >-13227; [18-90]
+ (=jis-x0208@1990 . #x327A) ; &I-J90-327A; [18-90]
+ (=jis-x0213-1@2000 . #x327A) ; &I-JX1-327A; [18-90]
+ (=gt . 13227) ; &I-GT-13227;
+ (=gt-pj-1 . #x327A) ; &I-GT-13227; [18-90]
+ (=jef-china3 . #x4EEA) ; &I-JC3-4EEA;
+ (=ucs@jis/1990 . #x6062) ; >-13227;
+ (=ucs@jis/2000 . #x6062) ; >-13227;
))
(define-char
'((ideographic-radical . 61) ; ⼼
(=gb2312 . #x3B5E) ; &I-G0-3B5E; [27-62]
(=ks-x1001 . #x7C64) ; &I-K0-7C64; [92-68]
(=cns11643-1 . #x5B28) ; &I-C1-5B28; [59-08]
+ (=jis-x0213-1@2004 . #x3322) ; &I-JX3-3322; [19-02]
(=big5 . #xB1E2) ; &I-B-B1E2;
(=daikanwa . 13960) ; &I-M-13960;
(=shinjigen@1ed . 3327) ; &M-13960;
(total-strokes . 10)
(=jis-x0208@1983 . #x3322) ; >-17551; [19-02]
(=jis-x0208@1990 . #x3322) ; &I-J90-3322; [19-02]
- (=jis-x0213-1 . #x3322) ; &I-JX1-3322; [19-02]
+ (=jis-x0213-1@2000 . #x3322) ; &I-JX1-3322; [19-02]
(=gt . 17551) ; &I-GT-17551;
(=gt-pj-1 . #x3322) ; &I-GT-17551; [19-02]
(=jef-china3 . #x51FD) ; &I-JC3-51FD;
- (=ucs@jis . #x6666) ; >-17551;
+ (=ucs@jis/1990 . #x6666) ; >-17551;
+ (=ucs@jis/2000 . #x6666) ; >-17551;
(mojikyo . 054042) ; &MCS-6000D31A;
(<-simplified@JP/jis
((=jis-x0208@1978 . #x3322) ; &M-13960; [19-02]
(=gb2312 . #x3B5E) ; &I-G0-3B5E; [27-62]
(=ks-x1001 . #x7C64) ; &I-K0-7C64; [92-68]
(=cns11643-1 . #x5B28) ; &I-C1-5B28; [59-08]
+ (=jis-x0213-1@2004 . #x3322) ; &I-JX3-3322; [19-02]
(=daikanwa . 13960) ; &I-M-13960;
))
))
(total-strokes . 11)
(=ucs . #x6DEB) ; 淫
(=big5 . #xB25D) ; &I-B-B25D;
+ (=jis-x0208@1997 . #x307C) ; 淫 [16-92]
))
(define-char
'((<-denotational
(total-strokes . 11)
(=jis-x0208@1978 . #x307C) ; >-22462; [16-92]
(=ks-x1001 . #x6B62) ; &I-K0-6B62; [75-66]
+ (=jis-x0213-1@2004 . #x307C) ; &I-JX3-307C; [16-92]
(=gt . 22462) ; &I-GT-22462;
(=gt-k . 07719) ; &I-GT-K07719;
(=gt-pj-4 . #x4E4D) ; &I-GT-22462; [46-45]
(=daikanwa . 17678) ; &I-M-17678;
+ (=ucs@jis/2004 . #x6DEB) ; >-22462;
))
(define-char
'((<-denotational
(=jis-x0208@1983 . #x307C) ; &I-J83-307C; [16-92]
(=jis-x0208@1990 . #x307C) ; &I-J90-307C; [16-92]
(=cns11643-1 . #x5B62) ; &I-C1-5B62; [59-66]
- (=jis-x0213-1 . #x307C) ; &I-JX1-307C; [16-92]
+ (=jis-x0213-1@2000 . #x307C) ; &I-JX1-307C; [16-92]
(=gt . 22466) ; &I-GT-22466;
(=gt-k . 07720) ; &I-GT-K07720;
(=gt-pj-1 . #x307C) ; &I-GT-22466; [16-92]
(<-simplified@JP
((=jis-x0208@1978 . #x307C) ; >-22462; [16-92]
(=ks-x1001 . #x6B62) ; &I-K0-6B62; [75-66]
+ (=jis-x0213-1@2004 . #x307C) ; &I-JX3-307C; [16-92]
(=daikanwa . 17678) ; &I-M-17678;
))
))
'((ideographic-radical . 92) ; ⽛
(ideographic-strokes . 0)
(=ucs . #x7259) ; 牙
+ (=big5 . #xA4FA) ; &I-B-A4FA;
+ (=jis-x0208@1997 . #x3267) ; 牙 [18-71]
))
(define-char
'((<-denotational
(ideographic-strokes . 0)
(total-strokes . 4)
(->subsumptive
- ((=cns11643-1 . #x455B) ; &M-19909; [37-59]
- (=daikanwa . 19909) ; &I-M-19909;
+ ((=daikanwa . 19909) ; &M-19909;
+ )
+ ((=cns11643-1 . #x455B) ; &C1-455B; [37-59]
+ )
+ ((=jis-x0213-1@2004 . #x3267) ; &JX3-3267; [18-71]
+ (=ucs@jis/2004 . #x7259) ; &JX3-3267;
)
((=gb2312 . #x5140) ; &G0-5140; [49-32]
- (=big5 . #xA4FA) ; &I-B-A4FA;
(=ucs@unicode . #x7259) ; &G0-5140;
))
))
(ideographic-radical . 92) ; ⽛
(ideographic-strokes . 0)
(total-strokes . 5)
- (=jis-x0208 . #x3267) ; >-25560; [18-71]
- (=ks-x1001 . #x6433) ; &I-K0-6433; [68-19]
- (=jis-x0213-1 . #x3267) ; &I-JX1-3267; [18-71]
- (=gt . 25560) ; &I-GT-25560;
- (=gt-k . 00900) ; &I-GT-K00900;
- (=gt-pj-1 . #x3267) ; &I-GT-25560; [18-71]
- (=jef-china3 . #x58C5) ; &I-JC3-58C5;
- (=ucs@jis . #x7259) ; >-25560;
+ (->subsumptive
+ ((=jis-x0208 . #x3267) ; >-25560; [18-71]
+ (=jis-x0213-1@2000 . #x3267) ; &I-JX1-3267; [18-71]
+ (=gt . 25560) ; &I-GT-25560;
+ (=gt-k . 00900) ; &I-GT-K00900;
+ (=gt-pj-1 . #x3267) ; &I-GT-25560; [18-71]
+ (=ucs@jis/1990 . #x7259) ; >-25560;
+ (=ucs@jis/2000 . #x7259) ; >-25560;
+ )
+ ((=ks-x1001 . #x6433) ; &K0-6433; [68-19]
+ (=jef-china3 . #x58C5) ; &I-JC3-58C5;
+ ))
))
(define-char
'((=>ucs . #x3E26) ; 㸦
(ideographic-strokes . 13)
(total-strokes . 19)
(=ucs . #x87F9) ; 蟹
+ (=big5 . #xC3C9) ; &I-B-C3C9;
))
(define-char
'((<-denotational
(ideographic-radical . 142) ; ⾍
(ideographic-strokes . 13)
(total-strokes . 19)
- (=jis-x0208 . #x332A) ; >-45432; [19-10]
- (=ks-x1001 . #x7A2F) ; &I-K0-7A2F; [90-15]
- (=iso-ir165 . #x5037) ; &I-EGB-5037; [48-23]
- (=cns11643-1 . #x7874) ; &I-C1-7874; [88-84]
- (=jis-x0213-1 . #x332A) ; &I-JX1-332A; [19-10]
- (=big5 . #xC3C9) ; &I-B-C3C9;
- (=gt . 45432) ; &I-GT-45432;
- (=gt-pj-1 . #x332A) ; &I-GT-45432; [19-10]
- (=daikanwa . 33668) ; &I-M-33668;
- (=shinjigen . 7274) ; >-45432;
- (=ucs@jis . #x87F9) ; >-45432;
+ (->subsumptive
+ ((=ks-x1001 . #x7A2F) ; >-45432; [90-15]
+ (=cns11643-1 . #x7874) ; &I-C1-7874; [88-84]
+ (=jis-x0213-1@2004 . #x332A) ; &I-JX3-332A; [19-10]
+ (=gt . 45432) ; &I-GT-45432;
+ (=gt-pj-1 . #x332A) ; &I-GT-45432; [19-10]
+ (=daikanwa . 33668) ; &I-M-33668;
+ (=ucs@jis/2004 . #x87F9) ; >-45432;
+ )
+ ((=jis-x0208 . #x332A) ; &J90-332A; [19-10]
+ (=jis-x0213-1@2000 . #x332A) ; &I-JX1-332A; [19-10]
+ (=shinjigen . 7274) ; &J90-332A;
+ (=ucs@jis/1990 . #x87F9) ; &J90-332A;
+ (=ucs@jis/2000 . #x87F9) ; &J90-332A;
+ ))
))
(define-char
'((<-denotational
(ideographic-radical . 142) ; ⾍
(ideographic-strokes . 13)
(total-strokes . 19)
- (=gb2312 . #x5037) ; &I-EGB-5037; [48-23]
- (=ucs@unicode . #x87F9) ; &I-EGB-5037;
+ (=gb2312 . #x5037) ; &G0-5037; [48-23]
+ (=ucs@unicode . #x87F9) ; &G0-5037;
+ ))
+(define-char
+ '((ideographic-radical . 142) ; ⾍
+ (ideographic-strokes . 13)
+ (total-strokes . 19)
+ (=ucs . #x880F) ; 蠏
))
(define-char
- '((=>ucs . #x880F) ; 蠏
+ '((<-denotational
+ ((=ucs . #x880F) ; 蠏
+ ))
(ideographic-radical . 142) ; ⾍
(ideographic-strokes . 13)
(total-strokes . 19)
(=ucs@jis . #x880F) ; >-45433;
))
(define-char
- '((morohashi-daikanwa 33669 0 1)
+ '((<-denotational
+ ((=ucs . #x880F) ; 蠏
+ ))
(ideographic-radical . 142) ; ⾍
(ideographic-strokes . 13)
(total-strokes . 19)
- (=ucs . #x880F) ; 蠏
+ (=ucs@unicode . #x880F) ; &UU+880F;
))
(define-char
'((ideographic-radical . 142) ; ⾍
(total-strokes . 19)
(->subsumptive
((=jis-x0208@1978 . #x3228) ; &M-34629; [18-08]
+ (=jis-x0213-1@2004 . #x3228) ; &I-JX3-3228; [18-08]
(=daikanwa . 34629) ; &I-M-34629;
+ (=ucs@jis/2004 . #x8956) ; &M-34629;
)
((=cns11643-1 . #x7878) ; &C1-7878; [88-88]
))
(->subsumptive
((=jis-x0208@1983 . #x3228) ; >-46563; [18-08]
(=jis-x0208@1990 . #x3228) ; &I-J90-3228; [18-08]
- (=jis-x0213-1 . #x3228) ; &I-JX1-3228; [18-08]
+ (=jis-x0213-1@2000 . #x3228) ; &I-JX1-3228; [18-08]
(=gt . 46563) ; &I-GT-46563;
(=gt-pj-1 . #x3228) ; &I-GT-46563; [18-08]
- (=ucs@jis . #x8956) ; >-46563;
+ (=ucs@jis/1990 . #x8956) ; >-46563;
+ (=ucs@jis/2000 . #x8956) ; >-46563;
(<-simplified@JP/jis
((=jis-x0208@1978 . #x3228) ; &M-34629; [18-08]
+ (=jis-x0213-1@2004 . #x3228) ; &I-JX3-3228; [18-08]
(=daikanwa . 34629) ; &I-M-34629;
))
)
(ideographic-strokes . 3)
(=ucs . #x8FC2) ; 迂
(=big5 . #xA8B1) ; &I-B-A8B1;
+ (=jis-x0208@1997 . #x312A) ; 迂 [17-10]
))
(define-char
'((<-denotational
(total-strokes . 7)
(=jis-x0208@1978 . #x312A) ; &M-38722; [17-10]
(=ks-x1001 . #x6966) ; &I-K0-6966; [73-70]
+ (=jis-x0213-1@2004 . #x312A) ; &I-JX3-312A; [17-10]
(=daikanwa . 38722) ; &I-M-38722;
+ (=ucs@jis/2004 . #x8FC2) ; &M-38722;
(<-original
((=daikanwa . 38723) ; &M-38723;
))
(=gb2312 . #x5358) ; >-51658; [51-56]
(=jis-x0208@1983 . #x312A) ; &I-J83-312A; [17-10]
(=jis-x0208@1990 . #x312A) ; &I-J90-312A; [17-10]
- (=jis-x0213-1 . #x312A) ; &I-JX1-312A; [17-10]
+ (=jis-x0213-1@2000 . #x312A) ; &I-JX1-312A; [17-10]
(=gt . 51658) ; &I-GT-51658;
(=gt-pj-1 . #x312A) ; &I-GT-51658; [17-10]
(=jef-china3 . #x70EE) ; &I-JC3-70EE;
(<-original
((=jis-x0208@1978 . #x312A) ; &M-38722; [17-10]
(=ks-x1001 . #x6966) ; &I-K0-6966; [73-70]
+ (=jis-x0213-1@2004 . #x312A) ; &I-JX3-312A; [17-10]
(=daikanwa . 38722) ; &I-M-38722;
))
(<-original*sources
(ideographic-strokes . 5)
(=ucs . #x8FE6) ; 迦
(=big5 . #xAD7B) ; &I-B-AD7B;
+ (=jis-x0208@1997 . #x3260) ; 迦 [18-64]
))
(define-char
'((<-denotational
(total-strokes . 9)
(=jis-x0208@1978 . #x3260) ; &M-38789; [18-64]
(=ks-x1001 . #x4A3C) ; &I-K0-4A3C; [42-28]
+ (=jis-x0213-1@2004 . #x3260) ; &I-JX3-3260; [18-64]
(=daikanwa . 38789) ; &I-M-38789;
+ (=ucs@jis/2004 . #x8FE6) ; &M-38789;
(<-formed
((=daikanwa . 38987) ; &M-38987;
)
(=gb2312 . #x6548) ; >-51758; [69-40]
(=jis-x0208@1983 . #x3260) ; &I-J83-3260; [18-64]
(=jis-x0208@1990 . #x3260) ; &I-J90-3260; [18-64]
- (=jis-x0213-1 . #x3260) ; &I-JX1-3260; [18-64]
+ (=jis-x0213-1@2000 . #x3260) ; &I-JX1-3260; [18-64]
(=gt . 51758) ; &I-GT-51758;
(=gt-k . 03654) ; &I-GT-K03654;
(=gt-pj-1 . #x3260) ; &I-GT-51758; [18-64]
(total-strokes . 10)
(=daikanwa . 38850) ; &M-38850;
(<-same
- ((=gb2312 . #x3B56) ; &M-10577; [27-54]
+ ((=jis-x0208@1978 . #x327A) ; &M-10577; [18-90]
(=daikanwa . 10577) ; &I-M-10577;
))
(<-same*sources
(->formed
((=jis-x0208@1978 . #x3260) ; &M-38789; [18-64]
(=ks-x1001 . #x4A3C) ; &I-K0-4A3C; [42-28]
+ (=jis-x0213-1@2004 . #x3260) ; &I-JX3-3260; [18-64]
(=daikanwa . 38789) ; &I-M-38789;
))
(->formed*sources
(->formed
((=jis-x0208@1978 . #x3260) ; &M-38789; [18-64]
(=ks-x1001 . #x4A3C) ; &I-K0-4A3C; [42-28]
+ (=jis-x0213-1@2004 . #x3260) ; &I-JX3-3260; [18-64]
(=daikanwa . 38789) ; &I-M-38789;
))
(->formed*sources
'((ideographic-radical . 184) ; ⾷
(ideographic-strokes . 6)
(=ucs . #x990C) ; 餌
+ (=jis-x0208@1997 . #x3142) ; 餌 [17-34]
))
(define-char
'((<-denotational
(->subsumptive
((=daikanwa . 44146) ; &M-44146;
)
+ ((=jis-x0213-1@2004 . #x3142) ; &JX3-3142; [17-34]
+ (=ucs@jis/2004 . #x990C) ; &JX3-3142;
+ )
((=jis-x0208@1978 . #x3142) ; &J78-3142; [17-34]
(=ks-x1001 . #x6C48) ; &I-K0-6C48; [76-40]
))
(=gt-pj-1 . #x3142) ; >-59204; [17-34]
)
((=jis-x0208@1990 . #x3142) ; &J90-3142; [17-34]
- (=jis-x0213-1 . #x3142) ; &I-JX1-3142; [17-34]
- (=ucs@jis . #x990C) ; &J90-3142;
+ (=jis-x0213-1@2000 . #x3142) ; &I-JX1-3142; [17-34]
+ (=ucs@jis/1990 . #x990C) ; &J90-3142;
+ (=ucs@jis/2000 . #x990C) ; &J90-3142;
(<-simplified@JP/jis
((=jis-x0208@1978 . #x3142) ; &J78-3142; [17-34]
(=ks-x1001 . #x6C48) ; &I-K0-6C48; [76-40]
(ideographic-strokes . 12)
(total-strokes . 22)
(=ucs . #x9B1C) ; 鬜
- (=jis-x0212 . #x6A2E) ; &I-JSP-6A2E; [74-14]
- (=jis-x0213-2 . #x7D3B) ; &I-JX2-7D3B; [93-27]
- (=daikanwa . 45587) ; &I-M-45587;
- ))
-(define-char
- '((=>ucs . #x9B1C) ; 鬜
- (morohashi-daikanwa 45587 0 0)
- (ideographic-radical . 190) ; ⾽
- (ideographic-strokes . 12)
- (total-strokes . 22)
- (=cns11643-4 . #x6971) ; &C4-6971; [73-81]
+ (->subsumptive
+ ((=daikanwa . 45587) ; &M-45587;
+ )
+ ((=jis-x0212 . #x6A2E) ; &JX2-7D3B; [74-14]
+ (=jis-x0213-2 . #x7D3B) ; &I-JX2-7D3B; [93-27]
+ (=ucs@unicode . #x9B1C) ; &JX2-7D3B;
+ (=ucs@jis/2000 . #x9B1C) ; &JX2-7D3B;
+ )
+ ((=cns11643-4 . #x6971) ; &C4-6971; [73-81]
+ ))
))
(define-char
- '((morohashi-daikanwa 45587 0 5)
+ '((=>daikanwa . 45587) ; &M-45587;
(ideographic-radical . 190) ; ⾽
(ideographic-strokes . 12)
(total-strokes . 22)
(ideographic-strokes . 10)
(total-strokes . 21)
(=ucs . #x9C2F) ; 鰯
+ (=jis-x0208@1997 . #x3073) ; 鰯 [16-83]
))
(define-char
'((<-denotational
(ideographic-strokes . 10)
(total-strokes . 21)
(=jis-x0208@1978 . #x3073) ; >-62856; [16-83]
+ (=jis-x0213-1@2004 . #x3073) ; &I-JX3-3073; [16-83]
(=gt . 62856) ; &I-GT-62856;
(=gt-pj-8 . #x5E5B) ; &I-GT-62856; [62-59]
(=daikanwa . 46413) ; &I-M-46413;
+ (=ucs@jis/2004 . #x9C2F) ; >-62856;
))
(define-char
'((<-denotational
(total-strokes . 21)
(=jis-x0208@1983 . #x3073) ; >-62857; [16-83]
(=jis-x0208@1990 . #x3073) ; &I-J90-3073; [16-83]
- (=jis-x0213-1 . #x3073) ; &I-JX1-3073; [16-83]
+ (=jis-x0213-1@2000 . #x3073) ; &I-JX1-3073; [16-83]
(=gt . 62857) ; &I-GT-62857;
(=gt-pj-1 . #x3073) ; &I-GT-62857; [16-83]
(=jef-china3 . #x6EC7) ; &I-JC3-6EC7;
;; #x353D #x4324 #x475B #x6E47 #x4371
;; #x3F5D #x6E49 #x4D6F #x3C72 #x3D37
;; #x6E4C #x3B44 #x734E #x5567 #x545A
-;; #x3071))
+;; #x3071 #x332A))
;; (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
;; '=gt-pj-1 v))
;; nil)
;;; read-maps.el --- Read mapping-tables.
-;; Copyright (C) 2002,2003,2004,2005,2006 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003,2004,2005,2006,2008 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
;; Keywords: mapping table, character, CCS, multiscript, multilingual
(defvar mapping-table-ccs-setting-alist
'((=jis-x0208@1990
"^J90-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
- =ucs@jis
+ =ucs@jis/1990
"\tJU[+-]\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]+\\)")
(=jis-x0212
"^JSP-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\)" 1 16
+2008-10-08 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+ * concord.c (concord_id_validate): New function.
+ (structure_type_create_concord): Use `concord_id_validate' instead
+ of `concord_name_validate' to accept integer and character as =id.
+
2008-09-27 MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
* concord.c (func_for_each_object): Fix bug about GC-protection.
}
static int
+concord_id_validate (Lisp_Object keyword, Lisp_Object value,
+ Error_behavior errb)
+{
+ if (ERRB_EQ (errb, ERROR_ME))
+ {
+ /* CHECK_SYMBOL (value); */
+ if ( INTP (value) || CHARP (value) || SYMBOLP (value) )
+ ;
+ else
+ dead_wrong_type_argument (Qsymbolp, value);
+ return 1;
+ }
+
+ return INTP (value) || CHARP (value) || SYMBOLP (value);
+}
+
+static int
concord_object_validate (Lisp_Object data, Error_behavior errb)
{
struct gcpro gcpro1, gcpro2, gcpro3;
concord_object_instantiate);
define_structure_type_keyword (st, Qgenre, concord_name_validate);
- define_structure_type_keyword (st, Q_id, concord_name_validate);
+ define_structure_type_keyword (st, Q_id, concord_id_validate);
}
void
projects / chise / xemacs-chise.git- / commitdiff