diff --git a/dist/relationship.js b/dist/relationship.js index a2dd183..3978388 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -287,8 +287,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':['堂姨祖母'], @@ -302,8 +302,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':['表舅祖父'], @@ -465,8 +465,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':['堂姨外祖母'], @@ -482,8 +482,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 719eb8c..e1dcab9 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("#"),e=0;e-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("#"),e=0;e-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