diff --git a/dist/relationship.js b/dist/relationship.js index a6842a4..ff393d8 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -216,21 +216,21 @@ 'f,f,f,m,xb':['舅高祖父'], 'f,f,f,m,xb,w':['舅高祖母'], // 从父* - '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':['堂叔祖父','族叔祖父'], - 'f,f,f,xb,s&l,w':['堂叔祖母','族叔祖母'], + 'f,f,f,xb,s&o':['从父伯祖父','叔伯伯祖父','堂伯祖父','族伯祖父','族祖父'], + 'f,f,f,xb,s&o,w':['从父伯祖母','叔伯伯祖母','堂伯祖母','族伯祖母','族祖母'], + 'f,f,f,xb,s&l':['从父叔祖父','叔伯叔祖父','堂叔祖父','族叔祖父','族祖父'], + 'f,f,f,xb,s&l,w':['从父叔祖母','叔伯叔祖母','堂叔祖母','族叔祖母','族祖母'], 'f,f,f,xb,s':['从父叔伯祖父'], 'f,f,f,xb,s,w':['从父叔伯祖母'], - 'f,f,f,xb,s,s&o':['再从父伯父','族伯父'], - 'f,f,f,xb,s,s&o,w':['再从父伯母','族伯母'], - 'f,f,f,xb,s,s&l':['再从父叔父','族叔父'], - 'f,f,f,xb,s,s&l,w':['再从父叔母','族叔母'], + 'f,f,f,xb,s,s&o':['再从父伯父','叔伯叔伯伯父','族伯父','族父'], + 'f,f,f,xb,s,s&o,w':['再从父伯母','叔伯叔伯伯母','族伯母','族母'], + 'f,f,f,xb,s,s&l':['再从父叔父','叔伯叔伯叔父','族叔父','族父'], + 'f,f,f,xb,s,s&l,w':['再从父叔母','叔伯叔伯叔母','族叔母','族母'], 'f,f,f,xb,s,s,s&o':['三从父兄','族兄'], 'f,f,f,xb,s,s,s&l':['三从父弟','族弟'], 'f,f,f,xb,s,s,d&o':['三从父姊','族姊'], @@ -323,8 +323,8 @@ 'f,f,ob,w':['伯婆','伯祖母','伯奶奶','大奶奶','堂祖母','姆婆'], 'f,f,lb':['叔公','叔祖父','叔老爷','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔婆','叔祖母','叔奶奶','小奶奶','堂祖母','婶婆'], - 'f,f,xb':['堂祖父','x爷爷','x大爷'], - 'f,f,xb,w':['堂祖母'], + 'f,f,xb':['堂祖父','从祖祖父','从祖父','x爷爷','x大爷'], + 'f,f,xb,w':['堂祖母','从祖祖母','从祖母'], // 再从父 'f,f,xb,s&o':['堂伯','堂伯父','从父伯父'], 'f,f,xb,s&o,w':['堂伯母','从父伯母'], @@ -637,8 +637,8 @@ // 外家 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','妈','母','娘','娘亲','妈咪'], // 外公 - 'm,f':['外公','姥爷','外祖父','阿公','毑父'], - 'm,f,f':['外曾祖父','外太祖父','外太公','外太爷爷','太外祖父'], + 'm,f':['外公','姥爷','外祖父','外王父','阿公','毑父'], + 'm,f,f':['外曾祖父','外太祖父','外曾王父','外太公','外太爷爷','太外祖父'], 'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公'], 'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆'], // 从父* @@ -683,7 +683,7 @@ 'm,f,f,xs,d,s,w':['姑表姑表舅母'], 'm,f,f,xs,d,d':['姑表姑表姨母'], 'm,f,f,xs,d,d,h':['姑表姑表姨父'], - 'm,f,m':['外曾祖母','外太祖母','太外祖母','外太奶奶','外太婆'], + 'm,f,m':['外曾祖母','外太祖母','外曾王母','太外祖母','外太奶奶','外太婆'], 'm,f,m,f':['外高外祖父','祖太姥爷','祖太公'], 'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'], // 舅表* @@ -795,7 +795,7 @@ 'm,f,xs,d,d,d':['姑表姨表甥女'], 'm,f,xs,d,d,d,h':['姑表姨表甥婿'], // 外婆 - 'm,m':['外婆','外祖母','姥姥','阿婆','毑母'], + 'm,m':['外婆','外祖母','外王母','姥姥','阿婆','毑母'], 'm,m,f':['外曾外祖父','外太外公','外太姥爷'], 'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公'], 'm,m,f,m':['外曾外曾祖母','祖太太','祖太奶奶','祖太婆'], @@ -1015,18 +1015,26 @@ // 婆家 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','爱人','老伴'], 'h,f':['公公','翁亲','老公公'], - 'h,f,f':['祖翁','奶公父'], - 'h,f,f,ob':['伯祖翁'], + 'h,f,f':['祖公','祖翁','奶公父'], + 'h,f,f,ob':['伯祖公','伯祖翁'], 'h,f,f,ob,w':['伯祖婆'], - 'h,f,f,lb':['叔祖翁'], + 'h,f,f,lb':['叔祖公','叔祖翁'], 'h,f,f,lb,w':['叔祖婆'], - 'h,f,f,f':['太公翁'], + '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,f,m':['曾祖婆','太奶亲'], + 'h,f,f,xs':['姑祖婆'], + 'h,f,f,xs,h':['姑祖公'], 'h,f,m':['祖婆','奶婆母'], + 'h,f,m,f':['曾外祖公'], + 'h,f,m,m':['曾外祖婆'], + 'h,f,m,xb':['舅祖公'], + 'h,f,m,xb,w':['舅祖婆'], + 'h,f,m,xs':['姨祖婆'], + 'h,f,m,xs,h':['姨祖公'], 'h,f,ob':['伯公父','伯翁'], 'h,f,ob,w':['伯婆母','伯婆'], 'h,f,lb':['叔公父','叔公','叔翁','叔祖'], @@ -1058,8 +1066,22 @@ 'h,f,xs,d,s':['姑表夫甥男'], 'h,f,xs,d,d':['姑表夫甥女'], 'h,m':['婆婆','婆母','姑亲','老婆婆'], - 'h,m,f':['姥公父'], - 'h,m,m':['姥婆母'], + 'h,m,f':['外祖公','姥公父'], + 'h,m,f,f':['外曾祖公'], + 'h,m,f,m':['外曾祖婆'], + 'h,m,f,ob':['伯外祖公'], + 'h,m,f,ob,w':['伯外祖婆'], + 'h,m,f,lb':['叔外祖公'], + 'h,m,f,lb,w':['叔外祖婆'], + 'h,m,f,xs':['姑外祖婆'], + 'h,m,f,xs,h':['姑外祖公'], + 'h,m,m':['外祖婆','姥婆母'], + 'h,m,m,f':['外曾外祖公'], + 'h,m,m,m':['外曾外祖婆'], + 'h,m,m,xb':['舅外祖公'], + 'h,m,m,xb,w':['舅外祖婆'], + 'h,m,m,xs':['姨外祖婆'], + 'h,m,m,xs,h':['姨外祖公'], 'h,m,xb':['舅公父','舅公'], 'h,m,xb,w':['舅婆母','舅婆'], 'h,m,xb,s&o':['舅表大伯子','表大伯'], @@ -1089,9 +1111,9 @@ 'h,m,xs,d,s':['姨夫甥男','从母夫甥男'], 'h,m,xs,d,d':['姨夫甥女','从母夫甥女'], 'h,ob':['大伯子','大伯哥','大伯兄','夫兄'], - 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], + 'h,ob,w':['大婶子','伯嫂','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], - 'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'], + 'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], 'h,xb,s':['叔侄男','叔伯男','从男','婆家侄男'], 'h,xb,s,w':['叔侄妇'], 'h,xb,s,s':['叔侄孙男'], @@ -1123,26 +1145,30 @@ // 岳家 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], - 'w,f,f':['太岳父','祖岳父','奶岳父'], + 'w,f,f':['祖岳父','太岳父','奶岳父'], + 'w,f,f,f':['曾祖丈人'], + 'w,f,f,m':['曾祖丈母'], 'w,f,f,f,xb,s,s&o':['姻伯丈'], 'w,f,f,f,xb,s,s&o,w':['姻伯丈'], 'w,f,f,f,xb,s,s&l':['姻叔丈'], 'w,f,f,f,xb,s,s&l,w':['姻婶'], - 'w,f,f,ob':['太伯岳'], - 'w,f,f,ob,w':['太伯岳母'], - 'w,f,f,lb,':['太叔岳'], - 'w,f,f,lb,w':['太叔岳母'], + 'w,f,f,ob':['伯祖岳父','太伯岳'], + 'w,f,f,ob,w':['伯祖岳母','太伯岳母'], + 'w,f,f,lb,':['叔祖岳父','太叔岳'], + 'w,f,f,lb,w':['叔祖岳母','太叔岳母'], 'w,f,f,xb,s&o':['姻伯'], 'w,f,f,xb,s&o,w':['姻姆'], 'w,f,f,xb,s&l':['姻叔'], 'w,f,f,xb,s&l,w':['姻婶'], - 'w,f,f,xs':['太姑岳母'], - 'w,f,f,xs,h':['太姑岳父'], - 'w,f,m':['太岳母','祖岳母','奶岳母'], - 'w,f,m,xb':['太舅岳父'], - 'w,f,m,xb,w':['太舅岳母'], - 'w,f,m,xs':['太姨岳母'], - 'w,f,m,xs,h':['太姨岳父'], + 'w,f,f,xs':['姑祖岳父母','太姑岳母'], + 'w,f,f,xs,h':['姑祖岳父','太姑岳父'], + 'w,f,m':['祖岳母','太岳母','奶岳母'], + 'w,f,m,f':['曾外祖丈人'], + 'w,f,m,m':['曾外祖丈母'], + 'w,f,m,xb':['舅祖岳父','太舅岳父'], + 'w,f,m,xb,w':['舅祖岳母','太舅岳母'], + 'w,f,m,xs':['姨祖岳母','太姨岳母'], + 'w,f,m,xs,h':['姨祖岳父','太姨岳父'], 'w,f,xb,s&o':['堂大舅兄','从父大舅兄','堂大舅','堂内兄'], 'w,f,xb,s&o,w':['堂内嫂','从父内嫂'], 'w,f,xb,s&l':['堂小舅弟','从父小舅弟','堂舅仔','堂内弟'], @@ -1166,8 +1192,22 @@ 'w,f,xs,d&l':['姑表小姨妹','表姨仔','表内妹'], 'w,f,xs,d&l,h':['姑表襟弟','表襟弟'], 'w,m':['岳母','丈母娘','丈母','泰水'], - 'w,m,f':['外太岳父','姥岳父'], - 'w,m,m':['外太岳母','姥岳母'], + 'w,m,f':['外祖岳父','外太岳父','姥岳父'], + 'w,m,f,f':['外曾祖丈人'], + 'w,m,f,m':['外曾祖丈母'], + 'w,m,f,ob':['伯外祖岳父'], + 'w,m,f,ob,w':['伯外祖岳母'], + 'w,m,f,lb':['叔外祖岳父'], + 'w,m,f,lb,w':['叔外祖岳母'], + 'w,m,f,xs':['姑外祖岳母'], + 'w,m,f,xs,h':['姑外祖岳父'], + 'w,m,m':['外祖岳母','外太岳母','姥岳母'], + 'w,m,m,f':['外曾外祖丈人'], + 'w,m,m,m':['外曾外祖丈母'], + 'w,m,m,xb':['舅外祖岳父'], + 'w,m,m,xb,w':['舅外祖岳母'], + 'w,m,m,xs':['姨外祖岳母'], + 'w,m,m,xs,h':['姨外祖岳父'], 'w,m,xb':['舅岳父'], 'w,m,xb,w':['舅岳母'], 'w,m,xb,s&o':['舅表大舅兄','表大舅','表内兄'], @@ -1518,12 +1558,6 @@ 'd,h,xs,h':['女息姻婿','息姻婿'], 'd,h,xs,s':['女息姻外孙男','息姻外孙男'], 'd,h,xs,d':['女息姻外孙女','息姻外孙女'], - //其他 - 't':['老师','师父','师'], - 't,w':['师娘','师母'], - 't,t':['师祖','师公','师爷','太师父'], - 't,t,w':['师婆','太师娘'], - 't,t,t':['太师祖'] }; //数组去重 diff --git a/dist/relationship.min.js b/dist/relationship.min.js index c45383b..b7f34e6 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1,2 +1,2 @@ -!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var f=s.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],d=!0;f.length;){var m=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?m="&l":s.indexOf("&l")>-1&&(m="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l