diff --git a/dist/relationship.js b/dist/relationship.js index b07e633..8ed86d3 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -564,7 +564,7 @@ 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], 'h,lb,w':['小婶子','小叔妇','小叔媳妇','妯娌'], - 'h,xs,s':['外甥'], + 'h,xs,s':['外甥','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], 'h,xs,s,w':['外甥媳妇'], 'h,xs,s,s':['外甥孙'], 'h,xs,s,s,w':['外甥孙媳妇'], @@ -574,7 +574,7 @@ 'h,xs,s,d,h':['外甥孙女婿'], 'h,xs,s,d,s':['外曾甥孙'], 'h,xs,s,d,d':['外曾甥孙女'], - 'h,xs,d':['外甥女'], + 'h,xs,d':['外甥女','甥女'], 'h,xs,d,h':['外甥女婿'], 'h,xs,d,s':['外甥孙'], 'h,xs,d,s,w':['外甥孙媳妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index be7501e..6db66ee 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