From: tomo Date: Wed, 20 May 2009 08:32:23 +0000 (+0000) Subject: Sync up with r21-4-21-chise-0_24-12. X-Git-Tag: r21-4-21-u2km-0_24-12 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5f57cb8a888d69aa807ff80ce93252c44752cc5b;p=chise%2Fxemacs-chise.git.1 Sync up with r21-4-21-chise-0_24-12. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 21519a0..26222f0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,27 @@ +2009-04-07 MORIOKA Tomohiko + + * mule/mule-conf.el (=jis-x0208@1978): Specify `=>iso-ir' in + XEmacs CHISE. + (=jis-x0208@1978/-4pr): Likewise. + (=jis-x0208@1978/4-pr): Likewise. + (=jis-x0213-1): Likewise. + (=ucs@iso): Likewise. + (=ucs@unicode): Likewise. + (=ucs@gb): Likewise. + (=ucs@gb/fw): Likewise. + (=ucs@cns): Likewise. + (=ucs@cns/fw): Likewise. + (=ucs@jis): Likewise. + (=ucs@jis/fw): Likewise. + (=ucs@jis/1990): Likewise. + (=ucs@jis/2000): Likewise. + (=ucs@jis/2004): Likewise. + (=ucs@JP): Likewise. + (=ucs@ks): Likewise. + (=ucs@big5): Likewise. + (=ucs@big5/cns11643): Likewise. + (=ucs@cns11643): Likewise. + 2008-10-17 MORIOKA Tomohiko * mule/mule-charset.el (default-coded-charset-priority-list): diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 870914b..0d8b37d 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -2,7 +2,8 @@ ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. -;; Copyright (C) 1997,1999,2000,2002,2003,2004,2005,2006,2008 MORIOKA Tomohiko +;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008, +;; 2009 MORIOKA Tomohiko ;; Keywords: mule, multilingual, character set, coding system @@ -34,6 +35,7 @@ dimension 2 chars 94 mother =jis-x0208 + =>iso-ir 42 final ?@ graphic 0 partial t)) @@ -44,6 +46,7 @@ dimension 2 chars 94 mother =jis-x0208@1978 + =>iso-ir 42 final ?@ graphic 0 partial t)) @@ -64,7 +67,8 @@ dimension 2 chars 94 mother =jis-x0208@1978 - ;; final ?@ + =>iso-ir 42 + ;; final ?@ graphic 0 partial t)) (define-charset-alias '=jis-x0208@1978/i1 '=jis-x0208@1978/1pr) @@ -195,6 +199,7 @@ '(registry "jisx0213\\(\\.[0-9]+\\)?-1" dimension 2 chars 94 + =>iso-ir 228 final ?O graphic 0 partial t)) @@ -581,6 +586,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs)) (make-charset '=ucs@unicode "Unicode for its representative glyphs" @@ -590,6 +596,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@iso)) (make-charset '=ucs@gb "ISO/IEC 10646 for GB" @@ -599,6 +606,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@unicode)) (define-charset-alias 'ucs-gb '=ucs@gb) (make-charset '=ucs@gb/fw @@ -609,6 +617,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@gb)) (make-charset '=ucs-bmp@gb "ISO/IEC 10646 BMP for GB" @@ -629,6 +638,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@unicode)) (define-charset-alias 'ucs-cns '=ucs@cns) (make-charset '=ucs@cns/fw @@ -639,6 +649,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@cns)) (make-charset '=ucs-bmp@cns "ISO/IEC 10646 BMP for CNS" @@ -659,6 +670,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@unicode)) (define-charset-alias 'ucs-jis '=ucs@jis) (make-charset '=ucs@jis/fw @@ -669,6 +681,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@jis)) (make-charset '=ucs-bmp@jis "ISO/IEC 10646 BMP for JIS" @@ -689,6 +702,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother ucs-jis)) (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990) (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990) @@ -700,6 +714,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother ucs-jis)) (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000) (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000) @@ -711,6 +726,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother ucs-jis)) (make-charset '=ucs@JP "UCS for common glyphs used in Japan" @@ -720,6 +736,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@jis/2004)) (define-charset-alias '=ucs@jp '=ucs@JP) (make-charset '=ucs@ks @@ -730,6 +747,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@unicode)) (define-charset-alias 'ucs-ks '=ucs@ks) (make-charset '=ucs-bmp@ks @@ -751,6 +769,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@unicode)) (define-charset-alias 'ucs-big5 '=ucs@big5) (make-charset '=ucs@big5/cns11643 @@ -761,6 +780,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@big5)) (make-charset '=ucs@cns11643 "ISO/IEC 10646 for CNS based on www.cns11643.gov.tw" @@ -770,6 +790,7 @@ columns 2 graphic 2 direction l2r + =>iso-ir 177 mother =ucs@cns)) (make-charset diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index ac6e534..79c1c02 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,119 @@ +2009-05-19 MORIOKA Tomohiko + + * Ideograph-R113-Spirit.el (J0-6349): Add `<-vulgar' for J0-6348. + + * Ideograph-R115-Grain.el (J0-6348): Unify S1-5640. + (U-000257D4): Use `->subsumptive'; integrate M-25128. + (U-000257D5): Use `->subsumptive'; integrate M-25129. + +2009-05-17 MORIOKA Tomohiko + + * Ideograph-R004-Slash.el (B-A546): Moved to U+4E4F. + +2009-05-15 MORIOKA Tomohiko + + * Ideograph-R004-Slash.el (B-A4A7): Moved to U+4E4B. + +2009-05-14 MORIOKA Tomohiko + + * Ideograph-R162-Walk.el (JX3-4B78): Use + `=jis-x0208@1978/4-pr*sources' instead of + `=jis-x0208@1978*sources'. + + * Ideograph-R086-Fire.el (J90-5F73): Omit `jisx0208-difference'. + +2009-05-13 MORIOKA Tomohiko + + * char-db-util.el (char-attribute-name<): Use `iso-ir' property of + coded-charsets. + +2009-05-08 MORIOKA Tomohiko + + * Ideograph-R038-Woman.el (U+59FC): Use `->subsumptive'. + (U+59FD): Likewise. + (U+59FE): Likewise. + (U-0002170B): Use `->subsumptive'. + (U+5A4F): Use `->subsumptive'. + (U+5A50): Likewise. + (U+5A51): Likewise. + (U+5A52): Likewise. + + * Ideograph-R109-Eye.el (U+77BD): Unify S1-5365. + (U+77BE): Use `->subsumptive'. + (U+77BF): Use `->subsumptive'. + (U-000252E0): Use `->subsumptive'. + +2009-05-07 MORIOKA Tomohiko + + * Ideograph-R022-Right-Open-Box.el (U+5337): Use `->subsumptive'. + (M-02667): Unify U-00020968 and H1-B6BB. + +2009-05-01 MORIOKA Tomohiko + + * Ideograph-R022-Right-Open-Box.el (U+531F): Use `->subsumptive'. + +2009-04-24 MORIOKA Tomohiko + + * Ideograph-R022-Right-Open-Box.el (U-0002092C): Omit + `=>daikanwa'. + (U+531B): Use `->subsumptive'. + (U-00020942): Use `->subsumptive'. + (U+532A): Use `->subsumptive'. + (U+3536): Use `->denotational' and `->subsumptive'. + (U-0002096C): Use `->denotational' and `->subsumptive'. + +2009-04-23 MORIOKA Tomohiko + + * Ideograph-R023-Hiding-Enclosure.el (U-0002092C): Omit + `=>daikanwa'. + +2009-04-22 MORIOKA Tomohiko + + * Ideograph-R030-Mouth.el (U-00020F6B): Use `->subsumptive'. + (U+35FF): Use `->subsumptive'; add `sound@ja/on/{kan|go}'. + (U+5676): Use `->denotational' instead of `->subsumptive'. + (U+5677): Use `->subsumptive'; add `sound@ja/on'. + (U+567E): Use `->subsumptive'. + (U-00021043): Use `->subsumptive'. + (U+567F): Add `sound@ja/on'. + (U-00021157): Use `->denotational' and `->subsumptive'. + (U-00021158): Use `->denotational'. + + * Ideograph-R140-Grass.el (U+845B): J97-336B. + (J78-336B): Unify JX3-336B. + (J90-336B): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' to + separate JX3-336B; unify JC3-61B5; add `=ucs@jis/1990' and + `=ucs@jis/2000' for J{90|00}U+845B. + (U+845C): Use `->denotational' and `->subsumptive'. + (U+845D): Use `->denotational'. + (U+85DD): Use `->denotational' and `->subsumptive'. + + * Ideograph-R076-Lack.el (C2-437B): Add `=ucs@cns' for CU+6B46. + (J0-5D3C): Separate S2-3932. + (G0-502A): Unify S-3932. + (S-3933): New variant of U+6B47. + + * Ideograph-R075-Tree.el (U+67E9): Use `->subsumptive'. + + * Ideograph-R032-Earth.el (M-05311): Map to U-00021394. + (U-00021395): Use `->denotational' and `->subsumptive'; add + `sound@ja/on'. + (U+5840): Use `->denotational' and `->subsumptive'. + (U+FA39): Use `<-denotational' for U+5840. + +2009-04-16 MORIOKA Tomohiko + + * Ideograph-R086-Fire.el (U-0002422B): Use `->subsumptive'. + (U+7103): Use `->subsumptive'. + (U+71D0): Add `sound@ja/on'. + +2009-04-15 MORIOKA Tomohiko + + * Ideograph-R116-Cave.el (C2-4C51): Add `=ucs@cns' for CU+7AA8. + + * README.en (Character Reference): Add `shuowen-changjian' to + `:sources'. + 2009-03-31 MORIOKA Tomohiko * ruimoku6.el, Ideograph-R169-Gate.el (RUI6-E01D): Map to diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index b07704e..0432127 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -561,6 +561,7 @@ (sound@ja/kun/name "yuki") (sound@ja/on "si") (=ucs . #x4E4B) ; 之 + (=big5 . #xA4A7) ; &I-B-A4A7; (->subsumptive ((ideographic-strokes@daikanwa . 3) (total-strokes@daikanwa . 4) @@ -571,7 +572,6 @@ (=jis-x0208 . #x4737) ; >-00166; [39-23] (=ks-x1001 . #x717D) ; &I-K0-717D; [81-93] (=jis-x0213-1 . #x4737) ; &I-JX1-4737; [39-23] - (=big5 . #xA4A7) ; &I-B-A4A7; (=gt . 00166) ; &I-GT-00166; (=gt-k . 00200) ; &I-GT-K00200; (=gt-pj-1 . #x4737) ; &I-GT-00166; [39-23] @@ -579,7 +579,6 @@ (=shinjigen . 0049) ; >-00166; (=ucs@jis . #x4E4B) ; >-00166; (=ucs@ks . #x4E4B) ; >-00166; - (=ucs@big5 . #x4E4B) ; >-00166; ) ((mojikyo . 000125) ; &MCS-6000007D; ) @@ -821,6 +820,7 @@ (sound@ja/kun "tobo+sii") (sound@ja/on/go "bAHu") (=ucs . #x4E4F) ; 乏 + (=big5 . #xA546) ; &I-B-A546; (->subsumptive ((ideographic-strokes@gt . 3) (total-strokes@gt . 4) @@ -840,7 +840,6 @@ (=jis-x0208 . #x4B33) ; >-00175; [43-19] (=ks-x1001 . #x7939) ; &I-K0-7939; [89-25] (=jis-x0213-1 . #x4B33) ; &I-JX1-4B33; [43-19] - (=big5 . #xA546) ; &I-B-A546; (=gt . 00175) ; &I-GT-00175; (=gt-k . 00491) ; &I-GT-K00491; (=gt-pj-1 . #x4B33) ; &I-GT-00175; [43-19] @@ -849,7 +848,6 @@ (=shinjigen@rev . 0050) ; >-00175; (=ucs@jis . #x4E4F) ; >-00175; (=ucs@ks . #x4E4F) ; >-00175; - (=ucs@big5 . #x4E4F) ; >-00175; ) ((mojikyo . 000133) ; &MCS-60000085; ) @@ -860,7 +858,8 @@ ) ((=ucs . #x4E3F) ; 丿 ) - ((=ucs . #x4E4B) ; 之 + ((=gb2312 . #x562E) ; &C1-4466; [54-14] + (=cns11643-1 . #x4466) ; &I-C1-4466; [36-70] )) (=gb2312 . #x3726) ; &C1-4566; [23-06] (=cns11643-1 . #x4566) ; &I-C1-4566; [37-70] diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 96e310b..65f3b1b 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -6144,7 +6144,8 @@ ((name . "CJK RADICAL PERSON") (=ucs . #x2E85) ; ⺅ ) - ((=ucs@unicode . #x5B83) ; &C1-4646; + ((=gb2312 . #x4B7C) ; &C1-4646; [43-92] + (=cns11643-1 . #x4646) ; &I-C1-4646; [38-38] )) (=gb2312 . #x5922) ; &C1-4870; [57-02] (=cns11643-1 . #x4870) ; &I-C1-4870; [40-80] diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el index 4f87a5e..f8bdc1b 100644 --- a/lisp/utf-2000/Ideograph-R011-Enter.el +++ b/lisp/utf-2000/Ideograph-R011-Enter.el @@ -1434,9 +1434,9 @@ (=jis-x0213-1 . #x467E) ; &I-JX1-467E; [38-94] (=daikanwa . 01415) ; &I-M-01415; ) - ((=ucs@unicode . #x975E) ; &G0-3747; + ((=gb2312 . #x3747) ; &G0-3747; [23-39] ) - ((=ucs@unicode . #x532A) ; &UU+532A; + ((=gb2312 . #x374B) ; &G0-374B; [23-43] )) (=hanziku-1 . #xD755) ; &HZK01-D755; ) @@ -1446,9 +1446,9 @@ ) ((=ucs . #x5165) ; 入 ) - ((=ucs@unicode . #x975E) ; &G0-3747; + ((=gb2312 . #x3747) ; &G0-3747; [23-39] ) - ((=ucs@unicode . #x532A) ; &UU+532A; + ((=gb2312 . #x374B) ; &G0-374B; [23-43] )) (=ucs@iso . #x204FF) ; &U-000204FF; )) diff --git a/lisp/utf-2000/Ideograph-R015-Ice.el b/lisp/utf-2000/Ideograph-R015-Ice.el index c7a651d..63c3857 100644 --- a/lisp/utf-2000/Ideograph-R015-Ice.el +++ b/lisp/utf-2000/Ideograph-R015-Ice.el @@ -2544,7 +2544,7 @@ ) ((=ucs . #x51AB) ; 冫 ) - ((=ucs@unicode . #x7A1F) ; &B-B85B; + ((=ucs@unicode . #x7A1F) ; &UU+7A1F; )) (=ucs@unicode . #x51DC) ; &UU+51DC; ) diff --git a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el index da14f66..45aed23 100644 --- a/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el +++ b/lisp/utf-2000/Ideograph-R022-Right-Open-Box.el @@ -17,8 +17,7 @@ (=shinjigen . 0786) ; 匚 )) (define-char - '((=>daikanwa . 02596) ; &CDP-87D4; - (ideographic-radical@ucs . 22) ; ⼕ + '((ideographic-radical@ucs . 22) ; ⼕ (ideographic-radical@ucs*sources daikanwa ucs) (ideographic-radical@cns . 23) ; ⼖ @@ -38,7 +37,6 @@ '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 3) (total-strokes . 5) - (hanyu-dazidian 1 82 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") (=ucs . #x2FF7) ; ⿷ @@ -48,17 +46,24 @@ ((=ucs . #x4E45) ; 久 )) (=ucs . #x531B) ; 匛 - (=jis-x0212 . #x3425) ; &I-JSP-3425; [20-05] - (=cns11643-4 . #x2165) ; &I-C4-2165; [01-69] - (=daikanwa . 02597) ; &I-M-02597; - (=hanziku-1 . #xB4D6) ; &I-HZK01-B4D6; - (=jef-china3 . #x45B0) ; &I-JC3-45B0; + (->subsumptive + ((=jis-x0212 . #x3425) ; &M-02597; [20-05] + (=cns11643-4 . #x2165) ; &I-C4-2165; [01-69] + (=daikanwa . 02597) ; &I-M-02597; + (=jef-china3 . #x45B0) ; &I-JC3-45B0; + (=ucs@jis . #x531B) ; &M-02597; + ) + ((hanyu-dazidian 1 82 5) + (=hanziku-1 . #xB4D6) ; &HZK01-B4D6; + (=ucs@unicode . #x531B) ; &HZK01-B4D6; + )) )) (define-char '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 3) (total-strokes . 5) (=ucs . #x531C) ; 匜 + (=big5 . #xC96C) ; &I-B-C96C; (->subsumptive ((hanyu-dazidian 1 82 6) (ideographic-structure @@ -76,7 +81,6 @@ (=jis-x0212 . #x3426) ; &M-02598; [20-06] (=iso-ir165 . #x7A28) ; &I-EGB-7A28; [90-08] (=jis-x0213-1 . #x2E6D) ; &I-JX1-2E6D; [14-77] - (=big5 . #xC96C) ; &I-B-C96C; (=daikanwa . 02598) ; &I-M-02598; (=shinjigen . 0787) ; &M-02598; (=jef-china3 . #x45B1) ; &I-JC3-45B1; @@ -174,43 +178,40 @@ (=hanziku-1 . #xB4F4) ; &I-HZK01-B4F4; )) (define-char - '((=>ucs . #x531F) ; 匟 - (ideographic-radical . 22) ; ⼕ + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 4) (total-strokes . 6) (hanyu-dazidian 1 84 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 - ) - ((=jis-x0208 . #x5036) ; >-00379; [48-22] - (=ks-x1001 . #x7971) ; &I-K0-7971; [89-81] - (=jis-x0213-1 . #x5036) ; &I-JX1-5036; [48-22] - (=daikanwa . 00288) ; &I-M-00288; - )) - (=jis-x0212 . #x3428) ; &M-02603; [20-08] + (=ucs . #x531F) ; 匟 (=big5 . #xC9C2) ; &I-B-C9C2; - (=daikanwa . 02603) ; &I-M-02603; - (=ucs@jis . #x531F) ; &M-02603; - (=ucs@big5 . #x531F) ; &M-02603; - )) -(define-char - '((morohashi-daikanwa 2603 0 0) - (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 4) - (total-strokes . 6) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=jis-x0208 . #x5036) ; >-00379; [48-22] + (=ks-x1001 . #x7971) ; &I-K0-7971; [89-81] + (=jis-x0213-1 . #x5036) ; &I-JX1-5036; [48-22] + (=daikanwa . 00288) ; &I-M-00288; + )) + (=jis-x0212 . #x3428) ; &M-02603; [20-08] + (=daikanwa . 02603) ; &I-M-02603; + (=ucs@jis . #x531F) ; &M-02603; ) - ((=ucs . #x4EA2) ; 亢 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=gb2312 . #x3F3A) ; &C1-446D; [31-26] + (=cns11643-1 . #x446D) ; &I-C1-446D; [36-77] + )) + (=cns11643-2 . #x2222) ; &C2-2222; [02-02] + (=ucs@unicode . #x531F) ; &C2-2222; )) - (=ucs . #x531F) ; 匟 - (=cns11643-2 . #x2222) ; &I-C2-2222; [02-02] )) (define-char '((ideographic-radical . 22) ; ⼕ @@ -697,83 +698,79 @@ (=hanziku-1 . #xB5B9) ; &I-HZK01-B5B9; )) (define-char - '((=>ucs . #x20942) ; 𠥂 - (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 7) - (total-strokes . 9) - (=cns11643-6 . #x2F32) ; &M-02628; [15-18] - (=daikanwa . 02628) ; &I-M-02628; - (mojikyo . 002628) ; &MCS-60000A44; - )) -(define-char - '((morohashi-daikanwa 2628 0 0) - (ideographic-radical . 22) ; ⼕ + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 7) (total-strokes . 9) - (hanyu-dazidian 1 85 16) (=ucs . #x20942) ; 𠥂 - (=hanziku-1 . #xB5A4) ; &I-HZK01-B5A4; - )) -(define-char - '((=>ucs . #x532A) ; 匪 - (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 8) - (total-strokes . 10) - (hanyu-dazidian 1 87 1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 - ) - ((=cns11643-1 . #x4F66) ; &C1-4F66; [47-70] - )) - (=jis-x0208 . #x485B) ; >-03371; [40-59] - (=cns11643-1 . #x544D) ; &I-C1-544D; [52-45] - (=jis-x0213-1 . #x485B) ; &I-JX1-485B; [40-59] - (=gt . 03371) ; &I-GT-03371; - (=gt-k . 06536) ; &I-GT-K06536; - (=gt-pj-1 . #x485B) ; &I-GT-03371; [40-59] - (=daikanwa . 02629) ; &I-M-02629; - (=shinjigen . 0791) ; >-03371; - (=ucs@jis . #x532A) ; >-03371; - )) -(define-char - '((=>ucs . #x532A) ; 匪 - (morohashi-daikanwa 2629 0 1) - (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 8) - (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 + (->subsumptive + ((=cns11643-6 . #x2F32) ; &M-02628; [15-18] + (=daikanwa . 02628) ; &I-M-02628; + (mojikyo . 002628) ; &MCS-60000A44; + (<-same + ((=jis-x0208 . #x5B4D) ; >-18571; [59-45] + (=ks-x1001 . #x4F2F) ; &I-K0-4F2F; [47-15] + (=cns11643-1 . #x5161) ; &I-C1-5161; [49-65] + (=jis-x0213-1 . #x5B4D) ; &I-JX1-5B4D; [59-45] + (=daikanwa . 14650) ; &I-M-14650; + )) + (<-same*sources + shuowen-changjian daikanwa) ) - ((=jis-x0208 . #x4873) ; >-57172; [40-83] - (=ks-x1001 . #x5E2A) ; &I-K0-5E2A; [62-10] - (=jis-x0213-1 . #x4873) ; &I-JX1-4873; [40-83] - (=daikanwa . 42585) ; &I-M-42585; + ((hanyu-dazidian 1 85 16) + (=hanziku-1 . #xB5A4) ; &HZK01-B5A4; + (=ucs@iso . #x20942) ; &HZK01-B5A4; )) - (=ks-x1001 . #x5D63) ; &K0-5D63; [61-67] - (=big5 . #xADEA) ; &I-B-ADEA; - (=ucs@big5 . #x532A) ; &K0-5D63; )) (define-char - '((morohashi-daikanwa 2629 0 2) - (ideographic-radical . 22) ; ⼕ + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 8) (total-strokes . 10) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ + (=ucs . #x532A) ; 匪 + (=big5 . #xADEA) ; &I-B-ADEA; + (->subsumptive + ((hanyu-dazidian 1 87 1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=cns11643-1 . #x4F66) ; &C1-4F66; [47-70] + )) + (=jis-x0208 . #x485B) ; >-03371; [40-59] + (=cns11643-1 . #x544D) ; &I-C1-544D; [52-45] + (=jis-x0213-1 . #x485B) ; &I-JX1-485B; [40-59] + (=gt . 03371) ; &I-GT-03371; + (=gt-k . 06536) ; &I-GT-K06536; + (=gt-pj-1 . #x485B) ; &I-GT-03371; [40-59] + (=daikanwa . 02629) ; &I-M-02629; + (=shinjigen . 0791) ; >-03371; + (=ucs@jis . #x532A) ; >-03371; ) - ((=ucs . #x531A) ; 匚 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=jis-x0208 . #x4873) ; >-57172; [40-83] + (=ks-x1001 . #x5E2A) ; &I-K0-5E2A; [62-10] + (=jis-x0213-1 . #x4873) ; &I-JX1-4873; [40-83] + (=daikanwa . 42585) ; &I-M-42585; + )) + (=ks-x1001 . #x5D63) ; &K0-5D63; [61-67] ) - ((=ucs . #x975E) ; 非 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=gb2312 . #x3747) ; &G0-3747; [23-39] + )) + (=gb2312 . #x374B) ; &G0-374B; [23-43] + (=ucs@unicode . #x532A) ; &G0-374B; )) - (=ucs . #x532A) ; 匪 - (=gb2312 . #x374B) ; &I-G0-374B; [23-43] )) (define-char '((ideographic-radical . 22) ; ⼕ @@ -1566,47 +1563,47 @@ (=hanziku-1 . #xB6B8) ; &I-HZK01-B6B8; )) (define-char - '((=>ucs . #x5337) ; 匷 - (ideographic-radical . 22) ; ⼕ + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 18) (total-strokes . 20) (hanyu-dazidian 1 91 3) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 - ) - ((=jis-x0208 . #x625A) ; >-30367; [66-58] - (=ks-x1001 . #x4F3A) ; &I-K0-4F3A; [47-26] - (=jis-x0213-1 . #x625A) ; &I-JX1-625A; [66-58] - (=daikanwa . 23747) ; &I-M-23747; - )) - (=big5 . #xF3FD) ; &M-02666; - (=daikanwa . 02666) ; &I-M-02666; - (=ucs@big5 . #x5337) ; &M-02666; - )) -(define-char - '((morohashi-daikanwa 2666 0 0) - (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 18) - (total-strokes . 20) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") - (=ucs . #x2FF7) ; ⿷ - ) - ((=ucs . #x531A) ; 匚 + (=ucs . #x5337) ; 匷 + (=big5 . #xF3FD) ; &I-B-F3FD; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=jis-x0208 . #x625A) ; >-30367; [66-58] + (=ks-x1001 . #x4F3A) ; &I-K0-4F3A; [47-26] + (=jis-x0213-1 . #x625A) ; &I-JX1-625A; [66-58] + (=daikanwa . 23747) ; &I-M-23747; + )) + (=daikanwa . 02666) ; &M-02666; ) - ((=ucs . #x77BF) ; 瞿 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT") + (=ucs . #x2FF7) ; ⿷ + ) + ((=ucs . #x531A) ; 匚 + ) + ((=gb2312 . #x7644) ; &C1-766D; [86-36] + (=cns11643-1 . #x766D) ; &I-C1-766D; [86-77] + )) + (=cns11643-2 . #x686A) ; &C2-686A; [72-74] + (=ucs@unicode . #x5337) ; &C2-686A; )) - (=ucs . #x5337) ; 匷 - (=cns11643-2 . #x686A) ; &I-C2-686A; [72-74] )) (define-char '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 18) (total-strokes . 20) - (=daikanwa . 02667) ; &M-02667; + (hanyu-dazidian 1 91 4) + (=ucs . #x20968) ; 𠥨 + (=daikanwa . 02667) ; &I-M-02667; + (=hanziku-1 . #xB6BB) ; &I-HZK01-B6BB; )) (define-char '((=>ucs . #x2096A) ; 𠥪 @@ -1648,40 +1645,82 @@ (ideographic-strokes . 24) (total-strokes . 26) (=ucs . #x3536) ; 㔶 - (=cns11643-4 . #x6D53) ; &I-C4-6D53; [77-51] - (=daikanwa . 02670) ; &I-M-02670; )) (define-char - '((=>ucs . #x2096C) ; 𠥬 + '((<-denotational + ((=ucs . #x3536) ; 㔶 + )) (ideographic-radical . 22) ; ⼕ - (ideographic-strokes . 26) - (total-strokes . 28) - (=daikanwa . 02671) ; &M-02671; + (ideographic-strokes . 24) + (total-strokes . 26) + (->subsumptive + ((=daikanwa . 02670) ; &M-02670; + ) + ((=cns11643-4 . #x6D53) ; &C4-6D53; [77-51] + )) )) (define-char - '((=>ucs . #x2096C) ; 𠥬 - (morohashi-daikanwa 2671 0 1) + '((<-denotational + ((=ucs . #x3536) ; 㔶 + )) (ideographic-radical . 22) ; ⼕ + (ideographic-strokes . 24) + (total-strokes . 26) + (=ucs@unicode . #x3536) ; &UU+3536; + )) +(define-char + '((ideographic-radical . 22) ; ⼕ (ideographic-strokes . 26) (total-strokes . 28) - (hanyu-dazidian 1 91 10) - (=cns11643-7 . #x6443) ; &HZK01-B6C1; [68-35] - (=hanziku-1 . #xB6C1) ; &I-HZK01-B6C1; + (=ucs . #x2096C) ; 𠥬 )) (define-char - '((=>ucs . #x2096C) ; 𠥬 - (morohashi-daikanwa 2671 0 2) + '((<-denotational + ((=ucs . #x2096C) ; 𠥬 + )) (ideographic-radical . 22) ; ⼕ (ideographic-strokes . 26) (total-strokes . 28) - (mojikyo . 002671) ; &MCS-60000A6F; + (->subsumptive + ((=daikanwa . 02671) ; &M-02671; + (<-Zhouwen + ((=jis-x0212 . #x3425) ; &M-02597; [20-05] + (=cns11643-4 . #x2165) ; &I-C4-2165; [01-69] + (=daikanwa . 02597) ; &I-M-02597; + ) + ((=jis-x0208 . #x5B4D) ; >-18571; [59-45] + (=ks-x1001 . #x4F2F) ; &I-K0-4F2F; [47-15] + (=cns11643-1 . #x5161) ; &I-C1-5161; [49-65] + (=jis-x0213-1 . #x5B4D) ; &I-JX1-5B4D; [59-45] + (=daikanwa . 14650) ; &I-M-14650; + )) + (<-Zhouwen*sources + jiyun daikanwa) + (<-Zhouwen@shuowen + ((=jis-x0212 . #x3425) ; &M-02597; [20-05] + (=cns11643-4 . #x2165) ; &I-C4-2165; [01-69] + (=daikanwa . 02597) ; &I-M-02597; + )) + (<-Zhouwen@shuowen*sources + shuowen yupian jiyun daikanwa) + ) + ((hanyu-dazidian 1 91 10) + (=cns11643-7 . #x6443) ; &HZK01-B6C1; [68-35] + (=hanziku-1 . #xB6C1) ; &I-HZK01-B6C1; + )) )) (define-char - '((morohashi-daikanwa 2671 0 3) + '((<-denotational + ((=ucs . #x2096C) ; 𠥬 + )) (ideographic-radical . 22) ; ⼕ (ideographic-strokes . 26) (total-strokes . 28) - (=ucs . #x2096C) ; 𠥬 + (->subsumptive + ((mojikyo . 002671) ; &MCS-60000A6F; + ) + ((=ucs@iso . #x2096C) ; &U-0002096C; + )) )) (define-char '((ideographic-radical . 22) ; ⼕ @@ -1725,9 +1764,3 @@ (=ucs . #x20958) ; 𠥘 (=hanziku-1 . #xB660) ; &I-HZK01-B660; )) -(define-char - '((ideographic-radical . 22) ; ⼕ - (hanyu-dazidian 1 91 4) - (=ucs . #x20968) ; 𠥨 - (=hanziku-1 . #xB6BB) ; &I-HZK01-B6BB; - )) diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el index 3ff53c5..a644909 100644 --- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el +++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el @@ -1,7 +1,6 @@ ;; -*- coding: utf-8-mcs-er -*- (define-char - '((=>daikanwa . 02596) ; &CDP-87D4; - (ideographic-radical@ucs . 22) ; ⼕ + '((ideographic-radical@ucs . 22) ; ⼕ (ideographic-radical@ucs*sources daikanwa ucs) (ideographic-radical@cns . 23) ; ⼖ diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 851d180..7155225 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -19941,7 +19941,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x67E5) ; &G0-3269; + ((=gb2312 . #x3269) ; &G0-3269; [18-73] )) (=gb2312 . #x547B) ; &G0-547B; [52-91] (=big5 . #xB3E5) ; &I-B-B3E5; @@ -19972,7 +19972,11 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x5A01) ; >-07806; + ((=jis-x0208 . #x3052) ; >-07806; [16-50] + (=gb2312 . #x4D7E) ; &I-G0-4D7E; [45-94] + (=ks-x1001 . #x6A4E) ; &I-K0-6A4E; [74-46] + (=jis-x0213-1 . #x3052) ; &I-JX1-3052; [16-50] + (=daikanwa . 06259) ; &I-M-06259; )) (=daikanwa . 04023) ; &M-04023; (=hanziku-2 . #xD877) ; &I-HZK02-D877; @@ -20027,7 +20031,10 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x82D7) ; >-39971; + ((=jis-x0208 . #x4944) ; >-39971; [41-36] + (=gb2312 . #x4367) ; &I-G0-4367; [35-71] + (=ks-x1001 . #x5960) ; &I-K0-5960; [57-64] + (=jis-x0213-1 . #x4944) ; &I-JX1-4944; [41-36] )) (=gb2312 . #x5F77) ; &G0-5F77; [63-87] (=big5 . #xD870) ; &I-B-D870; @@ -20596,7 +20603,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x8652) ; &EGB-7A27; + ((=iso-ir165 . #x7A27) ; &EGB-7A27; [90-07] )) (=daikanwa . 04035) ; &M-04035; (=hanziku-2 . #xDBE2) ; &I-HZK02-DBE2; @@ -21277,7 +21284,8 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x76CA) ; &C1-5674; + ((=gb2312 . #x5266) ; &C1-5674; [50-70] + (=cns11643-1 . #x5674) ; &I-C1-5674; [54-84] )) (=gb2312 . #x6049) ; &C2-4171; [64-41] (=cns11643-2 . #x4171) ; &I-C2-4171; [33-81] @@ -26676,7 +26684,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x89DC) ; &G0-757E; + ((=gb2312 . #x757E) ; &G0-757E; [85-94] )) (=gb2312 . #x576C) ; &G0-576C; [55-76] (=ucs@unicode . #x5634) ; &G0-576C; @@ -26759,17 +26767,18 @@ (ideographic-strokes . 12) (total-strokes . 15) (=ucs . #x20F6B) ; 𠽫 - (=daikanwa . 04261) ; &I-M-04261; - )) -(define-char - '((=>ucs . #x20F6B) ; 𠽫 - (morohashi-daikanwa 4261 0 0) - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 12) - (total-strokes . 15) - (hanyu-dazidian 1 687 7) - (=cns11643-5 . #x4C3D) ; &HZK02-DFB4; [44-29] - (=hanziku-2 . #xDFB4) ; &I-HZK02-DFB4; + (->subsumptive + ((=daikanwa . 04261) ; &M-04261; + (<-formed@s=laugh + ((=daikanwa . 04395) ; &M-04395; + )) + ) + ((=ucs@iso . #x20F6B) ; &U-00020F6B; + ) + ((hanyu-dazidian 1 687 7) + (=cns11643-5 . #x4C3D) ; &HZK02-DFB4; [44-29] + (=hanziku-2 . #xDFB4) ; &I-HZK02-DFB4; + )) )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -30299,7 +30308,9 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x611B) ; >-13779; + ((=jis-x0208 . #x3026) ; >-13779; [16-06] + (=ks-x1001 . #x6471) ; &I-K0-6471; [68-81] + (=jis-x0213-1 . #x3026) ; &I-JX1-3026; [16-06] )) (=jis-x0212 . #x3650) ; &JX1-2F37; [22-48] (=jis-x0213-1 . #x2F37) ; &I-JX1-2F37; [15-23] @@ -30311,9 +30322,46 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 13) (total-strokes . 16) + (sound@ja/on/go "ke") + (sound@ja/on/kan "ka") (=ucs . #x35FF) ; 㗿 - (=cns11643-4 . #x4F6A) ; &I-C4-4F6A; [47-74] - (=daikanwa . 04395) ; &I-M-04395; + (->subsumptive + ((=daikanwa . 04395) ; &M-04395; + (<-formed@s=hollow + ((=jis-x0208 . #x6C2E) ; &M-36193; [76-14] + (=jis-x0213-1 . #x6C2E) ; &I-JX1-6C2E; [76-14] + (=daikanwa . 36193) ; &I-M-36193; + )) + (<-formed@s=hollow*sources + jiyun) + (<-formed@s=laugh-out + ((=cns11643-4 . #x2970) ; &M-16030; [09-80] + (=daikanwa . 16030) ; &I-M-16030; + )) + (<-formed@s=laugh-out*sources + jiyun) + (<-same@s=hollow + ((=jis-x0208 . #x6C2E) ; &M-36193; [76-14] + (=jis-x0213-1 . #x6C2E) ; &I-JX1-6C2E; [76-14] + (=daikanwa . 36193) ; &I-M-36193; + )) + (<-same@s=hollow*sources + jiyun daikanwa) + (<-same@s=laugh-out + ((=cns11643-4 . #x2970) ; &M-16030; [09-80] + (=daikanwa . 16030) ; &I-M-16030; + )) + (<-same@s=laugh-out*sources + jiyun daikanwa) + (->formed@s=laugh + ((=daikanwa . 04261) ; &M-04261; + )) + (->formed@s=laugh*sources + jiyun daikanwa) + ) + ((=cns11643-4 . #x4F6A) ; &C4-4F6A; [47-74] + (=ucs@unicode . #x35FF) ; &C4-4F6A; + )) )) (define-char '((=>ucs . #x20FDE) ; 𠿞 @@ -30450,7 +30498,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@cns . #x8C66) ; &C2-475D; + ((=cns11643-2 . #x475D) ; &C2-475D; [39-61] )) (=cns11643-1 . #x7044) ; &C1-7044; [80-36] ) @@ -30765,37 +30813,49 @@ (define-char '((ideographic-radical . 30) ; ⼝ (=ucs . #x5676) ; 噶 - (->subsumptive - ((ideographic-strokes . 13) - (total-strokes . 16) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=daikanwa . 31420) ; &M-31420; - )) - (=cns11643-1 . #x7048) ; &M-04421; [80-40] - (=daikanwa . 04421) ; &I-M-04421; - (=jef-china3 . #x47AF) ; &I-JC3-47AF; + (=big5 . #xBEBF) ; &I-B-BEBF; + )) +(define-char + '((<-denotational + ((=ucs . #x5676) ; 噶 + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 13) + (total-strokes . 16) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) - ((ideographic-strokes . 12) - (total-strokes . 15) - (hanyu-dazidian 1 681 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=ucs@unicode . #x845B) ; &J78-336B; - )) - (=gb2312 . #x3841) ; &JX1-2F34; [24-33] - (=jis-x0213-1 . #x2F34) ; &I-JX1-2F34; [15-20] - (=big5 . #xBEBF) ; &I-B-BEBF; - (=ucs@unicode . #x5676) ; &JX1-2F34; + ((=ucs . #x53E3) ; 口 + ) + ((=daikanwa . 31420) ; &M-31420; )) + (=cns11643-1 . #x7048) ; &M-04421; [80-40] + (=daikanwa . 04421) ; &I-M-04421; + (=jef-china3 . #x47AF) ; &I-JC3-47AF; + )) +(define-char + '((<-denotational + ((=ucs . #x5676) ; 噶 + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 12) + (total-strokes . 15) + (hanyu-dazidian 1 681 8) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=jis-x0208@1978 . #x336B) ; &JX3-336B; [19-75] + (=gb2312 . #x3870) ; &I-G0-3870; [24-80] + (=ks-x1001 . #x4A67) ; &I-K0-4A67; [42-71] + (=jis-x0213-1@2004 . #x336B) ; &I-JX3-336B; [19-75] + )) + (=gb2312 . #x3841) ; &JX1-2F34; [24-33] + (=jis-x0213-1 . #x2F34) ; &I-JX1-2F34; [15-20] + (=ucs@unicode . #x5676) ; &JX1-2F34; )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -30848,18 +30908,43 @@ (ideographic-strokes . 13) (total-strokes . 16) (hanyu-dazidian 1 693 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + (sound@ja/on "kiN") + (=ucs . #x5677) ; 噷 + (=big5 . #xE946) ; &I-B-E946; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ks-x1001 . #x7D64) ; &M-16139; [93-68] + (=jis-x0212 . #x4571) ; &I-JSP-4571; [37-81] + (=jis-x0213-1 . #x7640) ; &I-JX1-7640; [86-32] + (=daikanwa . 16139) ; &I-M-16139; + )) + (=daikanwa . 04427) ; &M-04427; ) - ((=ucs . #x53E3) ; 口 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=cns11643-2 . #x437B) ; &C2-437B; [35-91] + )) + (=cns11643-2 . #x5650) ; &C2-5650; [54-48] ) - ((=ucs . #x6B46) ; 歆 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=gb2312 . #x6C27) ; &G0-6C27; [76-07] + )) + (=ucs@unicode . #x5677) ; &UU+5677; )) - (=ucs . #x5677) ; 噷 - (=cns11643-2 . #x5650) ; &I-C2-5650; [54-48] - (=big5 . #xE946) ; &I-B-E946; - (=daikanwa . 04427) ; &I-M-04427; )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -30917,7 +31002,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x9813) ; &C1-6761; + ((=cns11643-1 . #x6761) ; &C1-6761; [71-65] )) (=cns11643-1 . #x7040) ; &C1-7040; [80-32] (=gb12345 . #x3656) ; &C1-7040; [22-54] @@ -31310,42 +31395,90 @@ (ideographic-strokes . 14) (total-strokes . 17) (hanyu-dazidian 1 697 17) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ + (=ucs . #x567E) ; 噾 + (=big5 . #xECC6) ; &I-B-ECC6; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=daikanwa . 25578) ; &M-25578; + )) + (=daikanwa . 04442) ; &M-04442; + (<-formed + ((=jis-x0212 . #x356C) ; &M-03934; [21-76] + (=jis-x0213-2 . #x242E) ; &I-JX2-242E; [04-14] + (=daikanwa . 03934) ; &I-M-03934; + )) + (<-formed*sources + jiyun) + (<-same + ((=jis-x0212 . #x356C) ; &M-03934; [21-76] + (=jis-x0213-2 . #x242E) ; &I-JX2-242E; [04-14] + (=daikanwa . 03934) ; &I-M-03934; + )) + (<-same*sources + jiyun daikanwa) ) - ((=ucs . #x53E3) ; 口 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=cns11643-2 . #x4C51) ; &C2-4C51; [44-49] + )) + (=cns11643-2 . #x5C52) ; &C2-5C52; [60-50] ) - ((=ucs . #x7AA8) ; 窨 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=gb2312 . #x713F) ; &G0-713F; [81-31] + )) + (=ucs@unicode . #x567E) ; &UU+567E; )) - (=ucs . #x567E) ; 噾 - (=cns11643-2 . #x5C52) ; &I-C2-5C52; [60-50] - (=big5 . #xECC6) ; &I-B-ECC6; - (=daikanwa . 04442) ; &I-M-04442; )) (define-char - '((=>ucs . #x21043) ; 𡁃 - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 14) - (total-strokes . 17) - (=daikanwa . 04443) ; &M-04443; - )) -(define-char - '((morohashi-daikanwa 4443 0 0) - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 14) (total-strokes . 17) - (hanyu-dazidian 1 697 19) (=ucs . #x21043) ; 𡁃 - (=cns11643-7 . #x372A) ; &I-C7-372A; [23-10] - (=hanziku-2 . #xE1C6) ; &I-HZK02-E1C6; + (->subsumptive + ((=daikanwa . 04443) ; &M-04443; + (<-formed + ((=jis-x0212 . #x5F3E) ; &M-36887; [63-30] + (=jis-x0213-1 . #x7C3C) ; &I-JX1-7C3C; [92-28] + (=daikanwa . 36887) ; &I-M-36887; + )) + (<-formed*sources + jiyun) + (<-same + ((=jis-x0212 . #x5F3E) ; &M-36887; [63-30] + (=jis-x0213-1 . #x7C3C) ; &I-JX1-7C3C; [92-28] + (=daikanwa . 36887) ; &I-M-36887; + )) + (<-same*sources + jiyun daikanwa) + ) + ((hanyu-dazidian 1 697 19) + (=cns11643-7 . #x372A) ; &HZK02-E1C6; [23-10] + (=hanziku-2 . #xE1C6) ; &I-HZK02-E1C6; + (=ucs@iso . #x21043) ; &HZK02-E1C6; + )) )) (define-char '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 14) (total-strokes . 17) (hanyu-dazidian 1 698 5) + (sound@ja/on "sui") (=ucs . #x567F) ; 噿 + (=big5 . #xECC8) ; &I-B-ECC8; )) (define-char '((<-denotational @@ -31364,8 +31497,7 @@ (=ks-x1001 . #x7628) ; &I-K0-7628; [86-08] (=daikanwa . 28732) ; &I-M-28732; )) - (=big5 . #xECC8) ; &M-04444; - (=daikanwa . 04444) ; &I-M-04444; + (=daikanwa . 04444) ; &M-04444; )) (define-char '((<-denotational @@ -31381,7 +31513,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x7FE0) ; &G0-3464; + ((=gb2312 . #x3464) ; &G0-3464; [20-68] )) (=ucs@unicode . #x567F) ; &UU+567F; ) @@ -31475,7 +31607,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x7FDF) ; &G0-3554; + ((=gb2312 . #x3554) ; &G0-3554; [21-52] )) (=ucs@unicode . #x5681) ; &UU+5681; ) @@ -36078,6 +36210,7 @@ '((ideographic-radical . 30) ; ⼝ (hanyu-dazidian 1 707 8) (=ucs . #x56C6) ; 囆 + (=big5 . #xF6D7) ; &I-B-F6D7; )) (define-char '((<-denotational @@ -36112,34 +36245,43 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x8806) ; &JX1-7B63; + ((=jis-x0212 . #x5B6A) ; &JX1-7B63; [59-74] + (=jis-x0213-1 . #x7B63) ; &I-JX1-7B63; [91-67] )) - (=big5 . #xF6D7) ; &B-F6D7; - (=ucs@unicode . #x56C6) ; &B-F6D7; + (=ucs@unicode . #x56C6) ; &UU+56C6; )) (define-char - '((=>ucs . #x21157) ; 𡅗 - (ideographic-radical . 30) ; ⼝ + '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 19) (total-strokes . 22) - (=daikanwa . 04627) ; &M-04627; + (=ucs . #x21157) ; 𡅗 )) (define-char - '((=>ucs . #x21157) ; 𡅗 - (morohashi-daikanwa 4627 0 1) + '((<-denotational + ((=ucs . #x21157) ; 𡅗 + )) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 19) (total-strokes . 22) - (=cns11643-7 . #x5759) ; &C7-5759; [55-57] + (->subsumptive + ((=daikanwa . 04627) ; &M-04627; + ) + ((=cns11643-7 . #x5759) ; &C7-5759; [55-57] + )) )) (define-char - '((morohashi-daikanwa 4627 0 2) + '((<-denotational + ((=ucs . #x21157) ; 𡅗 + )) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 19) (total-strokes . 22) - (hanyu-dazidian 1 707 15) - (=ucs . #x21157) ; 𡅗 - (=hanziku-2 . #xE3C8) ; &I-HZK02-E3C8; + (->subsumptive + ((hanyu-dazidian 1 707 15) + (=hanziku-2 . #xE3C8) ; &HZK02-E3C8; + ) + ((=ucs@iso . #x21157) ; &U-00021157; + )) )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -36169,7 +36311,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x9E97) ; &UU+9E97; + ((=gb12345 . #x4076) ; &UU+9E97; [32-86] )) (=hanziku-2 . #xE3C7) ; &HZK02-E3C7; (=ucs@unicode . #x56C7) ; &HZK02-E3C7; @@ -36189,6 +36331,7 @@ '((ideographic-radical . 30) ; ⼝ (hanyu-dazidian 1 705 13) (=ucs . #x56C8) ; 囈 + (=big5 . #xC56D) ; &I-B-C56D; )) (define-char '((<-denotational @@ -36232,16 +36375,13 @@ (=gt-pj-1 . #x5374) ; &I-GT-05801; [51-84] (=ucs@jis . #x56C8) ; >-05801; ) - ((=big5 . #xC56D) ; &B-C56D; - (=ucs@big5 . #x56C8) ; &B-C56D; - ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x85DD) ; &UU+85DD; + ((=gb12345 . #x5255) ; &UU+85DD; [50-53] )) (=gb12345 . #x5F3D) ; &UU+56C8; [63-29] (=ucs@unicode . #x56C8) ; &UU+56C8; @@ -36251,6 +36391,15 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 19) (total-strokes . 22) + (=ucs . #x21158) ; 𡅘 + )) +(define-char + '((<-denotational + ((=ucs . #x21158) ; 𡅘 + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 19) + (total-strokes . 22) (hanyu-dazidian 1 708 6) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -36258,16 +36407,20 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs . #x81D8) ; 臘 + ((=jis-x0208 . #x6744) ; >-38838; [71-36] + (=ks-x1001 . #x5544) ; &I-K0-5544; [53-36] + (=jis-x0213-1 . #x6744) ; &I-JX1-6744; [71-36] + (=daikanwa . 30009) ; &I-M-30009; )) - (=ucs . #x21158) ; 𡅘 - (=daikanwa . 04630) ; &I-M-04630; + (=daikanwa . 04630) ; &M-04630; (=hanziku-2 . #xE3DF) ; &I-HZK02-E3DF; (=cbeta . 02978) ; &I-CB02978; + (=ucs@iso . #x21158) ; &M-04630; )) (define-char - '((=>ucs . #x21158) ; 𡅘 - (morohashi-daikanwa 4630 0 3) + '((<-denotational + ((=ucs . #x21158) ; 𡅘 + )) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 19) (total-strokes . 22) @@ -36312,7 +36465,7 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x7F85) ; &C1-7865; + ((=cns11643-1 . #x7865) ; &C1-7865; [88-69] )) (=cns11643-1 . #x7B5B) ; &C1-7B5B; [91-59] (=gb12345 . #x7853) ; &C1-7B5B; [88-51] diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index 39ea93b..c83931f 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -7230,16 +7230,21 @@ '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 9) (total-strokes . 12) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x571F) ; 土 - ) - ((=ucs . #x5C4B) ; 屋 + (sound@ja/on "yaku") + (=ucs . #x21394) ; 𡎔 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00199) ; >-K00199; + ) + ((=ucs . #x5C4B) ; 屋 + )) + (=daikanwa . 05311) ; &M-05311; + (=cbeta . 00098) ; &I-CB00098; + (=ucs@unicode . #x21394) ; &M-05311; )) - (=daikanwa . 05311) ; &M-05311; - (=cbeta . 00098) ; &I-CB00098; )) (define-char '((ideographic-radical . 32) ; ⼟ @@ -7253,14 +7258,50 @@ '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 9) (total-strokes . 12) + (sound@ja/on "gi") (=ucs . #x21395) ; 𡎕 - (=cns11643-6 . #x4749) ; &I-C6-4749; [39-41] - (=daikanwa . 05315) ; &I-M-05315; + )) +(define-char + '((<-denotational + ((=ucs . #x21395) ; 𡎕 + )) + (ideographic-radical . 32) ; ⼟ + (ideographic-strokes . 9) + (total-strokes . 12) + (=daikanwa . 05315) ; &M-05315; + (<-same + ((=ucs . #x87FB) ; 蟻 + (=daikanwa . 33672) ; &I-M-33672; + )) + (<-same*sources + wuyin-pianhai daikanwa) + )) +(define-char + '((<-denotational + ((=ucs . #x21395) ; 𡎕 + )) + (ideographic-radical . 32) ; ⼟ + (ideographic-strokes . 9) + (total-strokes . 12) + (->subsumptive + ((=cns11643-6 . #x4749) ; &C6-4749; [39-41] + ) + ((=ucs@iso . #x21395) ; &U-00021395; + )) )) (define-char '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 9) (total-strokes . 12) + (=ucs . #x5840) ; 塀 + )) +(define-char + '((<-denotational + ((=ucs . #x5840) ; 塀 + )) + (ideographic-radical . 32) ; ⼟ + (ideographic-strokes . 9) + (total-strokes . 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ @@ -7269,21 +7310,23 @@ ) ((=ucs . #x5C4F) ; 屏 )) - (=ucs . #x5840) ; 塀 - (=jis-x0208 . #x4A3D) ; &I-J90-4A3D; [42-29] + (=jis-x0208 . #x4A3D) ; >-06679; [42-29] (=jis-x0213-1 . #x4A3D) ; &I-JX1-4A3D; [42-29] (=gt . 06679) ; &I-GT-06679; (=gt-pj-1 . #x4A3D) ; &I-GT-06679; [42-29] (=daikanwa . 05316) ; &I-M-05316; - (=shinjigen@rev . 1454) ; 塀 + (=shinjigen@rev . 1454) ; >-06679; (=cbeta . 06237) ; &I-CB06237; + (=ucs@unicode . #x5840) ; >-06679; (<-simplified@JP/Jouyou ((=jis-x0213-1 . #x2F5A) ; &JX1-2F5A; [15-58] )) )) (define-char - '((=>ucs* . #x5840) ; 塀 - (=>daikanwa . 05316) ; 塀 + '((<-denotational + ((=ucs . #x5840) ; 塀 + )) + (=>ucs* . #x5840) ; 塀 (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 11) (total-strokes . 13) @@ -7307,7 +7350,7 @@ ) ((=gt-k . 00199) ; >-K00199; ) - ((=ucs@unicode . #x5C5B) ; &C3-3543; + ((=cns11643-3 . #x3543) ; &C3-3543; [21-35] )) (=jef-china3 . #x48B9) ; &JC3-48B9; )) diff --git a/lisp/utf-2000/Ideograph-R034-Go.el b/lisp/utf-2000/Ideograph-R034-Go.el index 3de423d..390ddf5 100644 --- a/lisp/utf-2000/Ideograph-R034-Go.el +++ b/lisp/utf-2000/Ideograph-R034-Go.el @@ -340,7 +340,7 @@ ((=gb2312 . #x5260) ; &C1-4729; [50-64] (=cns11643-1 . #x4729) ; &I-C1-4729; [39-09] ) - ((=ucs@unicode . #x590A) ; &CDP-8A71; + ((=cns11643-3 . #x213A) ; &CDP-8A71; [01-26] )) (=cns11643-3 . #x2B79) ; &C3-2B79; [11-89] ) diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el index da48439..083b902 100644 --- a/lisp/utf-2000/Ideograph-R038-Woman.el +++ b/lisp/utf-2000/Ideograph-R038-Woman.el @@ -4157,51 +4157,55 @@ (ideographic-strokes . 6) (total-strokes . 9) (=ucs . #x59FC) ; 姼 - (=cns11643-2 . #x296B) ; &I-C2-296B; [09-75] (=big5 . #xCE6A) ; &I-B-CE6A; - (=daikanwa . 06253) ; &I-M-06253; + (->subsumptive + ((=daikanwa . 06253) ; &M-06253; + (=ucs@unicode . #x59FC) ; &M-06253; + ) + ((=cns11643-2 . #x296B) ; &C2-296B; [09-75] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 6) (total-strokes . 9) (=ucs . #x59FD) ; 姽 - (=iso-ir165 . #x2C40) ; &I-EGB-2C40; [12-32] - (=cns11643-2 . #x296A) ; &I-C2-296A; [09-74] (=big5 . #xCE69) ; &I-B-CE69; - (=daikanwa . 06254) ; &I-M-06254; - (=jef-china3 . #x91C3) ; &I-JC3-91C3; + (->subsumptive + ((=iso-ir165 . #x2C40) ; &M-06254; [12-32] + (=daikanwa . 06254) ; &I-M-06254; + (=jef-china3 . #x91C3) ; &I-JC3-91C3; + (=ucs@unicode . #x59FD) ; &M-06254; + ) + ((=cns11643-2 . #x296A) ; &C2-296A; [09-74] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 6) (total-strokes . 9) (=ucs . #x59FE) ; 姾 - (=cns11643-2 . #x2975) ; &I-C2-2975; [09-85] (=big5 . #xCE74) ; &I-B-CE74; - (=daikanwa . 06255) ; &I-M-06255; - )) -(define-char - '((=>ucs . #x2170B) ; 𡜋 - (ideographic-radical . 38) ; ⼥ - (ideographic-strokes . 6) - (total-strokes . 9) - (=daikanwa . 06256) ; &M-06256; + (->subsumptive + ((=daikanwa . 06255) ; &M-06255; + ) + ((=cns11643-2 . #x2975) ; &C2-2975; [09-85] + ) + ((=ucs@unicode . #x59FE) ; &UU+59FE; + )) )) (define-char - '((morohashi-daikanwa 6256 0 1) - (ideographic-radical . 38) ; ⼥ + '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 6) (total-strokes . 9) (=ucs . #x2170B) ; 𡜋 - )) -(define-char - '((=>ucs . #x2170B) ; 𡜋 - (morohashi-daikanwa 6256 0 2) - (ideographic-radical . 38) ; ⼥ - (ideographic-strokes . 6) - (total-strokes . 9) - (=cns11643-5 . #x2863) ; &C5-2863; [08-67] + (->subsumptive + ((=daikanwa . 06256) ; &M-06256; + ) + ((=ucs@iso . #x2170B) ; &U-0002170B; + ) + ((=cns11643-5 . #x2863) ; &C5-2863; [08-67] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ @@ -6727,36 +6731,54 @@ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x5A4F) ; 婏 - (=cns11643-3 . #x353B) ; &I-C3-353B; [21-27] - (=daikanwa . 06403) ; &I-M-06403; + (->subsumptive + ((=daikanwa . 06403) ; &M-06403; + ) + ((=ucs@unicode . #x5A4F) ; &UU+5A4F; + ) + ((=cns11643-3 . #x353B) ; &C3-353B; [21-27] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x5A50) ; 婐 - (=jis-x0212 . #x3960) ; &I-JSP-3960; [25-64] - (=cns11643-2 . #x3459) ; &I-C2-3459; [20-57] (=big5 . #xD4D6) ; &I-B-D4D6; - (=daikanwa . 06404) ; &I-M-06404; + (->subsumptive + ((=jis-x0212 . #x3960) ; &M-06404; [25-64] + (=daikanwa . 06404) ; &I-M-06404; + (=ucs@unicode . #x5A50) ; &M-06404; + ) + ((=cns11643-2 . #x3459) ; &C2-3459; [20-57] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x5A51) ; 婑 - (=cns11643-2 . #x346E) ; &I-C2-346E; [20-78] (=big5 . #xD4EB) ; &I-B-D4EB; - (=daikanwa . 06405) ; &I-M-06405; + (->subsumptive + ((=daikanwa . 06405) ; &M-06405; + (=ucs@unicode . #x5A51) ; &M-06405; + ) + ((=cns11643-2 . #x346E) ; &C2-346E; [20-78] + )) )) (define-char '((ideographic-radical . 38) ; ⼥ (ideographic-strokes . 8) (total-strokes . 11) (=ucs . #x5A52) ; 婒 - (=cns11643-2 . #x3462) ; &I-C2-3462; [20-66] (=big5 . #xD4DF) ; &I-B-D4DF; - (=daikanwa . 06406) ; &I-M-06406; + (->subsumptive + ((=daikanwa . 06406) ; &M-06406; + ) + ((=ucs@unicode . #x5A52) ; &UU+5A52; + ) + ((=cns11643-2 . #x3462) ; &C2-3462; [20-66] + )) )) (define-char '((=>ucs . #x21767) ; 𡝧 @@ -15813,7 +15835,8 @@ (=jis-x0213-1 . #x3D77) ; &I-JX1-3D77; [29-87] (=daikanwa . 06036) ; &I-M-06036; ) - ((=ucs@unicode . #x77BF) ; &UU+77BF; + ((=gb2312 . #x7644) ; &C1-766D; [86-36] + (=cns11643-1 . #x766D) ; &I-C1-766D; [86-77] )) (=ucs@unicode . #x3739) ; &UU+3739; ) @@ -15823,7 +15846,8 @@ ) ((=cns11643-1 . #x444C) ; &C1-444C; [36-44] ) - ((=ucs . #x77BF) ; 瞿 + ((=gb2312 . #x7644) ; &C1-766D; [86-36] + (=cns11643-1 . #x766D) ; &I-C1-766D; [86-77] )) (=cns11643-4 . #x6637) ; &C4-6637; [70-23] (=ucs@cns . #x3739) ; &C4-6637; diff --git a/lisp/utf-2000/Ideograph-R046-Mountain.el b/lisp/utf-2000/Ideograph-R046-Mountain.el index 3799189..0f00de5 100644 --- a/lisp/utf-2000/Ideograph-R046-Mountain.el +++ b/lisp/utf-2000/Ideograph-R046-Mountain.el @@ -8934,7 +8934,7 @@ ) ((=ucs . #x5C71) ; 山 ) - ((=ucs@unicode . #x7F6A) ; &G0-576F; + ((=gb2312 . #x576F) ; &G0-576F; [55-79] )) (=ucs@unicode . #x3811) ; &UU+3811; )) @@ -10128,7 +10128,9 @@ ) ((=ucs . #x5C71) ; 山 ) - ((=ucs@unicode . #x76E7) ; >-29541; + ((=jis-x0208 . #x623A) ; >-29541; [66-26] + (=jis-x0213-1 . #x623A) ; &I-JX1-623A; [66-26] + (=daikanwa . 23050) ; &I-M-23050; )) (=daikanwa . 08597) ; &M-08597; (=ucs@unicode . #x3820) ; &M-08597; diff --git a/lisp/utf-2000/Ideograph-R050-Turban.el b/lisp/utf-2000/Ideograph-R050-Turban.el index 1cc8bee..c1e5026 100644 --- a/lisp/utf-2000/Ideograph-R050-Turban.el +++ b/lisp/utf-2000/Ideograph-R050-Turban.el @@ -3653,7 +3653,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs@unicode . #x822C) ; &G0-3063; + ((=gb2312 . #x3063) ; &G0-3063; [16-67] ) ((=ucs . #x5DFE) ; 巾 )) @@ -5656,7 +5656,10 @@ ) ((=ucs . #x5DFE) ; 巾 ) - ((=ucs@unicode . #x8511) ; >-42131; + ((=jis-x0208 . #x4A4E) ; >-42131; [42-46] + (=gb2312 . #x436F) ; &I-G0-436F; [35-79] + (=ks-x1001 . #x5921) ; &I-K0-5921; [57-01] + (=jis-x0213-1 . #x4A4E) ; &I-JX1-4A4E; [42-46] )) (=jis-x0212 . #x3C3F) ; &JX2-287E; [28-31] (=jis-x0213-2 . #x287E) ; &I-JX2-287E; [08-94] diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index 68d5f50..bb603a5 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -15082,7 +15082,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs@unicode . #x655D) ; &G0-3156; + ((=gb2312 . #x3156) ; &G0-3156; [17-54] ) ((=ucs . #x624B) ; 手 )) diff --git a/lisp/utf-2000/Ideograph-R068-Dipper.el b/lisp/utf-2000/Ideograph-R068-Dipper.el index 817b35b..d0af63a 100644 --- a/lisp/utf-2000/Ideograph-R068-Dipper.el +++ b/lisp/utf-2000/Ideograph-R068-Dipper.el @@ -256,7 +256,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) - ((=ucs@unicode . #x89D2) ; &G0-3D47; + ((=gb2312 . #x3D47) ; &G0-3D47; [29-39] ) ((=ucs . #x6597) ; 斗 )) diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index c646c88..17b0642 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -4379,16 +4379,33 @@ (ideographic-strokes . 5) (total-strokes . 9) (=ucs . #x67E9) ; 柩 - (=jis-x0208 . #x5B4D) ; &I-J90-5B4D; [59-45] - (=gb2312 . #x6851) ; &I-G0-6851; [72-49] - (=ks-x1001 . #x4F2F) ; &I-K0-4F2F; [47-15] - (=cns11643-1 . #x5161) ; &I-C1-5161; [49-65] - (=jis-x0213-1 . #x5B4D) ; &I-JX1-5B4D; [59-45] - (=big5 . #xAC5E) ; &I-B-AC5E; - (=gt . 18571) ; &I-GT-18571; - (=gt-pj-1 . #x5B4D) ; &I-GT-18571; [59-45] - (=daikanwa . 14650) ; &I-M-14650; - (=shinjigen@rev . 3539) ; 柩 + (->subsumptive + ((=jis-x0208 . #x5B4D) ; >-18571; [59-45] + (=ks-x1001 . #x4F2F) ; &I-K0-4F2F; [47-15] + (=cns11643-1 . #x5161) ; &I-C1-5161; [49-65] + (=jis-x0213-1 . #x5B4D) ; &I-JX1-5B4D; [59-45] + (=big5 . #xAC5E) ; &I-B-AC5E; + (=gt . 18571) ; &I-GT-18571; + (=gt-pj-1 . #x5B4D) ; &I-GT-18571; [59-45] + (=daikanwa . 14650) ; &I-M-14650; + (=shinjigen . 3539) ; >-18571; + (=ucs@jis . #x67E9) ; >-18571; + (<-same + ((=jis-x0212 . #x3425) ; &M-02597; [20-05] + (=cns11643-4 . #x2165) ; &I-C4-2165; [01-69] + (=daikanwa . 02597) ; &I-M-02597; + )) + (<-same*sources + shuowen shuowen-zhu daikanwa) + (->Zhouwen + ((=daikanwa . 02671) ; &M-02671; + )) + (->Zhouwen*sources + shuowen daikanwa) + ) + ((=gb2312 . #x6851) ; &G0-6851; [72-49] + (=ucs@unicode . #x67E9) ; &G0-6851; + )) )) (define-char '((ideographic-radical . 75) ; ⽊ @@ -7469,7 +7486,7 @@ ) ((=ucs . #x6728) ; 木 ) - ((=ucs@unicode . #x8C55) ; &G0-7539; + ((=gb2312 . #x7539) ; &G0-7539; [85-25] )) (=ucs@unicode . #x3B6C) ; &UU+3B6C; ) diff --git a/lisp/utf-2000/Ideograph-R076-Lack.el b/lisp/utf-2000/Ideograph-R076-Lack.el index e56a367..118d789 100644 --- a/lisp/utf-2000/Ideograph-R076-Lack.el +++ b/lisp/utf-2000/Ideograph-R076-Lack.el @@ -2433,6 +2433,7 @@ (=ucs@jis . #x6B46) ; &M-16139; ) ((=cns11643-2 . #x437B) ; &C2-437B; [35-91] + (=ucs@cns . #x6B46) ; &C2-437B; ) ((=gb2312 . #x6C27) ; &G0-6C27; [76-07] (=ucs@unicode . #x6B46) ; &G0-6C27; @@ -2443,6 +2444,7 @@ (ideographic-strokes . 9) (total-strokes . 13) (=ucs . #x6B47) ; 歇 + (=big5 . #xB7B2) ; &I-B-B7B2; (->subsumptive ((=jis-x0208 . #x5D3C) ; >-20735; [61-28] (=ks-x1001 . #x7A4E) ; &I-K0-7A4E; [90-46] @@ -2452,16 +2454,30 @@ (=gt-k . 10315) ; &I-GT-K10315; (=gt-pj-1 . #x5D3C) ; &I-GT-20735; [61-28] (=daikanwa . 16141) ; &I-M-16141; - (=shinjigen@rev . 3932) ; >-20735; (=ucs@jis . #x6B47) ; >-20735; ) ((=gb2312 . #x502A) ; &G0-502A; [48-10] - (=big5 . #xB7B2) ; &I-B-B7B2; + (=shinjigen . 3932) ; &G0-502A; (=ucs@unicode . #x6B47) ; &G0-502A; (mojikyo . 016141) ; &MCS-60003F0D; )) )) (define-char + '((<-denotational + ((=ucs . #x6B47) ; 歇 + )) + (ideographic-radical . 76) ; ⽋ + (ideographic-strokes . 9) + (total-strokes . 13) + (=shinjigen . 3933) ; &SJG2-3933; + (<-vulgar + ((=gb2312 . #x502A) ; &G0-502A; [48-10] + (=shinjigen . 3932) ; &G0-502A; + )) + (<-vulgar*sources + shinjigen) + )) +(define-char '((ideographic-radical . 76) ; ⽋ (ideographic-strokes . 9) (total-strokes . 13) diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 28e4250..cafac11 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -4011,9 +4011,9 @@ (ideographic-strokes . 7) (total-strokes . 11) (=ucs . #x70FF) ; 烿 + (=big5 . #xD653) ; &I-B-D653; (->subsumptive - ((=big5 . #xD653) ; &M-19062; - (=daikanwa . 19062) ; &I-M-19062; + ((=daikanwa . 19062) ; &M-19062; (=ucs@unicode . #x70FF) ; &M-19062; ) ((=cns11643-2 . #x3676) ; &C2-3676; [22-86] @@ -4036,7 +4036,11 @@ (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] (=daikanwa . 18850) ; &I-M-18850; ) - ((=ucs@unicode . #x77E3) ; >-30619; + ((=jis-x0208 . #x6263) ; >-30619; [66-67] + (=gb2312 . #x5253) ; &I-G0-5253; [50-51] + (=ks-x1001 . #x6B78) ; &I-K0-6B78; [75-88] + (=jis-x0213-1 . #x6263) ; &I-JX1-6263; [66-67] + (=daikanwa . 23931) ; &I-M-23931; )) (=daikanwa . 19063) ; &M-19063; (=cbeta . 00198) ; &I-CB00198; @@ -4058,9 +4062,9 @@ (ideographic-strokes . 7) (total-strokes . 11) (=ucs . #x7100) ; 焀 + (=big5 . #xD656) ; &I-B-D656; (->subsumptive - ((=big5 . #xD656) ; &M-19064; - (=daikanwa . 19064) ; &I-M-19064; + ((=daikanwa . 19064) ; &M-19064; (=ucs@unicode . #x7100) ; &M-19064; ) ((=cns11643-2 . #x3679) ; &C2-3679; [22-89] @@ -4071,19 +4075,23 @@ '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 7) (total-strokes . 11) - (hanyu-dazidian 1 400 5) (=ucs . #x2422B) ; 𤈫 - (=daikanwa . 19065) ; &I-M-19065; - (=hanziku-1 . #xF858) ; &I-HZK01-F858; - (=cbeta . 05337) ; &I-CB05337; - )) -(define-char - '((=>ucs . #x2422B) ; 𤈫 - (morohashi-daikanwa 19065 0 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 7) - (total-strokes . 11) - (=cns11643-6 . #x414E) ; &C6-414E; [33-46] + (->subsumptive + ((=daikanwa . 19065) ; &M-19065; + (<-original + ((=cns11643-1 . #x5970) ; &M-07440; [57-80] + (=daikanwa . 07440) ; &I-M-07440; + )) + (<-original*sources + zhengzitong daikanwa) + ) + ((hanyu-dazidian 1 400 5) + (=hanziku-1 . #xF858) ; &CB05337; + (=cbeta . 05337) ; &I-CB05337; + (=ucs@iso . #x2422B) ; &CB05337; + ) + ((=cns11643-6 . #x414E) ; &C6-414E; [33-46] + )) )) (define-char '((ideographic-radical . 86) ; ⽕ @@ -4103,10 +4111,11 @@ (ideographic-strokes . 7) (total-strokes . 11) (=ucs . #x7102) ; 焂 + (=big5 . #xD65A) ; &I-B-D65A; (->subsumptive - ((=big5 . #xD65A) ; &M-19067; - (=daikanwa . 19067) ; &I-M-19067; - (=ucs@unicode . #x7102) ; &M-19067; + ((=daikanwa . 19067) ; &M-19067; + ) + ((=ucs@unicode . #x7102) ; &UU+7102; ) ((=cns11643-2 . #x367D) ; &C2-367D; [22-93] (=ucs@cns . #x7102) ; &C2-367D; @@ -4116,35 +4125,32 @@ '((ideographic-radical . 86) ; ⽕ (ideographic-strokes . 7) (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x706B) ; 火 - ) - ((=ucs . #x8D64) ; 赤 - )) (=ucs . #x7103) ; 焃 - (=jis-x0212 . #x4962) ; &I-JSP-4962; [41-66] - (=jis-x0213-2 . #x6F6A) ; &I-JX2-6F6A; [79-74] - (=daikanwa . 19068) ; &I-M-19068; - (=cbeta . 00199) ; &I-CB00199; - )) -(define-char - '((=>ucs . #x7103) ; 焃 - (morohashi-daikanwa 19068 0 0) - (ideographic-radical . 86) ; ⽕ - (ideographic-strokes . 7) - (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=cns11643-1 . #x4556) ; &C1-4556; [37-54] + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00405) ; >-K00405; + ) + ((=ucs . #x8D64) ; 赤 + )) + (=jis-x0212 . #x4962) ; &M-19068; [41-66] + (=jis-x0213-2 . #x6F6A) ; &I-JX2-6F6A; [79-74] + (=daikanwa . 19068) ; &I-M-19068; + (=cbeta . 00199) ; &I-CB00199; + (=ucs@unicode . #x7103) ; &M-19068; ) - ((=ucs . #x8D64) ; 赤 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=cns11643-1 . #x4556) ; &C1-4556; [37-54] + ) + ((=ucs . #x8D64) ; 赤 + )) + (=cns11643-3 . #x372C) ; &C3-372C; [23-12] )) - (=cns11643-3 . #x372C) ; &C3-372C; [23-12] )) (define-char '((ideographic-radical . 86) ; ⽕ @@ -6396,6 +6402,7 @@ (define-char '((ideographic-radical . 86) ; ⽕ (=ucs . #x7150) ; 煐 + (=big5 . #xDE7D) ; &I-B-DE7D; )) (define-char '((<-denotational @@ -6422,7 +6429,6 @@ (=ks-x1001 . #x673C) ; &JX2-6F73; [71-28] (=jis-x0212 . #x4978) ; &I-JSP-4978; [41-88] (=jis-x0213-2 . #x6F73) ; &I-JX2-6F73; [79-83] - (=big5 . #xDE7D) ; &I-B-DE7D; (=jef-china3 . #x98BA) ; &I-JC3-98BA; (=ucs@unicode . #x7150) ; &JX2-6F73; )) @@ -6479,7 +6485,11 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs@unicode . #x8005) ; >-37308; + ((=jis-x0208 . #x3C54) ; >-37308; [28-52] + (=gb2312 . #x555F) ; &I-G0-555F; [53-63] + (=cns11643-1 . #x4F2F) ; &I-C1-4F2F; [47-15] + (=jis-x0213-1 . #x3C54) ; &I-JX1-3C54; [28-52] + (=daikanwa . 28852) ; &I-M-28852; ) ((=jis-x0208 . #x3250) ; >-24152; [18-48] (=gb2312 . #x3B70) ; &I-G0-3B70; [27-80] @@ -8851,7 +8861,8 @@ (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] (=daikanwa . 18850) ; &I-M-18850; ) - ((=ucs@unicode . #x8200) ; &C1-576A; + ((=gb2312 . #x5228) ; &C1-576A; [50-08] + (=cns11643-1 . #x576A) ; &I-C1-576A; [55-74] )) (=ucs@unicode . #x7196) ; &UU+7196; )) @@ -10910,13 +10921,39 @@ )) (define-char '((ideographic-radical . 86) ; ⽕ + (sound@ja/on "riN") (=ucs . #x71D0) ; 燐 + (=big5 . #xBF4D) ; &I-B-BF4D; (->subsumptive ((ideographic-strokes . 12) (total-strokes . 16) - (=big5 . #xBF4D) ; &M-19417; - (=daikanwa . 19417) ; &I-M-19417; - (=ucs@unicode . #x71D0) ; &M-19417; + (=daikanwa . 19417) ; &M-19417; + (<-formed@jiyun + ((=iso-ir165 . #x2F7B) ; &CDP-8CB9; [15-91] + (=daikanwa . 26939) ; &I-M-26939; + )) + (<-formed@jiyun*sources + jiyun) + (<-same@jiyun + ((=iso-ir165 . #x2F7B) ; &CDP-8CB9; [15-91] + (=daikanwa . 26939) ; &I-M-26939; + )) + (<-same@jiyun*sources + jiyun daikanwa) + (<-same@zhengzitong + ((=daikanwa . 19267) ; &M-19267; + )) + (<-same@zhengzitong*sources + zhengzitong daikanwa) + (<-vulgar@zhengzitong + ((=daikanwa . 19267) ; &M-19267; + )) + (<-vulgar@zhengzitong*sources + zhengzitong) + ) + ((ideographic-strokes . 12) + (total-strokes . 16) + (=ucs@unicode . #x71D0) ; &UU+71D0; ) ((ideographic-strokes . 12) (total-strokes . 16) @@ -10942,11 +10979,7 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) - ((=jis-x0208 . #x3250) ; >-24152; [18-48] - (=gb2312 . #x3B70) ; &I-G0-3B70; [27-80] - (=ks-x1001 . #x7B7D) ; &I-K0-7B7D; [91-93] - (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] - (=daikanwa . 18850) ; &I-M-18850; + ((=gt-k . 00405) ; >-K00405; ) ((=jis-x0208 . #x4638) ; >-33246; [38-24] (=ks-x1001 . #x545B) ; &I-K0-545B; [52-59] @@ -10960,13 +10993,10 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) - ((=jis-x0208 . #x3250) ; >-24152; [18-48] - (=gb2312 . #x3B70) ; &I-G0-3B70; [27-80] - (=ks-x1001 . #x7B7D) ; &I-K0-7B7D; [91-93] - (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] - (=daikanwa . 18850) ; &I-M-18850; + ((=gt-k . 00405) ; >-K00405; ) - ((=ucs@unicode . #x7AE5) ; &C1-6129; + ((=gb2312 . #x4D2F) ; &C1-6129; [45-15] + (=cns11643-1 . #x6129) ; &I-C1-6129; [65-09] )) (=ucs@unicode . #x71D1) ; &UU+71D1; ) @@ -10976,7 +11006,8 @@ ) ((=cns11643-1 . #x4556) ; &C1-4556; [37-54] ) - ((=ucs@unicode . #x7AE5) ; &C1-6129; + ((=gb2312 . #x4D2F) ; &C1-6129; [45-15] + (=cns11643-1 . #x6129) ; &I-C1-6129; [65-09] )) (=cns11643-3 . #x515E) ; &C3-515E; [49-62] )) @@ -11242,11 +11273,10 @@ (->subsumptive ((=daikanwa . 19431) ; &M-19431; ) - ((jisx0208-difference . -78/4) + ((=jis-x0208@1978/4-pr . #x5F73) ; >-24851; [63-83] (=jis-x0208@1983 . #x5F73) ; >-24851; [63-83] (=jis-x0208@1990 . #x5F73) ; &I-J90-5F73; [63-83] (=jis-x0213-1 . #x5F73) ; &I-JX1-5F73; [63-83] - (=jis-x0208@1978/4-pr . #x5F73) ; >-24851; [63-83] (=gt . 24851) ; &I-GT-24851; (=gt-pj-1 . #x5F73) ; &I-GT-24851; [63-83] (=jef-china3 . #x57FC) ; &I-JC3-57FC; diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el index a1f5757..f4d7c49 100644 --- a/lisp/utf-2000/Ideograph-R109-Eye.el +++ b/lisp/utf-2000/Ideograph-R109-Eye.el @@ -8626,72 +8626,57 @@ (=gt . 30371) ; &I-GT-30371; (=gt-pj-1 . #x625C) ; &I-GT-30371; [66-60] (=daikanwa . 23745) ; &I-M-23745; - (=shinjigen@rev . 5365) ; 瞽 + (=shinjigen . 5365) ; 瞽 )) (define-char - '((=>ucs . #x77BE) ; 瞾 - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 13) - (total-strokes . 18) - (=jis-x0212 . #x4F3B) ; &M-23746; [47-27] - (=daikanwa . 23746) ; &I-M-23746; - (=ucs@jis . #x77BE) ; &M-23746; - )) -(define-char - '((=>ucs . #x77BE) ; 瞾 - (morohashi-daikanwa 23746 0 0) - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 13) - (total-strokes . 18) - (=cns11643-3 . #x583B) ; &C3-583B; [56-27] - )) -(define-char - '((morohashi-daikanwa 23746 0 1) - (ideographic-radical . 109) ; ⽬ + '((ideographic-radical . 109) ; ⽬ (ideographic-strokes . 13) (total-strokes . 18) - (hanyu-dazidian 4 2517 5) (=ucs . #x77BE) ; 瞾 - (=hanziku-7 . #xB260) ; &I-HZK07-B260; - )) -(define-char - '((=>ucs . #x77BF) ; 瞿 - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 13) - (total-strokes . 18) - (=jis-x0208 . #x625A) ; >-30367; [66-58] - (=ks-x1001 . #x4F3A) ; &I-K0-4F3A; [47-26] - (=jis-x0213-1 . #x625A) ; &I-JX1-625A; [66-58] - (=big5 . #xC2A3) ; &I-B-C2A3; - (=gt . 30367) ; &I-GT-30367; - (=gt-pj-1 . #x625A) ; &I-GT-30367; [66-58] - (=daikanwa . 23747) ; &I-M-23747; - (=shinjigen@rev . 5363) ; >-30367; - (=ucs@jis . #x77BF) ; >-30367; + (->subsumptive + ((=jis-x0212 . #x4F3B) ; &M-23746; [47-27] + (=daikanwa . 23746) ; &I-M-23746; + (=ucs@jis . #x77BE) ; &M-23746; + ) + ((=cns11643-3 . #x583B) ; &C3-583B; [56-27] + ) + ((hanyu-dazidian 4 2517 5) + (=hanziku-7 . #xB260) ; &HZK07-B260; + (=ucs@unicode . #x77BE) ; &HZK07-B260; + )) )) (define-char - '((morohashi-daikanwa 23747 0 1) - (ideographic-radical . 109) ; ⽬ + '((ideographic-radical . 109) ; ⽬ (ideographic-strokes . 13) (total-strokes . 18) (=ucs . #x77BF) ; 瞿 - (=gb2312 . #x7644) ; &I-G0-7644; [86-36] - (=cns11643-1 . #x766D) ; &I-C1-766D; [86-77] - )) -(define-char - '((=>ucs . #x252E0) ; 𥋠 - (ideographic-radical . 109) ; ⽬ - (ideographic-strokes . 13) - (total-strokes . 18) - (=cns11643-7 . #x407C) ; &M-23748; [32-92] - (=daikanwa . 23748) ; &I-M-23748; + (=big5 . #xC2A3) ; &I-B-C2A3; + (->subsumptive + ((=jis-x0208 . #x625A) ; >-30367; [66-58] + (=ks-x1001 . #x4F3A) ; &I-K0-4F3A; [47-26] + (=jis-x0213-1 . #x625A) ; &I-JX1-625A; [66-58] + (=gt . 30367) ; &I-GT-30367; + (=gt-pj-1 . #x625A) ; &I-GT-30367; [66-58] + (=daikanwa . 23747) ; &I-M-23747; + (=shinjigen . 5363) ; >-30367; + (=ucs@jis . #x77BF) ; >-30367; + ) + ((=gb2312 . #x7644) ; &C1-766D; [86-36] + (=cns11643-1 . #x766D) ; &I-C1-766D; [86-77] + (=ucs@unicode . #x77BF) ; &C1-766D; + )) )) (define-char - '((morohashi-daikanwa 23748 0 0) - (ideographic-radical . 109) ; ⽬ + '((ideographic-radical . 109) ; ⽬ (ideographic-strokes . 13) (total-strokes . 18) (=ucs . #x252E0) ; 𥋠 + (->subsumptive + ((=cns11643-7 . #x407C) ; &M-23748; [32-92] + (=daikanwa . 23748) ; &I-M-23748; + ) + ((=ucs@iso . #x252E0) ; &U-000252E0; + )) )) (define-char '((ideographic-radical . 109) ; ⽬ diff --git a/lisp/utf-2000/Ideograph-R113-Spirit.el b/lisp/utf-2000/Ideograph-R113-Spirit.el index 51a3323..c7138fd 100644 --- a/lisp/utf-2000/Ideograph-R113-Spirit.el +++ b/lisp/utf-2000/Ideograph-R113-Spirit.el @@ -3323,6 +3323,15 @@ (=gt-pj-1 . #x6349) ; &I-GT-31833; [67-41] (=shinjigen . 5641) ; >-31833; (=ucs@jis . #x7980) ; >-31833; + (<-vulgar + ((=jis-x0208 . #x6348) ; >-32415; [67-40] + (=ks-x1001 . #x7922) ; &I-K0-7922; [89-02] + (=jis-x0213-1 . #x6348) ; &I-JX1-6348; [67-40] + (=daikanwa . 25127) ; &I-M-25127; + (=shinjigen . 5640) ; >-32415; + )) + (<-vulgar*sources + shinjigen) ) ((=gb2312 . #x5977) ; &G0-5977; [57-87] (=ucs@unicode . #x7980) ; &G0-5977; @@ -3333,6 +3342,7 @@ (ideographic-strokes . 8) (total-strokes . 13) (=ucs . #x7981) ; 禁 + (=big5 . #xB854) ; &I-B-B854; (->subsumptive ((=cns11643-1 . #x655B) ; &M-24743; [69-59] (=daikanwa . 24743) ; &I-M-24743; @@ -3341,7 +3351,6 @@ (=gb2312 . #x3D7B) ; &I-G0-3D7B; [29-91] (=ks-x1001 . #x5057) ; &I-K0-5057; [48-55] (=jis-x0213-1 . #x3658) ; &I-JX1-3658; [22-56] - (=big5 . #xB854) ; &I-B-B854; (=gt . 31785) ; &I-GT-31785; (=gt-k . 10195) ; &I-GT-K10195; (=gt-pj-1 . #x3658) ; &I-GT-31785; [22-56] diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el index b8f915d..7c1b497 100644 --- a/lisp/utf-2000/Ideograph-R115-Grain.el +++ b/lisp/utf-2000/Ideograph-R115-Grain.el @@ -2429,6 +2429,7 @@ (ideographic-strokes . 8) (total-strokes . 13) (=ucs . #x7A1F) ; 稟 + (=big5 . #xB85B) ; &I-B-B85B; (->subsumptive ((=jis-x0208 . #x6348) ; >-32415; [67-40] (=ks-x1001 . #x7922) ; &I-K0-7922; [89-02] @@ -2437,11 +2438,10 @@ (=gt-k . 10331) ; &I-GT-K10331; (=gt-pj-1 . #x6348) ; &I-GT-32415; [67-40] (=daikanwa . 25127) ; &I-M-25127; - (=shinjigen@rev . 5640) ; >-32415; + (=shinjigen . 5640) ; >-32415; (=ucs@jis . #x7A1F) ; >-32415; ) - ((=big5 . #xB85B) ; &B-B85B; - (=ucs@unicode . #x7A1F) ; &B-B85B; + ((=ucs@unicode . #x7A1F) ; &UU+7A1F; ) ((=cns11643-1 . #x6562) ; &C1-6562; [69-66] )) @@ -2450,22 +2450,60 @@ '((ideographic-radical . 115) ; ⽲ (ideographic-strokes . 8) (total-strokes . 13) - (=ucs . #x7A20) ; 稠 + (=ucs . #x257D4) ; 𥟔 + (->subsumptive + ((=daikanwa . 25128) ; &M-25128; + ) + ((=ucs@iso . #x257D4) ; &U-000257D4; + ) + ((=cns11643-5 . #x4132) ; &C5-4132; [33-18] + )) + )) +(define-char + '((ideographic-radical . 115) ; ⽲ + (ideographic-strokes . 8) + (total-strokes . 13) + (=ucs . #x257D5) ; 𥟕 (->subsumptive - ((=jis-x0208 . #x6347) ; >-32401; [67-39] - (=ks-x1001 . #x7056) ; &I-K0-7056; [80-54] - (=jis-x0213-1 . #x6347) ; &I-JX1-6347; [67-39] - (=big5 . #xB859) ; &I-B-B859; - (=gt . 32401) ; &I-GT-32401; - (=gt-pj-1 . #x6347) ; &I-GT-32401; [67-39] - (=daikanwa . 25130) ; &I-M-25130; - (=shinjigen@rev . 5637) ; >-32401; - (=ucs@jis . #x7A20) ; >-32401; + ((=cns11643-5 . #x4134) ; &M-25129; [33-20] + (=daikanwa . 25129) ; &I-M-25129; ) - ((=gb2312 . #x336D) ; &C1-6560; [19-77] - (=cns11643-1 . #x6560) ; &I-C1-6560; [69-64] - (=ucs@unicode . #x7A20) ; &C1-6560; + ((=ucs@iso . #x257D5) ; &U-000257D5; + )) + )) +(define-char + '((ideographic-radical . 115) ; ⽲ + (ideographic-strokes . 8) + (total-strokes . 13) + (=ucs . #x7A20) ; 稠 + (=big5 . #xB859) ; &I-B-B859; + )) +(define-char + '((<-denotational + ((=ucs . #x7A20) ; 稠 )) + (ideographic-radical . 115) ; ⽲ + (ideographic-strokes . 8) + (total-strokes . 13) + (=jis-x0208 . #x6347) ; >-32401; [67-39] + (=ks-x1001 . #x7056) ; &I-K0-7056; [80-54] + (=jis-x0213-1 . #x6347) ; &I-JX1-6347; [67-39] + (=gt . 32401) ; &I-GT-32401; + (=gt-pj-1 . #x6347) ; &I-GT-32401; [67-39] + (=daikanwa . 25130) ; &I-M-25130; + (=shinjigen . 5637) ; >-32401; + (=ucs@jis . #x7A20) ; >-32401; + )) +(define-char + '((<-denotational + ((=ucs . #x7A20) ; 稠 + )) + (ideographic-radical . 115) ; ⽲ + (ideographic-strokes . 8) + (total-strokes . 13) + (=gb2312 . #x336D) ; &C1-6560; [19-77] + (=cns11643-1 . #x6560) ; &I-C1-6560; [69-64] + (=ucs@unicode . #x7A20) ; &C1-6560; )) (define-char '((ideographic-radical . 115) ; ⽲ @@ -2644,20 +2682,6 @@ '((ideographic-radical . 115) ; ⽲ (ideographic-strokes . 8) (total-strokes . 13) - (=ucs . #x257D4) ; 𥟔 - (=cns11643-5 . #x4132) ; &I-C5-4132; [33-18] - )) -(define-char - '((ideographic-radical . 115) ; ⽲ - (ideographic-strokes . 8) - (total-strokes . 13) - (=ucs . #x257D5) ; 𥟕 - (=cns11643-5 . #x4134) ; &I-C5-4134; [33-20] - )) -(define-char - '((ideographic-radical . 115) ; ⽲ - (ideographic-strokes . 8) - (total-strokes . 13) (=ucs . #x257D6) ; 𥟖 (=cns11643-5 . #x4138) ; &I-C5-4138; [33-24] )) diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el index b6d6295..ac3759a 100644 --- a/lisp/utf-2000/Ideograph-R116-Cave.el +++ b/lisp/utf-2000/Ideograph-R116-Cave.el @@ -2204,6 +2204,7 @@ ((=daikanwa . 25578) ; &M-25578; ) ((=cns11643-2 . #x4C51) ; &C2-4C51; [44-49] + (=ucs@cns . #x7AA8) ; &C2-4C51; ) ((=gb2312 . #x713F) ; &G0-713F; [81-31] (=ucs@unicode . #x7AA8) ; &G0-713F; diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index e919dca..849d4df 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -2049,9 +2049,9 @@ (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) + (=jis-x0208@1978/4-pr . #x3032) ; &JX3-3032; [16-18] (=ks-x1001 . #x7B58) ; &JX3-3032; [91-56] (=jis-x0213-1@2004 . #x3032) ; &I-JX3-3032; [16-18] - (=jis-x0208@1978/4-pr . #x3032) ; &JX3-3032; [16-18] )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -17732,6 +17732,7 @@ (define-char '((ideographic-radical . 140) ; ⾋ (=ucs . #x845B) ; 葛 + (=jis-x0208@1997 . #x336B) ; 葛 [19-75] )) (define-char '((<-denotational @@ -17739,6 +17740,7 @@ )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) + (=big5 . #xB8AF) ; &B-B8AF; (->subsumptive ((total-strokes . 13) (=daikanwa . 31420) ; &M-31420; @@ -17747,11 +17749,11 @@ (=cns11643-1 . #x6636) ; &C1-6636; [70-22] ) ((total-strokes . 12) - (=jis-x0208@1978 . #x336B) ; &J78-336B; [19-75] + (=jis-x0208@1978 . #x336B) ; &JX3-336B; [19-75] (=gb2312 . #x3870) ; &I-G0-3870; [24-80] (=ks-x1001 . #x4A67) ; &I-K0-4A67; [42-71] - (=big5 . #xB8AF) ; &I-B-B8AF; - (=ucs@unicode . #x845B) ; &J78-336B; + (=jis-x0213-1@2004 . #x336B) ; &I-JX3-336B; [19-75] + (=ucs@unicode . #x845B) ; &JX3-336B; )) )) (define-char @@ -17763,57 +17765,81 @@ (total-strokes . 11) (=jis-x0208@1983 . #x336B) ; >-40592; [19-75] (=jis-x0208@1990 . #x336B) ; &I-J90-336B; [19-75] - (=jis-x0213-1 . #x336B) ; &I-JX1-336B; [19-75] + (=jis-x0213-1@2000 . #x336B) ; &I-JX1-336B; [19-75] (=gt . 40592) ; &I-GT-40592; (=gt-k . 07731) ; &I-GT-K07731; (=gt-pj-1 . #x336B) ; &I-GT-40592; [19-75] - (=ucs@jis . #x845B) ; >-40592; + (=jef-china3 . #x61B5) ; &I-JC3-61B5; + (=ucs@jis/1990 . #x845B) ; >-40592; + (=ucs@jis/2000 . #x845B) ; >-40592; (<-simplified@JP/jis - ((=jis-x0208@1978 . #x336B) ; &J78-336B; [19-75] + ((=jis-x0208@1978 . #x336B) ; &JX3-336B; [19-75] (=gb2312 . #x3870) ; &I-G0-3870; [24-80] (=ks-x1001 . #x4A67) ; &I-K0-4A67; [42-71] + (=jis-x0213-1@2004 . #x336B) ; &I-JX3-336B; [19-75] )) (<-simplified@JP/misc ((=daikanwa . 31420) ; &M-31420; )) )) (define-char - '((=>ucs . #x845C) ; 葜 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 9) + (=ucs . #x845C) ; 葜 + )) +(define-char + '((<-denotational + ((=ucs . #x845C) ; 葜 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=daikanwa . 31421) ; &M-31421; + (->subsumptive + ((total-strokes . 13) + (=daikanwa . 31421) ; &M-31421; + ) + ((total-strokes . 12) + (=jis-x0212 . #x585B) ; &JSP-585B; [56-59] + (=ucs@jis/1990 . #x845C) ; &JSP-585B; + )) )) (define-char - '((=>ucs . #x845C) ; 葜 - (morohashi-daikanwa 31421 0 1) + '((<-denotational + ((=ucs . #x845C) ; 葜 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 12) - (=jis-x0212 . #x585B) ; &JX2-764D; [56-59] - (=jis-x0213-2 . #x764D) ; &I-JX2-764D; [86-45] - (=ucs@jis . #x845C) ; &JX2-764D; + (hanyu-dazidian 5 3243 3) + (=gb2312 . #x5D56) ; &HZK08-F5C4; [61-54] + (=hanziku-8 . #xF5C4) ; &I-HZK08-F5C4; + (=ucs@unicode . #x845C) ; &HZK08-F5C4; )) (define-char - '((=>ucs . #x845C) ; 葜 - (morohashi-daikanwa 31421 0 2) + '((<-denotational + ((=ucs . #x845C) ; 葜 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-3 . #x4432) ; &C3-4432; [36-18] + (->subsumptive + ((total-strokes . 13) + (=cns11643-3 . #x4432) ; &C3-4432; [36-18] + ) + ((total-strokes . 12) + (=jis-x0213-2 . #x764D) ; &JX2-764D; [86-45] + (=ucs@jis/2000 . #x845C) ; &JX2-764D; + (=ucs@jis/2004 . #x845C) ; &JX2-764D; + )) )) (define-char - '((morohashi-daikanwa 31421 0 3) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) - (hanyu-dazidian 5 3243 3) - (=ucs . #x845C) ; 葜 - (=gb2312 . #x5D56) ; &I-G0-5D56; [61-54] - (=hanziku-8 . #xF5C4) ; &I-HZK08-F5C4; + (=ucs . #x845D) ; 葝 + (=big5 . #xDFBC) ; &I-B-DFBC; )) (define-char - '((=>ucs . #x845D) ; 葝 + '((<-denotational + ((=ucs . #x845D) ; 葝 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 13) @@ -17821,12 +17847,13 @@ (=daikanwa . 31422) ; &I-M-31422; )) (define-char - '((morohashi-daikanwa 31422 0 1) + '((<-denotational + ((=ucs . #x845D) ; 葝 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) (total-strokes . 12) - (=ucs . #x845D) ; 葝 - (=big5 . #xDFBC) ; &I-B-DFBC; + (=ucs@unicode . #x845D) ; &UU+845D; )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -36024,43 +36051,49 @@ (=daikanwa . 32329) ; &I-M-32329; )) (define-char - '((=>ucs . #x85DD) ; 藝 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 15) + (=ucs . #x85DD) ; 藝 + (=big5 . #xC3C0) ; &I-B-C3C0; + )) +(define-char + '((<-denotational + ((=ucs . #x85DD) ; 藝 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 15) (total-strokes . 19) - (=daikanwa . 32330) ; &M-32330; + (->subsumptive + ((=daikanwa . 32330) ; &M-32330; + ) + ((=cns11643-1 . #x786B) ; &C1-786B; [88-75] + )) )) (define-char - '((=>ucs . #x85DD) ; 藝 - (morohashi-daikanwa 32330 0 0) + '((<-denotational + ((=ucs . #x85DD) ; 藝 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 15) - (total-strokes . 19) - (=cns11643-1 . #x786B) ; &C1-786B; [88-75] + (total-strokes . 18) + (=gb12345 . #x5255) ; &UU+85DD; [50-53] + (=ucs@unicode . #x85DD) ; &UU+85DD; )) (define-char - '((=>ucs . #x85DD) ; 藝 - (morohashi-daikanwa 32330 0 1) + '((<-denotational + ((=ucs . #x85DD) ; 藝 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 15) (total-strokes . 18) (=jis-x0208 . #x693A) ; >-43244; [73-26] (=ks-x1001 . #x675D) ; &I-K0-675D; [71-61] (=jis-x0213-1 . #x693A) ; &I-JX1-693A; [73-26] - (=big5 . #xC3C0) ; &I-B-C3C0; (=gt . 43244) ; &I-GT-43244; (=gt-pj-1 . #x693A) ; &I-GT-43244; [73-26] (=ucs@jis . #x85DD) ; >-43244; )) (define-char - '((morohashi-daikanwa 32330 0 2) - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 15) - (total-strokes . 18) - (=ucs . #x85DD) ; 藝 - (=gb12345 . #x5255) ; 藝 [50-53] - )) -(define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 15) (total-strokes . 19) diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index bd0ef69..1ac7601 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -936,9 +936,9 @@ (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 3) (total-strokes . 7) - (=jis-x0208@1978*sources jis-x0208@1978/i4- jis-x0208@1997) - (=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] + (=jis-x0208@1978/4-pr*sources jis-x0208@1978/4-pr jis-x0208@1997) (=jis-x0208@1978/4-pr . #x4B78) ; &M-38724; [43-88] + (=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] (=daikanwa . 38724) ; &I-M-38724; )) (define-char @@ -7549,9 +7549,9 @@ (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 7) (total-strokes . 11) + (=jis-x0208@1978/4-pr . #x3029) ; &M-38901; [16-09] (=ks-x1001 . #x5C71) ; &M-38901; [60-81] (=jis-x0213-1@2004 . #x3029) ; &I-JX3-3029; [16-09] - (=jis-x0208@1978/4-pr . #x3029) ; &M-38901; [16-09] (=daikanwa . 38901) ; &I-M-38901; (=jef-china3 . #x67CA) ; &I-JC3-67CA; (<-synonyms diff --git a/lisp/utf-2000/Ideograph-R198-Deer.el b/lisp/utf-2000/Ideograph-R198-Deer.el index 1501b44..39c14f9 100644 --- a/lisp/utf-2000/Ideograph-R198-Deer.el +++ b/lisp/utf-2000/Ideograph-R198-Deer.el @@ -1412,7 +1412,7 @@ (->subsumptive ((=daikanwa . 47690) ; &M-47690; (->synonyms@daikanwa - ((=daikanwa . 19417) ; &I-M-19417; + ((=daikanwa . 19417) ; &M-19417; )) (->synonyms@daikanwa*sources daikanwa) diff --git a/lisp/utf-2000/README.en b/lisp/utf-2000/README.en index 8c3b71b..4a07267 100644 --- a/lisp/utf-2000/README.en +++ b/lisp/utf-2000/README.en @@ -69,6 +69,7 @@ describes meaning of keys: (setsumon-tsuukun-teisei) $B@bJ8DL71Djfa(B shuowen $B@bJ8(B shuowen-zhu (danchuu) $(C`c$BJ82r;zCm!JCJCp!K(B + shuowen-changjian $B@bJ8D9d5(B songyuan-yilai-suzipu (sougen-irai-zokujifu) $BAW850JMhB/;zIh(B yuquan $B6L@t(B diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 232904a..dea1a15 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -155,61 +155,46 @@ ) ((find-charset ka) (if (find-charset kb) - (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)) - (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 (or (<= (charset-id kb) 1) - (and (charset-final kb) - (>= (charset-final kb) ?@))) - nil - (< (charset-id ka)(charset-id kb)))) - nil)) - ((find-charset kb) - t) + (let (a-ir b-ir) + (if (and (setq a-ir (charset-property ka 'iso-ir)) + (if (= a-ir 177) + (if (= (charset-id ka) -177) + t + (setq a-ir nil)) + t)) + (if (and (setq b-ir (charset-property kb 'iso-ir)) + (if (= b-ir 177) + (if (= (charset-id kb) -177) + t + (setq b-ir nil)) + t)) + (cond + ((= a-ir b-ir) + (< (charset-id ka)(charset-id kb)) + ) + ;; ((= a-ir 177) + ;; t) + ;; ((= b-ir 177) + ;; nil) + ((= (charset-dimension ka) + (charset-dimension kb)) + (< a-ir b-ir) + ) + ((> (charset-dimension ka) + (charset-dimension kb)) + )) + t) + (if (and (setq b-ir (charset-property kb 'iso-ir)) + (if (= b-ir 177) + (if (= (charset-id kb) -177) + t + (setq b-ir nil)) + t)) + nil + (< (charset-id ka)(charset-id kb))))) + nil) + ) + ((find-charset kb)) ((symbolp ka) (cond ((symbolp kb) (string< (symbol-name ka) @@ -312,7 +297,9 @@ =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))) diff --git a/src/ChangeLog b/src/ChangeLog index 53ac354..ce4a54a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,26 @@ +2009-04-04 MORIOKA Tomohiko + + * mule-charset.c (Fmake_charset): Add DOC-string of 'iso-ir and + '=>iso-ir. + (Fcharset_property): Regard '=>iso-ir as same as `iso_ir. + +2009-04-03 MORIOKA Tomohiko + + * mule-charset.c (Qto_iso_ir): New variable for XEmacs CHISE. + (make_charset): Add new argument `iso_ir'. + (Fmake_charset): Add new property `=>iso-ir' in XEmacs CHISE. + (Fmake_reverse_direction_charset): Copy CHARSET_ISO_IR(cs) in + XEmacs CHISE. + (Fcharset_property): Support `iso-ir' in XEmacs CHISE. + (syms_of_mule_charset): Add new builtin symbol `=>iso-ir' in + XEmacs CHISE. + (complex_vars_of_mule_charset): Specify argument `iso_ir' of + function `make_charset'. + + * char-ucs.h (LEADING_BYTE_*): Enclose negative value with ( ). + (struct Lisp_Charset): Add new member `iso_ir'. + (CHARSET_ISO_IR): New macro. + 2009-03-07 MORIOKA Tomohiko * mule-charset.c (Fdecode_char): Fix problem when decoding GR diff --git a/src/char-ucs.h b/src/char-ucs.h index 204efac..dee81e7 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -1,5 +1,5 @@ /* Header for UCS-4 character representation. - Copyright (C) 1999,2000,2001,2002,2003,2004,2008 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004,2008,2009 MORIOKA Tomohiko This file is part of XEmacs. @@ -64,13 +64,13 @@ Lisp_Object remove_char_ccs (Lisp_Object character, Lisp_Object ccs); typedef short Charset_ID; /* ISO/IEC 10646 */ -#define LEADING_BYTE_UCS -177 +#define LEADING_BYTE_UCS (-177) /* represent normal 80-9F */ -#define LEADING_BYTE_CONTROL_1 -77 +#define LEADING_BYTE_CONTROL_1 (-77) /* ISO/IEC 10646 BMP */ -#define LEADING_BYTE_UCS_BMP -176 +#define LEADING_BYTE_UCS_BMP (-176) #define LEADING_BYTE_SYSTEM_CHAR_ID 0 @@ -110,75 +110,75 @@ typedef short Charset_ID; /* ISO 646 IRV */ -#define LEADING_BYTE_ASCII -6 /* (CHARSET_ID_OFFSET_94 + 'B') */ +#define LEADING_BYTE_ASCII ( -6) /* (CHARSET_ID_OFFSET_94 + 'B') */ /* Right half of JIS X0201-1976 */ -#define LEADING_BYTE_KATAKANA_JISX0201 -13 /* (CHARSET_ID_OFFSET_94 + 'I') */ +#define LEADING_BYTE_KATAKANA_JISX0201 ( -13) /* (CHARSET_ID_OFFSET_94 + 'I') */ /* Left half of JIS X0201-1976 */ -#define LEADING_BYTE_LATIN_JISX0201 -14 /* (CHARSET_ID_OFFSET_94 + 'J') */ +#define LEADING_BYTE_LATIN_JISX0201 ( -14) /* (CHARSET_ID_OFFSET_94 + 'J') */ /* Right half of ISO 8859-1 */ -#define LEADING_BYTE_LATIN_ISO8859_1 -100 /* (CHARSET_ID_OFFSET_96 + 'A') */ +#define LEADING_BYTE_LATIN_ISO8859_1 (-100) /* (CHARSET_ID_OFFSET_96 + 'A') */ /* Right half of ISO 8859-2 */ -#define LEADING_BYTE_LATIN_ISO8859_2 -101 /* (CHARSET_ID_OFFSET_96 + 'B') */ +#define LEADING_BYTE_LATIN_ISO8859_2 (-101) /* (CHARSET_ID_OFFSET_96 + 'B') */ /* Right half of ISO 8859-3 */ -#define LEADING_BYTE_LATIN_ISO8859_3 -109 /* (CHARSET_ID_OFFSET_96 + 'C') */ +#define LEADING_BYTE_LATIN_ISO8859_3 (-109) /* (CHARSET_ID_OFFSET_96 + 'C') */ /* Right half of ISO 8859-4 */ -#define LEADING_BYTE_LATIN_ISO8859_4 -110 /* (CHARSET_ID_OFFSET_96 + 'D') */ +#define LEADING_BYTE_LATIN_ISO8859_4 (-110) /* (CHARSET_ID_OFFSET_96 + 'D') */ /* Right half of ISO 8859-7 */ -#define LEADING_BYTE_GREEK_ISO8859_7 -126 /* (CHARSET_ID_OFFSET_96 + 'F') */ +#define LEADING_BYTE_GREEK_ISO8859_7 (-126) /* (CHARSET_ID_OFFSET_96 + 'F') */ /* Right half of ISO 8859-6 */ -#define LEADING_BYTE_ARABIC_ISO8859_6 -127 /* (CHARSET_ID_OFFSET_96 + 'G') */ +#define LEADING_BYTE_ARABIC_ISO8859_6 (-127) /* (CHARSET_ID_OFFSET_96 + 'G') */ /* Right half of ISO 8859-8 */ -#define LEADING_BYTE_HEBREW_ISO8859_8 -138 /* (CHARSET_ID_OFFSET_96 + 'H') */ +#define LEADING_BYTE_HEBREW_ISO8859_8 (-138) /* (CHARSET_ID_OFFSET_96 + 'H') */ /* Right half of ISO 8859-5 */ -#define LEADING_BYTE_CYRILLIC_ISO8859_5 -144 /* (CHARSET_ID_OFFSET_96 + 'L') */ +#define LEADING_BYTE_CYRILLIC_ISO8859_5 (-144) /* (CHARSET_ID_OFFSET_96 + 'L') */ /* Right half of ISO 8859-9 */ -#define LEADING_BYTE_LATIN_ISO8859_9 -148 /* (CHARSET_ID_OFFSET_96 + 'M') */ +#define LEADING_BYTE_LATIN_ISO8859_9 (-148) /* (CHARSET_ID_OFFSET_96 + 'M') */ /* TIS620-2533 */ -#define LEADING_BYTE_THAI_TIS620 -166 /* (CHARSET_ID_OFFSET_96 + 'T') */ +#define LEADING_BYTE_THAI_TIS620 (-166) /* (CHARSET_ID_OFFSET_96 + 'T') */ /* Right-hand Part of the VSCII-2 (TCVN 5712:1983) */ -#define LEADING_BYTE_LATIN_TCVN5712 -180 /* F = 5/10 0x5A `Z' */ +#define LEADING_BYTE_LATIN_TCVN5712 (-180) /* F = 5/10 0x5A `Z' */ /* Japanese JIS X0208-1978 2/4 2/{(8),9,10,11} 4/0 (@) */ -#define LEADING_BYTE_JAPANESE_JISX0208_1978 -42 +#define LEADING_BYTE_JAPANESE_JISX0208_1978 ( -42) /* Chinese Hanzi GB2312-1980 2/4 2/{(8),9,10,11} 4/1 (A) */ -#define LEADING_BYTE_CHINESE_GB2312 -58 +#define LEADING_BYTE_CHINESE_GB2312 ( -58) /* Japanese JIS X0208-1983 2/4 2/{(8),9,10,11} 4/2 (B) */ -#define LEADING_BYTE_JAPANESE_JISX0208 -87 +#define LEADING_BYTE_JAPANESE_JISX0208 ( -87) /* Japanese JIS X0208-1990 2/4 2/{(8),9,10,11} 4/2 (B) */ -#define LEADING_BYTE_JAPANESE_JISX0208_1990 -168 +#define LEADING_BYTE_JAPANESE_JISX0208_1990 (-168) /* Hangul KS C5601-1987 2/4 2/{8,9,10,11} 4/3 (C) */ -#define LEADING_BYTE_KOREAN_KSC5601 -149 +#define LEADING_BYTE_KOREAN_KSC5601 (-149) /* Japanese JIS X0212-1990 2/4 2/{8,9,10,11} 4/4 (D) */ -#define LEADING_BYTE_JAPANESE_JISX0212 -159 +#define LEADING_BYTE_JAPANESE_JISX0212 (-159) /* CCITT Extended GB 2/4 2/{8,9,10,11} 4/5 (E) */ -#define LEADING_BYTE_CHINESE_CCITT_GB -165 +#define LEADING_BYTE_CHINESE_CCITT_GB (-165) /* Chinese CNS11643 Set 1 2/4 2/{8,9,10,11} 4/7 (G) */ -#define LEADING_BYTE_CHINESE_CNS11643_1 -171 +#define LEADING_BYTE_CHINESE_CNS11643_1 (-171) /* Chinese CNS11643 Set 2 2/4 2/{8,9,10,11} 4/8 (H) */ -#define LEADING_BYTE_CHINESE_CNS11643_2 -172 +#define LEADING_BYTE_CHINESE_CNS11643_2 (-172) /* Chinese CNS11643 Set 3 2/4 2/{8,9,10,11} 4/9 (I) */ #define LEADING_BYTE_CHINESE_CNS11643_3 -183 @@ -223,6 +223,8 @@ struct Lisp_Charset Lisp_Object ccl_program; + int iso_ir; + /* Final byte of this character set in ISO2022 designating escape sequence */ Bufbyte final; @@ -281,6 +283,7 @@ DECLARE_LRECORD (charset, Lisp_Charset); #define CHARSET_COLUMNS(cs) ((cs)->columns) #define CHARSET_GRAPHIC(cs) ((cs)->graphic) #define CHARSET_DIRECTION(cs) ((cs)->direction) +#define CHARSET_ISO_IR(cs) ((cs)->iso_ir) #define CHARSET_FINAL(cs) ((cs)->final) #define CHARSET_DOC_STRING(cs) ((cs)->doc_string) #define CHARSET_REGISTRY(cs) ((cs)->registry) diff --git a/src/mule-charset.c b/src/mule-charset.c index fb0ca3f..d8b9630 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -368,6 +368,7 @@ Lisp_Object Qleading_byte; Lisp_Object Qshort_name, Qlong_name; Lisp_Object Qiso_ir; #ifdef UTF2000 +Lisp_Object Qto_iso_ir; Lisp_Object Qpartial; Lisp_Object Qmin_code, Qmax_code, Qcode_offset; Lisp_Object Qmother, Qconversion, Q94x60, Q94x94x60, Qbig5_1, Qbig5_2; @@ -821,6 +822,7 @@ make_charset (Charset_ID id, Lisp_Object name, Bufbyte final, unsigned char direction, Lisp_Object short_name, Lisp_Object long_name, Lisp_Object doc, Lisp_Object reg, + int iso_ir, Lisp_Object decoding_table, Emchar min_code, Emchar max_code, Emchar code_offset, unsigned char byte_offset, @@ -849,6 +851,7 @@ make_charset (Charset_ID id, Lisp_Object name, CHARSET_CCL_PROGRAM (cs) = Qnil; CHARSET_REVERSE_DIRECTION_CHARSET (cs) = Qnil; #ifdef UTF2000 + CHARSET_ISO_IR (cs) = iso_ir; CHARSET_DECODING_TABLE(cs) = Qunbound; CHARSET_MIN_CODE (cs) = min_code; CHARSET_MAX_CODE (cs) = max_code; @@ -1631,6 +1634,8 @@ character set. Recognized properties are: is passed the octets of the character, with the high bit cleared and set depending upon whether the value of the 'graphic property is 0 or 1. +'iso-ir ISO-IR number (for representative coded-charset). +'=>iso-ir [UTF-2000 only] Corresponding ISO-IR number. 'mother [UTF-2000 only] Base coded-charset. 'code-min [UTF-2000 only] Minimum code-point of a base coded-charset. 'code-max [UTF-2000 only] Maximum code-point of a base coded-charset. @@ -1643,6 +1648,7 @@ character set. Recognized properties are: (name, doc_string, props)) { int id = 0, dimension = 1, chars = 94, graphic = 0, final = 0, columns = -1; + int iso_ir = 0; int direction = CHARSET_LEFT_TO_RIGHT; Lisp_Object registry = Qnil; Lisp_Object charset; @@ -1681,10 +1687,19 @@ character set. Recognized properties are: { #ifdef UTF2000 CHECK_INT (value); - id = - XINT (value); + iso_ir = XINT (value); + id = - iso_ir; #endif } +#ifdef UTF2000 + else if (EQ (keyword, Qto_iso_ir)) + { + CHECK_INT (value); + iso_ir = XINT (value); + } +#endif + else if (EQ (keyword, Qdimension)) { CHECK_INT (value); @@ -1861,7 +1876,7 @@ character set. Recognized properties are: charset = make_charset (id, name, chars, dimension, columns, graphic, final, direction, short_name, long_name, - doc_string, registry, + doc_string, registry, iso_ir, Qnil, min_code, max_code, code_offset, byte_offset, mother, conversion, partial); if (!NILP (ccl_program)) @@ -1912,6 +1927,7 @@ NEW-NAME is the name of the new charset. Return the new charset. graphic, final, direction, short_name, long_name, doc_string, registry, #ifdef UTF2000 + CHARSET_ISO_IR(cs), CHARSET_DECODING_TABLE(cs), CHARSET_MIN_CODE(cs), CHARSET_MAX_CODE(cs), @@ -2072,6 +2088,14 @@ Recognized properties are those listed in `make-charset', as well as return CHARSETP (obj) ? XCHARSET_NAME (obj) : obj; } #ifdef UTF2000 + if (EQ (prop, Qiso_ir)|| + EQ (prop, Qto_iso_ir)) + { + if ( CHARSET_ISO_IR (cs) > 0 ) + return make_int (CHARSET_ISO_IR (cs)); + else + return Qnil; + } if (EQ (prop, Qmother)) return CHARSET_MOTHER (cs); if (EQ (prop, Qmin_code)) @@ -3053,6 +3077,7 @@ syms_of_mule_charset (void) defsymbol (&Qlong_name, "long-name"); defsymbol (&Qiso_ir, "iso-ir"); #ifdef UTF2000 + defsymbol (&Qto_iso_ir, "=>iso-ir"); defsymbol (&Qpartial, "partial"); defsymbol (&Qmother, "mother"); defsymbol (&Qmin_code, "min-code"); @@ -3197,6 +3222,7 @@ complex_vars_of_mule_charset (void) build_string ("CHAR-ID"), build_string ("System char-id"), build_string (""), + 0, Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_ucs); @@ -3207,6 +3233,7 @@ complex_vars_of_mule_charset (void) build_string ("UCS"), build_string ("ISO/IEC 10646"), build_string (""), + - LEADING_BYTE_UCS, Qnil, 0, 0xEFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_ucs_bmp); @@ -3218,6 +3245,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO/IEC 10646 Group 0 Plane 0 (BMP)"), build_string ("\\(ISO10646\\(\\.[0-9]+\\)?-[01]\\|UCS00-0\\|UNICODE[23]?-0\\)"), + - LEADING_BYTE_UCS_BMP, Qnil, 0, 0xFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_ucs_smp); @@ -3228,6 +3256,7 @@ complex_vars_of_mule_charset (void) build_string ("UCS-SMP"), build_string ("ISO/IEC 10646 Group 0 Plane 1 (SMP)"), build_string ("UCS00-1"), + 0, Qnil, MIN_CHAR_SMP, MAX_CHAR_SMP, MIN_CHAR_SMP, 0, Qnil, CONVERSION_IDENTICAL, 0); @@ -3239,6 +3268,7 @@ complex_vars_of_mule_charset (void) build_string ("UCS-SIP"), build_string ("ISO/IEC 10646 Group 0 Plane 2 (SIP)"), build_string ("\\(ISO10646.*-2\\|UCS00-2\\)"), + 0, Qnil, MIN_CHAR_SIP, MAX_CHAR_SIP, MIN_CHAR_SIP, 0, Qnil, CONVERSION_IDENTICAL, 0); @@ -3258,6 +3288,7 @@ complex_vars_of_mule_charset (void) build_string ("ASCII)"), build_string ("ASCII (ISO646 IRV)"), build_string ("\\(iso8859-[0-9]*\\|-ascii\\)"), + - LEADING_BYTE_ASCII, Qnil, 0, 0x7F, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_control_1); @@ -3268,6 +3299,7 @@ complex_vars_of_mule_charset (void) build_string ("Control characters"), build_string ("Control characters 128-191"), build_string (""), + - LEADING_BYTE_CONTROL_1, Qnil, 0x80, 0x9F, 0x80, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_iso8859_1); @@ -3278,6 +3310,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-1 (Latin-1)"), build_string ("ISO8859-1 (Latin-1)"), build_string ("iso8859-1"), + - LEADING_BYTE_LATIN_ISO8859_1, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_iso8859_2); @@ -3288,6 +3321,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-2 (Latin-2)"), build_string ("ISO8859-2 (Latin-2)"), build_string ("iso8859-2"), + - LEADING_BYTE_LATIN_ISO8859_2, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_iso8859_3); @@ -3298,6 +3332,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-3 (Latin-3)"), build_string ("ISO8859-3 (Latin-3)"), build_string ("iso8859-3"), + - LEADING_BYTE_LATIN_ISO8859_3, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_iso8859_4); @@ -3308,6 +3343,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-4 (Latin-4)"), build_string ("ISO8859-4 (Latin-4)"), build_string ("iso8859-4"), + - LEADING_BYTE_LATIN_ISO8859_4, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_thai_tis620); @@ -3318,6 +3354,7 @@ complex_vars_of_mule_charset (void) build_string ("TIS620 (Thai)"), build_string ("TIS620.2529 (Thai)"), build_string ("tis620"), + - LEADING_BYTE_THAI_TIS620, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_greek_iso8859_7); @@ -3328,6 +3365,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-7 (Greek)"), build_string ("ISO8859-7 (Greek)"), build_string ("iso8859-7"), + - LEADING_BYTE_GREEK_ISO8859_7, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_arabic_iso8859_6); @@ -3338,6 +3376,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-6 (Arabic)"), build_string ("ISO8859-6 (Arabic)"), build_string ("iso8859-6"), + - LEADING_BYTE_ARABIC_ISO8859_6, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_hebrew_iso8859_8); @@ -3348,6 +3387,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-8 (Hebrew)"), build_string ("ISO8859-8 (Hebrew)"), build_string ("iso8859-8"), + - LEADING_BYTE_HEBREW_ISO8859_8, Qnil, 0 /* MIN_CHAR_HEBREW */, 0 /* MAX_CHAR_HEBREW */, 0, 32, @@ -3361,6 +3401,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0201.1976 (Japanese Kana)"), build_string ("JISX0201.1976 Japanese Kana"), build_string ("jisx0201\\.1976"), + - LEADING_BYTE_KATAKANA_JISX0201, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_jisx0201); @@ -3371,6 +3412,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0201.1976 (Japanese Roman)"), build_string ("JISX0201.1976 Japanese Roman"), build_string ("jisx0201\\.1976"), + - LEADING_BYTE_LATIN_JISX0201, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_cyrillic_iso8859_5); @@ -3381,6 +3423,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-5 (Cyrillic)"), build_string ("ISO8859-5 (Cyrillic)"), build_string ("iso8859-5"), + - LEADING_BYTE_CYRILLIC_ISO8859_5, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_iso8859_9); @@ -3391,6 +3434,7 @@ complex_vars_of_mule_charset (void) build_string ("ISO8859-9 (Latin-5)"), build_string ("ISO8859-9 (Latin-5)"), build_string ("iso8859-9"), + - LEADING_BYTE_LATIN_ISO8859_9, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); #ifdef UTF2000 @@ -3403,6 +3447,7 @@ complex_vars_of_mule_charset (void) build_string ("JIS X0208 Common"), build_string ("JIS X0208 Common part"), build_string ("jisx0208\\.1990"), + - LEADING_BYTE_JAPANESE_JISX0208_1978, Qnil, MIN_CHAR_JIS_X0208_1990, MAX_CHAR_JIS_X0208_1990, MIN_CHAR_JIS_X0208_1990, 33, @@ -3420,6 +3465,7 @@ complex_vars_of_mule_charset (void) build_string ("JIS X0208:1978 Japanese Kanji (so called \"old JIS\")"), build_string ("\\(jisx0208\\|jisc6226\\)\\.1978"), + - LEADING_BYTE_JAPANESE_JISX0208_1978, Qnil, 0, 0, 0, 33, #ifdef UTF2000 Vcharset_jis_x0208, @@ -3437,6 +3483,7 @@ complex_vars_of_mule_charset (void) build_string ("GB2312)"), build_string ("GB2312 Chinese simplified"), build_string ("gb2312"), + - LEADING_BYTE_CHINESE_GB2312, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_chinese_gb12345); @@ -3447,6 +3494,7 @@ complex_vars_of_mule_charset (void) build_string ("GB 12345)"), build_string ("GB 12345-1990"), build_string ("GB12345\\(\\.1990\\)?-0"), + 0, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_japanese_jisx0208); @@ -3457,6 +3505,7 @@ complex_vars_of_mule_charset (void) build_string ("JIS X0208:1983 (Japanese)"), build_string ("JIS X0208:1983 Japanese Kanji"), build_string ("jisx0208\\.1983"), + - LEADING_BYTE_JAPANESE_JISX0208, Qnil, 0, 0, 0, 33, #ifdef UTF2000 Vcharset_jis_x0208, @@ -3475,6 +3524,7 @@ complex_vars_of_mule_charset (void) build_string ("JIS X0208:1990 (Japanese)"), build_string ("JIS X0208:1990 Japanese Kanji"), build_string ("jisx0208\\.1990"), + - LEADING_BYTE_JAPANESE_JISX0208_1990, Qnil, 0x2121 /* MIN_CHAR_JIS_X0208_1990 */, 0x7426 /* MAX_CHAR_JIS_X0208_1990 */, @@ -3491,6 +3541,7 @@ complex_vars_of_mule_charset (void) build_string ("KSC5601 (Korean"), build_string ("KSC5601 Korean Hangul and Hanja"), build_string ("ksc5601"), + - LEADING_BYTE_KOREAN_KSC5601, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_japanese_jisx0212); @@ -3501,6 +3552,7 @@ complex_vars_of_mule_charset (void) build_string ("JISX0212 (Japanese)"), build_string ("JISX0212 Japanese Supplement"), build_string ("jisx0212"), + - LEADING_BYTE_JAPANESE_JISX0212, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); @@ -3514,6 +3566,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 1 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("1")), + - LEADING_BYTE_CHINESE_CNS11643_1, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_chinese_cns11643_2); @@ -3525,6 +3578,7 @@ complex_vars_of_mule_charset (void) build_string ("CNS 11643 Plane 2 Chinese traditional"), build_string (CHINESE_CNS_PLANE_RE("2")), + - LEADING_BYTE_CHINESE_CNS11643_2, Qnil, 0, 0, 0, 33, Qnil, CONVERSION_IDENTICAL, 0); #ifdef UTF2000 @@ -3536,6 +3590,7 @@ complex_vars_of_mule_charset (void) build_string ("TCVN 5712 (VSCII-2)"), build_string ("Vietnamese TCVN 5712:1983 (VSCII-2)"), build_string ("tcvn5712\\(\\.1993\\)?-1"), + - LEADING_BYTE_LATIN_TCVN5712, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_viscii_lower); @@ -3546,6 +3601,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII lower (Vietnamese)"), build_string ("VISCII lower (Vietnamese)"), build_string ("MULEVISCII-LOWER"), + 0, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_viscii_upper); @@ -3556,6 +3612,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII upper (Vietnamese)"), build_string ("VISCII upper (Vietnamese)"), build_string ("MULEVISCII-UPPER"), + 0, Qnil, 0, 0, 0, 32, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_latin_viscii); @@ -3566,6 +3623,7 @@ complex_vars_of_mule_charset (void) build_string ("VISCII 1.1 (Vietnamese)"), build_string ("VISCII 1.1 (Vietnamese)"), build_string ("VISCII1\\.1"), + 0, Qnil, 0, 0, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); staticpro (&Vcharset_chinese_big5); @@ -3576,6 +3634,7 @@ complex_vars_of_mule_charset (void) build_string ("Big5"), build_string ("Big5 Chinese traditional"), build_string ("big5-0"), + 0, Qnil, MIN_CHAR_BIG5_CDP, MAX_CHAR_BIG5_CDP, MIN_CHAR_BIG5_CDP, 0, Qnil, CONVERSION_IDENTICAL, @@ -3589,6 +3648,7 @@ complex_vars_of_mule_charset (void) build_string ("Ethiopic (UCS)"), build_string ("Ethiopic of UCS"), build_string ("Ethiopic-Unicode"), + 0, Qnil, 0x1200, 0x137F, 0, 0, Qnil, CONVERSION_IDENTICAL, 0); @@ -3602,6 +3662,7 @@ complex_vars_of_mule_charset (void) build_string ("Big5 Level-1 Chinese traditional"), build_string ("big5"), + 0, Qnil, 0, 0, 0, 33, /* Qnil, CONVERSION_IDENTICAL */ Vcharset_chinese_big5, CONVERSION_BIG5_1, 0); @@ -3614,6 +3675,7 @@ complex_vars_of_mule_charset (void) build_string ("Big5 Level-2 Chinese traditional"), build_string ("big5"), + 0, Qnil, 0, 0, 0, 33, /* Qnil, CONVERSION_IDENTICAL */ Vcharset_chinese_big5, CONVERSION_BIG5_2, 0);