diff --git a/dist/relationship.js b/dist/relationship.js index 087091b..cee81a5 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -667,8 +667,8 @@ 'f,ls':['姑妈','姑姐'], 'f,xs':['姑妈','姑姑','姑娘','大姑妈','姑','x姑妈'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫','x姑丈','x姑父'], - 'f,xs,h,f':['姑姻祖母','姻奶奶'], - 'f,xs,h,m':['姑姻祖父','姻爷爷'], + 'f,xs,h,f':['姑姻祖父','姻爷爷'], + 'f,xs,h,m':['姑姻祖母','姻奶奶'], 'f,xs,h,ob':['姑姻伯父','姻伯父','姻世伯'], 'f,xs,h,ob,w':['姑姻伯母','姻伯母'], 'f,xs,h,lb':['姑姻叔父','姻叔父'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index ff8a434..c646c28 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=[],h=!1;for(var l in w){var o=w[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(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 w=!0;do{f=s;for(var h in b){var l=b[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&&f.length||b.push(l),h=!0)}if(h||(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 w=!0;do{f=s;for(var h in b){var l=b[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