diff --git a/dist/relationship.js b/dist/relationship.js index 9470030..6df50b0 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -174,14 +174,14 @@ 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'], 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], - 'f,f,f,f':['高祖父','老太爷','祖太爷','祖太爷爷'], + 'f,f,f,f':['高祖父','老太爷','祖太爷','祖太爷爷','祖太公'], 'f,f,f,f,ob':['伯高祖父'], 'f,f,f,f,ob,w':['伯高祖母'], 'f,f,f,f,lb':['叔高祖父'], 'f,f,f,f,lb,w':['叔高祖母'], 'f,f,f,f,xs':['姑高祖母'], 'f,f,f,f,xs,h':['姑高祖父'], - 'f,f,f,m':['高祖母','老太太','祖太太','祖太奶','祖太奶奶'], + 'f,f,f,m':['高祖母','老太太','祖太太','祖太奶','祖太奶奶','祖太婆'], 'f,f,f,m,xs':['姨高祖母'], 'f,f,f,m,xs,h':['姨高祖父'], 'f,f,f,ob':['曾伯祖父','曾伯父','伯曾祖父','伯公太','伯太爷'], @@ -209,8 +209,8 @@ 'f,f,f,xs,d':['表姑祖母'], 'f,f,f,xs,d,h':['表姑祖父'], 'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'], - 'f,f,m,f':['高外祖父','祖太姥爷'], - 'f,f,m,m':['高外祖母','祖太姥姥'], + 'f,f,m,f':['高外祖父','祖太姥爷','祖太公'], + 'f,f,m,m':['高外祖母','祖太姥姥','祖太姥娘','祖太婆'], 'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷'], 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶'], 'f,f,m,xb,s&o':['表伯祖父'], @@ -263,8 +263,8 @@ 'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'], 'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'], 'f,m,f':['曾外祖父','外太公','太姥爷'], - 'f,m,f,f':['祖太爷爷'], - 'f,m,f,m':['祖太奶奶'], + 'f,m,f,f':['祖太爷','祖太爷爷','祖太公'], + 'f,m,f,m':['祖太太','祖太奶奶','祖太婆'], 'f,m,f,xb,s':['堂舅祖父'], 'f,m,f,xb,s,w':['堂舅祖母'], 'f,m,f,xb,d':['堂姨祖母'], @@ -278,8 +278,8 @@ 'f,m,f,xs,s':['表舅祖父'], 'f,m,f,xs,s,w':['表舅祖母'], 'f,m,m':['曾外祖母','外太婆','太姥姥'], - 'f,m,m,f':['祖太姥爷'], - 'f,m,m,m':['祖太姥姥'], + 'f,m,m,f':['祖太姥爷','祖太公'], + 'f,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'], 'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'], 'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'], 'f,m,m,xb,s':['表舅祖父'], @@ -369,8 +369,8 @@ 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'], 'm,f':['外公','外祖父','姥爷'], 'm,f,f':['外曾祖父','外太祖父','外太公','外太爷爷','太外祖父'], - 'm,f,f,f':['外高祖父','祖太爷爷'], - 'm,f,f,m':['外高祖母','祖太奶奶'], + 'm,f,f,f':['外高祖父','祖太爷','祖太爷爷','祖太公'], + 'm,f,f,m':['外高祖母','祖太太','祖太奶奶','祖太婆'], 'm,f,f,xb,s&o':['堂伯外祖父'], 'm,f,f,xb,s&o,w':['堂伯外祖母'], 'm,f,f,xb,s&l':['堂叔外祖父'], @@ -390,8 +390,8 @@ 'm,f,f,xs,d':['表姑外祖母'], 'm,f,f,xs,d,h':['表姑外祖父'], 'm,f,m':['外曾祖母','外太祖母','太外祖母','外太奶奶','外太婆'], - 'm,f,m,f':['外高外祖父','祖太姥爷'], - 'm,f,m,m':['外高外祖母','祖太姥姥'], + 'm,f,m,f':['外高外祖父','祖太姥爷','祖太公'], + 'm,f,m,m':['外高外祖母','祖太姥姥','祖太姥娘','祖太婆'], 'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'], 'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'], 'm,f,m,xb,d':['表姑外祖母'], @@ -421,8 +421,8 @@ 'm,f,xs,d,d':['从表姐妹'], 'm,m':['外婆','外祖母','姥姥','阿婆'], 'm,m,f':['外曾外祖父','外太外公','外太姥爷'], - 'm,m,f,f':['祖太爷爷'], - 'm,m,f,m':['祖太奶奶'], + 'm,m,f,f':['祖太爷','祖太爷爷','祖太公'], + 'm,m,f,m':['祖太太','祖太奶奶','祖太婆'], 'm,m,f,xb,s':['堂舅外祖父'], 'm,m,f,xb,s,w':['堂舅外祖母'], 'm,m,f,xb,d':['堂姨外祖母'], @@ -438,8 +438,8 @@ 'm,m,f,xs,d':['表姨外祖母'], 'm,m,f,xs,d,h':['表姨外祖父'], 'm,m,m':['外曾外祖母','外太外婆','外太姥姥'], - 'm,m,m,f':['祖太姥爷'], - 'm,m,m,m':['祖太姥姥'], + 'm,m,m,f':['祖太姥爷','祖太公'], + 'm,m,m,m':['祖太姥姥','祖太姥娘','祖太婆'], 'm,m,m,xb':['舅外曾外祖父','舅太姥爷'], 'm,m,m,xb,w':['舅外曾外祖母','舅太姥姥'], 'm,m,m,xb,s':['表舅外祖父'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 501ac80..f1b016f 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 o in w){var h=w[o];h.indexOf(b)>-1&&(!o&&f.length||d.push(o),l=!0)}if(l||(m=!1),x.length){for(var e=[],o=0;o-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 o=d[l];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var h=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=[],o=0;o-1&&(!o&&f.length||d.push(o),l=!0)}if(l||(m=!1),x.length){for(var e=[],o=0;o-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 o=d[l];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var h=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=[],o=0;o