diff --git a/dist/relationship.js b/dist/relationship.js index b6e7d88..ba51aba 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -740,14 +740,14 @@ 'w,m,xs,s&l':['表舅仔'], 'w,m,xs,d&o':['表大姨'], 'w,m,xs,d&l':['表姨仔'], - 'w,xb,s':['内侄','妻侄','舅侄'], - 'w,xb,s,w':['内侄媳妇'], + 'w,xb,s':['内侄','内侄男','妻侄男','舅侄男','岳侄男','丈人侄男'], + 'w,xb,s,w':['内侄妇','内侄媳妇','妻侄妇','舅侄妇','岳侄妇','丈人侄妇'], 'w,xb,s,s':['内侄孙'], - 'w,xb,s,s,w':['内侄孙媳妇'], + 'w,xb,s,s,w':['内侄孙妇','内侄孙媳妇'], 'w,xb,s,d':['内侄孙女'], 'w,xb,s,d,h':['内侄孙女婿'], - 'w,xb,d':['内侄女','妻侄女'], - 'w,xb,d,h':['内侄女婿'], + 'w,xb,d':['内侄女','妻侄女','舅侄女','岳侄女','丈人侄女'], + 'w,xb,d,h':['内侄女婿','妻侄女婿','舅侄女婿','岳侄女婿','丈人侄女婿'], 'w,xb,d,s':['外侄孙'], 'w,xb,d,s,w':['外侄孙媳妇'], 'w,xb,d,d':['外侄孙女'], @@ -756,18 +756,18 @@ 'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'], 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'], 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], - 'w,xs,s':['内甥','姨甥','妻外甥'], - 'w,xs,s,w':['姨甥媳妇'], - 'w,xs,s,s':['姨甥孙'], - 'w,xs,s,s,w':['姨甥孙媳妇'], - 'w,xs,s,d':['姨甥孙女'], - 'w,xs,s,d,h':['姨甥孙女婿'], - 'w,xs,d':['姨甥女','妻外甥女'], - 'w,xs,d,h':['姨甥女婿'], - 'w,xs,d,s':['姨甥孙'], - 'w,xs,d,s,w':['姨甥孙媳妇'], - 'w,xs,d,d':['姨甥孙女'], - 'w,xs,d,d,h':['姨甥孙女婿'], + 'w,xs,s':['内甥','内甥男','妻甥男','姨甥男','岳甥男','丈人甥男'], + 'w,xs,s,w':['内甥妇','姨甥妇','姨甥妇','岳甥妇','丈人甥妇'], + 'w,xs,s,s':['内甥孙','姨甥孙'], + 'w,xs,s,s,w':['内甥孙妇','姨甥孙妇'], + 'w,xs,s,d':['内甥孙女','姨甥孙女'], + 'w,xs,s,d,h':['内甥孙女婿','姨甥孙女婿'], + 'w,xs,d':['内甥女','姨甥女','妻外甥女','丈人甥女'], + 'w,xs,d,h':['内甥婿','姨甥婿','姨甥女婿','妻甥婿','岳甥婿','丈人甥婿'], + 'w,xs,d,s':['内甥孙','姨甥孙'], + 'w,xs,d,s,w':['内甥孙媳妇','姨甥孙媳妇'], + 'w,xs,d,d':['内甥孙女','姨甥孙女'], + 'w,xs,d,d,h':['内甥孙女婿','姨甥孙女婿'], 'w,os':['大姨子','大姨姐','大姨姊','妻姐'], 'w,os,h':['大姨夫','大姨姐夫','大姨姊夫','襟兄','连襟','姨夫'], 'w,ls':['小姨子','小姨妹','妻妹','小妹儿'], @@ -862,14 +862,20 @@ 's,s,s,s,s,s,s,s,d':['耳孙女'], 's,s,d':['曾孙女'], 's,s,d,h':['曾孙女婿'], - 's,s,d,s':['外玄孙'], - 's,s,d,d':['外玄孙女'], + 's,s,d,s':['玄外孙'], + 's,s,d,d':['玄外孙女'], 's,d':['孙女','孙囡'], 's,d,h':['孙女婿','孙婿'], 's,d,h,xb':['姻家再侄'], 's,d,h,xs':['姻家再侄'], 's,d,s':['曾外孙'], + 's,d,s,w':['曾外孙媳妇'], + 's,d,s,s':['曾外曾孙'], + 's,d,s,d':['曾外曾孙女'], 's,d,d':['曾外孙女'], + 's,d,d,h':['曾外孙女婿'], + 's,d,d,s':['曾外曾外孙'], + 's,d,d,d':['曾外曾外孙女'], 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿','孩子','孩儿'], 'd,h':['女婿','姑爷','女婿子','女婿儿','儿婿'], 'd,h,xb':['姻侄'], @@ -883,11 +889,23 @@ 'd,s':['外孙'], 'd,s,w':['外孙媳'], 'd,s,s':['外曾孙','重外孙'], + 'd,s,s,w':['外曾孙媳妇'], + 'd,s,s,s':['外玄孙'], + 'd,s,s,d':['外玄孙女'], 'd,s,d':['外曾孙女','重外孙女'], + 'd,s,d,h':['外曾孙女婿','重外孙女婿'], + 'd,s,d,s':['外玄外孙'], + 'd,s,d,d':['外玄外孙女'], 'd,d':['外孙女','外孙囡'], 'd,d,h':['外孙女婿'], 'd,d,s':['外曾外孙'], + 'd,d,s,w':['外曾外孙媳妇'], + 'd,d,s,s':['外曾外曾孙'], + 'd,d,s,d':['外曾外曾孙女'], 'd,d,d':['外曾外孙女'], + 'd,d,d,h':['外曾外孙女'], + 'd,d,d,s':['外曾外曾外孙'], + 'd,d,d,d':['外曾外曾外孙女'], //亲家 's,w,m':['亲家母','亲家'], 's,w,f':['亲家公','亲家翁','亲家'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 9c35d19..9f1daa4 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1 +1 @@ -!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 b=f.shift(),d=[],h=!1;for(var l in w){var o=w[l];o.indexOf(b)>-1&&(!l&&f.length||d.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 b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in d){var l=d[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 b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||d.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 b=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in d){var l=d[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 b=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var d=s.split(",").reverse(),w=b.split(",").reverse(),h=[],l=0;l