diff --git a/dist/relationship.js b/dist/relationship.js index ff393d8..73784c5 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -185,15 +185,16 @@ '[f,f|f,m|m,f|m,m]':['祖辈','祖父母'], '[f|m]':['父母','爹娘','爹妈','爸妈','双亲','二亲','两亲','二老','高堂'], '[h,f|h,m]':['公婆'], - '[xb|xs]':['兄弟姐妹'], + '[w,f|w,m]':['岳父母'], + '[xb|xs]':['兄弟姐妹','同胞','手足'], '[s|d]':['子女','儿女','小孩','孩子'], '[s,s|s,d|d,s|d,d]':['孙辈'], // 本家 - 'f':['爸爸','父亲','阿爸','老爸','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子','老头子'], + 'f':['爸爸','父亲','阿爸','老爸','老窦','爸','父','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'], // 爷爷 'f,f':['爷爷','祖父','阿爷','奶爷','阿公','老爷'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷','太老爷'], - 'f,f,f,f':['高祖父','老太奶爷','老太爷','祖太爷','祖太爷爷','祖太公'], + 'f,f,f,f':['高祖父','老太奶爷','老太爷','祖太爷','祖太爷爷','祖太公','高王父'], 'f,f,f,f,f':['天祖父'], 'f,f,f,f,f,f':['烈祖父'], 'f,f,f,f,f,m':['烈祖母'], @@ -210,7 +211,7 @@ 'f,f,f,f,lb,w':['叔高祖母'], 'f,f,f,f,xs':['姑高祖母'], 'f,f,f,f,xs,h':['姑高祖父'], - 'f,f,f,m':['高祖母','老太奶奶','老太太','祖太太','祖太奶','祖太奶奶','祖太婆'], + 'f,f,f,m':['高祖母','老太奶奶','老太太','祖太太','祖太奶','祖太奶奶','祖太婆','高王母'], 'f,f,f,m,xs':['姨高祖母'], 'f,f,f,m,xs,h':['姨高祖父'], 'f,f,f,m,xb':['舅高祖父'], @@ -270,8 +271,8 @@ 'f,f,f,xs,d,d':['姑表姑表姑母'], 'f,f,f,xs,d,d,h':['姑表姑表姑父'], 'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'], - 'f,f,m,f':['高外祖父','老太姥爷','祖太姥爷','祖太公'], - 'f,f,m,m':['高外祖母','老太姥姥','祖太姥姥','祖太姥娘','祖太婆'], + 'f,f,m,f':['高外祖父','老太姥爷','祖太姥爷','祖太公','高王父'], + 'f,f,m,m':['高外祖母','老太姥姥','祖太姥姥','祖太姥娘','祖太婆','高王母'], // 舅表* 'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷','舅公老爷'], 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶','舅婆奶奶'], @@ -401,8 +402,8 @@ // 奶奶 'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'], 'f,m,f':['曾外祖父','外太公','太姥爷'], - 'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公'], - 'f,m,f,m':['曾外曾祖母','祖太太','祖太奶奶','祖太婆'], + 'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'], + 'f,m,f,m':['曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'], // 从父* 'f,m,f,ob':['伯曾外祖父','伯太姥爷','伯太奶爷'], 'f,m,f,ob,w':['伯曾外祖母','伯太姥姥','伯太奶奶'], @@ -448,8 +449,8 @@ 'f,m,f,xs,d,d':['姑表姨表姑母'], 'f,m,f,xs,d,d,h':['姑表姨表姑父'], 'f,m,m':['曾外祖母','外太婆','太姥姥'], - 'f,m,m,f':['曾外曾外祖父','祖太姥爷','祖太公'], - 'f,m,m,m':['曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆'], + 'f,m,m,f':['曾外曾外祖父','祖太姥爷','祖太公','高王父'], + 'f,m,m,m':['曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'], // 舅表* 'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'], 'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'], @@ -639,8 +640,8 @@ // 外公 'm,f':['外公','姥爷','外祖父','外王父','阿公','毑父'], 'm,f,f':['外曾祖父','外太祖父','外曾王父','外太公','外太爷爷','太外祖父'], - 'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公'], - 'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆'], + 'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公','高王父'], + 'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆','高王母'], // 从父* 'm,f,f,ob':['伯外曾祖父','外太伯公','伯太姥爷','伯太奶爷','伯太爷爷'], 'm,f,f,ob,w':['伯外曾祖母','外太伯母','伯太姥姥','伯太奶奶'], @@ -684,8 +685,8 @@ 'm,f,f,xs,d,d':['姑表姑表姨母'], 'm,f,f,xs,d,d,h':['姑表姑表姨父'], 'm,f,m':['外曾祖母','外太祖母','外曾王母','太外祖母','外太奶奶','外太婆'], - 'm,f,m,f':['外高外祖父','祖太姥爷','祖太公'], - 'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'], + 'm,f,m,f':['外高外祖父','祖太姥爷','祖太公','高王父'], + 'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'], // 舅表* 'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'], 'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'], @@ -797,8 +798,8 @@ // 外婆 'm,m':['外婆','外祖母','外王母','姥姥','阿婆','毑母'], 'm,m,f':['外曾外祖父','外太外公','外太姥爷'], - 'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公'], - 'm,m,f,m':['外曾外曾祖母','祖太太','祖太奶奶','祖太婆'], + 'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'], + 'm,m,f,m':['外曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'], // 从父* 'm,m,f,ob':['伯外曾外祖父','伯太姥爷'], 'm,m,f,ob,w':['伯外曾外祖母','伯太姥姥'], @@ -836,8 +837,8 @@ 'm,m,f,xs,d,d':['姑表姨表姨母'], 'm,m,f,xs,d,d,h':['姑表姨表姨父'], 'm,m,m':['外曾外祖母','外太外婆','外太姥姥'], - 'm,m,m,f':['外曾外曾外祖父','祖太姥爷','祖太公'], - 'm,m,m,m':['外曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆'], + 'm,m,m,f':['外曾外曾外祖父','祖太姥爷','祖太公','高王父'], + 'm,m,m,m':['外曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'], // 舅表* 'm,m,m,xb':['舅外曾外祖父','舅太姥爷'], 'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'], @@ -1013,7 +1014,7 @@ 'm,xs,d,d':['姨甥女','从母甥女','姨甥'], 'm,xs,d,d,h':['姨甥婿','从母甥婿'], // 婆家 - 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','爱人','老伴'], + 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'], 'h,f':['公公','翁亲','老公公'], 'h,f,f':['祖公','祖翁','奶公父'], 'h,f,f,ob':['伯祖公','伯祖翁'], @@ -1039,10 +1040,10 @@ 'h,f,ob,w':['伯婆母','伯婆'], 'h,f,lb':['叔公父','叔公','叔翁','叔祖'], 'h,f,lb,w':['叔婆母','叔婆','婶婆','婶亲'], - 'h,f,xb,s&o':['堂大伯子','从父大伯子','堂大伯','从父大伯'], - 'h,f,xb,s&o,w':['堂大伯嫂','从父大伯嫂','堂大姆','从父大姆'], - 'h,f,xb,s&l':['堂小叔弟','从父小叔弟','堂叔仔','从父叔仔'], - 'h,f,xb,s&l,w':['堂小叔弟妇','从父小叔弟妇','堂小弟','从父小弟'], + 'h,f,xb,s&o':['堂大伯子','从父大伯子','堂大伯','从父大伯','夫从兄'], + 'h,f,xb,s&o,w':['堂大伯嫂','从父大伯嫂','堂大姆','从父大姆','从兄嫂'], + 'h,f,xb,s&l':['堂小叔弟','从父小叔弟','堂叔仔','从父叔仔','夫从弟'], + 'h,f,xb,s&l,w':['堂小叔弟妇','从父小叔弟妇','堂小弟','从父小弟','从弟妇'], 'h,f,xb,s,s':['堂夫侄男','从父夫侄男'], 'h,f,xb,s,d':['堂夫侄女','从父夫侄女'], 'h,f,xb,d&o':['堂大姑姐','从父大姑姐'], @@ -1114,6 +1115,7 @@ 'h,ob,w':['大婶子','伯嫂','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], 'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], + 'h,xb':['伯叔'], 'h,xb,s':['叔侄男','叔伯男','从男','婆家侄男'], 'h,xb,s,w':['叔侄妇'], 'h,xb,s,s':['叔侄孙男'], @@ -1143,7 +1145,7 @@ 'h,xs,d,d':['姑甥外孙女'], 'h,xs,d,d,h':['姑甥外孙婿'], // 岳家 - 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], + 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','爱妻','老伴','老太婆'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], 'w,f,f':['祖岳父','太岳父','奶岳父'], 'w,f,f,f':['曾祖丈人'], @@ -1307,7 +1309,7 @@ '0,xb,w,xs,d':['舅眷姨女'], '1,xb,w,xs,d':['叔眷姨女'], 'xb,s':['侄子','侄男','侄男儿','侄儿','阿侄'], - 'xb,s,w':['侄妇','侄媳妇'], + 'xb,s,w':['侄媳妇','侄妇'], 'xb,s,s':['侄孙男','侄孙子'], 'xb,s,s,w':['侄孙妇'], 'xb,s,s,s':['侄曾孙'], @@ -1329,7 +1331,7 @@ 'xb,s,d,d,s':['侄曾外曾外孙'], 'xb,s,d,d,d':['侄曾外曾外孙女'], 'xb,d':['侄女','侄女儿','侄囡'], - 'xb,d,h':['侄婿','侄女婿'], + 'xb,d,h':['侄女婿','侄婿'], 'xb,d,s':['侄外孙','外侄孙'], 'xb,d,s,w':['侄外孙妇','外侄孙妇'], 'xb,d,s,s':['侄外曾孙'], @@ -1397,7 +1399,7 @@ '0,xs,h,xs,d':['姨姻姑女'], '1,xs,h,xs,d':['姑姻姑女'], 'xs,s':['外甥','外甥男','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], - 'xs,s,w':['甥妇','甥媳妇'], + 'xs,s,w':['甥媳妇','外甥媳妇','甥妇'], 'xs,s,s':['甥孙男'], 'xs,s,s,w':['甥孙妇'], 'xs,s,s,s':['甥曾孙'], @@ -1419,7 +1421,7 @@ 'xs,s,d,d,s':['甥曾外曾外孙'], 'xs,s,d,d,d':['甥曾外曾外孙女'], 'xs,d':['外甥女','甥女','外甥囡'], - 'xs,d,h':['甥婿','甥女婿'], + 'xs,d,h':['甥女婿','外甥女婿','甥婿'], 'xs,d,s':['甥外孙'], 'xs,d,s,w':['甥外孙妇'], 'xs,d,s,s':['甥外曾孙'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index b7f34e6..d09d4c3 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=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-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-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