From 486506bf7c0e36c2ff391da822507c707fff17d0 Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 24 May 2004 11:01:29 +0000 Subject: [PATCH] Add mappings between CJK Ext B and CNS 11643 plain 5. (M-42632): Unify U-0002920B. (U-00029210): New character. (M-42643): Unify U-00029214. (M-42644): Unify U-00029217. (U-00029237): New character. (U-0002923F): New character. (U+4A4D): Unify JC3-6CBC. (U-00029250): New character. --- lisp/utf-2000/Ideograph-R176-Face.el | 367 +++++++++++++++++++++------------- 1 file changed, 224 insertions(+), 143 deletions(-) diff --git a/lisp/utf-2000/Ideograph-R176-Face.el b/lisp/utf-2000/Ideograph-R176-Face.el index 9ccd3ef..ff3cd34 100644 --- a/lisp/utf-2000/Ideograph-R176-Face.el +++ b/lisp/utf-2000/Ideograph-R176-Face.el @@ -70,42 +70,43 @@ (ideographic-strokes . 4) (total-strokes . 13) (=ucs . #x4A42) ; 䩂 - (=cns11643-4 . #x415A) ; &I-C4-415A; - (=daikanwa . 42625) ; &I-M-42625; + (->subsumptive + ((=cns11643-4 . #x415A) ; &M-42625; + (=daikanwa . 42625) ; &I-M-42625; + ) + ((=ucs@unicode . #x4A42) ; &UU+4A42; + )) )) (define-char - '((=>ucs . #x29207) ; 𩈇 - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 4) - (total-strokes . 13) - (=daikanwa . 42626) ; &M-42626; - )) -(define-char - '((morohashi-daikanwa 42626 0 0) - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 4) (total-strokes . 13) (=ucs . #x29207) ; 𩈇 - (=cns11643-4 . #x415B) ; &I-C4-415B; + (->subsumptive + ((=daikanwa . 42626) ; &M-42626; + ) + ((=cns11643-4 . #x415B) ; &C4-415B; + (=ucs@iso . #x29207) ; &C4-415B; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 4) (total-strokes . 13) - (=daikanwa . 42627) ; &M-42627; - )) -(define-char - '((morohashi-daikanwa 42627 0 0) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 4) - (total-strokes . 13) - (=cns11643-5 . #x4428) ; &C5-4428; + (=ucs . #x29208) ; 𩈈 + (->subsumptive + ((=daikanwa . 42627) ; &M-42627; + ) + ((=cns11643-5 . #x4428) ; &C5-4428; + (=ucs@iso . #x29208) ; &C5-4428; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 4) (total-strokes . 13) - (=cns11643-5 . #x4427) ; &M-42628; + (=ucs . #x29209) ; 𩈉 + (=cns11643-5 . #x4427) ; &I-C5-4427; (=daikanwa . 42628) ; &I-M-42628; )) (define-char @@ -127,14 +128,19 @@ (ideographic-strokes . 4) (total-strokes . 13) (=ucs . #x4A43) ; 䩃 - (=cns11643-3 . #x454A) ; &I-C3-454A; - (=daikanwa . 42631) ; &I-M-42631; + (->subsumptive + ((=daikanwa . 42631) ; &M-42631; + (=ucs@unicode . #x4A43) ; &M-42631; + ) + ((=cns11643-3 . #x454A) ; &C3-454A; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 4) (total-strokes . 13) - (=daikanwa . 42632) ; &M-42632; + (=ucs . #x2920B) ; 𩈋 + (=daikanwa . 42632) ; &I-M-42632; )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -147,7 +153,8 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=cns11643-5 . #x4B25) ; &M-42634; + (=ucs . #x2920E) ; 𩈎 + (=cns11643-5 . #x4B25) ; &I-C5-4B25; (=daikanwa . 42634) ; &I-M-42634; )) (define-char @@ -170,29 +177,33 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=cns11643-6 . #x6421) ; &M-42638; - (=daikanwa . 42638) ; &I-M-42638; + (=ucs . #x29210) ; 𩈐 + (=daikanwa . 42637) ; &I-M-42637; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (shinjigen-2 . 5225) - (=ucs . #x9764) ; 靤 - (=jis-x0208 . #x7052) ; &I-J90-7052; - (=cns11643-3 . #x4A4E) ; &I-C3-4A4E; - (=gt . 57239) ; &I-GT-57239; - (=gt-pj-1 . #x7052) ; &I-GT-57239; - (=daikanwa . 42639) ; &I-M-42639; + (=cns11643-6 . #x6421) ; &M-42638; + (=daikanwa . 42638) ; &I-M-42638; )) (define-char - '((=>ucs . #x9764) ; 靤 - (morohashi-daikanwa 42639 0 2) - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=gt . 57240) ; >-57240; - (=gt-pj-11 . #x3236) ; >-57240; + (=ucs . #x9764) ; 靤 + (->subsumptive + ((shinjigen-2 . 5225) + (=jis-x0208 . #x7052) ; >-57239; + (=cns11643-3 . #x4A4E) ; &I-C3-4A4E; + (=gt . 57239) ; &I-GT-57239; + (=gt-pj-1 . #x7052) ; &I-GT-57239; + (=daikanwa . 42639) ; &I-M-42639; + (=ucs@unicode . #x9764) ; >-57239; + ) + ((=gt . 57240) ; >-57240; + (=gt-pj-11 . #x3236) ; >-57240; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -227,54 +238,57 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=daikanwa . 42643) ; &M-42643; + (=ucs . #x29214) ; 𩈔 + (=daikanwa . 42643) ; &I-M-42643; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=daikanwa . 42644) ; &M-42644; + (=ucs . #x29217) ; 𩈗 + (=daikanwa . 42644) ; &I-M-42644; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 5) (total-strokes . 14) - (=cns11643-5 . #x4B24) ; &C5-4B24; + (=ucs . #x29212) ; 𩈒 + (=cns11643-5 . #x4B24) ; &I-C5-4B24; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 6) (total-strokes . 15) (=ucs . #x29219) ; 𩈙 - (=daikanwa . 42645) ; &I-M-42645; - )) -(define-char - '((=>ucs . #x29219) ; 𩈙 - (morohashi-daikanwa 42645 0 0) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 6) - (total-strokes . 15) - (=cns11643-4 . #x4E4E) ; &C4-4E4E; + (->subsumptive + ((=daikanwa . 42645) ; &M-42645; + (=ucs@iso . #x29219) ; &M-42645; + ) + ((=cns11643-4 . #x4E4E) ; &C4-4E4E; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 6) (total-strokes . 15) - (=cns11643-5 . #x5246) ; &M-42646; + (=ucs . #x2921A) ; 𩈚 + (=cns11643-5 . #x5246) ; &I-C5-5246; (=daikanwa . 42646) ; &I-M-42646; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 6) (total-strokes . 15) - (=cns11643-5 . #x5248) ; &M-42647; + (=ucs . #x2921B) ; 𩈛 + (=cns11643-5 . #x5248) ; &I-C5-5248; (=daikanwa . 42647) ; &I-M-42647; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 6) (total-strokes . 15) - (=cns11643-5 . #x5247) ; &M-42648; + (=ucs . #x2921C) ; 𩈜 + (=cns11643-5 . #x5247) ; &I-C5-5247; (=daikanwa . 42648) ; &I-M-42648; )) (define-char @@ -329,42 +343,50 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=cns11643-5 . #x5950) ; &M-42654; + (=ucs . #x29221) ; 𩈡 + (=cns11643-5 . #x5950) ; &I-C5-5950; (=daikanwa . 42654) ; &I-M-42654; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=daikanwa . 42655) ; &M-42655; - )) -(define-char - '((morohashi-daikanwa 42655 0 0) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 7) - (total-strokes . 16) - (=cns11643-5 . #x594F) ; &C5-594F; + (=ucs . #x29222) ; 𩈢 + (->subsumptive + ((=daikanwa . 42655) ; &M-42655; + ) + ((=cns11643-5 . #x594F) ; &C5-594F; + (=ucs@iso . #x29222) ; &C5-594F; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=cns11643-5 . #x5954) ; &M-42656; + (=ucs . #x29223) ; 𩈣 + (=cns11643-5 . #x5954) ; &I-C5-5954; (=daikanwa . 42656) ; &I-M-42656; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=cns11643-5 . #x5951) ; &M-42657; + (=ucs . #x29224) ; 𩈤 + (=cns11643-5 . #x5951) ; &I-C5-5951; (=daikanwa . 42657) ; &I-M-42657; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=cns11643-5 . #x5952) ; &M-42658; - (=daikanwa . 42658) ; &I-M-42658; + (=ucs . #x29225) ; 𩈥 + (->subsumptive + ((=daikanwa . 42658) ; &M-42658; + ) + ((=cns11643-5 . #x5952) ; &C5-5952; + ) + ((=ucs@iso . #x29225) ; &UU+29225; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -390,7 +412,8 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 7) (total-strokes . 16) - (=cns11643-5 . #x5953) ; &M-42661; + (=ucs . #x29226) ; 𩈦 + (=cns11643-5 . #x5953) ; &I-C5-5953; (=daikanwa . 42661) ; &I-M-42661; )) (define-char @@ -411,8 +434,13 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 8) (total-strokes . 17) - (=cns11643-5 . #x5F5F) ; &M-42664; - (=daikanwa . 42664) ; &I-M-42664; + (=ucs . #x2922C) ; 𩈬 + (->subsumptive + ((=daikanwa . 42664) ; &M-42664; + ) + ((=cns11643-5 . #x5F5F) ; &C5-5F5F; + (=ucs@iso . #x2922C) ; &C5-5F5F; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -426,34 +454,37 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 8) (total-strokes . 17) - (=cns11643-5 . #x5F60) ; &M-42666; - (=daikanwa . 42666) ; &I-M-42666; + (=ucs . #x2922D) ; 𩈭 + (->subsumptive + ((=daikanwa . 42666) ; &M-42666; + ) + ((=cns11643-5 . #x5F60) ; &C5-5F60; + (=ucs@iso . #x2922D) ; &C5-5F60; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 8) (total-strokes . 17) - (=daikanwa . 42667) ; &M-42667; - )) -(define-char - '((morohashi-daikanwa 42667 0 2) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 8) - (total-strokes . 17) - (=cns11643-5 . #x5F62) ; &C5-5F62; + (=ucs . #x2922E) ; 𩈮 + (->subsumptive + ((=daikanwa . 42667) ; &M-42667; + ) + ((=cns11643-5 . #x5F62) ; &C5-5F62; + (=ucs@iso . #x2922E) ; &C5-5F62; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 8) (total-strokes . 17) - (=daikanwa . 42668) ; &M-42668; - )) -(define-char - '((morohashi-daikanwa 42668 0 0) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 8) - (total-strokes . 17) - (=cns11643-5 . #x5F61) ; &C5-5F61; + (=ucs . #x2922F) ; 𩈯 + (->subsumptive + ((=daikanwa . 42668) ; &M-42668; + (=ucs@iso . #x2922F) ; &M-42668; + ) + ((=cns11643-5 . #x5F61) ; &C5-5F61; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -479,7 +510,8 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 9) (total-strokes . 18) - (=cns11643-5 . #x6572) ; &M-42669; + (=ucs . #x29232) ; 𩈲 + (=cns11643-5 . #x6572) ; &I-C5-6572; (=daikanwa . 42669) ; &I-M-42669; )) (define-char @@ -493,50 +525,67 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 9) (total-strokes . 18) - (=cns11643-5 . #x6570) ; &M-42671; - (=daikanwa . 42671) ; &I-M-42671; + (=ucs . #x29234) ; 𩈴 + (->subsumptive + ((=daikanwa . 42671) ; &M-42671; + ) + ((=cns11643-5 . #x6570) ; &C5-6570; + (=ucs@iso . #x29234) ; &C5-6570; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 9) (total-strokes . 18) - (=cns11643-5 . #x6571) ; &M-42672; + (=ucs . #x29235) ; 𩈵 + (=cns11643-5 . #x6571) ; &I-C5-6571; (=daikanwa . 42672) ; &I-M-42672; )) (define-char - '((=>ucs . #x29236) ; 𩈶 - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 9) (total-strokes . 18) - (=cns11643-4 . #x5E39) ; &M-42673; - (=daikanwa . 42673) ; &I-M-42673; + (=ucs . #x29236) ; 𩈶 + (->subsumptive + ((=cns11643-4 . #x5E39) ; &M-42673; + (=daikanwa . 42673) ; &I-M-42673; + ) + ((=ucs@iso . #x29236) ; &UU+29236; + )) )) (define-char - '((morohashi-daikanwa 42673 0 0) - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 9) (total-strokes . 18) - (=ucs . #x29236) ; 𩈶 + (=ucs . #x29237) ; 𩈷 + (=daikanwa . 42674) ; &I-M-42674; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 10) (total-strokes . 19) - (=cns11643-5 . #x6A4B) ; &M-42675; + (=ucs . #x29238) ; 𩈸 + (=cns11643-5 . #x6A4B) ; &I-C5-6A4B; (=daikanwa . 42675) ; &I-M-42675; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 10) (total-strokes . 19) - (=cns11643-5 . #x6A4A) ; &M-42676; - (=daikanwa . 42676) ; &I-M-42676; + (=ucs . #x29239) ; 𩈹 + (->subsumptive + ((=daikanwa . 42676) ; &M-42676; + ) + ((=cns11643-5 . #x6A4A) ; &C5-6A4A; + (=ucs@iso . #x29239) ; &C5-6A4A; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 11) (total-strokes . 20) - (=cns11643-5 . #x6E47) ; &M-42678; + (=ucs . #x2923B) ; 𩈻 + (=cns11643-5 . #x6E47) ; &I-C5-6E47; (=daikanwa . 42678) ; &I-M-42678; )) (define-char @@ -544,14 +593,20 @@ (ideographic-strokes . 11) (total-strokes . 20) (=ucs . #x4A4B) ; 䩋 - (=cns11643-4 . #x647C) ; &I-C4-647C; - (=daikanwa . 42679) ; &I-M-42679; + (->subsumptive + ((=daikanwa . 42679) ; &M-42679; + ) + ((=cns11643-4 . #x647C) ; &C4-647C; + ) + ((=ucs@unicode . #x4A4B) ; &UU+4A4B; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 11) (total-strokes . 20) - (=cns11643-5 . #x6E46) ; &M-42680; + (=ucs . #x2923C) ; 𩈼 + (=cns11643-5 . #x6E46) ; &I-C5-6E46; (=daikanwa . 42680) ; &I-M-42680; )) (define-char @@ -563,9 +618,17 @@ )) (define-char '((ideographic-radical . 176) ; ⾯ + (ideographic-strokes . 11) + (total-strokes . 20) + (=ucs . #x2923F) ; 𩈿 + (=daikanwa . 42682) ; &I-M-42682; + )) +(define-char + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 12) (total-strokes . 21) - (=cns11643-5 . #x7164) ; &M-42683; + (=ucs . #x29241) ; 𩉁 + (=cns11643-5 . #x7164) ; &I-C5-7164; (=daikanwa . 42683) ; &I-M-42683; )) (define-char @@ -583,19 +646,16 @@ (=daikanwa . 42685) ; &I-M-42685; )) (define-char - '((=>ucs . #x4A4C) ; 䩌 - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 12) - (total-strokes . 21) - (=daikanwa . 42686) ; &M-42686; - )) -(define-char - '((morohashi-daikanwa 42686 0 1) - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 12) (total-strokes . 21) (=ucs . #x4A4C) ; 䩌 - (=cns11643-4 . #x676E) ; &I-C4-676E; + (->subsumptive + ((=daikanwa . 42686) ; &M-42686; + ) + ((=cns11643-4 . #x676E) ; &C4-676E; + (=ucs@unicode . #x4A4C) ; &C4-676E; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -604,19 +664,19 @@ (=ucs . #x4A4D) ; 䩍 (=cns11643-5 . #x7163) ; &I-C5-7163; (=daikanwa . 42687) ; &I-M-42687; + (=jef-china3 . #x6CBC) ; &I-JC3-6CBC; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 12) (total-strokes . 21) - (=daikanwa . 42688) ; &M-42688; - )) -(define-char - '((morohashi-daikanwa 42688 0 2) - (ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 12) - (total-strokes . 21) - (=cns11643-5 . #x7166) ; &C5-7166; + (=ucs . #x29243) ; 𩉃 + (->subsumptive + ((=daikanwa . 42688) ; &M-42688; + ) + ((=cns11643-5 . #x7166) ; &C5-7166; + (=ucs@iso . #x29243) ; &C5-7166; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -631,8 +691,13 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 12) (total-strokes . 21) - (=cns11643-5 . #x7165) ; &M-42690; - (=daikanwa . 42690) ; &I-M-42690; + (=ucs . #x29244) ; 𩉄 + (->subsumptive + ((=daikanwa . 42690) ; &M-42690; + ) + ((=cns11643-5 . #x7165) ; &C5-7165; + (=ucs@iso . #x29244) ; &C5-7165; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -679,36 +744,51 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 14) (total-strokes . 23) - (=cns11643-5 . #x7664) ; &M-42697; + (=ucs . #x2924D) ; 𩉍 + (=cns11643-5 . #x7664) ; &I-C5-7664; (=daikanwa . 42697) ; &I-M-42697; )) (define-char '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 14) (total-strokes . 23) - (shinjigen-2 . 9043) (=ucs . #x9768) ; 靨 - (=jis-x0208 . #x7054) ; &I-J90-7054; - (=gb12345 . #x584C) ; 靨 - (=gt . 57308) ; &I-GT-57308; - (=gt-pj-1 . #x7054) ; &I-GT-57308; - (=daikanwa . 42698) ; &I-M-42698; + (->subsumptive + ((shinjigen-2 . 9043) + (=jis-x0208 . #x7054) ; >-57308; + (=gb12345 . #x584C) ; >-57308; + (=gt . 57308) ; &I-GT-57308; + (=gt-pj-1 . #x7054) ; &I-GT-57308; + (=daikanwa . 42698) ; &I-M-42698; + (=ucs@unicode . #x9768) ; >-57308; + ) + ((=cns11643-1 . #x7C4E) ; &C1-7C4E; + )) )) (define-char - '((=>ucs . #x9768) ; 靨 - (morohashi-daikanwa 42698 0 0) - (ideographic-radical . 176) ; ⾯ + '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 14) (total-strokes . 23) - (=cns11643-1 . #x7C4E) ; &C1-7C4E; + (=ucs . #x29250) ; 𩉐 + (->subsumptive + ((=daikanwa . 42699) ; &M-42699; + ) + ((=ucs@iso . #x29250) ; &UU+29250; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ - (ideographic-strokes . 15) - (total-strokes . 24) (=ucs . #x4A4F) ; 䩏 - (=cns11643-4 . #x6C33) ; &I-C4-6C33; - (=daikanwa . 42701) ; &I-M-42701; + (->subsumptive + ((ideographic-strokes . 15) + (total-strokes . 24) + (=cns11643-4 . #x6C33) ; &M-42701; + (=daikanwa . 42701) ; &I-M-42701; + ) + ((ideographic-strokes . 14) + (total-strokes . 23) + (=ucs@unicode . #x4A4F) ; &UU+4A4F; + )) )) (define-char '((ideographic-radical . 176) ; ⾯ @@ -721,7 +801,8 @@ '((ideographic-radical . 176) ; ⾯ (ideographic-strokes . 17) (total-strokes . 26) - (=cns11643-5 . #x7A45) ; &M-42704; + (=ucs . #x29254) ; 𩉔 + (=cns11643-5 . #x7A45) ; &I-C5-7A45; (=daikanwa . 42704) ; &I-M-42704; )) (define-char -- 1.7.10.4