From 7cfc9dc80bdd0c9e0aa8781abb2f9af4b01e245d Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 26 May 2010 11:12:50 +0000 Subject: [PATCH] Sync up with r21-4-22-chise-0_24-jis-x0213-2004-add. --- etc/char-data/ChangeLog | 8 ++ etc/char-data/J90-to-UCS.txt | 2 +- etc/char-data/JX1-to-UCS.txt | 2 +- lisp/ChangeLog | 9 ++ lisp/mule/mule-conf.el | 35 +++++- lisp/utf-2000/ChangeLog | 72 +++++++++++ lisp/utf-2000/Ideograph-R009-Man.el | 4 +- lisp/utf-2000/Ideograph-R030-Mouth.el | 190 ++++++++++++++++++++++++------ lisp/utf-2000/Ideograph-R032-Earth.el | 23 +++- lisp/utf-2000/Ideograph-R051-Dry.el | 99 +++++++++++----- lisp/utf-2000/Ideograph-R104-Sickness.el | 14 ++- lisp/utf-2000/Ideograph-R120-Silk.el | 39 ++++-- lisp/utf-2000/Ideograph-R158-Body.el | 96 ++++++++++----- lisp/utf-2000/Ideograph-R188-Bone.el | 39 +++--- lisp/utf-2000/maps-conf.el | 2 +- 15 files changed, 496 insertions(+), 138 deletions(-) diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog index b9a8720..8d784a7 100644 --- a/etc/char-data/ChangeLog +++ b/etc/char-data/ChangeLog @@ -1,3 +1,11 @@ +2010-05-14 MORIOKA Tomohiko + + * JX1-to-UCS.txt (JX1-3C38): Delete mapping for U-00020B9F. + +2010-05-12 MORIOKA Tomohiko + + * J90-to-UCS.txt (J90-3C38): Delete mapping for U-00020B9F. + 2009-09-01 MORIOKA Tomohiko * JC3-to-UCS.txt (JC3-70BA): Map to U+56CA instead of U+56A2. diff --git a/etc/char-data/J90-to-UCS.txt b/etc/char-data/J90-to-UCS.txt index 98c025a..28f4d83 100644 --- a/etc/char-data/J90-to-UCS.txt +++ b/etc/char-data/J90-to-UCS.txt @@ -1673,7 +1673,7 @@ J90-3C34 U+8EF8 J90-3C35 U+5B8D J90-3C36 U+96EB J90-3C37 U+4E03 -J90-3C38 JU+53F1 U-00020B9F +J90-3C38 JU+53F1 J90-3C39 U+57F7 J90-3C3A U+5931 J90-3C3B U+5AC9 diff --git a/etc/char-data/JX1-to-UCS.txt b/etc/char-data/JX1-to-UCS.txt index 03fa754..30d7b34 100644 --- a/etc/char-data/JX1-to-UCS.txt +++ b/etc/char-data/JX1-to-UCS.txt @@ -2492,7 +2492,7 @@ JX1-3C34 U+8EF8 JX1-3C35 U+5B8D JX1-3C36 U+96EB JX1-3C37 U+4E03 -JX1-3C38 JU+53F1 U-00020B9F +JX1-3C38 JU+53F1 JX1-3C39 U+57F7 JX1-3C3A U+5931 JX1-3C3B U+5AC9 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 09170b9..627b390 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2010-05-12 MORIOKA Tomohiko + + * mule/mule-conf.el (=jis-x0208@1978/2-pr): New coded-charset for + XEmacs CHISE. + (=jis-x0208@1978/4er): New coded-charset for XEmacs CHISE. + (=jis-x0208@1978/4-pr): Use `=jis-x0208@1978/2-pr' instead of + `=jis-x0208@1978/1er-pr' as the mother. + (=jis-x0208@1978/5pr): New coded-charset for XEmacs CHISE. + 2010-04-24 MORIOKA Tomohiko * mule/mule-conf.el (=ucs@big5): Use `=>>ucs@unicode' instead of diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index 0e30a04..3daff0a 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -83,12 +83,45 @@ graphic 0 partial t)) (make-charset + '=jis-x0208@1978/2-pr + "JIS X 0208:1978, 2nd impression or later." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978/1er-pr + =>iso-ir 42 + ;; final ?@ + graphic 0 + partial t)) + (make-charset + '=jis-x0208@1978/4er + "JIS X 0208:1978, replaced by errata of 4th impression." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978/2-pr + =>iso-ir 42 + ;; final ?@ + graphic 0 + partial t)) + (make-charset '=jis-x0208@1978/4-pr "JIS X 0208:1978, 4th impression or later." '(registry "jisx0208\\.1978" dimension 2 chars 94 - mother =jis-x0208@1978/1er-pr + mother =jis-x0208@1978/2-pr + =>iso-ir 42 + ;; final ?@ + graphic 0 + partial t)) + (make-charset + '=jis-x0208@1978/5pr + "JIS X 0208:1978, 5th impression." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978/4-pr =>iso-ir 42 ;; final ?@ graphic 0 diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index e226279..6938d43 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,75 @@ +2010-05-21 MORIOKA Tomohiko + + * Ideograph-R158-Body.el (U-0002822B): Use `->subsumptive'. + (U+4833): Use `->subsumptive' to separate representative nodes. + (U+4834): Likewise. + (U+4832): Likewise. + (U+8EB0): Use `->subsumptive'. + (J0-6D3C): Add `<-vulgar' for J0-7173. + (U-0002822C): Unify H10-C060 and CB02553. + +2010-05-19 MORIOKA Tomohiko + + * Ideograph-R188-Bone.el (U+9AD4): Use `->denotational' and + `->subsumptive'. + +2010-05-18 MORIOKA Tomohiko + + * Ideograph-R030-Mouth.el (J97-3C38): New abstract character. + (U-00020B9F): Add `<-denotational' for J97-3C38; delete + `<-subsumptive' for U+53F1; separate J0-3C38, C1-4639, + JX{1|3}-3C38 and GT-04123; use `->subsumptive' to separate + representative node. + (M-03247): Unify J78/4er-3C38, J78/5pr-3C38 and JX3-4F54. + (U+53F1): Add `<-denotational' for J97-3C38; delete + `->subsumptive'. + (U-0002F83A): Add `<-denotational' for J97-3C38. + (C5-2160): Use `<-subsumptive' to integrate J78/1pr-3C38. + (C1-4639): Unify GT-04123. + (J90-3C38): Unify J78/2-pr-3C38, J83-3C38 and JX{1|3}-3C38. + (U+5617): Add abstract ideographic-structure. + (J97-3133): New abstract character. + (U+5653): Add `<-denotational' for J97-3133; unify abstract + JX3-7427. + (K0-7A46): Unify JX3-7427. + (U+5618): Add `<-denotational' for J97-3133; unify abstract + JX3-3133; add abstract ideographic-structure. + +2010-05-12 MORIOKA Tomohiko + + * Ideograph-R051-Dry.el (J97-5675): New abstract character. + (U+5E76): Add `<-denotational' for J97-5675; add `<-vulgar' for + JX3-7E7C. + (U-0002218A): Use `->denotational' instead of `->subsumptive'; add + abstract ideographic-structure. + (U+5E77): Add `<-denotational' for J97-5675; unify abstract + JX3-7E7C. + (K0-5C34): Unify JX3-7E7C and S-2156. + + * maps-conf.el: Don't add `=gt-pj-1' for J90-3C38. + + * Ideograph-R120-Silk.el (J97-3752): New abstract character. + (U+7E4B): Add `<-denotational' for J97-3752; unify abstract + JX3-3752. + (J90-3752): Use `<-simplified@JP/extra' instead of + `<-simplified@JP/jis' for J78-3752. + (U+7E6B): Add `<-denotational' for J97-3752; unify abstract + JX3-7E7E. + (J78-3752): Unify JX3-7E7E. + + * Ideograph-R032-Earth.el (U+5840): Add abstract + ideographic-structure. + (U+FA39): Likewise. + (JX1-2F5A): Fix `ideographic-structure'. + + * Ideograph-R104-Sickness.el (J97-4169): Separate abstract + JX3-4169. + (U+7626): Unify abstract JX3-7E7D. + (J78-4169): Unify JX3-7E7D. + (U+75E9): Unify abstract JX3-4169. + (J90-4169): Use `<-simplified@JP/extra/design' instead of + `<-simplified@JP/jis' for J78-4169. + 2010-04-30 MORIOKA Tomohiko * Ideograph-R124-Feather.el (U+7FCF): Use `->denotational' instead diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index d98b002..bcbad45 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -6169,7 +6169,8 @@ (=shinjigen . 0188) ; 体 (mojikyo . 000509) ; &MCS-600001FD; (<-simplified@CN - ((=gb12345 . #x4C65) ; 體 [44-69] + ((=ucs@unicode . #x9AD4) ; &UU+9AD4; + (=gb12345 . #x4C65) ; &UU+9AD4; [44-69] )) (<-simplified@JP/Jouyou ((=ucs@jis . #x9AD4) ; >-60937; @@ -14346,6 +14347,7 @@ (=ucs . #x2E85) ; ⺅ ) ((=ks-x1001 . #x5C34) ; &CDP-88EB; [60-20] + (=jis-x0213-1@2004 . #x7E7C) ; &I-JX3-7E7C; [94-92] (=daikanwa . 09175) ; &I-M-09175; )) (=ks-x1001 . #x5C31) ; &M-00746; [60-17] diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 2b0cace..6c88790 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -514,10 +514,27 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 2) (total-strokes . 5) - (=ucs . #x53F1) ; 叱 + (=>jis-x0208@1997 . #x3C38) ; &J97-3C38; [28-24] + )) +(define-char + '((<-denotational + ((=>jis-x0208@1997 . #x3C38) ; &J97-3C38; [28-24] + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 2) + (total-strokes . 5) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x4E03) ; 七 + )) + (=ucs . #x20B9F) ; 𠮟 + (=>jis-x0213-1@2004 . #x4F54) ; 𠮟 [47-52] (->subsumptive - ((hanyu-dazidian 1 572 5) - (ideographic-structure + ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") (=ucs . #x2FF0) ; ⿰ ) @@ -530,34 +547,29 @@ (=jis-x0213-1 . #x3C37) ; &I-JX1-3C37; [28-23] (=daikanwa . 00006) ; &I-M-00006; )) - (jisx0208-difference . 78/1) - (=ucs . #x20B9F) ; 𠮟 - (=ucs@cns . #x53F1) ; 𠮟 - (=ucs@jis . #x53F1) ; 𠮟 - (=jis-x0208 . #x3C38) ; &I-J90-3C38; [28-24] - (=cns11643-1 . #x4639) ; &I-C1-4639; [38-25] - (=jis-x0213-1 . #x3C38) ; &I-JX1-3C38; [28-24] - (=gt . 04123) ; &I-GT-04123; - (=gt-pj-1 . #x3C38) ; &I-GT-04123; [28-24] + (=ucs@iso . #x20B9F) ; &M-03247; + (=jis-x0208@1978/4er . #x3C38) ; &M-03247; [28-24] + (=jis-x0208@1978/5pr . #x3C38) ; &M-03247; [28-24] + (=jis-x0213-1@2004 . #x4F54) ; &M-03247; [47-52] (=daikanwa . 03247) ; &I-M-03247; (mojikyo . 003247) ; &MCS-60000CAF; - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs . #x53E3) ; 口 - ) - ((=ucs . #x2090E) ; 𠤎 - )) - (=ucs@unicode . #x53F1) ; &K0-726A; - (=gb2312 . #x5F33) ; &K0-726A; [63-19] - (=ks-x1001 . #x726A) ; &I-K0-726A; [82-74] - (=big5 . #xA577) ; &I-B-A577; )) )) (define-char - '((=>ucs* . #x53F1) ; 叱 + '((<-denotational + ((=>jis-x0208@1997 . #x3C38) ; &J97-3C38; [28-24] + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 2) + (total-strokes . 5) + (hanyu-dazidian 1 572 5) + (=ucs . #x53F1) ; 叱 + )) +(define-char + '((<-denotational + ((=ucs . #x53F1) ; 叱 + )) + (=>ucs* . #x53F1) ; 叱 (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 2) (total-strokes . 5) @@ -583,13 +595,15 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs . #x2090E) ; 𠤎 + ((=jis-x0208@1978 . #x5238) ; &J83-5238; [50-24] + (=jis-x0208@1983 . #x5238) ; &I-J83-5238; [50-24] )) (=daikanwa . 03248) ; &M-03248; (=hanziku-2 . #xC5AD) ; &I-HZK02-C5AD; (mojikyo . 003248) ; &MCS-60000CB0; (->mistakable - ((=ucs . #x20B9F) ; 𠮟 + ((=ucs@iso . #x20B9F) ; &M-03247; + (=jis-x0213-1@2004 . #x4F54) ; &M-03247; [47-52] (=daikanwa . 03247) ; &I-M-03247; )) (->mistakable*sources @@ -602,8 +616,67 @@ (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 2) (total-strokes . 5) - (=ucs@unicode . #x2F83A) ; &C5-2160; - (=cns11643-5 . #x2160) ; &C5-2160; [01-64] + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x5315) ; 匕 + )) + (->subsumptive + ((=jis-x0208@1978/1pr . #x3C38) ; &J78-3C38; [28-24] + ) + ((=ucs@iso . #x2F83A) ; &C5-2160; + (=cns11643-5 . #x2160) ; &C5-2160; [01-64] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x53F1) ; 叱 + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes . 2) + (total-strokes . 5) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x2090E) ; 𠤎 + )) + (=>>ucs@unicode . #x53F1) ; &G-JX1-3C38; + (=>>jis-x0208 . #x3C38) ; &G-JX1-3C38; [28-24] + (=>>jis-x0213-1 . #x3C38) ; &G-JX1-3C38; [28-24] + (=big5 . #xA577) ; &G-JX1-3C38; + (->subsumptive + ((=ucs@cns . #x53F1) ; >-04123; + (=cns11643-1 . #x4639) ; >-04123; [38-25] + (=gt . 04123) ; &I-GT-04123; + (=gt-pj-1 . #x3C38) ; &I-GT-04123; [28-24] + ) + ((=ucs@jis . #x53F1) ; &J90-3C38; + (=jis-x0208@1978/2-pr . #x3C38) ; &J90-3C38; [28-24] + (=jis-x0208@1983 . #x3C38) ; &J90-3C38; [28-24] + (=jis-x0208@1990 . #x3C38) ; &I-J90-3C38; [28-24] + (=jis-x0213-1 . #x3C38) ; &I-JX1-3C38; [28-24] + ) + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs@iso . #x2090E) ; &CDP-8BBA; + (=big5-cdp . #x8BBA) ; &CDP-8BBA; + (=daikanwa . 02571) ; &I-M-02571; + )) + (=ucs@unicode . #x53F1) ; &G0-5F33; + (=gb2312 . #x5F33) ; &G0-5F33; [63-19] + ) + ((=ks-x1001 . #x726A) ; &K0-726A; [82-74] + )) )) (define-char '((ideographic-radical . 30) ; ⼝ @@ -25884,7 +25957,16 @@ '((ideographic-radical . 30) ; ⼝ (ideographic-strokes . 11) (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=gt-k . 05014) ; >-K05014; + ) + ((=ucs . #x65E8) ; 旨 + )) (=ucs . #x5617) ; 嘗 + (=big5 . #xB9C1) ; &I-B-B9C1; (->subsumptive ((hanyu-dazidian 2 1529 9) (ideographic-structure @@ -25905,12 +25987,11 @@ (=ks-x1001 . #x5F44) ; &I-K0-5F44; [63-36] (=jis-x0213-1 . #x3E28) ; &I-JX1-3E28; [30-08] (=gb12345 . #x3322) ; >-05259; [19-02] - (=big5 . #xB9C1) ; &I-B-B9C1; (=gt . 05259) ; &I-GT-05259; (=gt-k . 11132) ; &I-GT-K11132; (=gt-pj-1 . #x3E28) ; &I-GT-05259; [30-08] (=daikanwa . 04205) ; &I-M-04205; - (=shinjigen@rev . 1216) ; >-05259; + (=shinjigen . 1216) ; >-05259; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -25925,10 +26006,36 @@ )) (define-char '((ideographic-radical . 30) ; ⼝ + (=>jis-x0208@1997 . #x3133) ; &J97-3133; [17-19] + (=>jis-x0213-1@2000 . #x3133) ; &J97-3133; [17-19] + )) +(define-char + '((<-denotational + ((=>jis-x0208@1997 . #x3133) ; &J97-3133; [17-19] + )) + (ideographic-radical . 30) ; ⼝ + (ideographic-strokes@ucs . 12) + (total-strokes@ucs . 15) + (ideographic-strokes@ucs*sources + jis-x0213-1@2004) + (total-strokes@ucs*sources + cns11643) + (ideographic-strokes@daikanwa . 11) + (total-strokes@daikanwa . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x865B) ; 虛 + )) (=ucs . #x5653) ; 噓 + (=>jis-x0213-1@2004 . #x7427) ; 噓 [84-07] + (=big5 . #xBC4E) ; &I-B-BC4E; (->subsumptive - ((ideographic-strokes . 11) - (total-strokes . 14) + ((ideographic-strokes@daikanwa . 11) + (ideographic-strokes@jis . 12) (hanyu-dazidian 1 675 12) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -25943,7 +26050,7 @@ )) (=ucs@unicode . #x5653) ; &M-04206; (=ks-x1001 . #x7A46) ; &M-04206; [90-38] - (=big5 . #xBC4E) ; &I-B-BC4E; + (=jis-x0213-1@2004 . #x7427) ; &I-JX3-7427; [84-07] (=daikanwa . 04206) ; &I-M-04206; (=jef-china3 . #x47BA) ; &I-JC3-47BA; ) @@ -25962,11 +26069,22 @@ )) )) (define-char - '((=>daikanwa . 04206) ; &M-04206; + '((<-denotational + ((=>jis-x0208@1997 . #x3133) ; &J97-3133; [17-19] + )) (ideographic-radical . 30) ; ⼝ (ideographic-strokes . 11) (total-strokes . 14) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x53E3) ; 口 + ) + ((=ucs . #x865A) ; 虚 + )) (=ucs . #x5618) ; 嘘 + (=>jis-x0213-1@2004 . #x3133) ; 嘘 [17-19] (->subsumptive ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el index b9b1d8c..2e52424 100644 --- a/lisp/utf-2000/Ideograph-R032-Earth.el +++ b/lisp/utf-2000/Ideograph-R032-Earth.el @@ -7333,6 +7333,14 @@ '((ideographic-radical . 32) ; ⼟ (ideographic-strokes . 9) (total-strokes . 12) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00199) ; >-K00199; + ) + ((=>jis-x0208@1997 . #x5622) ; &J97-5622; [54-02] + )) (=ucs . #x5840) ; 塀 )) (define-char @@ -7371,6 +7379,14 @@ (ideographic-radical . 32) ; ⼟ (ideographic-strokes . 11) (total-strokes . 13) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=gt-k . 00199) ; >-K00199; + ) + ((=ucs . #x5C5B) ; 屛 + )) (=ucs . #xFA39) ; 塀 (->subsumptive ((ideographic-structure @@ -7379,11 +7395,14 @@ ) ((=gt-k . 00199) ; >-K00199; ) - ((=ks-x1001 . #x5C34) ; &CDP-88EB; [60-20] - (=daikanwa . 09175) ; &I-M-09175; + ((=jis-x0208@1978 . #x5622) ; &M-07734; [54-02] + (=ks-x1001 . #x5C33) ; &I-K0-5C33; [60-19] + (=jis-x0213-1@2004 . #x7E7B) ; &I-JX3-7E7B; [94-91] + (=daikanwa . 07734) ; &I-M-07734; )) (=ucs@unicode . #xFA39) ; &JX1-2F5A; (=jis-x0213-1 . #x2F5A) ; &JX1-2F5A; [15-58] + (=shinjigen/+p@rev . 1454) ; &JX1-2F5A; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R051-Dry.el b/lisp/utf-2000/Ideograph-R051-Dry.el index a1ad8db..dd1e473 100644 --- a/lisp/utf-2000/Ideograph-R051-Dry.el +++ b/lisp/utf-2000/Ideograph-R051-Dry.el @@ -110,6 +110,14 @@ )) (define-char '((ideographic-radical . 51) ; ⼲ + (=>jis-x0208@1997 . #x5675) ; &J97-5675; [54-85] + (=>jis-x0213-1@2000 . #x5675) ; &J97-5675; [54-85] + )) +(define-char + '((<-denotational + ((=>jis-x0208@1997 . #x5675) ; &J97-5675; [54-85] + )) + (ideographic-radical . 51) ; ⼲ (ideographic-strokes . 3) (total-strokes . 6) (=ucs . #x5E76) ; 并 @@ -122,41 +130,70 @@ (=gt-k . 01721) ; &I-GT-K01721; (=gt-pj-1 . #x5675) ; &I-GT-11554; [54-85] (=daikanwa . 09170) ; &I-M-09170; - (=shinjigen@rev . 2157) ; 并 + (=shinjigen . 2157) ; 并 + (<-vulgar + ((=ks-x1001 . #x5C34) ; &CDP-88EB; [60-20] + (=jis-x0213-1@2004 . #x7E7C) ; &I-JX3-7E7C; [94-92] + (=daikanwa . 09175) ; &I-M-09175; + (=shinjigen . 2156) ; &CDP-88EB; + )) + (<-vulgar*sources + zhengzitong daikanwa shinjigen) )) (define-char '((ideographic-radical . 51) ; ⼲ (ideographic-strokes . 4) (total-strokes . 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs . #x5E73) ; 平 + ) + ((=ucs . #x4E01) ; 丁 + )) (=ucs . #x2218A) ; 𢆊 - (->subsumptive - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ks-x1001 . #x7841) ; >-11550; [88-33] - (=daikanwa . 09167) ; &I-M-09167; - ) - ((=ucs . #x4E01) ; 丁 - )) - (=daikanwa . 09171) ; &M-09171; - (=hanziku-1 . #xA872) ; &I-HZK01-A872; + )) +(define-char + '((<-denotational + ((=ucs . #x2218A) ; 𢆊 + )) + (ideographic-radical . 51) ; ⼲ + (ideographic-strokes . 4) + (total-strokes . 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") - (=ucs . #x2FF0) ; ⿰ - ) - ((=ucs@unicode . #x5E73) ; >-11551; - (=jis-x0208 . #x4A3F) ; >-11551; [42-31] - (=gb2312 . #x463D) ; &I-G0-463D; [38-29] - (=cns11643-1 . #x464D) ; &I-C1-464D; [38-45] - (=jis-x0213-1 . #x4A3F) ; &I-JX1-4A3F; [42-31] - ) - ((=ucs . #x4E01) ; 丁 - )) - (=ucs@unicode . #x2218A) ; &C6-2742; - (=cns11643-6 . #x2742) ; &C6-2742; [07-34] + ((=ks-x1001 . #x7841) ; >-11550; [88-33] + (=daikanwa . 09167) ; &I-M-09167; + ) + ((=ucs . #x4E01) ; 丁 )) + (=daikanwa . 09171) ; &M-09171; + (=hanziku-1 . #xA872) ; &I-HZK01-A872; + )) +(define-char + '((<-denotational + ((=ucs . #x2218A) ; 𢆊 + )) + (ideographic-radical . 51) ; ⼲ + (ideographic-strokes . 4) + (total-strokes . 7) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") + (=ucs . #x2FF0) ; ⿰ + ) + ((=ucs@unicode . #x5E73) ; >-11551; + (=jis-x0208 . #x4A3F) ; >-11551; [42-31] + (=gb2312 . #x463D) ; &I-G0-463D; [38-29] + (=cns11643-1 . #x464D) ; &I-C1-464D; [38-45] + (=jis-x0213-1 . #x4A3F) ; &I-JX1-4A3F; [42-31] + ) + ((=ucs . #x4E01) ; 丁 + )) + (=ucs@iso . #x2218A) ; &C6-2742; + (=cns11643-6 . #x2742) ; &C6-2742; [07-34] )) (define-char '((ideographic-radical . 51) ; ⼲ @@ -188,14 +225,20 @@ (=daikanwa . 09174) ; &I-M-09174; )) (define-char - '((ideographic-radical . 51) ; ⼲ + '((<-denotational + ((=>jis-x0208@1997 . #x5675) ; &J97-5675; [54-85] + )) + (ideographic-radical . 51) ; ⼲ (ideographic-strokes . 5) (total-strokes . 8) (=ucs . #x5E77) ; 幷 + (=>jis-x0213-1@2004 . #x7E7C) ; 幷 [94-92] (->subsumptive ((=ks-x1001 . #x5C34) ; &CDP-88EB; [60-20] + (=jis-x0213-1@2004 . #x7E7C) ; &I-JX3-7E7C; [94-92] (=big5-cdp . #x88EB) ; &I-CDP-88EB; (=daikanwa . 09175) ; &I-M-09175; + (=shinjigen . 2156) ; &CDP-88EB; (=jef-china3 . #x4CB2) ; &I-JC3-4CB2; ) ((=ucs@unicode . #x5E77) ; &C3-2863; diff --git a/lisp/utf-2000/Ideograph-R104-Sickness.el b/lisp/utf-2000/Ideograph-R104-Sickness.el index a302d63..065fb50 100644 --- a/lisp/utf-2000/Ideograph-R104-Sickness.el +++ b/lisp/utf-2000/Ideograph-R104-Sickness.el @@ -5370,23 +5370,25 @@ )) (define-char '((ideographic-radical . 104) ; ⽧ - (=>jis-x0208 . #x4169) ; &J97-4169; [33-73] - (=>jis-x0213-1 . #x4169) ; &J97-4169; [33-73] + (=>jis-x0208@1997 . #x4169) ; &J97-4169; [33-73] + (=>jis-x0213-1@2000 . #x4169) ; &J97-4169; [33-73] )) (define-char '((<-denotational - ((=>jis-x0208 . #x4169) ; &J97-4169; [33-73] + ((=>jis-x0208@1997 . #x4169) ; &J97-4169; [33-73] )) (ideographic-radical . 104) ; ⽧ (ideographic-strokes . 10) (total-strokes . 15) (=ucs . #x7626) ; 瘦 + (=>jis-x0213-1@2004 . #x7E7D) ; 瘦 [94-93] (=big5 . #xBD47) ; &I-B-BD47; (->subsumptive ((=ucs@jis . #x7626) ; &M-22415; (=jis-x0208@1978 . #x4169) ; &M-22415; [33-73] (=ks-x1001 . #x6231) ; &I-K0-6231; [66-17] (=jis-x0212 . #x4D77) ; &I-JSP-4D77; [45-87] + (=jis-x0213-1@2004 . #x7E7D) ; &I-JX3-7E7D; [94-93] (=daikanwa . 22415) ; &I-M-22415; ) ((=ucs@unicode . #x7626) ; &C1-6D70; @@ -5396,12 +5398,13 @@ )) (define-char '((<-denotational - ((=>jis-x0208 . #x4169) ; &J97-4169; [33-73] + ((=>jis-x0208@1997 . #x4169) ; &J97-4169; [33-73] )) (ideographic-radical . 104) ; ⽧ (ideographic-strokes . 7) (total-strokes . 12) (=ucs . #x75E9) ; 痩 + (=>jis-x0213-1@2004 . #x4169) ; 痩 [33-73] (->subsumptive ((=ucs@jis . #x75E9) ; >-28480; (=jis-x0208@1983 . #x4169) ; >-28480; [33-73] @@ -5410,11 +5413,12 @@ (=gt . 28480) ; &I-GT-28480; (=gt-pj-1 . #x4169) ; &I-GT-28480; [33-73] (=jef-china3 . #x5AF5) ; &I-JC3-5AF5; - (<-simplified@JP/jis + (<-simplified@JP/extra/design ((=ucs@jis . #x7626) ; &M-22415; (=jis-x0208@1978 . #x4169) ; &M-22415; [33-73] (=ks-x1001 . #x6231) ; &I-K0-6231; [66-17] (=jis-x0212 . #x4D77) ; &I-JSP-4D77; [45-87] + (=jis-x0213-1@2004 . #x7E7D) ; &I-JX3-7E7D; [94-93] (=daikanwa . 22415) ; &I-M-22415; )) ) diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index 3c6f256..a23621a 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -11845,9 +11845,18 @@ )) (define-char '((ideographic-radical . 120) ; ⽷ + (=>jis-x0208@1997 . #x3752) ; &J97-3752; [23-50] + (=>jis-x0213-1@2000 . #x3752) ; &J97-3752; [23-50] + )) +(define-char + '((<-denotational + ((=>jis-x0208@1997 . #x3752) ; &J97-3752; [23-50] + )) + (ideographic-radical . 120) ; ⽷ (ideographic-strokes . 11) (total-strokes . 17) (=ucs . #x7E4B) ; 繋 + (=>jis-x0213-1@2004 . #x3752) ; 繋 [23-50] (->subsumptive ((morohashi-daikanwa ho 486) (=ucs@jis . #x7E4B) ; >-35822; @@ -11858,11 +11867,12 @@ (=gt-pj-1 . #x3752) ; &I-GT-35822; [23-50] (=jef-china3 . #x5FDF) ; &I-JC3-5FDF; (mojikyo . 054094) ; &MCS-6000D34E; - (<-simplified@JP/jis + (<-simplified@JP/extra ((=ucs@jis . #x7E6B) ; &M-27940; (=jis-x0208@1978 . #x3752) ; &M-27940; [23-50] (=ks-x1001 . #x4D28) ; &I-K0-4D28; [45-08] (=jis-x0212 . #x545A) ; &I-JSP-545A; [52-58] + (=jis-x0213-1@2004 . #x7E7E) ; &I-JX3-7E7E; [94-94] (=daikanwa . 27940) ; &I-M-27940; )) ) @@ -12959,7 +12969,7 @@ (=gt . 35996) ; &I-GT-35996; (=gt-pj-1 . #x6569) ; &I-GT-35996; [69-73] (=daikanwa . 27939) ; &I-M-27939; - (=shinjigen@rev . 6030) ; >-35996; + (=shinjigen . 6030) ; >-35996; ) ((=ucs@unicode . #x7E6A) ; &C1-7863; (=cns11643-1 . #x7863) ; &C1-7863; [88-67] @@ -12967,21 +12977,24 @@ )) )) (define-char - '((ideographic-radical . 120) ; ⽷ + '((<-denotational + ((=>jis-x0208@1997 . #x3752) ; &J97-3752; [23-50] + )) + (ideographic-radical . 120) ; ⽷ (ideographic-strokes . 13) (total-strokes . 19) (=ucs . #x7E6B) ; 繫 + (=>jis-x0213-1@2004 . #x7E7E) ; 繫 [94-94] + (=big5 . #xC3B4) ; &I-B-C3B4; (->subsumptive - ((=big5 . #xC3B4) ; &B-C3B4; - (->subsumptive - ((=ucs@jis . #x7E6B) ; &M-27940; - (=jis-x0208@1978 . #x3752) ; &M-27940; [23-50] - (=ks-x1001 . #x4D28) ; &I-K0-4D28; [45-08] - (=jis-x0212 . #x545A) ; &I-JSP-545A; [52-58] - (=daikanwa . 27940) ; &I-M-27940; - ) - ((=cns11643-1 . #x785F) ; &C1-785F; [88-63] - )) + ((=ucs@jis . #x7E6B) ; &M-27940; + (=jis-x0208@1978 . #x3752) ; &M-27940; [23-50] + (=ks-x1001 . #x4D28) ; &I-K0-4D28; [45-08] + (=jis-x0212 . #x545A) ; &I-JSP-545A; [52-58] + (=jis-x0213-1@2004 . #x7E7E) ; &I-JX3-7E7E; [94-94] + (=daikanwa . 27940) ; &I-M-27940; + ) + ((=cns11643-1 . #x785F) ; &C1-785F; [88-63] ) ((=ucs@unicode . #x7E6B) ; &UU+7E6B; (=gb12345 . #x7873) ; &UU+7E6B; [88-83] diff --git a/lisp/utf-2000/Ideograph-R158-Body.el b/lisp/utf-2000/Ideograph-R158-Body.el index 91932c1..3805ea6 100644 --- a/lisp/utf-2000/Ideograph-R158-Body.el +++ b/lisp/utf-2000/Ideograph-R158-Body.el @@ -263,64 +263,94 @@ (=daikanwa . 38060) ; &I-M-38060; )) (define-char - '((=>ucs . #x2822B) ; 𨈫 - (ideographic-radical . 158) ; ⾝ - (ideographic-strokes . 5) - (total-strokes . 12) - (=daikanwa . 38061) ; &M-38061; - )) -(define-char - '((morohashi-daikanwa 38061 0 0) - (ideographic-radical . 158) ; ⾝ + '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 5) (total-strokes . 12) (=ucs . #x2822B) ; 𨈫 - (=cns11643-5 . #x3C64) ; &I-C5-3C64; [28-68] + (->subsumptive + ((=daikanwa . 38061) ; &M-38061; + ) + ((=cns11643-5 . #x3C64) ; &C5-3C64; [28-68] + ) + ((=ucs@iso . #x2822B) ; &U-0002822B; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 5) (total-strokes . 12) (=ucs . #x4833) ; 䠳 - (=cns11643-5 . #x3C67) ; &I-C5-3C67; [28-71] - (=daikanwa . 38062) ; &I-M-38062; + (->subsumptive + ((=daikanwa . 38062) ; &M-38062; + ) + ((=cns11643-5 . #x3C67) ; &C5-3C67; [28-71] + ) + ((=ucs@unicode . #x4833) ; &UU+4833; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 5) (total-strokes . 12) (=ucs . #x4834) ; 䠴 - (=cns11643-4 . #x3B52) ; &I-C4-3B52; [27-50] - (=daikanwa . 38063) ; &I-M-38063; + (->subsumptive + ((=daikanwa . 38063) ; &M-38063; + ) + ((=cns11643-4 . #x3B52) ; &C4-3B52; [27-50] + ) + ((=ucs@unicode . #x4834) ; &UU+4834; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 5) (total-strokes . 12) (=ucs . #x4832) ; 䠲 - (=cns11643-3 . #x3F42) ; &I-C3-3F42; [31-34] - (=daikanwa . 38064) ; &I-M-38064; - )) -(define-char - '((=>ucs . #x8EB0) ; 躰 - (ideographic-radical . 158) ; ⾝ - (ideographic-strokes . 5) - (total-strokes . 12) - (=ucs@jis . #x8EB0) ; >-50841; - (=jis-x0208 . #x6D3C) ; >-50841; [77-28] - (=cns11643-3 . #x3F40) ; &I-C3-3F40; [31-32] - (=jis-x0213-1 . #x6D3C) ; &I-JX1-6D3C; [77-28] - (=gt . 50841) ; &I-GT-50841; - (=gt-pj-1 . #x6D3C) ; &I-GT-50841; [77-28] - (=daikanwa . 38065) ; &I-M-38065; - (=shinjigen@rev . 0190) ; >-50841; + (->subsumptive + ((=daikanwa . 38064) ; &M-38064; + ) + ((=cns11643-3 . #x3F42) ; &C3-3F42; [31-34] + ) + ((=ucs@unicode . #x4832) ; &UU+4832; + )) )) (define-char - '((morohashi-daikanwa 38065 0 0) - (ideographic-radical . 158) ; ⾝ + '((ideographic-radical . 158) ; ⾝ (ideographic-strokes . 5) (total-strokes . 12) (=ucs . #x8EB0) ; 躰 + (->subsumptive + ((=ucs@jis . #x8EB0) ; >-50841; + (=jis-x0208 . #x6D3C) ; >-50841; [77-28] + (=cns11643-3 . #x3F40) ; &I-C3-3F40; [31-32] + (=jis-x0213-1 . #x6D3C) ; &I-JX1-6D3C; [77-28] + (=gt . 50841) ; &I-GT-50841; + (=gt-pj-1 . #x6D3C) ; &I-GT-50841; [77-28] + (=daikanwa . 38065) ; &I-M-38065; + (<-vulgar + ((=ucs@jis . #x9AD4) ; >-60937; + (=jis-x0208 . #x7173) ; >-60937; [81-83] + (=ks-x1001 . #x7477) ; &I-K0-7477; [84-87] + (=jis-x0213-1 . #x7173) ; &I-JX1-7173; [81-83] + (=daikanwa . 45291) ; &I-M-45291; + )) + (<-vulgar*sources + yupian daikanwa) + ) + ((=shinjigen . 0190) ; &SJG2-0190; + (<-vulgar + ((=ucs@jis . #x9AD4) ; >-60937; + (=jis-x0208 . #x7173) ; >-60937; [81-83] + (=ks-x1001 . #x7477) ; &I-K0-7477; [84-87] + (=jis-x0213-1 . #x7173) ; &I-JX1-7173; [81-83] + (=daikanwa . 45291) ; &I-M-45291; + (=shinjigen . 0189) ; >-60937; + )) + (<-vulgar*sources + shinjigen) + ) + ((=ucs@unicode . #x8EB0) ; &UU+8EB0; + )) )) (define-char '((ideographic-radical . 158) ; ⾝ @@ -329,6 +359,8 @@ (=ucs . #x2822C) ; 𨈬 (=cns11643-6 . #x4F41) ; &I-C6-4F41; [47-33] (=daikanwa . 38066) ; &I-M-38066; + (=hanziku-10 . #xC060) ; &I-HZK10-C060; + (=cbeta . 02553) ; &I-CB02553; )) (define-char '((ideographic-radical . 158) ; ⾝ diff --git a/lisp/utf-2000/Ideograph-R188-Bone.el b/lisp/utf-2000/Ideograph-R188-Bone.el index bac1e24..8108c67 100644 --- a/lisp/utf-2000/Ideograph-R188-Bone.el +++ b/lisp/utf-2000/Ideograph-R188-Bone.el @@ -2968,34 +2968,39 @@ )) )) (define-char - '((=>ucs . #x9AD4) ; 體 - (ideographic-radical . 188) ; ⾻ + '((ideographic-radical . 188) ; ⾻ (ideographic-strokes . 13) - (total-strokes . 23) - (=ucs@jis . #x9AD4) ; >-60937; - (=jis-x0208 . #x7173) ; >-60937; [81-83] - (=ks-x1001 . #x7477) ; &I-K0-7477; [84-87] - (=jis-x0213-1 . #x7173) ; &I-JX1-7173; [81-83] - (=gt . 60937) ; &I-GT-60937; - (=gt-pj-1 . #x7173) ; &I-GT-60937; [81-83] - (=daikanwa . 45291) ; &I-M-45291; - (=shinjigen@rev . 0189) ; >-60937; + (=ucs . #x9AD4) ; 體 )) (define-char - '((=>ucs . #x9AD4) ; 體 - (morohashi-daikanwa 45291 0 0) + '((<-denotational + ((=ucs . #x9AD4) ; 體 + )) (ideographic-radical . 188) ; ⾻ (ideographic-strokes . 13) (total-strokes . 23) - (=cns11643-1 . #x7C55) ; &C1-7C55; [92-53] + (->subsumptive + ((=ucs@jis . #x9AD4) ; >-60937; + (=jis-x0208 . #x7173) ; >-60937; [81-83] + (=ks-x1001 . #x7477) ; &I-K0-7477; [84-87] + (=jis-x0213-1 . #x7173) ; &I-JX1-7173; [81-83] + (=gt . 60937) ; &I-GT-60937; + (=gt-pj-1 . #x7173) ; &I-GT-60937; [81-83] + (=daikanwa . 45291) ; &I-M-45291; + (=shinjigen . 0189) ; >-60937; + ) + ((=cns11643-1 . #x7C55) ; &C1-7C55; [92-53] + )) )) (define-char - '((morohashi-daikanwa 45291 0 4) + '((<-denotational + ((=ucs . #x9AD4) ; 體 + )) (ideographic-radical . 188) ; ⾻ (ideographic-strokes . 13) (total-strokes . 22) - (=ucs . #x9AD4) ; 體 - (=gb12345 . #x4C65) ; 體 [44-69] + (=ucs@unicode . #x9AD4) ; &UU+9AD4; + (=gb12345 . #x4C65) ; &UU+9AD4; [44-69] )) (define-char '((ideographic-radical . 188) ; ⾻ diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el index 85b4e43..eb63b73 100644 --- a/lisp/utf-2000/maps-conf.el +++ b/lisp/utf-2000/maps-conf.el @@ -65,7 +65,7 @@ ;; #x5734 #x552D #x565A #x564B #x5B79 ;; #x5C74 #x5C27 #x5B5E #x3564 #x3823 ;; #x6131 #x4A4D #x632E #x635E #x3729 -;; #x3951 #x6967 #x704B)) +;; #x3951 #x6967 #x704B #x3C38)) ;; (put-char-attribute (decode-char 'japanese-jisx0208-1990 v) ;; '=gt-pj-1 v)) ;; nil) -- 1.7.10.4