diff --git a/dist/relationship.js b/dist/relationship.js index e03aefb..2330840 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -172,7 +172,7 @@ '':['自己','我'], //本家 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'], - 'f,f':['爷爷','祖父','阿爷','奶爷'], + 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], 'f,f,f,f':['高祖父','老太爷','祖太爷'], 'f,f,f,f,ob':['伯高祖父'], @@ -261,7 +261,7 @@ 'f,f,xs,s&l,w':['姑表叔母','表叔母','表叔妈','表婶'], 'f,f,xs,d':['姑表姑母','表姑妈','表姑母','表姑姑','表姑'], 'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'], - 'f,m':['奶奶','祖母','阿嫲','嫲嫲'], + 'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'], 'f,m,f':['曾外祖父','外太公'], 'f,m,f,xb,s':['堂舅祖父'], 'f,m,f,xb,s,w':['堂舅祖母'], @@ -363,7 +363,7 @@ 'f,ls':['姑姐'], //外家 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'], - 'm,f':['外公','外祖父','姥爷','阿公'], + 'm,f':['外公','外祖父','姥爷'], 'm,f,f':['外曾祖父','外太祖父','太外祖父','太姥爷','外太公'], 'm,f,f,f':['外高祖父'], 'm,f,f,m':['外高祖母'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 3bda29f..0f4befe 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