Merge branch 'gh-pages' of https://github.com/mumuy/relationship into gh-pages
Conflicts: dist/relationship.min.js
This commit is contained in:
mumuy
commit
630d32d9b8
54
dist/relationship.js
vendored
54
dist/relationship.js
vendored
@ -184,10 +184,10 @@
|
||||
'f,f,f,m':['高祖母','老太太','祖太太'],
|
||||
'f,f,f,m,xs':['姨高祖母'],
|
||||
'f,f,f,m,xs,h':['姨高祖父'],
|
||||
'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,xb,s&o':['堂伯祖父'],
|
||||
'f,f,f,xb,s&o,w':['堂伯祖母'],
|
||||
'f,f,f,xb,s&l':['堂叔祖父'],
|
||||
@ -200,8 +200,8 @@
|
||||
'f,f,f,xb,s,s,s&l':['族弟'],
|
||||
'f,f,f,xb,d':['堂姑祖母'],
|
||||
'f,f,f,xb,d,h':['堂姑祖父'],
|
||||
'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':['表叔祖父'],
|
||||
@ -253,8 +253,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':['姑表叔父','表叔父','表叔爸','表叔'],
|
||||
@ -302,8 +302,8 @@
|
||||
'f,m,xb,d,h':['舅表姑父','表姑爸','表姑父','表姑丈'],
|
||||
'f,m,xb,d,s':['从表兄弟'],
|
||||
'f,m,xb,d,d':['从表姐妹'],
|
||||
'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':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'],
|
||||
@ -333,11 +333,11 @@
|
||||
'f,xb,d,s':['堂外甥'],
|
||||
'f,xb,d,d':['堂外甥女'],
|
||||
'f,ob':['伯父','伯伯','大伯','x伯'],
|
||||
'f,ob,w':['伯母','大娘'],
|
||||
'f,ob,w':['伯母','大娘','大妈','x妈'],
|
||||
'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'],
|
||||
'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','婶'],
|
||||
'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','x婶','婶'],
|
||||
//姑家
|
||||
'f,xs':['姑妈','姑母','姑姑','姑娘','姑'],
|
||||
'f,xs':['姑妈','姑母','姑姑','姑娘','大姑妈','x姑妈','姑'],
|
||||
'f,xs,h':['姑丈','姑父','姑爸','姑夫'],
|
||||
'f,xs,s&o':['姑表哥','表哥'],
|
||||
'f,xs,s&o,w':['姑表嫂','表嫂'],
|
||||
@ -465,7 +465,7 @@
|
||||
'm,m,xs,d,s':['从表兄弟'],
|
||||
'm,m,xs,d,d':['从表姐妹'],
|
||||
//舅家
|
||||
'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','x舅'],
|
||||
'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
|
||||
'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'],
|
||||
'm,xb,s&o':['舅表哥','表哥'],
|
||||
'm,xb,s&o,w':['舅表嫂','表嫂'],
|
||||
@ -519,10 +519,18 @@
|
||||
'm,ls':['小姨','小姨妈','姨仔'],
|
||||
'm,ls,h':['小姨父','小姨丈'],
|
||||
//婆家
|
||||
'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','夫婿','爱人'],
|
||||
'h,f':['公公'],
|
||||
'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','夫婿','爱人','老伴'],
|
||||
'h,f':['公公','翁亲'],
|
||||
'h,f,f':['祖翁'],
|
||||
'h,f,f,ob':['伯祖翁'],
|
||||
'h,f,f,ob,w':['伯祖婆'],
|
||||
'h,f,f,lb':['叔祖翁'],
|
||||
'h,f,f,lb,w':['叔祖婆'],
|
||||
'h,f,f,f':['太公翁'],
|
||||
'h,f,f,f,ob':['太伯翁'],
|
||||
'h,f,f,f,ob,w':['太姆婆'],
|
||||
'h,f,f,f,lb':['太叔翁'],
|
||||
'h,f,f,f,lb,w':['太婶婆'],
|
||||
'h,f,f,m':['太奶亲'],
|
||||
'h,f,m':['祖婆'],
|
||||
'h,f,ob':['伯翁'],
|
||||
@ -543,7 +551,7 @@
|
||||
'h,f,xs,d&l':['姑表小姑妹'],
|
||||
'h,f,xs,d&l,h':['姑表小姑妹夫'],
|
||||
'h,f,xs,h':['姑公'],
|
||||
'h,m':['婆婆'],
|
||||
'h,m':['婆婆','姑亲'],
|
||||
'h,m,xb':['舅公'],
|
||||
'h,m,xb,w':['舅婆'],
|
||||
'h,m,xs':['姨婆'],
|
||||
@ -589,7 +597,7 @@
|
||||
'h,ls':['小姑子','小姑','姑仔'],
|
||||
'h,ls,h':['小姑夫','小姑妹夫'],
|
||||
//岳家
|
||||
'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人'],
|
||||
'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'],
|
||||
'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'],
|
||||
'w,f,f':['太岳父'],
|
||||
'w,f,f,ob':['太伯岳'],
|
||||
@ -686,7 +694,7 @@
|
||||
'xb,d,d':['外侄孙女'],
|
||||
'xb,d,d,h':['外侄孙女婿'],
|
||||
'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥'],
|
||||
'ob,w':['嫂子','大嫂','嫂','阿嫂'],
|
||||
'ob,w':['嫂子','大嫂','x嫂','嫂','阿嫂'],
|
||||
'ob,w,f':['姻伯父'],
|
||||
'ob,w,m':['姻伯母'],
|
||||
'lb':['弟弟','弟','细佬','老弟'],
|
||||
@ -753,14 +761,14 @@
|
||||
'd,d,s':['外曾外孙'],
|
||||
'd,d,d':['外曾外孙女'],
|
||||
//亲家
|
||||
's,w,m':['亲家母'],
|
||||
's,w,f':['亲家公','亲家翁'],
|
||||
's,w,m':['亲家母','亲家'],
|
||||
's,w,f':['亲家公','亲家翁','亲家'],
|
||||
's,w,f,f':['太姻翁'],
|
||||
's,w,f,m':['太姻姆'],
|
||||
's,w,f,ob':['姻兄'],
|
||||
's,w,f,lb':['姻弟'],
|
||||
'd,h,m':['亲家母'],
|
||||
'd,h,f':['亲家公','亲家翁'],
|
||||
'd,h,m':['亲家母','亲家'],
|
||||
'd,h,f':['亲家公','亲家翁','亲家'],
|
||||
'd,h,f,f':['太姻翁'],
|
||||
'd,h,f,m':['太姻姆'],
|
||||
'd,h,f,ob':['姻兄'],
|
||||
|
||||
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
@ -184,10 +184,10 @@
|
||||
'f,f,f,m':['高祖母','老太太','祖太太'],
|
||||
'f,f,f,m,xs':['姨高祖母'],
|
||||
'f,f,f,m,xs,h':['姨高祖父'],
|
||||
'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,xb,s&o':['堂伯祖父'],
|
||||
'f,f,f,xb,s&o,w':['堂伯祖母'],
|
||||
'f,f,f,xb,s&l':['堂叔祖父'],
|
||||
@ -200,8 +200,8 @@
|
||||
'f,f,f,xb,s,s,s&l':['族弟'],
|
||||
'f,f,f,xb,d':['堂姑祖母'],
|
||||
'f,f,f,xb,d,h':['堂姑祖父'],
|
||||
'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':['表叔祖父'],
|
||||
@ -253,8 +253,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':['姑表叔父','表叔父','表叔爸','表叔'],
|
||||
@ -302,8 +302,8 @@
|
||||
'f,m,xb,d,h':['舅表姑父','表姑爸','表姑父','表姑丈'],
|
||||
'f,m,xb,d,s':['从表兄弟'],
|
||||
'f,m,xb,d,d':['从表姐妹'],
|
||||
'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':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'],
|
||||
@ -333,11 +333,11 @@
|
||||
'f,xb,d,s':['堂外甥'],
|
||||
'f,xb,d,d':['堂外甥女'],
|
||||
'f,ob':['伯父','伯伯','大伯','x伯'],
|
||||
'f,ob,w':['伯母','大娘'],
|
||||
'f,ob,w':['伯母','大娘','大妈','x妈'],
|
||||
'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'],
|
||||
'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','婶'],
|
||||
'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','x婶','婶'],
|
||||
//姑家
|
||||
'f,xs':['姑妈','姑母','姑姑','姑娘','姑'],
|
||||
'f,xs':['姑妈','姑母','姑姑','姑娘','大姑妈','x姑妈','姑'],
|
||||
'f,xs,h':['姑丈','姑父','姑爸','姑夫'],
|
||||
'f,xs,s&o':['姑表哥','表哥'],
|
||||
'f,xs,s&o,w':['姑表嫂','表嫂'],
|
||||
@ -465,7 +465,7 @@
|
||||
'm,m,xs,d,s':['从表兄弟'],
|
||||
'm,m,xs,d,d':['从表姐妹'],
|
||||
//舅家
|
||||
'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','x舅'],
|
||||
'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
|
||||
'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'],
|
||||
'm,xb,s&o':['舅表哥','表哥'],
|
||||
'm,xb,s&o,w':['舅表嫂','表嫂'],
|
||||
@ -519,10 +519,18 @@
|
||||
'm,ls':['小姨','小姨妈','姨仔'],
|
||||
'm,ls,h':['小姨父','小姨丈'],
|
||||
//婆家
|
||||
'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','夫婿','爱人'],
|
||||
'h,f':['公公'],
|
||||
'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','夫婿','爱人','老伴'],
|
||||
'h,f':['公公','翁亲'],
|
||||
'h,f,f':['祖翁'],
|
||||
'h,f,f,ob':['伯祖翁'],
|
||||
'h,f,f,ob,w':['伯祖婆'],
|
||||
'h,f,f,lb':['叔祖翁'],
|
||||
'h,f,f,lb,w':['叔祖婆'],
|
||||
'h,f,f,f':['太公翁'],
|
||||
'h,f,f,f,ob':['太伯翁'],
|
||||
'h,f,f,f,ob,w':['太姆婆'],
|
||||
'h,f,f,f,lb':['太叔翁'],
|
||||
'h,f,f,f,lb,w':['太婶婆'],
|
||||
'h,f,f,m':['太奶亲'],
|
||||
'h,f,m':['祖婆'],
|
||||
'h,f,ob':['伯翁'],
|
||||
@ -543,7 +551,7 @@
|
||||
'h,f,xs,d&l':['姑表小姑妹'],
|
||||
'h,f,xs,d&l,h':['姑表小姑妹夫'],
|
||||
'h,f,xs,h':['姑公'],
|
||||
'h,m':['婆婆'],
|
||||
'h,m':['婆婆','姑亲'],
|
||||
'h,m,xb':['舅公'],
|
||||
'h,m,xb,w':['舅婆'],
|
||||
'h,m,xs':['姨婆'],
|
||||
@ -589,7 +597,7 @@
|
||||
'h,ls':['小姑子','小姑','姑仔'],
|
||||
'h,ls,h':['小姑夫','小姑妹夫'],
|
||||
//岳家
|
||||
'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人'],
|
||||
'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'],
|
||||
'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'],
|
||||
'w,f,f':['太岳父'],
|
||||
'w,f,f,ob':['太伯岳'],
|
||||
@ -686,7 +694,7 @@
|
||||
'xb,d,d':['外侄孙女'],
|
||||
'xb,d,d,h':['外侄孙女婿'],
|
||||
'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥'],
|
||||
'ob,w':['嫂子','大嫂','嫂','阿嫂'],
|
||||
'ob,w':['嫂子','大嫂','x嫂','嫂','阿嫂'],
|
||||
'ob,w,f':['姻伯父'],
|
||||
'ob,w,m':['姻伯母'],
|
||||
'lb':['弟弟','弟','细佬','老弟'],
|
||||
@ -753,14 +761,14 @@
|
||||
'd,d,s':['外曾外孙'],
|
||||
'd,d,d':['外曾外孙女'],
|
||||
//亲家
|
||||
's,w,m':['亲家母'],
|
||||
's,w,f':['亲家公','亲家翁'],
|
||||
's,w,m':['亲家母','亲家'],
|
||||
's,w,f':['亲家公','亲家翁','亲家'],
|
||||
's,w,f,f':['太姻翁'],
|
||||
's,w,f,m':['太姻姆'],
|
||||
's,w,f,ob':['姻兄'],
|
||||
's,w,f,lb':['姻弟'],
|
||||
'd,h,m':['亲家母'],
|
||||
'd,h,f':['亲家公','亲家翁'],
|
||||
'd,h,m':['亲家母','亲家'],
|
||||
'd,h,f':['亲家公','亲家翁','亲家'],
|
||||
'd,h,f,f':['太姻翁'],
|
||||
'd,h,f,m':['太姻姆'],
|
||||
'd,h,f,ob':['姻兄'],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user