diff --git a/dist/relationship.js b/dist/relationship.js index 80b5d57..3d005ba 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -351,7 +351,7 @@ 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'], 'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','x婶','婶'], //姑家 - 'f,xs':['姑妈','姑母','姑姑','姑娘','大姑妈','x姑妈','姑'], + 'f,xs':['姑妈','姑姑','姑娘','大姑妈','x姑妈','姑'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫'], 'f,xs,s&o':['姑表哥','表哥'], 'f,xs,s&o,w':['姑表嫂','表嫂'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index abf982c..7a6e5ce 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=[],l=!1;for(var h in w){var o=w[h];o.indexOf(b)>-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h-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 l in d){var h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l-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(),l=[],h=0;h-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h-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 l in d){var h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l-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(),l=[],h=0;h