diff --git a/dist/relationship.js b/dist/relationship.js index be5093c..7cfd16c 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -627,7 +627,7 @@ 'h,f,xs,d&l,h':['姑表小姑妹夫'], 'h,f,xs,d,s':['姑表夫甥男'], 'h,f,xs,d,d':['姑表夫甥女'], - 'h,m':['婆婆','姑亲','老婆婆'], + 'h,m':['婆婆','婆母','姑亲','老婆婆'], 'h,m,xb':['舅公'], 'h,m,xb,w':['舅婆'], 'h,m,xb,s&o':['舅表大伯子','表大伯'], @@ -660,12 +660,12 @@ 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], 'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'], - 'h,xb,s':['婆家侄'], + 'h,xb,s':['叔侄','婆家侄'], 'h,os':['大姑子','大姑','大娘姑','大姑姊'], 'h,os,h':['大姑夫','姊丈','大姑姐夫','大姑姊夫'], 'h,ls':['小姑子','小姑','小姑妹','姑仔'], 'h,ls,h':['小姑夫','小亘子','小姑妹夫'], - 'h,xs,s':['婆家甥'], + 'h,xs,s':['姑甥','婆家甥'], //岳家 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], @@ -718,7 +718,7 @@ 'w,m,xs,s&l':['表舅仔'], 'w,m,xs,d&o':['表大姨'], 'w,m,xs,d&l':['表姨仔'], - 'w,xb,s':['内侄','妻侄'], + 'w,xb,s':['内侄','妻侄','舅侄'], 'w,xb,s,w':['内侄媳妇'], 'w,xb,s,s':['内侄孙'], 'w,xb,s,s,w':['内侄孙媳妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 0193b67..bfebee1 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