diff --git a/dist/relationship.js b/dist/relationship.js index 81274b5..493919d 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -703,7 +703,7 @@ 'f,ob':['伯父','伯伯','阿伯','大伯','大爹','大爸','x伯'], 'f,ob,w':['伯母','伯妈','伯娘','大娘','大妈','x妈'], 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','小叔','小爹','小爸','幺爸','x叔','叔'], - 'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','小婶子','婶子','婶儿','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'], + 'f,lb,w':['婶婶','婶母','婶娘','婶爹','婶妈','小婶','小婶娘','婶子','婶儿','家婶','叔母','阿婶','叔妈','叔娘','季母','小娘','小妈','幺婶','x婶','婶'], 'f,xb,w,f':['叔眷外祖父','叔眷王父','叔眷毑父','叔眷姥爷','眷姥爷'], 'f,xb,w,m':['叔眷外祖女','叔眷王母','叔眷毑母','叔眷姥姥','眷姥姥'], 'f,xb,w,xb':['叔眷舅父','眷舅父'], @@ -1476,7 +1476,7 @@ 'h,ob':['大伯子','大伯哥','大伯兄','夫兄'], 'h,ob,w':['大婶子','伯嫂','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], - 'h,lb,w':['小婶子','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], + 'h,lb,w':['小婶子','小婶','叔嫂','小叔妇','小叔媳妇','小叔弟妇','妯娌'], 'h,xb':['伯叔'], 'h,xb,s':['婆家侄','叔侄男','叔伯男','从男','婆家侄男'], 'h,xb,s,w':['叔侄媳妇','叔伯侄妇','叔伯妇','叔侄妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 9a075c9..259b286 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=[],w=!1;for(var l in h){var o=h[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(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 b=!0;do{f=s;for(var h in w){var l=w[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.sex:h.sex;for(var e=f(l.selector,o),r=0;r-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(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 b=!0;do{f=s;for(var h in w){var l=w[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.sex:h.sex;for(var e=f(l.selector,o),r=0;r