diff --git a/dist/relationship.js b/dist/relationship.js index eb08ab5..7fb1e51 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -568,10 +568,10 @@ 'h,xb,d,s,w':['外侄媳妇'], 'h,xb,d,d':['外侄孙女'], 'h,xb,d,d,h':['外侄孙女婿'], - 'h,ob':['大伯子','大伯哥','夫兄'], + 'h,ob':['大伯子','大伯哥','大伯兄','夫兄'], 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], - 'h,lb,w':['小婶子','小叔妇','小叔媳妇','妯娌'], + 'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'], 'h,xs,s':['外甥','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], 'h,xs,s,w':['外甥媳妇'], 'h,xs,s,s':['外甥孙'], @@ -592,10 +592,10 @@ 'h,xs,d,d,h':['外甥孙女婿'], 'h,xs,d,d,s':['外曾甥孙'], 'h,xs,d,d,d':['外曾甥孙女'], - 'h,os':['大姑子','大姑','大娘姑'], - 'h,os,h':['大姑夫','姊丈','大姑姐夫'], - 'h,ls':['小姑子','小姑','姑仔'], - 'h,ls,h':['小姑夫','小姑妹夫'], + 'h,os':['大姑子','大姑','大娘姑','大姑姊'], + 'h,os,h':['大姑夫','姊丈','大姑姐夫','大姑姊夫'], + 'h,ls':['小姑子','小姑','小姑妹','姑仔'], + 'h,ls,h':['小姑夫','小亘子','小姑妹夫'], //岳家 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], @@ -655,10 +655,10 @@ 'w,xb,d,s,w':['外侄孙媳妇'], 'w,xb,d,d':['外侄孙女'], 'w,xb,d,d,h':['外侄孙女婿'], - 'w,ob':['大舅子','大舅哥','内兄','妻兄','妻舅'], - 'w,ob,w':['舅嫂','大舅妇','大舅媳妇','大妗子','内嫂','妻兄嫂'], - 'w,lb':['小舅子','内弟','妻弟','妻舅'], - 'w,lb,w':['舅弟媳','小舅妇','小舅媳妇','小妗子','妻妹夫'], + 'w,ob':['大舅子','大舅哥','大舅兄','内兄','妻兄','妻舅'], + 'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'], + 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅'], + 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], 'w,xs,s':['姨甥','妻外甥'], 'w,xs,s,w':['姨甥媳妇'], 'w,xs,s,s':['姨甥孙'], @@ -671,8 +671,8 @@ 'w,xs,d,s,w':['姨甥孙媳妇'], 'w,xs,d,d':['姨甥孙女'], 'w,xs,d,d,h':['姨甥孙女婿'], - 'w,os':['大姨子','大姨姐','妻姐'], - 'w,os,h':['大姨夫','大姨姐夫','襟兄','连襟','姨夫'], + 'w,os':['大姨子','大姨姐','大姨姊','妻姐'], + 'w,os,h':['大姨夫','大姨姐夫','大姨姊夫','襟兄','连襟','姨夫'], 'w,ls':['小姨子','小姨姐','妻妹','小妹儿'], 'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟','姨夫'], //旁支 @@ -701,7 +701,7 @@ 'lb,w':['弟妹','弟媳','弟媳妇'], 'lb,w,f':['姻叔父'], 'lb,w,m':['姻叔母'], - 'xs':['姐妹'], + 'xs':['姐妹','姊妹'], 'xs,h,f':['姻世伯','亲家爷','亲爹','亲伯'], 'xs,h,m':['姻伯母','亲家娘','亲娘'], 'xs,s':['外甥'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 3ffe776..bc17894 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.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("#"),h=0;h-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("#"),h=0;h-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