From 03d2300de3401eceb614494125551dd934b421aa Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 26 Jul 2016 22:58:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?updated=20=E5=88=AB=E7=A7=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 117 +++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 50 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index a3c6514..494afaf 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -165,30 +165,47 @@ '':['自己','我'], //本家 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爷子'], - 'f,f':['爷爷','祖父','阿爷'], - 'f,f,f':['曾祖父','太爷','太爷爷','太公'], + 'f,f':['爷爷','祖父','阿爷','奶爷'], + 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], 'f,f,f,f':['高祖父'], 'f,f,f,m':['高祖母'], - 'f,f,f,ob':['伯公太'], - 'f,f,f,ob,w':['伯婆太'], - 'f,f,f,lb':['叔公太'], - 'f,f,f,lb,w':['叔婆太'], + 'f,f,f,ob':['曾伯祖父','伯公太'], + 'f,f,f,ob,w':['曾伯祖母','伯婆太'], + 'f,f,f,lb':['曾叔祖父','叔公太'], + 'f,f,f,lb,w':['曾叔祖母','叔婆太'], 'f,f,f,xs':['姑婆太'], 'f,f,f,xs,h':['姑丈公太'], - 'f,f,m':['曾祖母','太奶奶','太婆'], + 'f,f,f,xs,s&o':['表伯祖父'], + 'f,f,f,xs,s&o,w':['表伯祖母'], + 'f,f,f,xs,s&l':['表叔祖父'], + 'f,f,f,xs,s&l,w':['表叔祖母'], + 'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'], + 'f,f,m,xb':['太舅公','太舅爷'], + 'f,f,m,xb,w':['太舅婆'], + 'f,f,m,xb,s&o':['表伯祖父'], + 'f,f,m,xb,s&o,w':['表伯祖母'], + 'f,f,m,xb,s&l':['表叔祖父'], + 'f,f,m,xb,s&l,w':['表叔祖母'], + 'f,f,m,xs':['太姨奶','曾姨奶奶'], + 'f,f,m,xs,h':['太姨爷'], + 'f,f,m,xs,s&o':['表伯祖父'], + 'f,f,m,xs,s&o,w':['表伯祖母'], + 'f,f,m,xs,s&l':['表叔祖父'], + 'f,f,m,xs,s&l,w':['表叔祖母'], 'f,f,xb':['堂祖父','二爷爷','三爷爷'], 'f,f,xb,w':['堂祖母'], - 'f,f,xb,s&o':['堂伯'], + 'f,f,xb,s&o':['堂伯','堂伯父'], + 'f,f,xb,s&o,w':['堂伯母'], 'f,f,xb,s&l':['堂叔'], - 'f,f,xb,s,w':['堂婶'], + 'f,f,xb,s,w':['堂婶','堂叔母','堂婶母'], 'f,f,xb,d':['堂姑'], 'f,f,xb,d,h':['堂姑丈'], - 'f,f,ob':['伯公','大爷爷','大爷','堂祖父'], - 'f,f,ob,w':['伯婆','大奶奶','堂祖母'], - 'f,f,lb':['叔公','小爷爷','堂祖父'], - 'f,f,lb,w':['叔婆','小奶奶','堂祖母'], - 'f,f,xs':['姑婆','姑奶奶'], - 'f,f,xs,h':['姑丈公','姑爷爷'], + 'f,f,ob':['伯祖父','伯公','大爷爷','大爷','堂祖父','伯爷爷','伯老爷'], + 'f,f,ob,w':['伯祖母','伯婆','大奶奶','堂祖母'], + 'f,f,lb':['叔祖父','叔公','小爷爷','堂祖父','叔爷爷','叔老爷'], + 'f,f,lb,w':['叔祖母','叔婆','小奶奶','堂祖母','叔奶奶'], + 'f,f,xs':['姑婆','姑祖母','姑奶奶'], + 'f,f,xs,h':['姑丈公','姑祖父','姑爷爷','姑奶爷','姑老爷'], 'f,f,xs,s&o':['表伯','表伯父'], 'f,f,xs,s&o,w':['表伯母'], 'f,f,xs,s&l':['表叔','表叔父'], @@ -199,15 +216,15 @@ 'f,m,f':['曾外祖父','外太公'], 'f,m,m':['曾外祖母','外太婆'], 'f,m,xb':['舅公','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅祖父'], - 'f,m,xb,w':['舅婆','舅奶奶'], + 'f,m,xb,w':['舅婆','舅奶奶','舅祖母'], 'f,m,xb,s&o':['表伯','表伯父'], 'f,m,xb,s&o,w':['表伯母'], 'f,m,xb,s&l':['表叔','表叔父'], 'f,m,xb,s&l,w':['表婶','表叔母'], 'f,m,xb,d':['表姑'], 'f,m,xb,d,h':['表姑丈'], - 'f,m,xs':['姨婆','姨奶奶'], - 'f,m,xs,h':['姨丈公','姨爷爷','姨爷'], + 'f,m,xs':['姨婆','姨奶奶','姨祖父'], + 'f,m,xs,h':['姨丈公','姨爷爷','姨祖母','姨爷','姨老爷','姨奶爷'], 'f,m,xs,s&o':['表伯','表伯父'], 'f,m,xs,s&o,w':['表伯母'], 'f,m,xs,s&l':['表叔','表叔父'], @@ -230,8 +247,8 @@ 'f,xb,d,d':['堂外甥女'], 'f,ob':['伯父','伯伯','大伯','二伯','三伯'], 'f,ob,w':['伯母','大娘'], - 'f,lb':['叔叔','叔父','阿叔','叔','二叔','三叔'], - 'f,lb,w':['婶婶','婶母','阿婶','家婶','婶'], + 'f,lb':['叔叔','叔父','阿叔','叔','二叔','三叔','仲父'], + 'f,lb,w':['婶婶','婶母','阿婶','家婶','婶','季母'], //姑家 'f,xs':['姑妈','姑母','姑姑','姑'], 'f,xs,h':['姑丈','姑父','姑夫'], @@ -259,31 +276,31 @@ 'm,f,xb,s,w':['堂舅妈','堂舅母'], 'm,f,xb,d':['堂姨'], 'm,f,xb,d,h':['堂姨丈'], - 'm,f,ob':['外伯祖父','大姥爷','外伯祖'], - 'm,f,ob,w':['外伯祖母','大姥姥','外姆婆'], - 'm,f,lb':['外叔祖父','小姥爷','外叔祖'], - 'm,f,lb,w':['外叔祖母','小姥姥','外姆婆'], + 'm,f,ob':['外伯祖父','伯姥爷','大姥爷','外伯祖'], + 'm,f,ob,w':['外伯祖母','伯姥姥','大姥姥','外姆婆'], + 'm,f,lb':['外叔祖父','叔姥爷','小姥爷','外叔祖'], + 'm,f,lb,w':['外叔祖母','叔姥姥','小姥姥','外姆婆'], 'm,f,xs':['外姑祖父','姑姥姥','外太姑母'], 'm,f,xs,h':['外姑祖母','姑姥爷','外太姑父'], - 'm,f,xs,s':['表舅'], - 'm,f,xs,s,w':['表舅妈'], - 'm,f,xs,d':['表姨'], - 'm,f,xs,d,h':['表姨丈'], + 'm,f,xs,s':['表舅','表舅父'], + 'm,f,xs,s,w':['表舅妈','表舅母'], + 'm,f,xs,d':['表姨','表姨母'], + 'm,f,xs,d,h':['表姨丈','表姨父'], 'm,m':['外婆','姥姥','阿婆'], 'm,m,f':['外曾外祖父','外太外公','太姥爷'], 'm,m,m':['外曾外祖母','外太外婆','太姥姥'], - 'm,m,xb':['外舅公','外舅祖父','舅姥爷','舅外祖父','舅外公','舅爷爷','舅公'], + 'm,m,xb':['外舅公','外舅祖父','舅姥爷','舅外祖父','舅外公'], 'm,m,xb,w':['外舅婆','外舅祖母','舅姥姥'], - 'm,m,xb,s':['表舅'], - 'm,m,xb,s,w':['表舅妈'], - 'm,m,xb,d':['表姨'], - 'm,m,xb,d,h':['表姨丈'], + 'm,m,xb,s':['表舅','表舅父'], + 'm,m,xb,s,w':['表舅妈','表舅母'], + 'm,m,xb,d':['表姨','表姨母'], + 'm,m,xb,d,h':['表姨丈','表姨父'], 'm,m,xs':['外姨婆','外姨祖父','姨姥姥','姨婆'], 'm,m,xs,w':['外姨丈公','外姨祖母','姨姥爷'], - 'm,m,xs,s':['表舅'], - 'm,m,xs,s,w':['表舅妈'], - 'm,m,xs,d':['表姨'], - 'm,m,xs,d,h':['表姨丈'], + 'm,m,xs,s':['表舅','表舅父'], + 'm,m,xs,s,w':['表舅妈','表舅母'], + 'm,m,xs,d':['表姨','表姨母'], + 'm,m,xs,d,h':['表姨丈','表姨父'], //舅家 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','二舅','三舅'], 'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','二舅妈','三舅妈'], @@ -342,7 +359,7 @@ 'h,m,xb,w':['舅婆'], 'h,m,xs':['姨婆'], 'h,m,xs,h':['姨公'], - 'h,xb,s':['侄子'], + 'h,xb,s':['侄子','侄儿'], 'h,xb,s,w':['侄媳','侄媳妇'], 'h,xb,s,s':['侄孙','侄孙子'], 'h,xb,s,s,w':['侄孙媳'], @@ -354,16 +371,16 @@ 'h,xb,d,s,w':['外侄媳妇'], 'h,xb,d,d':['外侄孙女'], 'h,xb,d,d,h':['外侄孙女婿'], - 'h,ob':['大伯子','夫兄'], - 'h,ob,w':['大婶子','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], - 'h,lb':['小叔子'], - 'h,lb,w':['小婶子','妯娌'], + 'h,ob':['大伯子','大伯哥','夫兄'], + 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], + 'h,lb':['小叔子','小叔弟'], + 'h,lb,w':['小婶子','小叔妇','小叔媳妇','妯娌'], 'h,xs,s':['外甥'], 'h,xs,d':['外甥女'], 'h,os':['大姑子','大姑','大娘姑'], - 'h,os,h':['大姑夫','姊丈'], + 'h,os,h':['大姑夫','姊丈','大姑姐夫'], 'h,ls':['小姑子','小姑','姑仔'], - 'h,ls,h':['小姑夫'], + 'h,ls,h':['小姑夫','小姑妹夫'], //岳家 'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人'], 'w,f':['岳父','老丈人','丈人','泰山','妻父'], @@ -418,9 +435,9 @@ 'w,xb,d,d':['外侄孙女'], 'w,xb,d,d,h':['外侄孙女婿'], 'w,ob':['大舅哥','大舅子','内兄'], - 'w,ob,w':['舅嫂','大妗子','内嫂'], + 'w,ob,w':['舅嫂','大舅妇','大舅媳妇','大妗子','内嫂'], 'w,lb':['小舅子','内弟'], - 'w,lb,w':['舅弟媳','小妗子'], + 'w,lb,w':['舅弟媳','小舅妇','小舅媳妇','小妗子'], 'w,xs,s':['姨甥','妻外甥'], 'w,xs,s,w':['姨甥媳妇'], 'w,xs,s,s':['姨甥孙'], @@ -434,14 +451,14 @@ 'w,xs,d,d':['姨甥孙女'], 'w,xs,d,d,h':['姨甥孙女婿'], 'w,os':['大姨子','大姨姐','妻姐'], - 'w,os,h':['大姨夫','襟兄','连襟'], + 'w,os,h':['大姨夫','大姨姐夫','襟兄','连襟'], 'w,ls':['小姨子','小姨姐','妻妹','小妹儿'], - 'w,ls,h':['小姨夫','襟弟','连襟'], + 'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟'], //旁支 'xb':['兄弟'], 'xb,w,f':['姻世伯','亲家爷','亲爹','亲伯'], 'xb,w,m':['姻伯母','亲家娘','亲娘'], - 'xb,s':['侄子'], + 'xb,s':['侄子','侄儿'], 'xb,s,w':['侄媳','侄媳妇'], 'xb,s,s':['侄孙','侄孙子'], 'xb,s,s,w':['侄孙媳'], @@ -496,7 +513,7 @@ 's,d,s':['曾外孙'], 's,d,d':['曾外孙女'], 'd':['女儿','千金','女','阿女','女女','掌上明珠'], - 'd,h':['女婿'], + 'd,h':['女婿','女婿子','女婿儿'], 'd,h,xb':['姻侄'], 'd,h,xs':['姻侄女'], 'd,s':['外孙'], From 03bc6950ad49240b81da557c5dc931920c273125 Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 26 Jul 2016 23:27:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?updated=20=E5=88=AB=E7=A7=B0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index 494afaf..2852234 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -167,14 +167,14 @@ 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爷子'], 'f,f':['爷爷','祖父','阿爷','奶爷'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], - 'f,f,f,f':['高祖父'], - 'f,f,f,m':['高祖母'], + 'f,f,f,f':['高祖父','老太爷'], + 'f,f,f,m':['高祖母','老太太'], 'f,f,f,ob':['曾伯祖父','伯公太'], 'f,f,f,ob,w':['曾伯祖母','伯婆太'], 'f,f,f,lb':['曾叔祖父','叔公太'], 'f,f,f,lb,w':['曾叔祖母','叔婆太'], - 'f,f,f,xs':['姑婆太'], - 'f,f,f,xs,h':['姑丈公太'], + 'f,f,f,xs':['太姑婆','姑婆太','曾祖姑母'], + 'f,f,f,xs,h':['太姑丈公','姑丈公太','曾祖姑丈'], 'f,f,f,xs,s&o':['表伯祖父'], 'f,f,f,xs,s&o,w':['表伯祖母'], 'f,f,f,xs,s&l':['表叔祖父'], @@ -204,8 +204,8 @@ 'f,f,ob,w':['伯祖母','伯婆','大奶奶','堂祖母'], 'f,f,lb':['叔祖父','叔公','小爷爷','堂祖父','叔爷爷','叔老爷'], 'f,f,lb,w':['叔祖母','叔婆','小奶奶','堂祖母','叔奶奶'], - 'f,f,xs':['姑婆','姑祖母','姑奶奶'], - 'f,f,xs,h':['姑丈公','姑祖父','姑爷爷','姑奶爷','姑老爷'], + 'f,f,xs':['姑婆','姑祖母','祖姑母','姑奶奶'], + 'f,f,xs,h':['姑丈公','姑祖父','祖姑丈','姑爷爷','姑奶爷','姑老爷'], 'f,f,xs,s&o':['表伯','表伯父'], 'f,f,xs,s&o,w':['表伯母'], 'f,f,xs,s&l':['表叔','表叔父'], @@ -216,7 +216,7 @@ 'f,m,f':['曾外祖父','外太公'], 'f,m,m':['曾外祖母','外太婆'], 'f,m,xb':['舅公','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅祖父'], - 'f,m,xb,w':['舅婆','舅奶奶','舅祖母'], + 'f,m,xb,w':['舅婆','舅奶奶','舅祖母','妗婆'], 'f,m,xb,s&o':['表伯','表伯父'], 'f,m,xb,s&o,w':['表伯母'], 'f,m,xb,s&l':['表叔','表叔父'], @@ -269,8 +269,8 @@ //外家 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'], 'm,f':['外公','姥爷','阿公'], - 'm,f,f':['外曾祖父','外太祖父','太姥爷'], - 'm,f,m':['外曾祖母','外太祖母','太姥姥'], + 'm,f,f':['外曾祖父','外太祖父','太外祖父','太姥爷'], + 'm,f,m':['外曾祖母','外太祖母','太外祖母','太姥姥'], 'm,f,xb':['xx姥爷','二姥爷','三姥爷'], 'm,f,xb,s':['堂舅','堂舅父'], 'm,f,xb,s,w':['堂舅妈','堂舅母'], @@ -284,7 +284,7 @@ 'm,f,xs,h':['外姑祖母','姑姥爷','外太姑父'], 'm,f,xs,s':['表舅','表舅父'], 'm,f,xs,s,w':['表舅妈','表舅母'], - 'm,f,xs,d':['表姨','表姨母'], + 'm,f,xs,d':['表姨','表姨母','表姨妈','表阿姨'], 'm,f,xs,d,h':['表姨丈','表姨父'], 'm,m':['外婆','姥姥','阿婆'], 'm,m,f':['外曾外祖父','外太外公','太姥爷'], @@ -293,13 +293,13 @@ 'm,m,xb,w':['外舅婆','外舅祖母','舅姥姥'], 'm,m,xb,s':['表舅','表舅父'], 'm,m,xb,s,w':['表舅妈','表舅母'], - 'm,m,xb,d':['表姨','表姨母'], + 'm,m,xb,d':['表姨','表姨母','表姨妈','表阿姨'], 'm,m,xb,d,h':['表姨丈','表姨父'], 'm,m,xs':['外姨婆','外姨祖父','姨姥姥','姨婆'], 'm,m,xs,w':['外姨丈公','外姨祖母','姨姥爷'], 'm,m,xs,s':['表舅','表舅父'], 'm,m,xs,s,w':['表舅妈','表舅母'], - 'm,m,xs,d':['表姨','表姨母'], + 'm,m,xs,d':['表姨','表姨母','表姨妈','表阿姨'], 'm,m,xs,d,h':['表姨丈','表姨父'], //舅家 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','二舅','三舅'],