From: tomo Date: Fri, 4 Jun 2004 12:00:34 +0000 (+0000) Subject: Sync up with r21-4-14-chise-0_21-26. X-Git-Tag: r21-4-14-u2km-0_21-26 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9e727c6867a6e5c814e4648fe583f5ce71461c15;p=chise%2Fxemacs-chise.git.1 Sync up with r21-4-14-chise-0_21-26. --- diff --git a/etc/char-data/ChangeLog b/etc/char-data/ChangeLog index 3ff955c..e8f6e85 100644 --- a/etc/char-data/ChangeLog +++ b/etc/char-data/ChangeLog @@ -1,3 +1,7 @@ +2004-04-15 MORIOKA Tomohiko + + * JC3-to-UCS.txt (JC3-68AC): Map to U+9115 instead of U+90F7. + 2004-03-09 MORIOKA Tomohiko * JC3-to-UCS.txt (JC3-67A3): Map to U+2ECC instead of U+8FB6. diff --git a/etc/char-data/JC3-to-UCS.txt b/etc/char-data/JC3-to-UCS.txt index 571cbad..3be8b3b 100644 --- a/etc/char-data/JC3-to-UCS.txt +++ b/etc/char-data/JC3-to-UCS.txt @@ -3189,7 +3189,7 @@ JC3-68A8 U+FA26 JC3-68A9 U+48D0 JC3-68AA U+9106 JC3-68AB U+9125 -JC3-68AC U+90F7 +JC3-68AC U+9115 JC3-68AD U+9116 JC3-68AE U+48DB JC3-68AF U+9122 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e3aab90..b9a715d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-04-08 MORIOKA Tomohiko + + * mule/mule-coding.el (coded-charset-entity-reference-alist): Add + settings for =ucs@{unicode|iso|gb|jis|cns|ks}. + 2004-04-05 MORIOKA Tomohiko * mule/mule-coding.el (coded-charset-entity-reference-alist): Add diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index ba5d040..daa2401 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -287,6 +287,18 @@ ((chinese-big5 . isolated) "I-B-" 4 X) ( chinese-big5 "B-" 4 X) ( chinese-big5 "C0-" 4 X) + ( =ucs@unicode "UU+" 4 X) + ( =ucs@unicode "UU-" 8 X) + ( =ucs@iso "U+" 4 X) + ( =ucs@iso "U-" 8 X) + ( =ucs@gb "GU+" 4 X) + ( =ucs@gb "GU-" 8 X) + ( =ucs@jis "JU+" 4 X) + ( =ucs@jis "JU-" 8 X) + ( =ucs@cns "CU+" 4 X) + ( =ucs@cns "CU-" 8 X) + ( =ucs@ks "KU+" 4 X) + ( =ucs@ks "KU-" 8 X) )) (make-coding-system diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 6c1613a..2f364cb 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,128 @@ +2004-04-16 MORIOKA Tomohiko + + * Ideograph-R164-Wine.el (J0-3D39): Moved into U+919C. + (U+919C): Use `->subsumptive'. + + * Ideograph-R001-One.el: Add some `<-simplified@CN' features. + (U+4E07): Use `<-simplified' instead of `<-simplified@JP/Jouyou' + for U+842C; put `<-simplified*sources' to add JP/Jouyou and CN. + (U+4E3D): Copied from Ideograph-R003-Dot.el. + (C3-2740): Add `<-denotational' for U+4E3D. + + * Ideograph-R075-Tree.el (U+696D): Use `->subsumptive'. + (C1-6446): Moved into U+696D. + +2004-04-15 MORIOKA Tomohiko + + * Ideograph-R041-Inch.el (U+5C08): Use `->subsumptive'. + (JC3-4ACE): Moved into U+5C08. + (U+5C02): Use `=>daikanwa' instead of `morohashi-daikanwa' for + M-07439. + + * Ideograph-R010-Legs.el (U+5145): Omit `=>daikanwa'. + +2004-04-15 MORIOKA Tomohiko + + * ideograph-util.el (char-daikanwa): Return value of `=>daikanwa' + with subcode 0. + + * Ideograph-R066-Rap.el (K0-4A72): Moved into U+6562. + (J83-343A): Likewise. + (U+6562): Use `->subsumptive'. + + * Ideograph-R030-Mouth.el (J0-536E): Moved into U+56B4. + (U+56B4): Use `->subsumptive'. + + * Ideograph-R163-City.el (U+9115): Use `->subsumptive'; moved into + intersection between U+9115 and U+9109. + (U+9109): Likewise. + + * Ideograph-R120-Silk.el (J0-652F): Moved into U+7D72. + (U+7D72): Use `->subsumptive'. + + * Ideograph-R011-Enter.el (J0-5140): Moved into U+5169. + (U+5169): Use `->subsumptive'. + +2004-04-14 MORIOKA Tomohiko + + * Ideograph-R134-Mortar.el (U+8207): Use `->subsumptive'. + (C1-6A58): Moved into U+8207. + (U+8209): Use `->subsumptive'. + (B-C17C): Moved into U+8209. + + * Ideograph-R003-Dot.el: Add some `<-simplified@CN' features. + (C3-2740): Add `<-denotational' for U+4E3D. + (GT-K04581): Likewise; add `<-ideographic-component-forms' for + C3-2740. + (G0-4076): Separate U+4E3D; add `<-denotational' for U+4E3D. + (U-0002592C): Use `->subsumptive'. + +2004-04-13 MORIOKA Tomohiko + + * Ideograph-R198-Deer.el (J83-4E6F): Moved into U+9E97. + (U+9E97): Use `->subsumptive'. + + * Ideograph-R029-Again.el (J0-4151): Moved into U+53E2. + (U+53E2): Use `->subsumptive'. + + * Ideograph-R140-Grass.el (C1-655C): Moved into U+842C. + (U+842C): Use `->subsumptive'. + + * Ideograph-R124-Feather.el (M-28672): Add `<-denotational' for + U+7FD2; use `->subsumptive'. + (K0-6327): Likewise. + (U+7FD2): Separate all CCS-features. + (J0-3D2C): Add `<-denotational' for U+7FD2; use `->subsumptive'. + (G1-4F30): Separate U+7FD2; add `<-denotational' for U+7FD2; use + `->subsumptive'. + + * Ideograph-R087-Claw.el (J0-602A): Moved into U+7232. + (U+7232): Use `->subsumptive'. + + * Ideograph-R005-Second.el: Add some `<-simplified@CN' features. + + * ideograph-util.el (char-daikanwa): Prefer children to parents. + +2004-04-12 MORIOKA Tomohiko + + * char-db-util.el (char-attribute-name<): Modify for =jis-x0208. + +2004-04-09 MORIOKA Tomohiko + + * Ideograph-R173-Rain.el (U+96F2): Use `->subsumptive'. + (C1-6278): Moved into U+96F2. + + * Ideograph-R169-Gate.el (M-41233): Moved into U+958B. + (U+958B): Use `->subsumptive'. + + * Ideograph-R087-Claw.el (J0-6027): Moved into U+722D. + (U+722D): Use `->subsumptive'. + + * Ideograph-R037-Big.el (M-05860): Moved into U+4E54. + (U+4E54): Use `->subsumptive'; add `<-simplified@CN' into G0-4747 + for U+55AC. + + * Ideograph-R004-Slash.el: Add some `<-simplified@CN' features. + (GT-00160): Moved into U+4E49. + (U+4E49): Use `->subsumptive'. + (U+4E54): Use `ideographic-{radical|strokes}@{ucs|cns}' and + `ideographic-radical@cns*sources' instead of `ideographic-'; use + `->subsumptive'. + +2004-04-08 MORIOKA Tomohiko + + * read-maps.el (jp-jouyou-read-file): Check `<-simplified' and + `<-simplified*sources'. + + * char-db-util.el (insert-char-attributes): Add some CCSs + corresponding with JP, JP/Jouyou and CN specified in + {<-|->}FOO*sources into required-features; add special code for + {<-|->}FOO@CN to add Chinese CCSs into required-features. + +2004-04-07 MORIOKA Tomohiko + + * Ideograph-R002-Line.el: Add some `<-simplified@CN' features. + 2004-04-07 MORIOKA Tomohiko * ruimoku6.el: Use utf-8-mcs-er instead of utf-8-mcs. diff --git a/lisp/utf-2000/Ideograph-R001-One.el b/lisp/utf-2000/Ideograph-R001-One.el index ba964b6..85ab6b1 100644 --- a/lisp/utf-2000/Ideograph-R001-One.el +++ b/lisp/utf-2000/Ideograph-R001-One.el @@ -266,10 +266,13 @@ (ideographic-radical . 1) ; ⼀ (ideographic-strokes . 2) (total-strokes . 3) - (<-simplified@JP/Jouyou - ((=ucs . #x842C) ; 萬 - (=jis-x0208 . #x685F) ; &I-J90-685F; + (<-simplified + ((=jis-x0208 . #x685F) ; >-41264; + (=ks-x1001 . #x583F) ; &I-K0-583F; + (=gb12345 . #x4D72) ; >-41264; )) + (<-simplified*sources + JP/Jouyou CN) (hanyu-dazidian 1 9 3) (shinjigen-1 . 12) (shinjigen-2 . 12) @@ -534,6 +537,9 @@ cns11643) (ideographic-strokes@gt . 2) (total-strokes@gt . 3) + (<-simplified@CN + ((=gb12345 . #x536B) ; >-39084; + )) (hanyu-dazidian 1 5 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") @@ -569,8 +575,9 @@ ((ideographic-strokes . 2) (total-strokes . 3) (<-simplified@JP/Jouyou - ((=ucs . #x8207) ; 與 - (=jis-x0208 . #x6750) ; &I-J90-6750; + ((=jis-x0208 . #x6750) ; >-39084; + (=ks-x1001 . #x6628) ; &I-K0-6628; + (=daikanwa . 30212) ; &I-M-30212; )) (shinjigen-1 . 6625) (shinjigen-2 . 6625) @@ -642,7 +649,10 @@ (=ucs@big5 . #x4E11) ; >-00033; (mojikyo . 000023) ; &MCS-60000017; ) - ((<-vulgar-ideograph + ((<-simplified@CN + ((=gb12345 . #x3373) ; &UU+919C; + )) + (<-vulgar-ideograph ((=daikanwa . 00023) ; &I-M-00023; )) (shinjigen-1 . 17) @@ -796,6 +806,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 3) (total-strokes . 4) + (<-simplified@CN + ((=gb12345 . #x5728) ; >-09367; + )) (hanyu-dazidian 1 10 5) (=ucs . #x4E13) ; 专 (=gb2312 . #x5728) ; &I-G0-5728; @@ -1134,6 +1147,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 4) (total-strokes . 5) + (<-simplified@CN + ((=gb12345 . #x5235) ; >-19258; + )) (hanyu-dazidian 1 15 4) (=ucs . #x4E1A) ; 业 (=gb2312 . #x5235) ; &I-G0-5235; @@ -1143,6 +1159,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 4) (total-strokes . 5) + (<-simplified@CN + ((=gb12345 . #x3454) ; &UU+53E2; + )) (hanyu-dazidian 1 17 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1160,6 +1179,10 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 4) (total-strokes . 5) + (<-simplified@CN + ((=ucs . #x6771) ; 東 + (=gb12345 . #x362B) ; 東 + )) (=ucs . #x4E1C) ; 东 (=gb2312 . #x362B) ; &I-G0-362B; )) @@ -1175,6 +1198,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 4) (total-strokes . 5) + (<-simplified@CN + ((=gb12345 . #x4B3F) ; &UU+7D72; + )) (hanyu-dazidian 1 17 8) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -1755,6 +1781,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 6) (total-strokes . 7) + (<-simplified@CN + ((=gb12345 . #x413D) ; &C1-4C25; + )) (hanyu-dazidian 1 21 2) (=ucs . #x4E24) ; 两 (=gb2312 . #x413D) ; &I-G0-413D; @@ -1795,6 +1824,9 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 6) (total-strokes . 7) + (<-simplified@CN + ((=gb12345 . #x514F) ; &UU+56B4; + )) (hanyu-dazidian 1 19 10) (=ucs . #x4E25) ; 严 (=gb2312 . #x514F) ; &I-G0-514F; @@ -2013,8 +2045,7 @@ (=daikanwa . 00104) ; &I-M-00104; )) (<-ancient-ideograph - ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; &I-M-47663; + ((=daikanwa . 47663) ; &I-M-47663; )) (<-ancient-ideograph*sources daikanwa) @@ -2044,8 +2075,23 @@ )) )) (define-char - '((=>ucs . #x4E3D) ; 丽 - (ideographic-radical@daikanwa . 3) ; ⼂ + '((ideographic-radical@daikanwa . 3) ; ⼂ + (ideographic-strokes@daikanwa . 7) + (total-strokes@daikanwa . 8) + (ideographic-radical@daikanwa*sources + daikanwa gt) + (ideographic-radical@cns . 1) ; ⼀ + (ideographic-strokes@cns . 7) + (total-strokes@cns . 8) + (ideographic-radical@cns*sources + cns11643) + (ideographic-radical@unicode . 3) + (ideographic-strokes@unicode . 6) + (total-strokes@unicode . 7) + (=ucs . #x4E3D) ; 丽 + )) +(define-char + '((ideographic-radical@daikanwa . 3) ; ⼂ (ideographic-strokes@daikanwa . 7) (ideographic-radical@daikanwa*sources daikanwa gt) @@ -2059,11 +2105,13 @@ (=daikanwa . 00059) ; &I-M-00059; )) (<-ancient-ideograph - ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; &I-M-47663; + ((=daikanwa . 47663) ; &I-M-47663; )) (<-ancient-ideograph*sources daikanwa) + (<-denotational + ((=ucs . #x4E3D) ; 丽 + )) (hanyu-dazidian 1 24 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -2150,6 +2198,10 @@ '((ideographic-radical . 1) ; ⼀ (ideographic-strokes . 7) (total-strokes . 8) + (<-simplified@CN + ((=ucs . #x55AA) ; 喪 + (=gb12345 . #x4925) ; 喪 + )) (hanyu-dazidian 1 22 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") diff --git a/lisp/utf-2000/Ideograph-R002-Line.el b/lisp/utf-2000/Ideograph-R002-Line.el index 8961db2..e441f0c 100644 --- a/lisp/utf-2000/Ideograph-R002-Line.el +++ b/lisp/utf-2000/Ideograph-R002-Line.el @@ -76,6 +76,10 @@ '((ideographic-radical . 2) ; ⼁ (ideographic-strokes . 2) (total-strokes . 3) + (<-simplified@CN + ((=ucs . #x500B) ; 個 + (=gb12345 . #x3876) ; 個 + )) (hanyu-dazidian 1 103 1) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -218,6 +222,10 @@ '((ideographic-radical . 2) ; ⼁ (ideographic-strokes . 3) (total-strokes . 4) + (<-simplified@CN + ((=ucs . #x8C50) ; 豐 + (=gb12345 . #x3761) ; 豐 + )) (shinjigen-1 . 35) (shinjigen-2 . 35) (=ucs . #x4E30) ; 丰 @@ -536,6 +544,10 @@ '((ideographic-radical . 2) ; ⼁ (ideographic-strokes . 8) (total-strokes . 9) + (<-simplified@CN + ((=ucs . #x81E8) ; 臨 + (=gb12345 . #x4159) ; 臨 + )) (hanyu-dazidian 1 30 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") diff --git a/lisp/utf-2000/Ideograph-R003-Dot.el b/lisp/utf-2000/Ideograph-R003-Dot.el index cf4e330..17067b1 100644 --- a/lisp/utf-2000/Ideograph-R003-Dot.el +++ b/lisp/utf-2000/Ideograph-R003-Dot.el @@ -254,6 +254,9 @@ '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 3) (total-strokes . 4) + (<-simplified@CN + ((=gb12345 . #x4E2A) ; >-25271; + )) (hanyu-dazidian 1 44 2) (=ucs . #x4E3A) ; 为 (=gb2312 . #x4E2A) ; &I-G0-4E2A; @@ -410,8 +413,23 @@ (=gt-pj-9 . #x4A2F) ; >-00144; )) (define-char - '((=>ucs . #x4E3D) ; 丽 - (ideographic-radical@daikanwa . 3) ; ⼂ + '((ideographic-radical@daikanwa . 3) ; ⼂ + (ideographic-strokes@daikanwa . 7) + (total-strokes@daikanwa . 8) + (ideographic-radical@daikanwa*sources + daikanwa gt) + (ideographic-radical@cns . 1) ; ⼀ + (ideographic-strokes@cns . 7) + (total-strokes@cns . 8) + (ideographic-radical@cns*sources + cns11643) + (ideographic-radical@unicode . 3) + (ideographic-strokes@unicode . 6) + (total-strokes@unicode . 7) + (=ucs . #x4E3D) ; 丽 + )) +(define-char + '((ideographic-radical@daikanwa . 3) ; ⼂ (ideographic-strokes@daikanwa . 7) (ideographic-radical@daikanwa*sources daikanwa gt) @@ -425,11 +443,13 @@ (=daikanwa . 00059) ; &I-M-00059; )) (<-ancient-ideograph - ((ideographic-radical . 198) ; ⿅ - (=daikanwa . 47663) ; &I-M-47663; + ((=daikanwa . 47663) ; &I-M-47663; )) (<-ancient-ideograph*sources daikanwa) + (<-denotational + ((=ucs . #x4E3D) ; 丽 + )) (hanyu-dazidian 1 24 5) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -476,19 +496,15 @@ (mojikyo . 000104) ; &MCS-60000068; )) (define-char - '((=>ucs . #x4E3D) ; 丽 - (morohashi-daikanwa 104 0 1) - (ideographic-radical . 3) ; ⼂ - (ideographic-strokes . 6) - (total-strokes . 7) - (=gt-k . 04581) ; >-K04581; - (=gt-pj-k1 . #x325C) ; >-K04581; - )) -(define-char - '((morohashi-daikanwa 104 0 2) - (ideographic-radical . 3) ; ⼂ + '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 6) (total-strokes . 7) + (<-denotational + ((=ucs . #x4E3D) ; 丽 + )) + (<-simplified@CN + ((=gb12345 . #x4076) ; &UU+9E97; + )) (hanyu-dazidian 1 21 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -519,37 +535,58 @@ )) )) )) - (=ucs . #x4E3D) ; 丽 - (=gb2312 . #x4076) ; &I-G0-4076; + (=gb2312 . #x4076) ; &HZK01-A86E; (=hanziku-1 . #xA86E) ; &I-HZK01-A86E; + (=ucs@unicode . #x4E3D) ; &HZK01-A86E; + )) +(define-char + '((ideographic-radical . 3) ; ⼂ + (ideographic-strokes . 6) + (total-strokes . 7) + (<-denotational + ((=ucs . #x4E3D) ; 丽 + )) + (<-ideographic-component-forms + ((=cns11643-3 . #x2740) ; >-00145; + (=daikanwa . 00104) ; &I-M-00104; + )) + (=gt-k . 04581) ; >-K04581; + (=gt-pj-k1 . #x325C) ; >-K04581; )) (define-char '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 7) (total-strokes . 8) - (hanyu-dazidian 1 47 2) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") - (=ucs . #x2FF5) ; ⿵ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + (=ucs . #x2592C) ; 𥤬 + (->subsumptive + ((hanyu-dazidian 1 47 2) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") + (=ucs . #x2FF5) ; ⿵ ) - ((=ucs . #x4E36) ; 丶 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E36) ; 丶 + ) + ((=big5-cdp . #x8C58) ; &CDP-8C58; + )) ) - ((=big5-cdp . #x8C58) ; &CDP-8C58; + ((=ucs . #x5EFE) ; 廾 )) + (=hanziku-1 . #xADBE) ; &HZK01-ADBE; ) - ((=ucs . #x5EFE) ; 廾 + ((=ucs@iso . #x2592C) ; &UU+2592C; )) - (=ucs . #x2592C) ; 𥤬 - (=hanziku-1 . #xADBE) ; &I-HZK01-ADBE; )) (define-char '((ideographic-radical . 3) ; ⼂ (ideographic-strokes . 8) (total-strokes . 9) + (<-simplified@CN + ((=gb12345 . #x3E59) ; >-39114; + )) (hanyu-dazidian 1 47 3) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE") diff --git a/lisp/utf-2000/Ideograph-R004-Slash.el b/lisp/utf-2000/Ideograph-R004-Slash.el index 60d7488..c4fa2b3 100644 --- a/lisp/utf-2000/Ideograph-R004-Slash.el +++ b/lisp/utf-2000/Ideograph-R004-Slash.el @@ -420,29 +420,31 @@ )) )) (define-char - '((=>ucs . #x4E49) ; 义 - (ideographic-radical . 4) ; ⼃ - (ideographic-strokes . 2) - (total-strokes . 3) - (=gt . 00160) ; >-00160; - (=gt-k . 00245) ; &I-GT-K00245; - (=gt-pj-2 . #x3122) ; >-00160; - (=daikanwa . 00124) ; &I-M-00124; - (=cbeta . 01415) ; &I-CB01415; - (mojikyo . 000124) ; &MCS-6000007C; - )) -(define-char - '((morohashi-daikanwa 124 0 0) - (ideographic-radical . 4) ; ⼃ + '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 2) (total-strokes . 3) - (hanyu-dazidian 1 42 10) (=ucs . #x4E49) ; 义 - (=gb2312 . #x5265) ; &I-G0-5265; - (=cns11643-3 . #x212E) ; &I-C3-212E; - (=big5-cdp . #x8AEE) ; &I-CDP-8AEE; - (=gt . 00165) ; &I-GT-00165; - (=gt-pj-9 . #x4A2A) ; &I-GT-00165; + (->subsumptive + ((=gt . 00160) ; >-00160; + (=gt-k . 00245) ; &I-GT-K00245; + (=gt-pj-2 . #x3122) ; >-00160; + (=daikanwa . 00124) ; &I-M-00124; + (=cbeta . 01415) ; &I-CB01415; + ) + ((mojikyo . 000124) ; &MCS-6000007C; + ) + ((<-simplified@CN + ((=ucs . #x7FA9) ; 義 + (=gb12345 . #x5265) ; 義 + )) + (hanyu-dazidian 1 42 10) + (=gb2312 . #x5265) ; >-00165; + (=cns11643-3 . #x212E) ; &I-C3-212E; + (=big5-cdp . #x8AEE) ; &I-CDP-8AEE; + (=gt . 00165) ; &I-GT-00165; + (=gt-pj-9 . #x4A2A) ; &I-GT-00165; + (=ucs@unicode . #x4E49) ; >-00165; + )) )) (define-char '((morohashi-daikanwa 3118 1) @@ -644,6 +646,10 @@ '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 3) (total-strokes . 4) + (<-simplified@CN + ((=ucs . #x70CF) ; 烏 + (=gb12345 . #x4E5A) ; 烏 + )) (hanyu-dazidian 1 34 10) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT") @@ -898,6 +904,10 @@ '((ideographic-radical . 4) ; ⼃ (ideographic-strokes . 4) (total-strokes . 5) + (<-simplified@CN + ((=ucs . #x6A02) ; 樂 + (=gb12345 . #x4056) ; 樂 + )) (hanyu-dazidian 1 37 5) (=ucs . #x4E50) ; 乐 (=gb2312 . #x4056) ; &I-G0-4056; @@ -1152,25 +1162,35 @@ (mojikyo . 000146) ; &MCS-60000092; )) (define-char - '((morohashi-daikanwa 5860 0 2) - (ideographic- (:radical 37 ; ⼤ - :strokes 3) - (:radical 4 ; ⼃ - :strokes 5)) + '((ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 5) + (ideographic-radical@cns . 37) ; ⼤ + (ideographic-strokes@cns . 3) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 6) - (hanyu-dazidian 1 38 1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x592D) ; 夭 + (=ucs . #x4E54) ; 乔 + (->subsumptive + ((=daikanwa . 05860) ; &M-05860; ) - ((=big5-cdp . #x89AB) ; &CDP-89AB; + ((<-simplified@CN + ((=ucs . #x55AC) ; 喬 + (=gb12345 . #x4747) ; 喬 + )) + (hanyu-dazidian 1 38 1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x592D) ; 夭 + ) + ((=big5-cdp . #x89AB) ; &CDP-89AB; + )) + (=gb2312 . #x4747) ; &HZK01-ABD7; + (=cns11643-3 . #x2345) ; &I-C3-2345; + (=hanziku-1 . #xABD7) ; &I-HZK01-ABD7; + (=ucs@unicode . #x4E54) ; &HZK01-ABD7; )) - (=ucs . #x4E54) ; 乔 - (=gb2312 . #x4747) ; &I-G0-4747; - (=cns11643-3 . #x2345) ; &I-C3-2345; - (=hanziku-1 . #xABD7) ; &I-HZK01-ABD7; )) (define-char '((ideographic- (:radical 49 ; ⼰ diff --git a/lisp/utf-2000/Ideograph-R005-Second.el b/lisp/utf-2000/Ideograph-R005-Second.el index 5b27f74..e0c12c2 100644 --- a/lisp/utf-2000/Ideograph-R005-Second.el +++ b/lisp/utf-2000/Ideograph-R005-Second.el @@ -338,6 +338,9 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 2) (total-strokes . 3) + (<-simplified@CN + ((=gb12345 . #x4F30) ; &UU+7FD2; + )) (hanyu-dazidian 1 51 3) (=ucs . #x4E60) ; 习 (=gb2312 . #x4F30) ; &I-G0-4F30; @@ -348,6 +351,9 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 2) (total-strokes . 3) + (<-simplified@CN + ((=gb12345 . #x4F67) ; 鄉 + )) (hanyu-dazidian 1 51 5) (=ucs . #x4E61) ; 乡 (=gb2312 . #x4F67) ; &I-G0-4F67; @@ -486,6 +492,10 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 3) (total-strokes . 4) + (<-simplified@CN + ((=ucs . #x66F8) ; 書 + (=gb12345 . #x4A69) ; 書 + )) (hanyu-dazidian 1 52 5) (=ucs . #x4E66) ; 书 (=gb2312 . #x4A69) ; &I-G0-4A69; @@ -929,6 +939,10 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 5) (total-strokes . 6) + (<-simplified@CN + ((=ucs . #x8CB7) ; 買 + (=gb12345 . #x4272) ; 買 + )) (hanyu-dazidian 1 53 10) (ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") @@ -971,6 +985,13 @@ '((ideographic-radical . 5) ; ⼄ (ideographic-strokes . 6) (total-strokes . 7) + (<-simplified + ((=ucs . #x4E82) ; 亂 + )) + (<-simplified@CN + ((=cns11643-1 . #x632A) ; >-00286; + (=gb12345 . #x4252) ; >-00286; + )) (<-simplified@JP/Jouyou ((=jis-x0208 . #x502C) ; >-00285; (=ks-x1001 . #x552F) ; &I-K0-552F; diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el index 7eb717f..e010d66 100644 --- a/lisp/utf-2000/Ideograph-R009-Man.el +++ b/lisp/utf-2000/Ideograph-R009-Man.el @@ -490,7 +490,7 @@ ) ((=ucs . #x516B) ; 八 )) - (=ucs@unicode . #x4EC8) ; 󰀂 + (=ucs@unicode . #x4EC8) ; &UU+4EC8; )) )) (define-char @@ -3291,7 +3291,7 @@ ) ((=ucs . #x5185) ; 内 )) - (=ucs@unicode . #x343B) ; 󰀄 + (=ucs@unicode . #x343B) ; &UU+343B; )) )) (define-char @@ -25080,7 +25080,7 @@ ) ((=ucs . #x6562) ; 敢 )) - (=ucs@unicode . #x3488) ; 󰀈 + (=ucs@unicode . #x3488) ; &UU+3488; )) )) (define-char @@ -26232,7 +26232,7 @@ ((=ucs . #x975E) ; 非 )) )) - (=ucs@unicode . #x348E) ; 󰀊 + (=ucs@unicode . #x348E) ; &UU+348E; )) )) (define-char @@ -28130,7 +28130,7 @@ ) ((=ucs . #x842C) ; 萬 )) - (=ucs@unicode . #x3496) ; 󰀋 + (=ucs@unicode . #x3496) ; &UU+3496; )) )) (define-char @@ -28632,7 +28632,7 @@ (=cns11643-4 . #x4F5D) ; &C4-4F5D; (=ucs@cns . #x349A) ; &C4-4F5D; ) - ((=ucs@unicode . #x349A) ; 󰀌 + ((=ucs@unicode . #x349A) ; &UU+349A; )) )) (define-char @@ -28723,7 +28723,7 @@ ) ((=ucs . #x7FDF) ; 翟 )) - (=ucs@unicode . #x349B) ; 󰀍 + (=ucs@unicode . #x349B) ; &UU+349B; ) ((ideographic-structure ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT") @@ -31455,7 +31455,7 @@ ) ((=ucs . #x7E47) ; 繇 )) - (=ucs@unicode . #x34A1) ; 󰀏 + (=ucs@unicode . #x34A1) ; &UU+34A1; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R010-Legs.el b/lisp/utf-2000/Ideograph-R010-Legs.el index 6ab5596..24b6bfc 100644 --- a/lisp/utf-2000/Ideograph-R010-Legs.el +++ b/lisp/utf-2000/Ideograph-R010-Legs.el @@ -249,8 +249,7 @@ (=hanziku-1 . #xDCE3) ; &I-HZK01-DCE3; )) (define-char - '((=>daikanwa . 01345) ; >-01746; - (ideographic-radical . 10) ; ⼉ + '((ideographic-radical . 10) ; ⼉ (sound@ja/kun "mi-t+iru" "mi-ta+s5" "a-t+eru") (sound@ja/kun/name "mituru" "mitu") (sound@ja/on "zyuu") @@ -653,7 +652,7 @@ ) ((=ucs . #x5144) ; 兄 )) - (=ucs@unicode . #x514C) ; 󰀐 + (=ucs@unicode . #x514C) ; &UU+514C; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R011-Enter.el b/lisp/utf-2000/Ideograph-R011-Enter.el index a0783f8..34a9687 100644 --- a/lisp/utf-2000/Ideograph-R011-Enter.el +++ b/lisp/utf-2000/Ideograph-R011-Enter.el @@ -670,50 +670,37 @@ (=cns11643-6 . #x2579) ; &C6-2579; )) (define-char - '((=>ucs . #x5169) ; 兩 - (ideographic-radical . 11) ; ⼊ - (ideographic-strokes . 6) - (total-strokes . 8) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E00) ; 一 - ) - ((=big5-cdp . #x8C62) ; &CDP-8C62; - )) - (shinjigen-1 . 484) - (shinjigen-2 . 484) - (=jis-x0208 . #x5140) ; >-01871; - (=ks-x1001 . #x5557) ; &I-K0-5557; - (=big5 . #xA8E2) ; &I-B-A8E2; - (=gt . 01871) ; &I-GT-01871; - (=gt-k . 03859) ; &I-GT-K03859; - (=gt-pj-1 . #x5140) ; &I-GT-01871; - (=daikanwa . 01436) ; &I-M-01436; - (=ucs@jis . #x5169) ; >-01871; - (=ucs@big5 . #x5169) ; >-01871; - (mojikyo . 001436) ; &MCS-6000059C; - )) -(define-char - '((morohashi-daikanwa 1436 0 0) - (ideographic-radical . 11) ; ⼊ + '((ideographic-radical . 11) ; ⼊ (ideographic-strokes . 6) (total-strokes . 8) - (hanyu-dazidian 1 24 2) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E00) ; 一 - ) - ((=big5-cdp . #x8C62) ; &CDP-8C62; - )) - (shinjigen-1 . 484) - (shinjigen-2 . 484) (=ucs . #x5169) ; 兩 - (=cns11643-1 . #x4C25) ; &I-C1-4C25; - (=gb12345 . #x413D) ; 兩 + (->subsumptive + ((shinjigen-1 . 484) + (shinjigen-2 . 484) + (=jis-x0208 . #x5140) ; >-01871; + (=ks-x1001 . #x5557) ; &I-K0-5557; + (=big5 . #xA8E2) ; &I-B-A8E2; + (=gt . 01871) ; &I-GT-01871; + (=gt-k . 03859) ; &I-GT-K03859; + (=gt-pj-1 . #x5140) ; &I-GT-01871; + (=daikanwa . 01436) ; &I-M-01436; + (=ucs@jis . #x5169) ; >-01871; + (=ucs@big5 . #x5169) ; >-01871; + (mojikyo . 001436) ; &MCS-6000059C; + ) + ((hanyu-dazidian 1 24 2) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E00) ; 一 + ) + ((=big5-cdp . #x8C62) ; &CDP-8C62; + )) + (=cns11643-1 . #x4C25) ; &C1-4C25; + (=gb12345 . #x413D) ; &C1-4C25; + (=ucs@unicode . #x5169) ; &C1-4C25; + )) )) (define-char '((=>ucs . #x516A) ; 兪 diff --git a/lisp/utf-2000/Ideograph-R027-Cliff.el b/lisp/utf-2000/Ideograph-R027-Cliff.el index c4fbb5c..fe1831d 100644 --- a/lisp/utf-2000/Ideograph-R027-Cliff.el +++ b/lisp/utf-2000/Ideograph-R027-Cliff.el @@ -3175,7 +3175,7 @@ (->subsumptive ((=daikanwa . 48819) ; &M-48819; ) - ((=ucs@unicode . #x9F8E) ; 󰀕 + ((=ucs@unicode . #x9F8E) ; &UU+9F8E; ) ((=cns11643-3 . #x5755) ; &C3-5755; )) diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el index 10e5a8d..d69d22a 100644 --- a/lisp/utf-2000/Ideograph-R029-Again.el +++ b/lisp/utf-2000/Ideograph-R029-Again.el @@ -2645,49 +2645,46 @@ (=hanziku-1 . #xF8D6) ; &I-HZK01-F8D6; )) (define-char - '((=>ucs . #x53E2) ; 叢 - (ideographic-radical . 29) ; ⼜ + '((ideographic-radical . 29) ; ⼜ (ideographic-strokes . 16) (total-strokes . 18) (hanyu-dazidian 1 402 15) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E35) ; 丵 - ) - ((=jis-x0208 . #x3C68) ; >-03992; - (=ks-x1001 . #x7622) ; &I-K0-7622; - (=cns11643-1 . #x4C3D) ; &I-C1-4C3D; - (=daikanwa . 03158) ; &I-M-03158; - )) - (shinjigen-1 . 932) - (shinjigen-2 . 932) - (=jis-x0208 . #x4151) ; >-04083; - (=ks-x1001 . #x753F) ; &I-K0-753F; - (=cns11643-1 . #x763B) ; &I-C1-763B; - (=big5 . #xC24F) ; &I-B-C24F; - (=gt . 04083) ; &I-GT-04083; - (=gt-pj-1 . #x4151) ; &I-GT-04083; - (=daikanwa . 03220) ; &I-M-03220; - (=ucs@jis . #x53E2) ; >-04083; - (=ucs@big5 . #x53E2) ; >-04083; - )) -(define-char - '((morohashi-daikanwa 3220 0 1) - (ideographic-radical . 29) ; ⼜ - (ideographic-strokes . 16) - (total-strokes . 18) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x4E35) ; 丵 + (=ucs . #x53E2) ; 叢 + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E35) ; 丵 + ) + ((=jis-x0208 . #x3C68) ; >-03992; + (=ks-x1001 . #x7622) ; &I-K0-7622; + (=cns11643-1 . #x4C3D) ; &I-C1-4C3D; + (=daikanwa . 03158) ; &I-M-03158; + )) + (shinjigen-1 . 932) + (shinjigen-2 . 932) + (=jis-x0208 . #x4151) ; >-04083; + (=ks-x1001 . #x753F) ; &I-K0-753F; + (=cns11643-1 . #x763B) ; &I-C1-763B; + (=big5 . #xC24F) ; &I-B-C24F; + (=gt . 04083) ; &I-GT-04083; + (=gt-pj-1 . #x4151) ; &I-GT-04083; + (=daikanwa . 03220) ; &I-M-03220; + (=ucs@jis . #x53E2) ; >-04083; + (=ucs@big5 . #x53E2) ; >-04083; ) - ((=ucs . #x53D6) ; 取 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x4E35) ; 丵 + ) + ((=ucs . #x53D6) ; 取 + )) + (=gb12345 . #x3454) ; &UU+53E2; + (=ucs@unicode . #x53E2) ; &UU+53E2; )) - (=ucs . #x53E2) ; 叢 - (=gb12345 . #x3454) ; 叢 )) (define-char '((=>ucs . #x20B91) ; 𠮑 diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 6a85738..ec2d0a8 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -30656,7 +30656,8 @@ ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") (=ucs . #x2FF1) ; ⿱ ) - ((=ucs . #x9115) ; 鄕 + ((=ks-x1001 . #x7A41) ; &M-39571; + (=daikanwa . 39571) ; &I-M-39571; ) ((=ucs . #x5411) ; 向 )) @@ -31204,85 +31205,80 @@ (=cbeta . 01836) ; &I-CB01836; )) (define-char - '((=>ucs . #x56B4) ; 嚴 - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 17) - (total-strokes . 20) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + '((ideographic-radical . 30) ; ⼝ + (=ucs . #x56B4) ; 嚴 + (->subsumptive + ((ideographic-strokes . 17) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ ) - ((=ucs . #x5405) ; 吅 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5405) ; 吅 + ) + ((=ucs . #x5382) ; 厂 + )) ) - ((=ucs . #x5382) ; 厂 + ((=ks-x1001 . #x4A72) ; >-16742; + (=cns11643-1 . #x5F56) ; &I-C1-5F56; + (=daikanwa . 13260) ; &I-M-13260; )) - ) - ((=ks-x1001 . #x4A72) ; >-16742; - (=cns11643-1 . #x5F56) ; &I-C1-5F56; - (=daikanwa . 13260) ; &I-M-13260; - )) - (shinjigen-1 . 1286) - (shinjigen-2 . 1286) - (=jis-x0208 . #x536E) ; >-05771; - (=ks-x1001 . #x6571) ; &I-K0-6571; - (=cns11643-1 . #x7964) ; &I-C1-7964; - (=big5 . #xC459) ; &I-B-C459; - (=gt . 05771) ; &I-GT-05771; - (=gt-pj-1 . #x536E) ; &I-GT-05771; - (=daikanwa . 04589) ; &I-M-04589; - (=ucs@jis . #x56B4) ; >-05771; - (=ucs@big5 . #x56B4) ; >-05771; - )) -(define-char - '((=>ucs . #x56B4) ; 嚴 - (morohashi-daikanwa 4589 0 0) - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 17) - (total-strokes . 20) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + (shinjigen-1 . 1286) + (shinjigen-2 . 1286) + (=jis-x0208 . #x536E) ; >-05771; + (=ks-x1001 . #x6571) ; &I-K0-6571; + (=cns11643-1 . #x7964) ; &I-C1-7964; + (=big5 . #xC459) ; &I-B-C459; + (=gt . 05771) ; &I-GT-05771; + (=gt-pj-1 . #x536E) ; &I-GT-05771; + (=daikanwa . 04589) ; &I-M-04589; + (=ucs@jis . #x56B4) ; >-05771; + (=ucs@big5 . #x56B4) ; >-05771; + ) + ((ideographic-strokes . 17) + (total-strokes . 20) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ ) - ((=ucs . #x5405) ; 吅 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5405) ; 吅 + ) + ((=ucs . #x5382) ; 厂 + )) ) - ((=ucs . #x5382) ; 厂 + ((=jis-x0208-1978 . #x343A) ; &J83-343A; + (=jis-x0208-1983 . #x343A) ; &I-J83-343A; )) + (mojikyo . 004589) ; &MCS-600011ED; ) - ((=jis-x0208-1978 . #x343A) ; &J83-343A; - (=jis-x0208-1983 . #x343A) ; &I-J83-343A; - )) - (mojikyo . 004589) ; &MCS-600011ED; - )) -(define-char - '((morohashi-daikanwa 4589 0 5) - (ideographic-radical . 30) ; ⼝ - (ideographic-strokes . 16) - (total-strokes . 19) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") - (=ucs . #x2FF8) ; ⿸ - ) - ((ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ + ((ideographic-strokes . 16) + (total-strokes . 19) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT") + (=ucs . #x2FF8) ; ⿸ ) - ((=ucs . #x5405) ; 吅 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x5405) ; 吅 + ) + ((=ucs . #x5382) ; 厂 + )) ) - ((=ucs . #x5382) ; 厂 + ((=gb2312 . #x3852) ; &G0-3852; )) - ) - ((=ucs . #x6562) ; 敢 + (=gb12345 . #x514F) ; &UU+56B4; + (=ucs@unicode . #x56B4) ; &UU+56B4; )) - (=ucs . #x56B4) ; 嚴 - (=gb12345 . #x514F) ; 嚴 )) (define-char '((=>ucs . #x21117) ; 𡄗 diff --git a/lisp/utf-2000/Ideograph-R037-Big.el b/lisp/utf-2000/Ideograph-R037-Big.el index 56f40a3..f94388f 100644 --- a/lisp/utf-2000/Ideograph-R037-Big.el +++ b/lisp/utf-2000/Ideograph-R037-Big.el @@ -426,32 +426,35 @@ (=cns11643-6 . #x243D) ; &C6-243D; )) (define-char - '((=>ucs . #x4E54) ; 乔 - (ideographic-radical . 37) ; ⼤ - (ideographic-strokes . 3) - (total-strokes . 6) - (=daikanwa . 05860) ; &M-05860; - )) -(define-char - '((morohashi-daikanwa 5860 0 2) - (ideographic- (:radical 37 ; ⼤ - :strokes 3) - (:radical 4 ; ⼃ - :strokes 5)) + '((ideographic-radical@ucs . 4) ; ⼃ + (ideographic-strokes@ucs . 5) + (ideographic-radical@cns . 37) ; ⼤ + (ideographic-strokes@cns . 3) + (ideographic-radical@cns*sources + daikanwa cns11643) (total-strokes . 6) - (hanyu-dazidian 1 38 1) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x592D) ; 夭 + (=ucs . #x4E54) ; 乔 + (->subsumptive + ((=daikanwa . 05860) ; &M-05860; ) - ((=big5-cdp . #x89AB) ; &CDP-89AB; + ((<-simplified@CN + ((=ucs . #x55AC) ; 喬 + (=gb12345 . #x4747) ; 喬 + )) + (hanyu-dazidian 1 38 1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x592D) ; 夭 + ) + ((=big5-cdp . #x89AB) ; &CDP-89AB; + )) + (=gb2312 . #x4747) ; &HZK01-ABD7; + (=cns11643-3 . #x2345) ; &I-C3-2345; + (=hanziku-1 . #xABD7) ; &I-HZK01-ABD7; + (=ucs@unicode . #x4E54) ; &HZK01-ABD7; )) - (=ucs . #x4E54) ; 乔 - (=gb2312 . #x4747) ; &I-G0-4747; - (=cns11643-3 . #x2345) ; &I-C3-2345; - (=hanziku-1 . #xABD7) ; &I-HZK01-ABD7; )) (define-char '((ideographic-radical . 37) ; ⼤ @@ -656,7 +659,7 @@ (ideographic-strokes . 4) (total-strokes . 7) (<-simplified - ((=gb12345 . #x5E46) ; 󰀗 + ((=gb12345 . #x5E46) ; &UU+5969; )) (hanyu-dazidian 1 529 9) (=ucs . #x5941) ; 奁 @@ -2565,8 +2568,8 @@ (=daikanwa . 05991) ; &I-M-05991; (=ucs@jis . #x5969) ; >-07573; ) - ((=gb12345 . #x5E46) ; 󰀗 - (=ucs@unicode . #x5969) ; 󰀗 + ((=gb12345 . #x5E46) ; &UU+5969; + (=ucs@unicode . #x5969) ; &UU+5969; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R041-Inch.el b/lisp/utf-2000/Ideograph-R041-Inch.el index e146658..de62ea1 100644 --- a/lisp/utf-2000/Ideograph-R041-Inch.el +++ b/lisp/utf-2000/Ideograph-R041-Inch.el @@ -389,34 +389,33 @@ '((ideographic-radical . 41) ; ⼨ (ideographic-strokes . 8) (total-strokes . 11) - (shinjigen-2 . 1885) (=ucs . #x5C08) ; 專 - (=jis-x0208 . #x5573) ; &I-J90-5573; - (=ks-x1001 . #x6E76) ; &I-K0-6E76; - (=cns11643-1 . #x5971) ; &I-C1-5971; - (=gb12345 . #x5728) ; 專 - (=big5 . #xB14D) ; &I-B-B14D; - (=gt . 09367) ; &I-GT-09367; - (=gt-k . 07926) ; &I-GT-K07926; - (=gt-pj-1 . #x5573) ; &I-GT-09367; - (=daikanwa . 07439) ; &I-M-07439; - )) -(define-char - '((=>ucs . #x5C08) ; 專 - (morohashi-daikanwa 7439 0 1) - (ideographic-radical . 41) ; ⼨ - (ideographic-strokes . 8) - (total-strokes . 11) - (=jef-china3 . #x4ACE) ; &JC3-4ACE; + (->subsumptive + ((shinjigen-2 . 1885) + (=jis-x0208 . #x5573) ; >-09367; + (=ks-x1001 . #x6E76) ; &I-K0-6E76; + (=cns11643-1 . #x5971) ; &I-C1-5971; + (=gb12345 . #x5728) ; >-09367; + (=big5 . #xB14D) ; &I-B-B14D; + (=gt . 09367) ; &I-GT-09367; + (=gt-k . 07926) ; &I-GT-K07926; + (=gt-pj-1 . #x5573) ; &I-GT-09367; + (=daikanwa . 07439) ; &I-M-07439; + (=ucs@unicode . #x5C08) ; >-09367; + ) + ((=jef-china3 . #x4ACE) ; &JC3-4ACE; + )) )) (define-char - '((morohashi-daikanwa 7439 0 5) + '((=>daikanwa . 07439) ; >-09367; (ideographic-radical . 41) ; ⼨ (ideographic-strokes . 6) (total-strokes . 9) (<-simplified@JP/Jouyou - ((=ucs . #x5C08) ; 專 - (=jis-x0208 . #x5573) ; &I-J90-5573; + ((=jis-x0208 . #x5573) ; >-09367; + (=ks-x1001 . #x6E76) ; &I-K0-6E76; + (=cns11643-1 . #x5971) ; &I-C1-5971; + (=daikanwa . 07439) ; &I-M-07439; )) (=ucs . #x5C02) ; 専 (=jis-x0208 . #x406C) ; &I-J90-406C; diff --git a/lisp/utf-2000/Ideograph-R062-Halberd.el b/lisp/utf-2000/Ideograph-R062-Halberd.el index 700a02b..c001054 100644 --- a/lisp/utf-2000/Ideograph-R062-Halberd.el +++ b/lisp/utf-2000/Ideograph-R062-Halberd.el @@ -604,7 +604,7 @@ ((=cns11643-4 . #x2D2F) ; &M-11583; (=daikanwa . 11583) ; &I-M-11583; ) - ((=ucs@unicode . #x39B4) ; 󰀙 + ((=ucs@unicode . #x39B4) ; &UU+39B4; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R064-Hand.el b/lisp/utf-2000/Ideograph-R064-Hand.el index eaeea14..d057fb5 100644 --- a/lisp/utf-2000/Ideograph-R064-Hand.el +++ b/lisp/utf-2000/Ideograph-R064-Hand.el @@ -313,7 +313,7 @@ (=ucs@jis-1990 . #x6256) ; >-14901; (=ucs@jis-2000 . #x6256) ; >-14901; ) - ((=ucs@unicode . #x6256) ; 󰀚 + ((=ucs@unicode . #x6256) ; &UU+6256; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R066-Rap.el b/lisp/utf-2000/Ideograph-R066-Rap.el index 15f1fe7..64ee942 100644 --- a/lisp/utf-2000/Ideograph-R066-Rap.el +++ b/lisp/utf-2000/Ideograph-R066-Rap.el @@ -1966,39 +1966,34 @@ (=daikanwa . 13259) ; &I-M-13259; )) (define-char - '((=>ucs . #x6562) ; 敢 - (ideographic-radical . 66) ; ⽁ - (ideographic-strokes . 8) - (total-strokes . 12) - (shinjigen-2 . 3176) - (=ks-x1001 . #x4A72) ; >-16742; - (=jis-x0208-1990 . #x343A) ; &I-J90-343A; - (=cns11643-1 . #x5F56) ; &I-C1-5F56; - (=big5 . #xB4B1) ; &I-B-B4B1; - (=gt . 16742) ; &I-GT-16742; - (=gt-k . 09015) ; &I-GT-K09015; - (=gt-pj-1 . #x343A) ; &I-GT-16742; - (=daikanwa . 13260) ; &I-M-13260; - (=ucs@jis . #x6562) ; >-16742; - (=ucs@big5 . #x6562) ; >-16742; - )) -(define-char - '((=>ucs . #x6562) ; 敢 - (morohashi-daikanwa 13260 0 1) - (ideographic-radical . 66) ; ⽁ - (ideographic-strokes . 8) - (total-strokes . 12) - (=jis-x0208-1978 . #x343A) ; &J83-343A; - (=jis-x0208-1983 . #x343A) ; &I-J83-343A; - (mojikyo . 013260) ; &MCS-600033CC; - )) -(define-char - '((morohashi-daikanwa 13260 0 5) - (ideographic-radical . 66) ; ⽁ - (ideographic-strokes . 8) - (total-strokes . 12) + '((ideographic-radical . 66) ; ⽁ (=ucs . #x6562) ; 敢 - (=gb2312 . #x3852) ; &I-G0-3852; + (->subsumptive + ((ideographic-strokes . 8) + (total-strokes . 12) + (->subsumptive + ((shinjigen-2 . 3176) + (=ks-x1001 . #x4A72) ; >-16742; + (=jis-x0208-1990 . #x343A) ; &I-J90-343A; + (=cns11643-1 . #x5F56) ; &I-C1-5F56; + (=big5 . #xB4B1) ; &I-B-B4B1; + (=gt . 16742) ; &I-GT-16742; + (=gt-k . 09015) ; &I-GT-K09015; + (=gt-pj-1 . #x343A) ; &I-GT-16742; + (=daikanwa . 13260) ; &I-M-13260; + (=ucs@jis . #x6562) ; >-16742; + (=ucs@big5 . #x6562) ; >-16742; + ) + ((=jis-x0208-1978 . #x343A) ; &J83-343A; + (=jis-x0208-1983 . #x343A) ; &I-J83-343A; + (mojikyo . 013260) ; &MCS-600033CC; + )) + ) + ((ideographic-strokes . 7) + (total-strokes . 11) + (=gb2312 . #x3852) ; &G0-3852; + (=ucs@unicode . #x6562) ; &G0-3852; + )) )) (define-char '((ideographic-radical . 66) ; ⽁ diff --git a/lisp/utf-2000/Ideograph-R075-Tree.el b/lisp/utf-2000/Ideograph-R075-Tree.el index 55c7187..925bcb4 100644 --- a/lisp/utf-2000/Ideograph-R075-Tree.el +++ b/lisp/utf-2000/Ideograph-R075-Tree.el @@ -2804,7 +2804,7 @@ (=ucs@jis . #x67A6) ; >-18539; (mojikyo . 055279) ; &MCS-6000D7EF; ) - ((=ucs@unicode . #x67A6) ; 󰀛 + ((=ucs@unicode . #x67A6) ; &UU+67A6; )) )) (define-char @@ -12647,24 +12647,21 @@ '((ideographic-radical . 75) ; ⽊ (ideographic-strokes . 9) (total-strokes . 13) - (shinjigen-2 . 3711) (=ucs . #x696D) ; 業 - (=jis-x0208 . #x3648) ; &I-J90-3648; - (=ks-x1001 . #x6576) ; &I-K0-6576; - (=gb12345 . #x5235) ; 業 - (=big5 . #xB77E) ; &I-B-B77E; - (=gt . 19258) ; &I-GT-19258; - (=gt-k . 10193) ; &I-GT-K10193; - (=gt-pj-1 . #x3648) ; &I-GT-19258; - (=daikanwa . 15170) ; &I-M-15170; - )) -(define-char - '((=>ucs . #x696D) ; 業 - (morohashi-daikanwa 15170 0 1) - (ideographic-radical . 75) ; ⽊ - (ideographic-strokes . 9) - (total-strokes . 13) - (=cns11643-1 . #x6446) ; &C1-6446; + (->subsumptive + ((shinjigen-2 . 3711) + (=jis-x0208 . #x3648) ; >-19258; + (=ks-x1001 . #x6576) ; &I-K0-6576; + (=gb12345 . #x5235) ; >-19258; + (=big5 . #xB77E) ; &I-B-B77E; + (=gt . 19258) ; &I-GT-19258; + (=gt-k . 10193) ; &I-GT-K10193; + (=gt-pj-1 . #x3648) ; &I-GT-19258; + (=daikanwa . 15170) ; &I-M-15170; + (=ucs@unicode . #x696D) ; >-19258; + ) + ((=cns11643-1 . #x6446) ; &C1-6446; + )) )) (define-char '((ideographic-radical . 75) ; ⽊ diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index ab9ee2c..e5b7ad6 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -3304,8 +3304,8 @@ (total-strokes . 10) (=ucs . #x70EE) ; 烮 (->subsumptive - ((=ucs@unicode . #x70EE) ; &MCS-6000E961; - (mojikyo . 059745) ; &MCS-6000E961; + ((=ucs@unicode . #x70EE) ; &UU+70EE; + (mojikyo . 059745) ; &UU+70EE; ) ((=cns11643-3 . #x3230) ; &C3-3230; )) diff --git a/lisp/utf-2000/Ideograph-R087-Claw.el b/lisp/utf-2000/Ideograph-R087-Claw.el index ef7810c..72c9cb3 100644 --- a/lisp/utf-2000/Ideograph-R087-Claw.el +++ b/lisp/utf-2000/Ideograph-R087-Claw.el @@ -98,28 +98,25 @@ (=daikanwa . 19662) ; &I-M-19662; )) (define-char - '((=>ucs . #x722D) ; 爭 - (ideographic-radical . 87) ; ⽖ - (ideographic-strokes . 4) - (total-strokes . 8) - (shinjigen-2 . 4699) - (=jis-x0208 . #x6027) ; >-25238; - (=ks-x1001 . #x6E33) ; &I-K0-6E33; - (=big5 . #xAAA7) ; &I-B-AAA7; - (=gt . 25238) ; &I-GT-25238; - (=gt-k . 03900) ; &I-GT-K03900; - (=gt-pj-1 . #x6027) ; &I-GT-25238; - (=daikanwa . 19663) ; &I-M-19663; - (=ucs@jis . #x722D) ; >-25238; - )) -(define-char - '((morohashi-daikanwa 19663 0 2) - (ideographic-radical . 87) ; ⽖ + '((ideographic-radical . 87) ; ⽖ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x722D) ; 爭 - (=cns11643-1 . #x4E68) ; &I-C1-4E68; - (=gb12345 . #x5579) ; 爭 + (->subsumptive + ((shinjigen-2 . 4699) + (=jis-x0208 . #x6027) ; >-25238; + (=ks-x1001 . #x6E33) ; &I-K0-6E33; + (=big5 . #xAAA7) ; &I-B-AAA7; + (=gt . 25238) ; &I-GT-25238; + (=gt-k . 03900) ; &I-GT-K03900; + (=gt-pj-1 . #x6027) ; &I-GT-25238; + (=daikanwa . 19663) ; &I-M-19663; + (=ucs@jis . #x722D) ; >-25238; + ) + ((=cns11643-1 . #x4E68) ; &C1-4E68; + (=gb12345 . #x5579) ; &C1-4E68; + (=ucs@unicode . #x722D) ; &C1-4E68; + )) )) (define-char '((ideographic-radical . 87) ; ⽖ @@ -319,31 +316,28 @@ (=cns11643-6 . #x4158) ; &I-C6-4158; )) (define-char - '((=>ucs . #x7232) ; 爲 - (ideographic-radical . 87) ; ⽖ - (ideographic-strokes . 8) - (total-strokes . 12) - (shinjigen-2 . 4703) - (=jis-x0208 . #x602A) ; >-25270; - (=ks-x1001 . #x6A53) ; &I-K0-6A53; - (=big5-cdp . #xACB0) ; &I-B-ACB0; - (=gt . 25270) ; &I-GT-25270; - (=gt-k . 09209) ; &I-GT-K09209; - (=gt-pj-1 . #x602A) ; &I-GT-25270; - (=daikanwa . 19686) ; &I-M-19686; - (=ucs@jis . #x7232) ; >-25270; - )) -(define-char - '((morohashi-daikanwa 19686 0 2) - (ideographic-radical . 87) ; ⽖ + '((ideographic-radical . 87) ; ⽖ (ideographic-strokes . 8) (total-strokes . 12) (=ucs . #x7232) ; 爲 - (=cns11643-3 . #x3D22) ; &I-C3-3D22; - (=gb12345 . #x4E2A) ; 爲 - (=gt . 25271) ; &I-GT-25271; - (=gt-k . 09877) ; &I-GT-K09877; - (=gt-pj-9 . #x6633) ; &I-GT-25271; + (->subsumptive + ((shinjigen-2 . 4703) + (=jis-x0208 . #x602A) ; >-25270; + (=ks-x1001 . #x6A53) ; &I-K0-6A53; + (=big5-cdp . #xACB0) ; &I-B-ACB0; + (=gt . 25270) ; &I-GT-25270; + (=gt-k . 09209) ; &I-GT-K09209; + (=gt-pj-1 . #x602A) ; &I-GT-25270; + (=daikanwa . 19686) ; &I-M-19686; + (=ucs@jis . #x7232) ; >-25270; + ) + ((=cns11643-3 . #x3D22) ; >-25271; + (=gb12345 . #x4E2A) ; >-25271; + (=gt . 25271) ; &I-GT-25271; + (=gt-k . 09877) ; &I-GT-K09877; + (=gt-pj-9 . #x6633) ; &I-GT-25271; + (=ucs@unicode . #x7232) ; >-25271; + )) )) (define-char '((=>ucs . #x24514) ; 𤔔 diff --git a/lisp/utf-2000/Ideograph-R115-Grain.el b/lisp/utf-2000/Ideograph-R115-Grain.el index 97498d7..856ed5a 100644 --- a/lisp/utf-2000/Ideograph-R115-Grain.el +++ b/lisp/utf-2000/Ideograph-R115-Grain.el @@ -3915,7 +3915,7 @@ ((=daikanwa . 25262) ; &M-25262; (=jef-china3 . #x98E8) ; &I-JC3-98E8; ) - ((=ucs@unicode . #x7A4B) ; 󰀝 + ((=ucs@unicode . #x7A4B) ; &UU+7A4B; ) ((=cns11643-1 . #x715C) ; &C1-715C; )) @@ -5310,7 +5310,7 @@ (->subsumptive ((ideographic-strokes . 15) (total-strokes . 20) - (=ucs@unicode . #x4188) ; 󰀞 + (=ucs@unicode . #x4188) ; &UU+4188; ) ((ideographic-strokes . 16) (total-strokes . 21) @@ -5323,7 +5323,7 @@ (total-strokes . 20) (=ucs . #x4189) ; 䆉 (->subsumptive - ((=ucs@unicode . #x4189) ; 󰀟 + ((=ucs@unicode . #x4189) ; &UU+4189; ) ((=cns11643-4 . #x6379) ; &C4-6379; )) diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el index 8a81e48..ef39e40 100644 --- a/lisp/utf-2000/Ideograph-R120-Silk.el +++ b/lisp/utf-2000/Ideograph-R120-Silk.el @@ -4491,27 +4491,25 @@ (=cns11643-1 . #x5C53) ; &C1-5C53; )) (define-char - '((=>ucs . #x7D72) ; 絲 - (ideographic-radical . 120) ; ⽷ - (ideographic-strokes . 6) - (total-strokes . 12) - (shinjigen-2 . 5959) - (=jis-x0208 . #x652F) ; >-35315; - (=ks-x1001 . #x5E6A) ; &I-K0-5E6A; - (=gt . 35315) ; &I-GT-35315; - (=gt-k . 09222) ; &I-GT-K09222; - (=gt-pj-1 . #x652F) ; &I-GT-35315; - (=daikanwa . 27448) ; &I-M-27448; - (=ucs@jis . #x7D72) ; >-35315; - )) -(define-char - '((morohashi-daikanwa 27448 0 2) - (ideographic-radical . 120) ; ⽷ + '((ideographic-radical . 120) ; ⽷ (ideographic-strokes . 6) (total-strokes . 12) (=ucs . #x7D72) ; 絲 - (=cns11643-1 . #x613D) ; &I-C1-613D; - (=gb12345 . #x4B3F) ; 絲 + (->subsumptive + ((shinjigen-2 . 5959) + (=jis-x0208 . #x652F) ; >-35315; + (=ks-x1001 . #x5E6A) ; &I-K0-5E6A; + (=gt . 35315) ; &I-GT-35315; + (=gt-k . 09222) ; &I-GT-K09222; + (=gt-pj-1 . #x652F) ; &I-GT-35315; + (=daikanwa . 27448) ; &I-M-27448; + (=ucs@jis . #x7D72) ; >-35315; + ) + ((=cns11643-1 . #x613D) ; &C1-613D; + ) + ((=gb12345 . #x4B3F) ; &UU+7D72; + (=ucs@unicode . #x7D72) ; &UU+7D72; + )) )) (define-char '((=>ucs . #x7D73) ; 絳 diff --git a/lisp/utf-2000/Ideograph-R124-Feather.el b/lisp/utf-2000/Ideograph-R124-Feather.el index 9003174..31ed538 100644 --- a/lisp/utf-2000/Ideograph-R124-Feather.el +++ b/lisp/utf-2000/Ideograph-R124-Feather.el @@ -1493,72 +1493,69 @@ (=cns11643-6 . #x4344) ; &I-C6-4344; )) (define-char - '((=>ucs . #x7FD2) ; 習 - (ideographic-radical . 124) ; ⽻ - (ideographic-strokes . 5) - (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ks-x1001 . #x6962) ; >-36832; - (=daikanwa . 28614) ; &I-M-28614; + '((<-denotational + ((=ucs . #x7FD2) ; 習 + )) + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ks-x1001 . #x6962) ; >-36832; + (=daikanwa . 28614) ; &I-M-28614; + ) + ((=ucs . #x767D) ; 白 + )) + (=daikanwa . 28672) ; &M-28672; ) - ((=ucs . #x767D) ; 白 + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=gt-k . 01762) ; >-K01762; + ) + ((=ucs . #x767D) ; 白 + )) + (=ks-x1001 . #x6327) ; >-36924; + (=big5 . #xB2DF) ; &I-B-B2DF; + (=gt . 36924) ; &I-GT-36924; + (=gt-k . 07784) ; &I-GT-K07784; + (=gt-pj-6 . #x3346) ; &I-GT-36924; + (=jef-china3 . #x60A5) ; &I-JC3-60A5; + (mojikyo . 028672) ; &MCS-60007000; )) - (=daikanwa . 28672) ; &M-28672; )) (define-char - '((=>ucs . #x7FD2) ; 習 - (morohashi-daikanwa 28672 0 0) - (ideographic-radical . 124) ; ⽻ + '((ideographic-radical . 124) ; ⽻ (ideographic-strokes . 5) (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=gt-k . 01762) ; >-K01762; - ) - ((=ucs . #x767D) ; 白 - )) - (=ks-x1001 . #x6327) ; >-36924; - (=big5 . #xB2DF) ; &I-B-B2DF; - (=gt . 36924) ; &I-GT-36924; - (=gt-k . 07784) ; &I-GT-K07784; - (=gt-pj-6 . #x3346) ; &I-GT-36924; - (=jef-china3 . #x60A5) ; &I-JC3-60A5; - (mojikyo . 028672) ; &MCS-60007000; + (=ucs . #x7FD2) ; 習 )) (define-char - '((=>ucs . #x7FD2) ; 習 - (morohashi-daikanwa 28672 1) - (ideographic-radical . 124) ; ⽻ - (ideographic-strokes . 5) - (total-strokes . 11) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x7FBD) ; 羽 + '((<-denotational + ((=ucs . #x7FD2) ; 習 + )) + (->subsumptive + ((morohashi-daikanwa 28672 1) + (ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x7FBD) ; 羽 + ) + ((=ucs . #x767D) ; 白 + )) + (=jis-x0208 . #x3D2C) ; >-36925; + (=cns11643-1 . #x5C64) ; &I-C1-5C64; + (=gt . 36925) ; &I-GT-36925; + (=gt-k . 07783) ; &I-GT-K07783; + (=gt-pj-1 . #x3D2C) ; &I-GT-36925; + (=ucs@jis . #x7FD2) ; >-36925; + (mojikyo . 050361) ; &MCS-6000C4B9; ) - ((=ucs . #x767D) ; 白 + ((=gb12345 . #x4F30) ; &UU+7FD2; + (=ucs@unicode . #x7FD2) ; &UU+7FD2; )) - (=jis-x0208 . #x3D2C) ; >-36925; - (=cns11643-1 . #x5C64) ; &I-C1-5C64; - (=gt . 36925) ; &I-GT-36925; - (=gt-k . 07783) ; &I-GT-K07783; - (=gt-pj-1 . #x3D2C) ; &I-GT-36925; - (=ucs@jis . #x7FD2) ; >-36925; - (mojikyo . 050361) ; &MCS-6000C4B9; - )) -(define-char - '((morohashi-daikanwa 28672 1 0) - (ideographic-radical . 124) ; ⽻ - (ideographic-strokes . 5) - (total-strokes . 11) - (=ucs . #x7FD2) ; 習 - (=gb12345 . #x4F30) ; 習 )) (define-char '((=>ucs . #x26419) ; 𦐙 diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index a5894c7..1a1153f 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -32,7 +32,7 @@ (=gt-pj-6 . #x3879) ; >-37857; (=daikanwa . 29237) ; &I-M-29237; ) - ((=ucs@unicode . #x2EBC) ; 󰀀 + ((=ucs@unicode . #x2EBC) ; &UU+2EBC; ) ((=big5-cdp . #x8A73) ; &CDP-8A73; ) diff --git a/lisp/utf-2000/Ideograph-R134-Mortar.el b/lisp/utf-2000/Ideograph-R134-Mortar.el index 5f6bba9..6458b03 100644 --- a/lisp/utf-2000/Ideograph-R134-Mortar.el +++ b/lisp/utf-2000/Ideograph-R134-Mortar.el @@ -77,7 +77,7 @@ (=daikanwa . 30177) ; &I-M-30177; (=ucs@jis . #x81FD) ; &M-30177; ) - ((=ucs@unicode . #x81FD) ; 󰀡 + ((=ucs@unicode . #x81FD) ; &UU+81FD; )) )) (define-char @@ -588,33 +588,30 @@ '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 7) (total-strokes . 14) - (shinjigen-1 . 6626) - (shinjigen-2 . 6626) (=ucs . #x8207) ; 與 - (=jis-x0208 . #x6750) ; &I-J90-6750; - (=ks-x1001 . #x6628) ; &I-K0-6628; - (=gb12345 . #x536B) ; 與 - (=big5 . #xBB50) ; &I-B-BB50; - (=gt . 39084) ; &I-GT-39084; - (=gt-k . 10342) ; &I-GT-K10342; - (=gt-pj-1 . #x6750) ; &I-GT-39084; - (=daikanwa . 30212) ; &I-M-30212; - )) -(define-char - '((=>ucs . #x8207) ; 與 - (morohashi-daikanwa 30212 0 0) - (ideographic-radical . 134) ; ⾅ - (ideographic-strokes . 7) - (total-strokes . 14) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") - (=ucs . #x2FF6) ; ⿶ - ) - ((=big5-cdp . #x8BA8) ; &CDP-8BA8; + (->subsumptive + ((shinjigen-1 . 6626) + (shinjigen-2 . 6626) + (=jis-x0208 . #x6750) ; >-39084; + (=ks-x1001 . #x6628) ; &I-K0-6628; + (=gb12345 . #x536B) ; >-39084; + (=big5 . #xBB50) ; &I-B-BB50; + (=gt . 39084) ; &I-GT-39084; + (=gt-k . 10342) ; &I-GT-K10342; + (=gt-pj-1 . #x6750) ; &I-GT-39084; + (=daikanwa . 30212) ; &I-M-30212; + (=ucs@unicode . #x8207) ; >-39084; ) - ((=big5-cdp . #x8BC2) ; &CDP-8BC2; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW") + (=ucs . #x2FF6) ; ⿶ + ) + ((=big5-cdp . #x8BA8) ; &CDP-8BA8; + ) + ((=big5-cdp . #x8BC2) ; &CDP-8BC2; + )) + (=cns11643-1 . #x6A58) ; &C1-6A58; )) - (=cns11643-1 . #x6A58) ; &C1-6A58; )) (define-char '((ideographic-radical . 134) ; ⾅ @@ -1004,38 +1001,35 @@ '((ideographic-radical . 134) ; ⾅ (ideographic-strokes . 10) (total-strokes . 17) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=ucs . #x8207) ; 與 - ) - ((=big5-cdp . #x8BF1) ; &CDP-8BF1; - )) - (shinjigen-2 . 2903) (=ucs . #x8209) ; 舉 - (=jis-x0208 . #x5A2A) ; &I-J90-5A2A; - (=cns11643-1 . #x7528) ; &I-C1-7528; - (=gb12345 . #x3E59) ; 舉 - (=gt . 39114) ; &I-GT-39114; - (=gt-pj-1 . #x5A2A) ; &I-GT-39114; - (=daikanwa . 30238) ; &I-M-30238; - )) -(define-char - '((=>ucs . #x8209) ; 舉 - (morohashi-daikanwa 30238 0 0) - (ideographic-radical . 134) ; ⾅ - (ideographic-strokes . 10) - (total-strokes . 17) - (ideographic-structure - ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") - (=ucs . #x2FF1) ; ⿱ - ) - ((=cns11643-1 . #x6A58) ; &C1-6A58; + (->subsumptive + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=ucs . #x8207) ; 與 + ) + ((=big5-cdp . #x8BF1) ; &CDP-8BF1; + )) + (shinjigen-2 . 2903) + (=jis-x0208 . #x5A2A) ; >-39114; + (=cns11643-1 . #x7528) ; &I-C1-7528; + (=gb12345 . #x3E59) ; >-39114; + (=gt . 39114) ; &I-GT-39114; + (=gt-pj-1 . #x5A2A) ; &I-GT-39114; + (=daikanwa . 30238) ; &I-M-30238; + (=ucs@unicode . #x8209) ; >-39114; ) - ((=big5-cdp . #x8BF1) ; &CDP-8BF1; + ((ideographic-structure + ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW") + (=ucs . #x2FF1) ; ⿱ + ) + ((=cns11643-1 . #x6A58) ; &C1-6A58; + ) + ((=big5-cdp . #x8BF1) ; &CDP-8BF1; + )) + (=big5 . #xC17C) ; &B-C17C; )) - (=big5 . #xC17C) ; &B-C17C; )) (define-char '((ideographic-radical . 134) ; ⾅ diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index 4353ab6..dcb05bd 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -13596,27 +13596,25 @@ (=big5 . #xDFDD) ; &I-B-DFDD; )) (define-char - '((=>ucs . #x842C) ; 萬 - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 9) - (cns-radical . 114) ; ⽱ - (total-strokes . 13) - (=cns11643-1 . #x655C) ; &M-31339; - (=daikanwa . 31339) ; &I-M-31339; - )) -(define-char - '((morohashi-daikanwa 31339 0 1) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 9) - (total-strokes . 12) (=ucs . #x842C) ; 萬 - (=jis-x0208 . #x685F) ; &I-J90-685F; - (=ks-x1001 . #x583F) ; &I-K0-583F; - (=gb12345 . #x4D72) ; 萬 - (=big5 . #xB855) ; &I-B-B855; - (=gt . 41264) ; &I-GT-41264; - (=gt-k . 09229) ; &I-GT-K09229; - (=gt-pj-1 . #x685F) ; &I-GT-41264; + (->subsumptive + ((ideographic-radical@cns . 114) ; ⽱ + (total-strokes . 13) + (=cns11643-1 . #x655C) ; &M-31339; + (=daikanwa . 31339) ; &I-M-31339; + ) + ((total-strokes . 12) + (=jis-x0208 . #x685F) ; >-41264; + (=ks-x1001 . #x583F) ; &I-K0-583F; + (=gb12345 . #x4D72) ; >-41264; + (=big5 . #xB855) ; &I-B-B855; + (=gt . 41264) ; &I-GT-41264; + (=gt-k . 09229) ; &I-GT-K09229; + (=gt-pj-1 . #x685F) ; &I-GT-41264; + (=ucs@unicode . #x842C) ; >-41264; + )) )) (define-char '((=>ucs . #x842D) ; 萭 diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index bbabdb5..5ed0bf1 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -655,7 +655,7 @@ (=cns11643-5 . #x2478) ; &C5-2478; ) ((total-strokes . 6) - (=ucs@iso . #x28460) ; 󰀢 + (=ucs@iso . #x28460) ; &UU+28460; )) )) (define-char @@ -820,7 +820,7 @@ (=cns11643-5 . #x276A) ; &C5-276A; ) ((total-strokes . 7) - (=ucs@iso . #x28463) ; 󰀣 + (=ucs@iso . #x28463) ; &UU+28463; )) )) (define-char @@ -849,7 +849,7 @@ (=cns11643-5 . #x2770) ; &C5-2770; ) ((total-strokes . 7) - (=ucs@iso . #x28465) ; 󰀤 + (=ucs@iso . #x28465) ; &UU+28465; )) )) (define-char @@ -891,7 +891,7 @@ (=cns11643-3 . #x2A6F) ; &C3-2A6F; ) ((total-strokes . 7) - (=ucs@unicode . #x488D) ; 󰀥 + (=ucs@unicode . #x488D) ; &UU+488D; )) )) (define-char @@ -1054,7 +1054,7 @@ (=cns11643-5 . #x2771) ; &C5-2771; ) ((total-strokes . 7) - (=ucs@iso . #x2846A) ; 󰀦 + (=ucs@iso . #x2846A) ; &UU+2846A; )) )) (define-char @@ -1101,7 +1101,7 @@ (=cns11643-5 . #x276D) ; &C5-276D; ) ((total-strokes . 7) - (=ucs@iso . #x2846B) ; 󰀧 + (=ucs@iso . #x2846B) ; &UU+2846B; )) )) (define-char @@ -1278,7 +1278,7 @@ (=cns11643-5 . #x2769) ; &C5-2769; ) ((total-strokes . 7) - (=ucs@unicode . #x488E) ; 󰀨 + (=ucs@unicode . #x488E) ; &UU+488E; )) )) (define-char @@ -1338,7 +1338,7 @@ (=cns11643-5 . #x2768) ; &C5-2768; ) ((total-strokes . 7) - (=ucs@iso . #x2847D) ; 󰀩 + (=ucs@iso . #x2847D) ; &UU+2847D; )) )) (define-char @@ -1354,7 +1354,7 @@ (=cns11643-5 . #x276C) ; &C5-276C; ) ((total-strokes . 7) - (=ucs@iso . #x2847F) ; 󰀪 + (=ucs@iso . #x2847F) ; &UU+2847F; )) )) (define-char @@ -1551,7 +1551,7 @@ (=cns11643-5 . #x2B4F) ; &C5-2B4F; ) ((total-strokes . 8) - (=ucs@iso . #x28483) ; 󰀫 + (=ucs@iso . #x28483) ; &UU+28483; )) )) (define-char @@ -1567,7 +1567,7 @@ (=cns11643-5 . #x2B56) ; &C5-2B56; ) ((total-strokes . 8) - (=ucs@iso . #x28484) ; 󰀬 + (=ucs@iso . #x28484) ; &UU+28484; )) )) (define-char @@ -1654,7 +1654,7 @@ (=cns11643-5 . #x2B52) ; &C5-2B52; ) ((total-strokes . 8) - (=ucs@iso . #x28485) ; 󰀭 + (=ucs@iso . #x28485) ; &UU+28485; )) )) (define-char @@ -1713,7 +1713,7 @@ (=cns11643-5 . #x2B51) ; &C5-2B51; ) ((total-strokes . 8) - (=ucs@iso . #x28487) ; 󰀮 + (=ucs@iso . #x28487) ; &UU+28487; )) )) (define-char @@ -1824,7 +1824,7 @@ (=cns11643-5 . #x2B55) ; &C5-2B55; ) ((total-strokes . 8) - (=ucs@iso . #x28489) ; 󰀯 + (=ucs@iso . #x28489) ; &UU+28489; )) )) (define-char @@ -1840,7 +1840,7 @@ (=cns11643-5 . #x2B53) ; &C5-2B53; ) ((total-strokes . 8) - (=ucs@iso . #x2848A) ; 󰀰 + (=ucs@iso . #x2848A) ; &UU+2848A; )) )) (define-char @@ -2092,7 +2092,7 @@ (=cns11643-5 . #x2B50) ; &C5-2B50; ) ((total-strokes . 8) - (=ucs@iso . #x2848D) ; 󰀱 + (=ucs@iso . #x2848D) ; &UU+2848D; )) )) (define-char @@ -2294,7 +2294,7 @@ (=cns11643-5 . #x2B57) ; &C5-2B57; ) ((total-strokes . 8) - (=ucs@iso . #x284A2) ; 󰀲 + (=ucs@iso . #x284A2) ; &UU+284A2; )) )) (define-char @@ -2310,7 +2310,7 @@ (=cns11643-5 . #x2B54) ; &C5-2B54; ) ((total-strokes . 8) - (=ucs@iso . #x284A3) ; 󰀳 + (=ucs@iso . #x284A3) ; &UU+284A3; )) )) (define-char @@ -2453,7 +2453,7 @@ (=cns11643-5 . #x305B) ; &C5-305B; ) ((total-strokes . 9) - (=ucs@iso . #x284A6) ; 󰀴 + (=ucs@iso . #x284A6) ; &UU+284A6; )) )) (define-char @@ -2601,7 +2601,7 @@ (=cns11643-5 . #x3056) ; &C5-3056; ) ((total-strokes . 9) - (=ucs@iso . #x284A8) ; 󰀵 + (=ucs@iso . #x284A8) ; &UU+284A8; )) )) (define-char @@ -2669,7 +2669,7 @@ (=cns11643-5 . #x305A) ; &C5-305A; ) ((total-strokes . 9) - (=ucs@iso . #x284A9) ; 󰀶 + (=ucs@iso . #x284A9) ; &UU+284A9; )) )) (define-char @@ -2685,7 +2685,7 @@ (=cns11643-5 . #x3057) ; &C5-3057; ) ((total-strokes . 9) - (=ucs@iso . #x284AB) ; 󰀷 + (=ucs@iso . #x284AB) ; &UU+284AB; )) )) (define-char @@ -2731,7 +2731,7 @@ (=cns11643-5 . #x3059) ; &C5-3059; ) ((total-strokes . 9) - (=ucs@iso . #x284AC) ; 󰀸 + (=ucs@iso . #x284AC) ; &UU+284AC; )) )) (define-char @@ -3240,7 +3240,7 @@ (=cns11643-5 . #x3058) ; &C5-3058; ) ((total-strokes . 9) - (=ucs@iso . #x284BE) ; 󰀹 + (=ucs@iso . #x284BE) ; &UU+284BE; )) )) (define-char @@ -3305,7 +3305,7 @@ (=cns11643-5 . #x305C) ; &C5-305C; ) ((total-strokes . 9) - (=ucs@iso . #x284C1) ; 󰀺 + (=ucs@iso . #x284C1) ; &UU+284C1; )) )) (define-char @@ -3323,7 +3323,7 @@ ) ((ideographic-strokes . 6) (total-strokes . 11) - (=ucs@iso . #x284C2) ; 󰀻 + (=ucs@iso . #x284C2) ; &UU+284C2; )) )) (define-char @@ -3341,7 +3341,7 @@ ) ((ideographic-strokes . 6) (total-strokes . 9) - (=ucs@iso . #x284C3) ; 󰀼 + (=ucs@iso . #x284C3) ; &UU+284C3; )) )) (define-char @@ -3857,7 +3857,7 @@ (=cns11643-5 . #x362C) ; &C5-362C; ) ((total-strokes . 10) - (=ucs@iso . #x284C7) ; 󰀽 + (=ucs@iso . #x284C7) ; &UU+284C7; )) )) (define-char @@ -4023,7 +4023,7 @@ (=cns11643-5 . #x362B) ; &C5-362B; ) ((total-strokes . 10) - (=ucs@iso . #x284CA) ; 󰀾 + (=ucs@iso . #x284CA) ; &UU+284CA; )) )) (define-char @@ -4394,7 +4394,7 @@ (=cns11643-5 . #x3629) ; &C5-3629; ) ((total-strokes . 10) - (=ucs@iso . #x284CD) ; 󰀿 + (=ucs@iso . #x284CD) ; &UU+284CD; )) )) (define-char @@ -4438,7 +4438,7 @@ (=cns11643-5 . #x362A) ; &C5-362A; ) ((total-strokes . 10) - (=ucs@iso . #x284E5) ; 󰁀 + (=ucs@iso . #x284E5) ; &UU+284E5; )) )) (define-char @@ -4489,7 +4489,7 @@ (=cns11643-5 . #x362D) ; &C5-362D; ) ((total-strokes . 10) - (=ucs@iso . #x284E8) ; 󰁁 + (=ucs@iso . #x284E8) ; &UU+284E8; )) )) (define-char @@ -4505,7 +4505,7 @@ (=cns11643-5 . #x3628) ; &C5-3628; ) ((total-strokes . 10) - (=ucs@iso . #x284E9) ; 󰁂 + (=ucs@iso . #x284E9) ; &UU+284E9; )) )) (define-char @@ -4749,7 +4749,7 @@ (=cns11643-5 . #x3C76) ; &C5-3C76; ) ((total-strokes . 11) - (=ucs@iso . #x284EC) ; 󰁃 + (=ucs@iso . #x284EC) ; &UU+284EC; )) )) (define-char @@ -4764,7 +4764,7 @@ ((->subsumptive ((=cns11643-5 . #x3C72) ; &C5-3C72; ) - ((=ucs@iso . #x284ED) ; 󰁅 + ((=ucs@iso . #x284ED) ; &UU+284ED; )) )) )) @@ -4879,7 +4879,7 @@ (=cns11643-3 . #x3F55) ; &C3-3F55; ) ((total-strokes . 11) - (=ucs@unicode . #x9030) ; 󰁆 + (=ucs@unicode . #x9030) ; &UU+9030; )) )) (define-char @@ -4910,7 +4910,7 @@ (=cns11643-5 . #x3C77) ; &C5-3C77; ) ((total-strokes . 11) - (=ucs@iso . #x284EF) ; 󰁇 + (=ucs@iso . #x284EF) ; &UU+284EF; )) )) (define-char @@ -5027,7 +5027,7 @@ (=cns11643-5 . #x3C79) ; &C5-3C79; ) ((total-strokes . 11) - (=ucs@iso . #x284F4) ; 󰁈 + (=ucs@iso . #x284F4) ; &UU+284F4; )) )) (define-char @@ -5367,7 +5367,7 @@ (=cns11643-5 . #x3C75) ; &C5-3C75; ) ((total-strokes . 11) - (=ucs@iso . #x28516) ; 󰁉 + (=ucs@iso . #x28516) ; &UU+28516; )) )) (define-char @@ -5409,7 +5409,7 @@ (=cns11643-5 . #x3C74) ; &C5-3C74; ) ((total-strokes . 11) - (=ucs@iso . #x28519) ; 󰁊 + (=ucs@iso . #x28519) ; &UU+28519; )) )) (define-char @@ -5425,7 +5425,7 @@ (=cns11643-5 . #x3C73) ; &C5-3C73; ) ((total-strokes . 11) - (=ucs@iso . #x2851A) ; 󰁋 + (=ucs@iso . #x2851A) ; &UU+2851A; )) )) (define-char @@ -6153,7 +6153,7 @@ (=cns11643-5 . #x4359) ; &C5-4359; ) ((total-strokes . 12) - (=ucs@iso . #x28526) ; 󰁌 + (=ucs@iso . #x28526) ; &UU+28526; )) )) (define-char @@ -6623,7 +6623,7 @@ ) ((ideographic-strokes . 9) (total-strokes . 12) - (=ucs@iso . #x2852F) ; 󰁍 + (=ucs@iso . #x2852F) ; &UU+2852F; ) ((ideographic-strokes . 8) (total-strokes . 12) @@ -6684,7 +6684,7 @@ (=cns11643-5 . #x4358) ; &C5-4358; ) ((total-strokes . 12) - (=ucs@iso . #x2855A) ; 󰁎 + (=ucs@iso . #x2855A) ; &UU+2855A; )) )) (define-char @@ -6700,7 +6700,7 @@ (=cns11643-5 . #x4356) ; &C5-4356; ) ((total-strokes . 12) - (=ucs@iso . #x2855C) ; 󰁏 + (=ucs@iso . #x2855C) ; &UU+2855C; )) )) (define-char @@ -7055,7 +7055,7 @@ (=cns11643-5 . #x4A54) ; &C5-4A54; ) ((total-strokes . 13) - (=ucs@iso . #x28562) ; 󰁐 + (=ucs@iso . #x28562) ; &UU+28562; )) )) (define-char @@ -7328,7 +7328,7 @@ (=cns11643-5 . #x4A53) ; &C5-4A53; ) ((total-strokes . 13) - (=ucs@iso . #x28566) ; 󰁑 + (=ucs@iso . #x28566) ; &UU+28566; )) )) (define-char @@ -7344,7 +7344,7 @@ (=cns11643-5 . #x4A56) ; &C5-4A56; ) ((total-strokes . 13) - (=ucs@iso . #x28567) ; 󰁒 + (=ucs@iso . #x28567) ; &UU+28567; )) )) (define-char @@ -7393,7 +7393,7 @@ (=cns11643-5 . #x4A55) ; &C5-4A55; ) ((total-strokes . 13) - (=ucs@iso . #x28583) ; 󰁓 + (=ucs@iso . #x28583) ; &UU+28583; )) )) (define-char @@ -7816,7 +7816,7 @@ (=cns11643-5 . #x5164) ; &C5-5164; ) ((total-strokes . 14) - (=ucs@iso . #x2858C) ; 󰁔 + (=ucs@iso . #x2858C) ; &UU+2858C; )) )) (define-char @@ -7893,7 +7893,7 @@ (=cns11643-5 . #x5168) ; &C5-5168; ) ((total-strokes . 14) - (=ucs@iso . #x2858E) ; 󰁕 + (=ucs@iso . #x2858E) ; &UU+2858E; )) )) (define-char @@ -7978,7 +7978,7 @@ (=cns11643-3 . #x4F3B) ; &C3-4F3B; ) ((total-strokes . 14) - (=ucs@unicode . #x9071) ; 󰁖 + (=ucs@unicode . #x9071) ; &UU+9071; )) )) (define-char @@ -7994,7 +7994,7 @@ (=cns11643-5 . #x5165) ; &C5-5165; ) ((total-strokes . 14) - (=ucs@iso . #x2858F) ; 󰁗 + (=ucs@iso . #x2858F) ; &UU+2858F; )) )) (define-char @@ -8103,7 +8103,7 @@ (=cns11643-5 . #x5169) ; &C5-5169; ) ((total-strokes . 14) - (=ucs@iso . #x285AC) ; 󰁘 + (=ucs@iso . #x285AC) ; &UU+285AC; )) )) (define-char @@ -8119,7 +8119,7 @@ (=cns11643-5 . #x5167) ; &C5-5167; ) ((total-strokes . 14) - (=ucs@iso . #x285AD) ; 󰁙 + (=ucs@iso . #x285AD) ; &UU+285AD; )) )) (define-char @@ -8135,7 +8135,7 @@ (=cns11643-5 . #x516C) ; &C5-516C; ) ((total-strokes . 14) - (=ucs@iso . #x285AE) ; 󰁚 + (=ucs@iso . #x285AE) ; &UU+285AE; )) )) (define-char @@ -8166,7 +8166,7 @@ (=cns11643-5 . #x516A) ; &C5-516A; ) ((total-strokes . 14) - (=ucs@iso . #x285B0) ; 󰁛 + (=ucs@iso . #x285B0) ; &UU+285B0; )) )) (define-char @@ -8287,7 +8287,7 @@ ) ((ideographic-strokes . 11) (total-strokes . 14) - (=ucs@iso . #x285B3) ; 󰁜 + (=ucs@iso . #x285B3) ; &UU+285B3; )) )) (define-char @@ -8374,7 +8374,7 @@ (=cns11643-5 . #x587C) ; &C5-587C; ) ((total-strokes . 15) - (=ucs@iso . #x285B5) ; 󰁝 + (=ucs@iso . #x285B5) ; &UU+285B5; )) )) (define-char @@ -8390,7 +8390,7 @@ (=cns11643-5 . #x587B) ; &C5-587B; ) ((total-strokes . 15) - (=ucs@iso . #x285B6) ; 󰁞 + (=ucs@iso . #x285B6) ; &UU+285B6; )) )) (define-char @@ -8475,7 +8475,7 @@ (=cns11643-5 . #x5879) ; &C5-5879; ) ((total-strokes . 15) - (=ucs@iso . #x285B7) ; 󰁟 + (=ucs@iso . #x285B7) ; &UU+285B7; )) )) (define-char @@ -8576,7 +8576,7 @@ (=cns11643-5 . #x5877) ; &C5-5877; ) ((total-strokes . 15) - (=ucs@iso . #x285B9) ; 󰁠 + (=ucs@iso . #x285B9) ; &UU+285B9; )) )) (define-char @@ -8915,7 +8915,7 @@ (=cns11643-5 . #x5878) ; &C5-5878; ) ((total-strokes . 15) - (=ucs@iso . #x285DE) ; 󰁡 + (=ucs@iso . #x285DE) ; &UU+285DE; )) )) (define-char @@ -8933,7 +8933,7 @@ ) ((ideographic-strokes . 11) (total-strokes . 14) - (=ucs@iso . #x285B1) ; 󰁢 + (=ucs@iso . #x285B1) ; &UU+285B1; )) )) (define-char @@ -8949,7 +8949,7 @@ (=cns11643-5 . #x587D) ; &C5-587D; ) ((total-strokes . 15) - (=ucs@iso . #x285DF) ; 󰁣 + (=ucs@iso . #x285DF) ; &UU+285DF; )) )) (define-char @@ -8988,7 +8988,7 @@ (=cns11643-5 . #x587A) ; &C5-587A; ) ((total-strokes . 15) - (=ucs@iso . #x285E1) ; 󰁤 + (=ucs@iso . #x285E1) ; &UU+285E1; )) )) (define-char @@ -9251,7 +9251,7 @@ (=cns11643-5 . #x5F2F) ; &C5-5F2F; ) ((total-strokes . 16) - (=ucs@iso . #x285E5) ; 󰁥 + (=ucs@iso . #x285E5) ; &UU+285E5; )) )) (define-char @@ -9527,7 +9527,7 @@ (=cns11643-4 . #x5939) ; &C4-5939; ) ((total-strokes . 16) - (=ucs@unicode . #x48AE) ; 󰁦 + (=ucs@unicode . #x48AE) ; &UU+48AE; )) )) (define-char @@ -9617,7 +9617,7 @@ (=cns11643-5 . #x5F32) ; &C5-5F32; ) ((total-strokes . 16) - (=ucs@iso . #x285F0) ; 󰁧 + (=ucs@iso . #x285F0) ; &UU+285F0; )) )) (define-char @@ -9633,7 +9633,7 @@ (=cns11643-5 . #x5F36) ; &C5-5F36; ) ((total-strokes . 16) - (=ucs@iso . #x28601) ; 󰁨 + (=ucs@iso . #x28601) ; &UU+28601; )) )) (define-char @@ -9649,7 +9649,7 @@ (=cns11643-5 . #x5F37) ; &C5-5F37; ) ((total-strokes . 16) - (=ucs@iso . #x28602) ; 󰁩 + (=ucs@iso . #x28602) ; &UU+28602; )) )) (define-char @@ -9665,7 +9665,7 @@ (=cns11643-5 . #x5F31) ; &C5-5F31; ) ((total-strokes . 16) - (=ucs@iso . #x28603) ; 󰁪 + (=ucs@iso . #x28603) ; &UU+28603; )) )) (define-char @@ -9681,7 +9681,7 @@ (=cns11643-5 . #x5F30) ; &C5-5F30; ) ((total-strokes . 16) - (=ucs@iso . #x28604) ; 󰁫 + (=ucs@iso . #x28604) ; &UU+28604; )) )) (define-char @@ -9866,7 +9866,7 @@ (=cns11643-5 . #x653D) ; &C5-653D; ) ((total-strokes . 17) - (=ucs@iso . #x28607) ; 󰁬 + (=ucs@iso . #x28607) ; &UU+28607; )) )) (define-char @@ -9973,7 +9973,7 @@ (=cns11643-5 . #x6539) ; &C5-6539; ) ((total-strokes . 17) - (=ucs@iso . #x28619) ; 󰁭 + (=ucs@iso . #x28619) ; &UU+28619; )) )) (define-char @@ -10004,7 +10004,7 @@ ) ((ideographic-strokes . 13) (total-strokes . 16) - (=ucs@iso . #x2860C) ; 󰁮 + (=ucs@iso . #x2860C) ; &UU+2860C; )) )) (define-char @@ -10076,7 +10076,7 @@ (=cns11643-5 . #x6538) ; &C5-6538; ) ((total-strokes . 17) - (=ucs@iso . #x2861F) ; 󰁯 + (=ucs@iso . #x2861F) ; &UU+2861F; )) )) (define-char @@ -10295,7 +10295,7 @@ (=cns11643-5 . #x6A21) ; &C5-6A21; ) ((total-strokes . 18) - (=ucs@iso . #x28632) ; 󰁰 + (=ucs@iso . #x28632) ; &UU+28632; )) )) (define-char @@ -10326,7 +10326,7 @@ (=cns11643-5 . #x697E) ; &C5-697E; ) ((total-strokes . 18) - (=ucs@iso . #x28635) ; 󰁱 + (=ucs@iso . #x28635) ; &UU+28635; )) )) (define-char @@ -10477,7 +10477,7 @@ (=cns11643-5 . #x6E29) ; &C5-6E29; ) ((total-strokes . 19) - (=ucs@iso . #x28638) ; 󰁲 + (=ucs@iso . #x28638) ; &UU+28638; )) )) (define-char @@ -10506,7 +10506,7 @@ (=cns11643-5 . #x6E28) ; &C5-6E28; ) ((total-strokes . 19) - (=ucs@iso . #x28640) ; 󰁳 + (=ucs@iso . #x28640) ; &UU+28640; )) )) (define-char @@ -10570,7 +10570,7 @@ (=cns11643-5 . #x7151) ; &C5-7151; ) ((total-strokes . 20) - (=ucs@iso . #x28644) ; 󰁴 + (=ucs@iso . #x28644) ; &UU+28644; )) )) (define-char @@ -10627,7 +10627,7 @@ (=cns11643-5 . #x7150) ; &C5-7150; ) ((total-strokes . 20) - (=ucs@iso . #x2864F) ; 󰁵 + (=ucs@iso . #x2864F) ; &UU+2864F; )) )) (define-char @@ -10658,7 +10658,7 @@ (=cns11643-4 . #x6952) ; &C4-6952; ) ((total-strokes . 21) - (=ucs@unicode . #x908E) ; 󰁶 + (=ucs@unicode . #x908E) ; &UU+908E; )) )) (define-char @@ -10674,7 +10674,7 @@ (=cns11643-5 . #x7152) ; &C5-7152; ) ((total-strokes . 20) - (=ucs@iso . #x28652) ; 󰁷 + (=ucs@iso . #x28652) ; &UU+28652; )) )) (define-char @@ -10690,7 +10690,7 @@ (=cns11643-5 . #x7452) ; &C5-7452; ) ((total-strokes . 21) - (=ucs@iso . #x28653) ; 󰁸 + (=ucs@iso . #x28653) ; &UU+28653; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el index c828e05..70c20e4 100644 --- a/lisp/utf-2000/Ideograph-R163-City.el +++ b/lisp/utf-2000/Ideograph-R163-City.el @@ -2841,8 +2841,7 @@ (ideographic-strokes . 8) (total-strokes . 11) (<-simplified@JP/Jouyou - ((=ucs . #x9115) ; 鄕 - (=jis-x0213-1-2000 . #x7C6C) ; &I-JX1-7C6C; + ((=jis-x0213-1-2000 . #x7C6C) ; &CDP-B66D; )) (=ucs . #x90F7) ; 郷 (=jis-x0208 . #x363F) ; &I-J90-363F; @@ -3766,37 +3765,34 @@ )) (define-char '((ideographic-radical . 163) ; ⾢ - (ideographic-strokes . 10) - (total-strokes . 13) - (=ucs . #x9115) ; 鄕 - (=ks-x1001 . #x7A41) ; &I-K0-7A41; - (=jis-x0213-1-2000 . #x7C6C) ; &I-JX1-7C6C; - (=daikanwa . 39571) ; &I-M-39571; - )) -(define-char - '((=>ucs . #x9115) ; 鄕 - (morohashi-daikanwa 39571 0 0) - (ideographic-radical . 163) ; ⾢ - (ideographic-strokes . 10) - (total-strokes . 13) - (=cns11643-3 . #x4525) ; &C3-4525; - )) -(define-char - '((=>ucs . #x9109) ; 鄉 - (morohashi-daikanwa 39571 0 3) - (ideographic-radical . 163) ; ⾢ - (ideographic-strokes . 10) - (total-strokes . 13) - (=big5 . #xB66D) ; &B-B66D; - )) -(define-char - '((morohashi-daikanwa 39571 0 5) - (ideographic-radical . 163) ; ⾢ - (ideographic-strokes . 9) - (total-strokes . 12) - (=ucs . #x9109) ; 鄉 - (=cns11643-1 . #x6254) ; &I-C1-6254; - (=gb12345 . #x4F67) ; 鄉 + (->subsumptive + ((ideographic-strokes . 10) + (total-strokes . 13) + (=ucs . #x9115) ; 鄕 + (->subsumptive + ((=ks-x1001 . #x7A41) ; &M-39571; + (=daikanwa . 39571) ; &I-M-39571; + (=jef-china3 . #x68AC) ; &I-JC3-68AC; + (=ucs@unicode . #x9115) ; &M-39571; + ) + ((=cns11643-3 . #x4525) ; &C3-4525; + )) + ) + ((=>ucs . #x9115) ; 鄕 + (ideographic-strokes . 10) + (total-strokes . 13) + (=jis-x0213-1-2000 . #x7C6C) ; &CDP-B66D; + (=big5-cdp . #xB66D) ; &I-B-B66D; + (=ucs@jis . #x9115) ; &CDP-B66D; + ) + ((ideographic-strokes . 9) + (total-strokes . 12) + (=ucs . #x9109) ; 鄉 + (=cns11643-1 . #x6254) ; &I-C1-6254; + (=gb12345 . #x4F67) ; 鄉 + (=big5 . #xB66D) ; &I-B-B66D; + (=ucs@unicode . #x9109) ; 鄉 + )) )) (define-char '((ideographic-radical . 163) ; ⾢ diff --git a/lisp/utf-2000/Ideograph-R164-Wine.el b/lisp/utf-2000/Ideograph-R164-Wine.el index fff3ffc..6f7cd76 100644 --- a/lisp/utf-2000/Ideograph-R164-Wine.el +++ b/lisp/utf-2000/Ideograph-R164-Wine.el @@ -239,7 +239,7 @@ ) ((=cns11643-4 . #x3578) ; &C4-3578; ) - ((=ucs@unicode . #x48E9) ; 󰁹 + ((=ucs@unicode . #x48E9) ; &UU+48E9; )) )) (define-char @@ -262,7 +262,7 @@ ((=jis-x0212 . #x6257) ; &JSP-6257; (=ucs@jis . #x9153) ; &JSP-6257; ) - ((=ucs@unicode . #x9153) ; 󰁺 + ((=ucs@unicode . #x9153) ; &UU+9153; )) )) (define-char @@ -589,7 +589,7 @@ ) ((=cns11643-5 . #x3D25) ; &C5-3D25; ) - ((=ucs@iso . #x2880C) ; 󰁻 + ((=ucs@iso . #x2880C) ; &UU+2880C; )) )) (define-char @@ -609,7 +609,7 @@ (->subsumptive ((=daikanwa . 39814) ; &M-39814; ) - ((=ucs@iso . #x2880D) ; 󰁼 + ((=ucs@iso . #x2880D) ; &UU+2880D; ) ((=cns11643-5 . #x3D26) ; &C5-3D26; )) @@ -1456,7 +1456,7 @@ ((=jis-x0212 . #x6264) ; &JSP-6264; (=ucs@jis . #x9181) ; &JSP-6264; ) - ((=ucs@unicode . #x9181) ; 󰁽 + ((=ucs@unicode . #x9181) ; &UU+9181; )) )) (define-char @@ -1468,7 +1468,7 @@ (->subsumptive ((=daikanwa . 39887) ; &M-39887; ) - ((=ucs@iso . #x2884C) ; 󰁾 + ((=ucs@iso . #x2884C) ; &UU+2884C; ) ((=cns11643-5 . #x5178) ; &C5-5178; )) @@ -1541,7 +1541,7 @@ ) ((=cns11643-5 . #x5176) ; &C5-5176; ) - ((=ucs@iso . #x28851) ; 󰁿 + ((=ucs@iso . #x28851) ; &UU+28851; )) )) (define-char @@ -1917,7 +1917,7 @@ ) ((=cns11643-5 . #x592C) ; &C5-592C; ) - ((=ucs@iso . #x2886D) ; 󰂀 + ((=ucs@iso . #x2886D) ; &UU+2886D; )) )) (define-char @@ -2067,7 +2067,7 @@ ((->subsumptive ((=cns11643-5 . #x592A) ; &C5-592A; ) - ((=ucs@iso . #x28874) ; 󰂂 + ((=ucs@iso . #x28874) ; &UU+28874; )) )) )) @@ -2140,7 +2140,7 @@ ((->subsumptive ((=cns11643-5 . #x5F41) ; &C5-5F41; ) - ((=ucs@iso . #x28885) ; 󰂄 + ((=ucs@iso . #x28885) ; &UU+28885; )) )) )) @@ -2230,7 +2230,7 @@ ((->subsumptive ((=cns11643-5 . #x5F43) ; &C5-5F43; ) - ((=ucs@iso . #x28888) ; 󰂆 + ((=ucs@iso . #x28888) ; &UU+28888; )) )) )) @@ -2291,7 +2291,7 @@ ) ((=cns11643-5 . #x5F42) ; &C5-5F42; ) - ((=ucs@iso . #x2888B) ; 󰂇 + ((=ucs@iso . #x2888B) ; &UU+2888B; )) )) (define-char @@ -2310,25 +2310,27 @@ (=cns11643-4 . #x593E) ; &I-C4-593E; )) (define-char - '((=>ucs . #x919C) ; 醜 - (ideographic-radical . 164) ; ⾣ - (ideographic-strokes . 10) - (total-strokes . 17) - (=jis-x0208 . #x3D39) ; >-53759; - (=ks-x1001 . #x755D) ; &I-K0-755D; - (=cns11643-1 . #x756B) ; &I-C1-756B; - (=gt . 53759) ; &I-GT-53759; - (=gt-pj-1 . #x3D39) ; &I-GT-53759; - (=daikanwa . 39969) ; &I-M-39969; - (=ucs@jis . #x919C) ; >-53759; - )) -(define-char - '((morohashi-daikanwa 39969 0 1) - (ideographic-radical . 164) ; ⾣ - (ideographic-strokes . 9) - (total-strokes . 16) + '((ideographic-radical . 164) ; ⾣ (=ucs . #x919C) ; 醜 - (=gb12345 . #x3373) ; 醜 + (->subsumptive + ((ideographic-strokes . 10) + (total-strokes . 17) + (->subsumptive + ((=cns11643-1 . #x756B) ; &M-39969; + (=daikanwa . 39969) ; &I-M-39969; + ) + ((=jis-x0208 . #x3D39) ; >-53759; + (=ks-x1001 . #x755D) ; &I-K0-755D; + (=gt . 53759) ; &I-GT-53759; + (=gt-pj-1 . #x3D39) ; &I-GT-53759; + (=ucs@jis . #x919C) ; >-53759; + )) + ) + ((ideographic-strokes . 9) + (total-strokes . 16) + (=gb12345 . #x3373) ; &UU+919C; + (=ucs@unicode . #x919C) ; &UU+919C; + )) )) (define-char '((ideographic-radical . 164) ; ⾣ @@ -2363,7 +2365,7 @@ ) ((=cns11643-5 . #x5F3E) ; &C5-5F3E; ) - ((=ucs@iso . #x2888E) ; 󰂈 + ((=ucs@iso . #x2888E) ; &UU+2888E; )) )) (define-char @@ -2392,7 +2394,7 @@ (->subsumptive ((=daikanwa . 39976) ; &M-39976; ) - ((=ucs@unicode . #x919F) ; 󰂉 + ((=ucs@unicode . #x919F) ; &UU+919F; ) ((=cns11643-2 . #x5F75) ; &C2-5F75; )) @@ -2408,7 +2410,7 @@ ) ((=cns11643-5 . #x5F44) ; &C5-5F44; ) - ((=ucs@iso . #x28890) ; 󰂊 + ((=ucs@iso . #x28890) ; &UU+28890; )) )) (define-char @@ -2483,7 +2485,7 @@ ((->subsumptive ((=cns11643-7 . #x3C70) ; &C7-3C70; ) - ((=ucs@unicode . #x490B) ; 󰂌 + ((=ucs@unicode . #x490B) ; &UU+490B; )) )) )) @@ -2498,7 +2500,7 @@ ) ((=cns11643-5 . #x5F3D) ; &C5-5F3D; ) - ((=ucs@iso . #x288A0) ; 󰂍 + ((=ucs@iso . #x288A0) ; &UU+288A0; )) )) (define-char @@ -2557,7 +2559,7 @@ ) ((=cns11643-5 . #x6547) ; &C5-6547; ) - ((=ucs@iso . #x288A2) ; 󰂎 + ((=ucs@iso . #x288A2) ; &UU+288A2; )) )) (define-char @@ -2571,7 +2573,7 @@ ) ((=cns11643-5 . #x6549) ; &C5-6549; ) - ((=ucs@iso . #x288A3) ; 󰂏 + ((=ucs@iso . #x288A3) ; &UU+288A3; )) )) (define-char @@ -2967,7 +2969,7 @@ ((->subsumptive ((=daikanwa . 40028) ; &M-40028; ) - ((=ucs@iso . #x288C1) ; 󰂑 + ((=ucs@iso . #x288C1) ; &UU+288C1; )) ) ((=cns11643-5 . #x6A27) ; &C5-6A27; @@ -3017,7 +3019,7 @@ (->subsumptive ((=daikanwa . 40033) ; &M-40033; ) - ((=ucs@iso . #x288C3) ; 󰂒 + ((=ucs@iso . #x288C3) ; &UU+288C3; ) ((=cns11643-5 . #x6A29) ; &C5-6A29; )) @@ -3101,7 +3103,7 @@ ((->subsumptive ((=cns11643-5 . #x6A28) ; &C5-6A28; ) - ((=ucs@iso . #x288C6) ; 󰂔 + ((=ucs@iso . #x288C6) ; &UU+288C6; )) )) )) @@ -3210,7 +3212,7 @@ ) ((=cns11643-5 . #x6E31) ; &C5-6E31; ) - ((=ucs@iso . #x288D7) ; 󰂕 + ((=ucs@iso . #x288D7) ; &UU+288D7; )) )) (define-char @@ -3224,7 +3226,7 @@ ) ((=cns11643-5 . #x6E2E) ; &C5-6E2E; ) - ((=ucs@iso . #x288D8) ; 󰂖 + ((=ucs@iso . #x288D8) ; &UU+288D8; )) )) (define-char @@ -3285,7 +3287,7 @@ (->subsumptive ((=daikanwa . 40054) ; &M-40054; ) - ((=ucs@iso . #x288D9) ; 󰂗 + ((=ucs@iso . #x288D9) ; &UU+288D9; ) ((=cns11643-5 . #x6E2F) ; &C5-6E2F; )) @@ -3315,7 +3317,7 @@ ) ((=cns11643-5 . #x6E2D) ; &C5-6E2D; ) - ((=ucs@iso . #x288DA) ; 󰂘 + ((=ucs@iso . #x288DA) ; &UU+288DA; )) )) (define-char @@ -3644,7 +3646,7 @@ (->subsumptive ((=daikanwa . 40092) ; &M-40092; ) - ((=ucs@iso . #x288FB) ; 󰂙 + ((=ucs@iso . #x288FB) ; &UU+288FB; ) ((=cns11643-5 . #x765B) ; &C5-765B; )) @@ -3772,7 +3774,7 @@ (->subsumptive ((=daikanwa . 40102) ; &M-40102; ) - ((=ucs@iso . #x28902) ; 󰂚 + ((=ucs@iso . #x28902) ; &UU+28902; ) ((=cns11643-5 . #x783E) ; &C5-783E; )) @@ -3899,8 +3901,8 @@ ((ideographic-radical . 164) ; ⾣ (ideographic-strokes . 19) (total-strokes . 26) - (=gb12345 . #x7526) ; 󰂛 - (=ucs@unicode . #x91C5) ; 󰂛 + (=gb12345 . #x7526) ; &UU+91C5; + (=ucs@unicode . #x91C5) ; &UU+91C5; )) )) (define-char diff --git a/lisp/utf-2000/Ideograph-R166-Village.el b/lisp/utf-2000/Ideograph-R166-Village.el index 3fc9e6c..5d425c4 100644 --- a/lisp/utf-2000/Ideograph-R166-Village.el +++ b/lisp/utf-2000/Ideograph-R166-Village.el @@ -233,7 +233,7 @@ (->subsumptive ((=daikanwa . 40150) ; &M-40150; ) - ((=ucs@iso . #x28939) ; 󰂜 + ((=ucs@iso . #x28939) ; &UU+28939; ) ((=cns11643-5 . #x7154) ; &C5-7154; )) diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el index 7b38976..b37d9b2 100644 --- a/lisp/utf-2000/Ideograph-R167-Gold.el +++ b/lisp/utf-2000/Ideograph-R167-Gold.el @@ -4343,7 +4343,7 @@ ((=cns11643-5 . #x517E) ; &M-40453; (=daikanwa . 40453) ; &I-M-40453; ) - ((=ucs@iso . #x289AE) ; 󰂝 + ((=ucs@iso . #x289AE) ; &UU+289AE; )) )) (define-char @@ -5765,7 +5765,7 @@ ((=cns11643-5 . #x5931) ; &M-40551; (=daikanwa . 40551) ; &I-M-40551; ) - ((=ucs@iso . #x28A2E) ; 󰂞 + ((=ucs@iso . #x28A2E) ; &UU+28A2E; )) )) (define-char @@ -6596,7 +6596,7 @@ (total-strokes . 16) (=ucs . #x289FE) ; 𨧾 (->subsumptive - ((=ucs@iso . #x289FE) ; 󰂟 + ((=ucs@iso . #x289FE) ; &UU+289FE; ) ((=cns11643-5 . #x5933) ; &C5-5933; )) @@ -7435,7 +7435,7 @@ (->subsumptive ((=daikanwa . 40669) ; &M-40669; ) - ((=ucs@iso . #x28A3A) ; 󰂠 + ((=ucs@iso . #x28A3A) ; &UU+28A3A; ) ((=cns11643-5 . #x5F4F) ; &C5-5F4F; )) @@ -8303,7 +8303,7 @@ (->subsumptive ((=daikanwa . 40732) ; &M-40732; ) - ((=ucs@iso . #x28A8F) ; 󰂡 + ((=ucs@iso . #x28A8F) ; &UU+28A8F; ) ((=cns11643-5 . #x654E) ; &C5-654E; )) @@ -9906,7 +9906,7 @@ (total-strokes . 19) (=ucs . #x28A90) ; 𨪐 (->subsumptive - ((=ucs@iso . #x28A90) ; 󰂢 + ((=ucs@iso . #x28A90) ; &UU+28A90; ) ((=cns11643-5 . #x6A31) ; &C5-6A31; )) diff --git a/lisp/utf-2000/Ideograph-R168-Long.el b/lisp/utf-2000/Ideograph-R168-Long.el index 8d85d15..8ec5f65 100644 --- a/lisp/utf-2000/Ideograph-R168-Long.el +++ b/lisp/utf-2000/Ideograph-R168-Long.el @@ -295,7 +295,7 @@ (->subsumptive ((=daikanwa . 41145) ; &M-41145; ) - ((=ucs@iso . #x28C86) ; 󰂣 + ((=ucs@iso . #x28C86) ; &UU+28C86; ) ((=cns11643-5 . #x4A6B) ; &C5-4A6B; )) @@ -331,7 +331,7 @@ ) ((=cns11643-5 . #x5221) ; &C5-5221; ) - ((=ucs@iso . #x28C87) ; 󰂤 + ((=ucs@iso . #x28C87) ; &UU+28C87; )) )) (define-char @@ -576,7 +576,7 @@ ((=cns11643-5 . #x6557) ; &M-41180; (=daikanwa . 41180) ; &I-M-41180; ) - ((=ucs@iso . #x28CA9) ; 󰂥 + ((=ucs@iso . #x28CA9) ; &UU+28CA9; )) )) (define-char @@ -725,7 +725,7 @@ (->subsumptive ((=daikanwa . 41203) ; &M-41203; ) - ((=ucs@iso . #x28CC1) ; 󰂦 + ((=ucs@iso . #x28CC1) ; &UU+28CC1; ) ((=cns11643-5 . #x7660) ; &C5-7660; )) diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el index 1bee483..5ae6508 100644 --- a/lisp/utf-2000/Ideograph-R169-Gate.el +++ b/lisp/utf-2000/Ideograph-R169-Gate.el @@ -250,7 +250,7 @@ (->subsumptive ((=daikanwa . 41223) ; &M-41223; ) - ((=ucs@iso . #x28CD0) ; 󰂧 + ((=ucs@iso . #x28CD0) ; &UU+28CD0; ) ((=cns11643-5 . #x3642) ; &C5-3642; )) @@ -273,7 +273,7 @@ ) ((=cns11643-5 . #x3641) ; &C5-3641; ) - ((=ucs@iso . #x28CD1) ; 󰂨 + ((=ucs@iso . #x28CD1) ; &UU+28CD1; )) )) (define-char @@ -364,7 +364,7 @@ (->subsumptive ((=daikanwa . 41231) ; &M-41231; ) - ((=ucs@iso . #x28CD7) ; 󰂩 + ((=ucs@iso . #x28CD7) ; &UU+28CD7; ) ((=cns11643-5 . #x3D33) ; &C5-3D33; )) @@ -382,26 +382,23 @@ )) )) (define-char - '((=>ucs . #x958B) ; 開 - (ideographic-radical . 169) ; ⾨ - (ideographic-strokes . 4) - (total-strokes . 12) - (=daikanwa . 41233) ; &M-41233; - )) -(define-char - '((morohashi-daikanwa 41233 0 0) - (ideographic-radical . 169) ; ⾨ + '((ideographic-radical . 169) ; ⾨ (ideographic-strokes . 4) (total-strokes . 12) - (shinjigen-2 . 8801) (=ucs . #x958B) ; 開 - (=jis-x0208 . #x332B) ; &I-J90-332B; - (=ks-x1001 . #x4B52) ; &I-K0-4B52; - (=cns11643-1 . #x6264) ; &I-C1-6264; - (=gb12345 . #x3F2A) ; 開 - (=gt . 55450) ; &I-GT-55450; - (=gt-k . 09007) ; &I-GT-K09007; - (=gt-pj-1 . #x332B) ; &I-GT-55450; + (->subsumptive + ((=daikanwa . 41233) ; &M-41233; + ) + ((shinjigen-2 . 8801) + (=jis-x0208 . #x332B) ; >-55450; + (=ks-x1001 . #x4B52) ; &I-K0-4B52; + (=cns11643-1 . #x6264) ; &I-C1-6264; + (=gb12345 . #x3F2A) ; >-55450; + (=gt . 55450) ; &I-GT-55450; + (=gt-k . 09007) ; &I-GT-K09007; + (=gt-pj-1 . #x332B) ; &I-GT-55450; + (=ucs@unicode . #x958B) ; >-55450; + )) )) (define-char '((ideographic-radical . 169) ; ⾨ @@ -411,7 +408,7 @@ (->subsumptive ((=daikanwa . 41234) ; &M-41234; ) - ((=ucs@iso . #x28CD9) ; 󰂪 + ((=ucs@iso . #x28CD9) ; &UU+28CD9; ) ((=cns11643-5 . #x3D2F) ; &C5-3D2F; )) @@ -448,7 +445,7 @@ ) ((=cns11643-5 . #x3D30) ; &C5-3D30; ) - ((=ucs@iso . #x28CDB) ; 󰂫 + ((=ucs@iso . #x28CDB) ; &UU+28CDB; )) )) (define-char @@ -701,7 +698,7 @@ (->subsumptive ((=daikanwa . 41253) ; &M-41253; ) - ((=ucs@iso . #x28CDF) ; 󰂬 + ((=ucs@iso . #x28CDF) ; &UU+28CDF; ) ((=cns11643-5 . #x3D2D) ; &C5-3D2D; )) @@ -740,7 +737,7 @@ (->subsumptive ((=daikanwa . 41257) ; &M-41257; ) - ((=ucs@iso . #x28CE3) ; 󰂭 + ((=ucs@iso . #x28CE3) ; &UU+28CE3; ) ((=cns11643-5 . #x3D32) ; &C5-3D32; )) @@ -1052,7 +1049,7 @@ ) ((=cns11643-5 . #x4374) ; &C5-4374; ) - ((=ucs@iso . #x28CFA) ; 󰂯 + ((=ucs@iso . #x28CFA) ; &UU+28CFA; )) )) (define-char @@ -1089,7 +1086,7 @@ ) ((=cns11643-5 . #x4372) ; &C5-4372; ) - ((=ucs@iso . #x28CFD) ; 󰂰 + ((=ucs@iso . #x28CFD) ; &UU+28CFD; )) )) (define-char @@ -1424,7 +1421,7 @@ (->subsumptive ((=daikanwa . 41305) ; &M-41305; ) - ((=ucs@iso . #x28D15) ; 󰂱 + ((=ucs@iso . #x28D15) ; &UU+28D15; ) ((=cns11643-5 . #x4A70) ; &C5-4A70; )) @@ -1601,7 +1598,7 @@ (->subsumptive ((=daikanwa . 41318) ; &M-41318; ) - ((=ucs@iso . #x28D25) ; 󰂲 + ((=ucs@iso . #x28D25) ; &UU+28D25; ) ((=cns11643-5 . #x4A6C) ; &C5-4A6C; )) @@ -2184,7 +2181,7 @@ (->subsumptive ((=daikanwa . 41371) ; &M-41371; ) - ((=ucs@iso . #x28D4A) ; 󰂳 + ((=ucs@iso . #x28D4A) ; &UU+28D4A; ) ((=cns11643-5 . #x593D) ; &C5-593D; )) @@ -2248,7 +2245,7 @@ ) ((=cns11643-2 . #x5B56) ; &C2-5B56; ) - ((=ucs@unicode . #x95BA) ; 󰂴 + ((=ucs@unicode . #x95BA) ; &UU+95BA; )) )) (define-char @@ -2474,7 +2471,7 @@ (->subsumptive ((=daikanwa . 41390) ; &M-41390; ) - ((=ucs@iso . #x28D50) ; 󰂵 + ((=ucs@iso . #x28D50) ; &UU+28D50; ) ((=cns11643-5 . #x593F) ; &C5-593F; )) @@ -3152,7 +3149,7 @@ (->subsumptive ((=daikanwa . 41444) ; &M-41444; ) - ((=ucs@iso . #x28D81) ; 󰂶 + ((=ucs@iso . #x28D81) ; &UU+28D81; ) ((=cns11643-5 . #x655E) ; &C5-655E; )) @@ -3500,7 +3497,7 @@ (->subsumptive ((=daikanwa . 41466) ; &M-41466; ) - ((=ucs@iso . #x28D9C) ; 󰂷 + ((=ucs@iso . #x28D9C) ; &UU+28D9C; ) ((=cns11643-5 . #x6A39) ; &C5-6A39; )) @@ -3724,8 +3721,8 @@ ) ((ideographic-strokes . 11) (total-strokes . 19) - (=gb12345 . #x635B) ; 󰂸 - (=ucs@unicode . #x95DE) ; 󰂸 + (=gb12345 . #x635B) ; &UU+95DE; + (=ucs@unicode . #x95DE) ; &UU+95DE; )) )) (define-char @@ -3742,7 +3739,7 @@ ) ((ideographic-strokes . 11) (total-strokes . 19) - (=ucs@iso . #x28DB1) ; 󰂹 + (=ucs@iso . #x28DB1) ; &UU+28DB1; )) )) (define-char @@ -3886,7 +3883,7 @@ ) ((ideographic-strokes . 12) (total-strokes . 20) - (=ucs@iso . #x28DC3) ; 󰂺 + (=ucs@iso . #x28DC3) ; &UU+28DC3; )) )) (define-char @@ -3955,7 +3952,7 @@ (->subsumptive ((=daikanwa . 41502) ; &M-41502; ) - ((=ucs@iso . #x28DC6) ; 󰂻 + ((=ucs@iso . #x28DC6) ; &UU+28DC6; ) ((=cns11643-5 . #x7159) ; &C5-7159; )) @@ -4084,7 +4081,7 @@ (->subsumptive ((=daikanwa . 41512) ; &M-41512; ) - ((=ucs@iso . #x28DD2) ; 󰂼 + ((=ucs@iso . #x28DD2) ; &UU+28DD2; ) ((=cns11643-5 . #x715C) ; &C5-715C; )) @@ -4184,7 +4181,7 @@ (->subsumptive ((=daikanwa . 41526) ; &M-41526; ) - ((=ucs@iso . #x28DF0) ; 󰂽 + ((=ucs@iso . #x28DF0) ; &UU+28DF0; ) ((=cns11643-5 . #x7954) ; &C5-7954; )) diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el index be5aba5..d96a5d0 100644 --- a/lisp/utf-2000/Ideograph-R170-Mound.el +++ b/lisp/utf-2000/Ideograph-R170-Mound.el @@ -680,7 +680,7 @@ ) ((=cns11643-3 . #x2A7C) ; &C3-2A7C; ) - ((=ucs@unicode . #x963E) ; 󰂾 + ((=ucs@unicode . #x963E) ; &UU+963E; )) )) (define-char @@ -2314,7 +2314,7 @@ (->subsumptive ((=daikanwa . 41730) ; &M-41730; ) - ((=ucs@iso . #x28EA1) ; 󰂿 + ((=ucs@iso . #x28EA1) ; &UU+28EA1; ) ((=cns11643-5 . #x3D39) ; &C5-3D39; )) @@ -2418,7 +2418,7 @@ (->subsumptive ((=daikanwa . 41739) ; &M-41739; ) - ((=ucs@iso . #x28EA6) ; 󰃀 + ((=ucs@iso . #x28EA6) ; &UU+28EA6; ) ((=cns11643-5 . #x3D34) ; &C5-3D34; )) @@ -2697,7 +2697,7 @@ (->subsumptive ((=daikanwa . 41762) ; &M-41762; ) - ((=ucs@iso . #x28EBF) ; 󰃁 + ((=ucs@iso . #x28EBF) ; &UU+28EBF; ) ((=cns11643-5 . #x3D36) ; &C5-3D36; )) @@ -2802,7 +2802,7 @@ (->subsumptive ((=daikanwa . 41769) ; &M-41769; ) - ((=ucs@iso . #x28EC2) ; 󰃂 + ((=ucs@iso . #x28EC2) ; &UU+28EC2; ) ((=cns11643-5 . #x4378) ; &C5-4378; )) @@ -2907,7 +2907,7 @@ (->subsumptive ((=daikanwa . 41778) ; &M-41778; ) - ((=ucs@iso . #x28EC6) ; 󰃃 + ((=ucs@iso . #x28EC6) ; &UU+28EC6; ) ((=cns11643-5 . #x437C) ; &C5-437C; )) @@ -3142,7 +3142,7 @@ ((=cns11643-5 . #x437A) ; &M-41795; (=daikanwa . 41795) ; &I-M-41795; ) - ((=ucs@iso . #x28ECD) ; 󰃄 + ((=ucs@iso . #x28ECD) ; &UU+28ECD; )) )) (define-char @@ -3541,7 +3541,7 @@ (->subsumptive ((=daikanwa . 41827) ; &M-41827; ) - ((=ucs@iso . #x28EFC) ; 󰃅 + ((=ucs@iso . #x28EFC) ; &UU+28EFC; ) ((=cns11643-5 . #x4A7A) ; &C5-4A7A; )) @@ -3556,7 +3556,7 @@ ) ((ideographic-strokes . 10) (total-strokes . 13) - (=ucs@unicode . #x969E) ; 󰃆 + (=ucs@unicode . #x969E) ; &UU+969E; ) ((ideographic-strokes . 11) (total-strokes . 14) @@ -3674,7 +3674,7 @@ (->subsumptive ((=cns11643-2 . #x4F24) ; &C2-4F24; ) - ((=ucs@unicode . #x96A1) ; 󰃇 + ((=ucs@unicode . #x96A1) ; &UU+96A1; )) )) (define-char @@ -3720,7 +3720,7 @@ (->subsumptive ((=daikanwa . 41840) ; &M-41840; ) - ((=ucs@iso . #x28F0B) ; 󰃈 + ((=ucs@iso . #x28F0B) ; &UU+28F0B; ) ((=cns11643-5 . #x5234) ; &C5-5234; )) @@ -3944,7 +3944,7 @@ ) ((=cns11643-5 . #x522F) ; &C5-522F; ) - ((=ucs@iso . #x28EF4) ; 󰃉 + ((=ucs@iso . #x28EF4) ; &UU+28EF4; )) )) (define-char @@ -3992,7 +3992,7 @@ (->subsumptive ((=daikanwa . 41862) ; &M-41862; ) - ((=ucs@iso . #x28F2B) ; 󰃊 + ((=ucs@iso . #x28F2B) ; &UU+28F2B; ) ((=cns11643-5 . #x5942) ; &C5-5942; )) @@ -4005,7 +4005,7 @@ (->subsumptive ((=daikanwa . 41863) ; &M-41863; ) - ((=ucs@iso . #x28F3D) ; 󰃋 + ((=ucs@iso . #x28F3D) ; &UU+28F3D; ) ((=cns11643-5 . #x6A3C) ; &C5-6A3C; )) @@ -4652,7 +4652,7 @@ (->subsumptive ((=daikanwa . 41913) ; &M-41913; ) - ((=ucs@iso . #x28F66) ; 󰃌 + ((=ucs@iso . #x28F66) ; &UU+28F66; ) ((=cns11643-5 . #x715D) ; &C5-715D; )) diff --git a/lisp/utf-2000/Ideograph-R173-Rain.el b/lisp/utf-2000/Ideograph-R173-Rain.el index aef55a6..d95780b 100644 --- a/lisp/utf-2000/Ideograph-R173-Rain.el +++ b/lisp/utf-2000/Ideograph-R173-Rain.el @@ -412,23 +412,20 @@ '((ideographic-radical . 173) ; ⾬ (ideographic-strokes . 4) (total-strokes . 12) - (shinjigen-2 . 8990) (=ucs . #x96F2) ; 雲 - (=jis-x0208 . #x3140) ; &I-J90-3140; - (=ks-x1001 . #x6A23) ; &I-K0-6A23; - (=gb12345 . #x5446) ; 雲 - (=gt . 56701) ; &I-GT-56701; - (=gt-k . 08997) ; &I-GT-K08997; - (=gt-pj-1 . #x3140) ; &I-GT-56701; - (=daikanwa . 42235) ; &I-M-42235; - )) -(define-char - '((=>ucs . #x96F2) ; 雲 - (morohashi-daikanwa 42235 0 0) - (ideographic-radical . 173) ; ⾬ - (ideographic-strokes . 4) - (total-strokes . 12) - (=cns11643-1 . #x6278) ; &C1-6278; + (->subsumptive + ((shinjigen-2 . 8990) + (=jis-x0208 . #x3140) ; >-56701; + (=ks-x1001 . #x6A23) ; &I-K0-6A23; + (=gb12345 . #x5446) ; >-56701; + (=gt . 56701) ; &I-GT-56701; + (=gt-k . 08997) ; &I-GT-K08997; + (=gt-pj-1 . #x3140) ; &I-GT-56701; + (=daikanwa . 42235) ; &I-M-42235; + (=ucs@unicode . #x96F2) ; >-56701; + ) + ((=cns11643-1 . #x6278) ; &C1-6278; + )) )) (define-char '((ideographic-radical . 173) ; ⾬ diff --git a/lisp/utf-2000/Ideograph-R198-Deer.el b/lisp/utf-2000/Ideograph-R198-Deer.el index 0588874..0604989 100644 --- a/lisp/utf-2000/Ideograph-R198-Deer.el +++ b/lisp/utf-2000/Ideograph-R198-Deer.el @@ -816,42 +816,27 @@ (=daikanwa . 47662) ; &I-M-47662; )) (define-char - '((=>ucs . #x9E97) ; 麗 - (ideographic-radical . 198) ; ⿅ - (ideographic-strokes . 8) - (total-strokes . 19) - (shinjigen-2 . 9782) - (=jis-x0208-1978 . #x4E6F) ; >-64844; - (=jis-x0208-1983 . #x4E6F) ; &I-J83-4E6F; - (=ks-x1001 . #x5572) ; &I-K0-5572; - (=gt . 64844) ; &I-GT-64844; - (=gt-pj-1 . #x4E6F) ; &I-GT-64844; - (=daikanwa . 47663) ; &I-M-47663; - )) -(define-char - '((morohashi-daikanwa 47663 0 0) - (ideographic-radical . 198) ; ⿅ + '((ideographic-radical . 198) ; ⿅ (ideographic-strokes . 8) (total-strokes . 19) (=ucs . #x9E97) ; 麗 - (=gb12345 . #x4076) ; 麗 - )) -(define-char - '((=>ucs . #x9E97) ; 麗 - (morohashi-daikanwa 47663 0 1) - (ideographic-radical . 198) ; ⿅ - (ideographic-strokes . 8) - (total-strokes . 19) - (=jis-x0208-1990 . #x4E6F) ; &J90-4E6F; - (=ucs@jis . #x9E97) ; &J90-4E6F; - )) -(define-char - '((=>ucs . #x9E97) ; 麗 - (morohashi-daikanwa 47663 0 2) - (ideographic-radical . 198) ; ⿅ - (ideographic-strokes . 8) - (total-strokes . 19) - (=cns11643-1 . #x795E) ; &C1-795E; + (->subsumptive + ((shinjigen-2 . 9782) + (=jis-x0208-1978 . #x4E6F) ; >-64844; + (=jis-x0208-1983 . #x4E6F) ; &I-J83-4E6F; + (=ks-x1001 . #x5572) ; &I-K0-5572; + (=gt . 64844) ; &I-GT-64844; + (=gt-pj-1 . #x4E6F) ; &I-GT-64844; + (=daikanwa . 47663) ; &I-M-47663; + ) + ((=gb12345 . #x4076) ; &UU+9E97; + (=ucs@unicode . #x9E97) ; &UU+9E97; + ) + ((=jis-x0208-1990 . #x4E6F) ; &J90-4E6F; + (=ucs@jis . #x9E97) ; &J90-4E6F; + ) + ((=cns11643-1 . #x795E) ; &C1-795E; + )) )) (define-char '((ideographic-radical . 198) ; ⿅ diff --git a/lisp/utf-2000/Ideograph-R212-Dragon.el b/lisp/utf-2000/Ideograph-R212-Dragon.el index 7ccedf3..562fffc 100644 --- a/lisp/utf-2000/Ideograph-R212-Dragon.el +++ b/lisp/utf-2000/Ideograph-R212-Dragon.el @@ -58,7 +58,7 @@ (->subsumptive ((=daikanwa . 48819) ; &M-48819; ) - ((=ucs@unicode . #x9F8E) ; 󰀕 + ((=ucs@unicode . #x9F8E) ; &UU+9F8E; ) ((=cns11643-3 . #x5755) ; &C3-5755; )) @@ -127,8 +127,8 @@ (=jef-china3 . #x70AA) ; &I-JC3-70AA; (=ucs@jis . #x9F90) ; &M-48824; ) - ((=gb12345 . #x4553) ; 󰃎 - (=ucs@unicode . #x9F90) ; 󰃎 + ((=gb12345 . #x4553) ; &UU+9F90; + (=ucs@unicode . #x9F90) ; &UU+9F90; ) ((ideographic-radical@cns . 53) ; ⼴ (ideographic-strokes@cns . 16) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 94beb34..3495f53 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -89,8 +89,8 @@ nil) ((find-charset ka) (if (find-charset kb) - (if (<= (charset-id ka) 0) - (if (<= (charset-id kb) 0) + (if (<= (charset-id ka) 1) + (if (<= (charset-id kb) 1) (cond ((= (charset-dimension ka) (charset-dimension kb)) @@ -100,7 +100,7 @@ (charset-dimension kb)) )) t) - (if (<= (charset-id kb) 0) + (if (<= (charset-id kb) 1) nil (< (charset-id ka)(charset-id kb)))) nil)) @@ -945,24 +945,45 @@ (intern (format "%s*sources" name)))) (setq required-features nil) (dolist (source sources) - (setq required-features - (cons - (if (find-charset - (setq ret (intern - (format "=%s" source)))) - ret - source) - required-features))) - (when (string-match "@JP" (symbol-name name)) - (setq required-features - (union required-features - '(=jis-x0208 - =jis-x0208-1990 - =jis-x0213-1-2000 - =jis-x0213-2-2000 - =jis-x0212 - =jis-x0208-1983 - =jis-x0208-1978)))) + (cond + ((find-charset + (setq ret (intern (format "=%s" source)))) + (setq required-features + (cons ret required-features))) + ((memq source '(JP JP/Jouyou)) + (setq required-features + (union required-features + '(=jis-x0208 + =jis-x0208-1990 + =jis-x0213-1-2000 + =jis-x0213-2-2000 + =jis-x0212 + =jis-x0208-1983 + =jis-x0208-1978)))) + ((eq source 'CN) + (setq required-features + (union required-features + '(=gb2312 + =gb12345 + =iso-ir165)))) + (t (setq required-features + (cons source required-features))))) + (cond ((string-match "@JP" (symbol-name name)) + (setq required-features + (union required-features + '(=jis-x0208 + =jis-x0208-1990 + =jis-x0213-1-2000 + =jis-x0213-2-2000 + =jis-x0212 + =jis-x0208-1983 + =jis-x0208-1978)))) + ((string-match "@CN" (symbol-name name)) + (setq required-features + (union required-features + '(=gb2312 + =gb12345 + =iso-ir165))))) (if separator (insert lbs)) (if readable diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el index 5bc6c73..a343fce 100644 --- a/lisp/utf-2000/ideograph-util.el +++ b/lisp/utf-2000/ideograph-util.el @@ -468,24 +468,24 @@ radical)) (let ((ret (or (encode-char char 'ideograph-daikanwa 'defined-only) (encode-char char '=daikanwa-rev2 'defined-only) - (get-char-attribute char 'morohashi-daikanwa) - (get-char-attribute char '=>daikanwa)))) + (get-char-attribute char 'morohashi-daikanwa)))) (or ret + (and (setq ret (get-char-attribute char '=>daikanwa)) + (if (numberp ret) + (list ret 0) + (append ret '(0)))) (unless (memq char checked) (catch 'tag (let ((rest - (append (get-char-attribute char '<-subsumptive) - (get-char-attribute char '<-denotational))) + (append (get-char-attribute char '->subsumptive) + (get-char-attribute char '->denotational))) (i 0) sc) (setq checked (cons char checked)) (while rest (setq sc (car rest)) - (when (setq ret (char-daikanwa sc radical checked)) - (throw 'tag - (if (numberp ret) - (list ret 0 i) - (append ret (list i))))) + (if (setq ret (char-daikanwa sc radical checked)) + (throw 'tag ret)) (setq checked (cons sc checked) rest (cdr rest) i (1+ i))) @@ -500,12 +500,15 @@ (setq checked (cons sc checked) rest (cdr rest))) (setq rest - (append (get-char-attribute char '->subsumptive) - (get-char-attribute char '->denotational))) + (append (get-char-attribute char '<-subsumptive) + (get-char-attribute char '<-denotational))) (while rest (setq sc (car rest)) - (if (setq ret (char-daikanwa sc radical checked)) - (throw 'tag ret)) + (when (setq ret (char-daikanwa sc radical checked)) + (throw 'tag + (if (numberp ret) + (list ret 0 i) + (append ret (list i))))) (setq checked (cons sc checked) rest (cdr rest)))))))))) diff --git a/lisp/utf-2000/read-maps.el b/lisp/utf-2000/read-maps.el index 54f27e4..43f27f8 100644 --- a/lisp/utf-2000/read-maps.el +++ b/lisp/utf-2000/read-maps.el @@ -161,8 +161,12 @@ (mapcar (lambda (c) (aref c 0)) (split-string tchars " "))) - (unless (equal (char-feature char '<-simplified@JP/Jouyou) - tchars) + (unless (or (equal (char-feature char '<-simplified@JP/Jouyou) + tchars) + (and (equal (char-feature char '<-simplified) + tchars) + (memq 'JP/Jouyou + (char-feature char '<-simplified*sources)))) (put-char-attribute char '<-simplified@JP/Jouyou tchars))) diff --git a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el index c2d11a3..f597969 100644 --- a/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el +++ b/lisp/utf-2000/u02E00-CJK-Radical-Supplement.el @@ -673,7 +673,7 @@ (=gt-pj-6 . #x3879) ; >-37857; (=daikanwa . 29237) ; &I-M-29237; ) - ((=ucs@unicode . #x2EBC) ; 󰀀 + ((=ucs@unicode . #x2EBC) ; &UU+2EBC; ) ((=big5-cdp . #x8A73) ; &CDP-8A73; ) diff --git a/src/ChangeLog b/src/ChangeLog index 861d37e..b38f420 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,34 @@ +2004-04-12 MORIOKA Tomohiko + + * text-coding.c (decode_add_er_char): Must to quote prefix string + as regexp. + +2004-04-12 MORIOKA Tomohiko + + * mule-charset.c (put_char_ccs_code_point): Store characters of + =ucs whose code_points >= 0xF0000. + +2004-04-09 MORIOKA Tomohiko + + * mule-charset.c (Vcharset_system_char_id): New variable in XEmacs + CHISE. + (syms_of_mule_charset): Add new symbol `system-char-id' in XEmacs + CHISE. + (complex_vars_of_mule_charset): Add new coded-charset + `system-char-id' in XEmacs CHISE; modify `=ucs' to eliminate + builtin characters over 0xEFFFF. + + * chartab.c (syms_of_chartab): Don't define symbol + `system-char-id' in every case. + + * char-ucs.h (Qsystem_char_id): New extern variable. + (LEADING_BYTE_SYSTEM_CHAR_ID): New macro. + +2004-04-08 MORIOKA Tomohiko + + * text-coding.c (char_encode_utf8): Try to use entity-references + for U-000F0000 ... U-0010FFFF. + 2004-04-05 MORIOKA Tomohiko * text-coding.c (ER_BUF_SIZE): New macro. diff --git a/src/char-ucs.h b/src/char-ucs.h index cdba83c..078dcea 100644 --- a/src/char-ucs.h +++ b/src/char-ucs.h @@ -48,6 +48,7 @@ extern Lisp_Object Vcharset_japanese_jisx0212; EXFUN (Fget_charset, 1); +extern Lisp_Object Qsystem_char_id; extern Lisp_Object Qmap_ucs, Qucs; Lisp_Object put_char_ccs_code_point (Lisp_Object character, @@ -70,38 +71,40 @@ typedef short Charset_ID; /* ISO/IEC 10646 BMP */ #define LEADING_BYTE_UCS_BMP -176 +#define LEADING_BYTE_SYSTEM_CHAR_ID 0 + /* Japanese JIS X0208 Common 2/4 2/{(8),9,10,11} 4/2 (B) */ -#define LEADING_BYTE_JIS_X0208 0 +#define LEADING_BYTE_JIS_X0208 1 /* Chinese GB 12345-1990 */ -#define LEADING_BYTE_CHINESE_GB12345 1 +#define LEADING_BYTE_CHINESE_GB12345 2 -#define LEADING_BYTE_CHINESE_BIG5 2 +#define LEADING_BYTE_CHINESE_BIG5 3 /* Big5 Level 1 2/4 2/{(8),9,10,11} 4/0 '0' */ -#define LEADING_BYTE_CHINESE_BIG5_1 3 +#define LEADING_BYTE_CHINESE_BIG5_1 4 /* Big5 Level 2 2/4 2/{(8),9,10,11} 4/0 '1' */ -#define LEADING_BYTE_CHINESE_BIG5_2 4 +#define LEADING_BYTE_CHINESE_BIG5_2 5 /* VISCII 1.1 */ -#define LEADING_BYTE_LATIN_VISCII 5 +#define LEADING_BYTE_LATIN_VISCII 6 /* MULE VISCII-LOWER (CHARSET_ID_OFFSET_96 + '1') */ -#define LEADING_BYTE_LATIN_VISCII_LOWER 6 +#define LEADING_BYTE_LATIN_VISCII_LOWER 7 /* MULE VISCII-UPPER (CHARSET_ID_OFFSET_96 + '2') */ -#define LEADING_BYTE_LATIN_VISCII_UPPER 7 +#define LEADING_BYTE_LATIN_VISCII_UPPER 8 -#define LEADING_BYTE_ETHIOPIC_UCS 8 +#define LEADING_BYTE_ETHIOPIC_UCS 9 /* ISO/IEC 10646 SMP */ -#define LEADING_BYTE_UCS_SMP 9 +#define LEADING_BYTE_UCS_SMP 10 /* ISO/IEC 10646 SIP */ -#define LEADING_BYTE_UCS_SIP 10 +#define LEADING_BYTE_UCS_SIP 11 -#define MIN_LEADING_BYTE_PRIVATE 11 +#define MIN_LEADING_BYTE_PRIVATE 12 #define MAX_LEADING_BYTE_PRIVATE 512 diff --git a/src/chartab.c b/src/chartab.c index 1ce7474..179f6bc 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1130,10 +1130,6 @@ make_char_id_table (Lisp_Object initval) } -#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE) -Lisp_Object Qsystem_char_id; -#endif - Lisp_Object Qcomposition; Lisp_Object Q_decomposition; Lisp_Object Q_identical; @@ -4599,10 +4595,6 @@ syms_of_chartab (void) INIT_LRECORD_IMPLEMENTATION (uint16_byte_table); INIT_LRECORD_IMPLEMENTATION (byte_table); -#if defined(HAVE_CHISE) && !defined(HAVE_LIBCHISE_LIBCHISE) - defsymbol (&Qsystem_char_id, "system-char-id"); -#endif - defsymbol (&Qto_ucs, "=>ucs"); defsymbol (&Q_ucs_unified, "->ucs-unified"); defsymbol (&Q_subsumptive, "->subsumptive"); diff --git a/src/mule-charset.c b/src/mule-charset.c index 9cb6015..6c07d63 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -1,7 +1,7 @@ /* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1999,2000,2001,2002,2003 MORIOKA Tomohiko + Copyright (C) 1999,2000,2001,2002,2003,2004 MORIOKA Tomohiko This file is part of XEmacs. @@ -67,6 +67,7 @@ Lisp_Object Vcharset_japanese_jisx0212; Lisp_Object Vcharset_chinese_cns11643_1; Lisp_Object Vcharset_chinese_cns11643_2; #ifdef UTF2000 +Lisp_Object Vcharset_system_char_id; Lisp_Object Vcharset_ucs; Lisp_Object Vcharset_ucs_bmp; Lisp_Object Vcharset_ucs_smp; @@ -179,9 +180,10 @@ Lisp_Object put_char_ccs_code_point (Lisp_Object character, Lisp_Object ccs, Lisp_Object value) { - if (!EQ (XCHARSET_NAME (ccs), Qmap_ucs) - || !INTP (value) - || (XCHAR (character) != XINT (value))) + if ( !(EQ (XCHARSET_NAME (ccs), Qmap_ucs) + && INTP (value) && (XINT (value) < 0xF0000)) + || !INTP (value) + /* || (XCHAR (character) != XINT (value)) */ ) { Lisp_Object v = XCHARSET_DECODING_TABLE (ccs); int code_point; @@ -306,6 +308,7 @@ Lisp_Object Qascii, Qmap_cns11643_1, Qmap_cns11643_2, #ifdef UTF2000 + Qsystem_char_id, Qmap_ucs, Qucs, Qucs_bmp, Qucs_smp, @@ -2766,6 +2769,7 @@ syms_of_mule_charset (void) defsymbol (&Qmap_cns11643_1, "=cns11643-1"); defsymbol (&Qmap_cns11643_2, "=cns11643-2"); #ifdef UTF2000 + defsymbol (&Qsystem_char_id, "system-char-id"); defsymbol (&Qmap_ucs, "=ucs"); defsymbol (&Qucs, "ucs"); defsymbol (&Qucs_bmp, "ucs-bmp"); @@ -2851,6 +2855,15 @@ complex_vars_of_mule_charset (void) ease of access. */ #ifdef UTF2000 + staticpro (&Vcharset_system_char_id); + Vcharset_system_char_id = + make_charset (LEADING_BYTE_SYSTEM_CHAR_ID, Qsystem_char_id, 256, 4, + 1, 2, 0, CHARSET_LEFT_TO_RIGHT, + build_string ("SCID"), + build_string ("CHAR-ID"), + build_string ("System char-id"), + build_string (""), + Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_ucs); Vcharset_ucs = make_charset (LEADING_BYTE_UCS, Qmap_ucs, 256, 4, @@ -2859,7 +2872,7 @@ complex_vars_of_mule_charset (void) build_string ("UCS"), build_string ("ISO/IEC 10646"), build_string (""), - Qnil, 0, 0x7FFFFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL); + Qnil, 0, 0xEFFFF, 0, 0, Qnil, CONVERSION_IDENTICAL); staticpro (&Vcharset_ucs_bmp); Vcharset_ucs_bmp = make_charset (LEADING_BYTE_UCS_BMP, Qucs_bmp, 256, 2, diff --git a/src/text-coding.c b/src/text-coding.c index 7be2d3e..9b6e7dc 100644 --- a/src/text-coding.c +++ b/src/text-coding.c @@ -3295,6 +3295,7 @@ decode_add_er_char (struct decoding_stream *str, Emchar c, pat = ret; else continue; + pat = Fregexp_quote (pat); cell = Fcdr (cell); cell = Fcdr (cell); @@ -4609,7 +4610,7 @@ char_encode_utf8 (struct encoding_stream *str, Emchar ch, = CODING_SYSTEM_ISO2022_INITIAL_CHARSET (str->codesys, 0); int code_point = charset_code_point (ucs_ccs, ch, 0); - if ( (code_point < 0) || (code_point > 0x10FFFF) ) + if ( (code_point < 0) || (code_point > 0xEFFFF) ) { Lisp_Object map = CODING_SYSTEM_ISO2022_INITIAL_CHARSET (str->codesys, 1);