From af2b2177bdd4d832a0d2fb989dabdca94e1e2d7e Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 5 Dec 2016 11:41:55 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=A4=AA=E7=A5=96?= =?UTF-8?q?=E8=BE=88=E7=9A=84=E5=85=B3=E7=B3=BB=E5=8F=8A=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=AB=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 104 +++++++++++++++------------------------ dist/relationship.min.js | 2 +- script/relationship.js | 104 +++++++++++++++------------------------ 3 files changed, 81 insertions(+), 129 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 7fb1e51..9470030 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,18 +209,18 @@ '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,xb':['舅曾祖父','太舅公','太舅爷','舅太爷'], - 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太'], + 'f,f,m,f':['高外祖父','祖太姥爷'], + 'f,f,m,m':['高外祖母','祖太姥姥'], + 'f,f,m,xb':['舅曾祖父','太舅公','太舅爷','舅太爷','舅太爷爷'], + 'f,f,m,xb,w':['舅曾祖母','太舅婆','舅太太','舅太奶奶'], 'f,f,m,xb,s&o':['表伯祖父'], 'f,f,m,xb,s&o,w':['表伯祖母'], 'f,f,m,xb,s&l':['表叔祖父'], 'f,f,m,xb,s&l,w':['表叔祖母'], 'f,f,m,xb,d':['表姑祖母'], 'f,f,m,xb,d,h':['表姑祖父'], - 'f,f,m,xs':['姨曾祖母','太姨奶','姨太太','曾姨奶奶'], - 'f,f,m,xs,h':['姨曾祖父','太姨爷','姨太爷'], + 'f,f,m,xs':['姨曾祖母','太姨奶','姨太太','曾姨奶奶','姨太奶奶'], + 'f,f,m,xs,h':['姨曾祖父','太姨爷','姨太爷','姨太爷爷'], 'f,f,m,xs,s&o':['表伯祖父'], 'f,f,m,xs,s&o,w':['表伯祖母'], 'f,f,m,xs,s&l':['表叔祖父'], @@ -262,7 +262,9 @@ 'f,f,xs,d':['姑表姑母','表姑妈','表姑母','表姑姑','表姑'], 'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'], 'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'], - 'f,m,f':['曾外祖父','外太公'], + 'f,m,f':['曾外祖父','外太公','太姥爷'], + 'f,m,f,f':['祖太爷爷'], + 'f,m,f,m':['祖太奶奶'], 'f,m,f,xb,s':['堂舅祖父'], 'f,m,f,xb,s,w':['堂舅祖母'], 'f,m,f,xb,d':['堂姨祖母'], @@ -272,12 +274,12 @@ 'f,m,f,lb':['叔曾外祖父','叔太姥爷','叔太奶爷'], 'f,m,f,lb,w':['叔曾外祖母','叔太姥姥','叔太奶奶'], 'f,m,f,xs':['姑曾外祖母','姑太姥姥','姑太奶奶'], - 'f,m,f,xs,h':['姑曾外祖父','姑太姥爷','姑太奶爷'], + 'f,m,f,xs,h':['姑曾外祖父','姑太姥爷','姑太奶爷','姑太爷爷'], 'f,m,f,xs,s':['表舅祖父'], 'f,m,f,xs,s,w':['表舅祖母'], - 'f,m,m,xs,d':['表姨祖母'], - 'f,m,m,xs,d,h':['表姨祖父'], - 'f,m,m':['曾外祖母','外太婆'], + 'f,m,m':['曾外祖母','外太婆','太姥姥'], + 'f,m,m,f':['祖太姥爷'], + 'f,m,m,m':['祖太姥姥'], 'f,m,m,xb':['舅曾外祖父','舅太姥爷','舅太奶爷'], 'f,m,m,xb,w':['舅曾外祖母','舅太姥姥','舅太奶奶'], 'f,m,m,xb,s':['表舅祖父'], @@ -285,7 +287,9 @@ 'f,m,m,xb,d':['表姨祖母'], 'f,m,m,xb,d,h':['表姨祖父'], 'f,m,m,xs':['姨曾外祖母','姨太姥姥','姨太奶奶'], - 'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'], + 'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'], + 'f,m,m,xs,d':['表姨祖母'], + 'f,m,m,xs,d,h':['表姨祖父'], 'f,m,m,xs,s':['表舅祖父'], 'f,m,m,xs,s,w':['表舅祖母'], 'f,m,m,xs,d':['表姨祖母'], @@ -364,36 +368,36 @@ //外家 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','娘','娘亲','妈咪'], 'm,f':['外公','外祖父','姥爷'], - 'm,f,f':['外曾祖父','外太祖父','太外祖父','太姥爷','外太公'], - 'm,f,f,f':['外高祖父'], - 'm,f,f,m':['外高祖母'], + 'm,f,f':['外曾祖父','外太祖父','外太公','外太爷爷','太外祖父'], + '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':['堂叔外祖父'], 'm,f,f,xb,s&l,w':['堂叔外祖母'], 'm,f,f,xb,d':['堂姑外祖母'], 'm,f,f,xb,d,h':['堂姑外祖父'], - 'm,f,f,ob':['伯外曾祖父','外太伯公','伯太姥爷','伯太奶爷'], + 'm,f,f,ob':['伯外曾祖父','外太伯公','伯太姥爷','伯太奶爷','伯太爷爷'], 'm,f,f,ob,w':['伯外曾祖母','外太伯母','伯太姥姥','伯太奶奶'], - 'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷'], + 'm,f,f,lb':['叔外曾祖父','外太叔公','叔太姥爷','叔太奶爷','叔太爷爷'], 'm,f,f,lb,w':['叔外曾祖母','外太叔母','叔太姥姥','叔太奶奶'], 'm,f,f,xs':['姑外曾祖母','外太姑婆','姑太姥姥','姑太奶奶'], - 'm,f,f,xs,h':['姑外曾祖父','外太姑丈公','姑太姥爷','姑太奶爷'], + 'm,f,f,xs,h':['姑外曾祖父','外太姑丈公','姑太姥爷','姑太奶爷','姑太爷爷'], 'm,f,f,xs,s&o':['表伯外祖父','外表伯祖父'], 'm,f,f,xs,s&o,w':['表伯外祖母','外表伯祖母'], 'm,f,f,xs,s&l':['表叔外祖父','外表叔祖父'], 'm,f,f,xs,s&l,w':['表叔外祖母','外表叔祖母'], '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':['外曾祖母','外太祖母','太外祖母','外太奶奶','外太婆'], + 'm,f,m,f':['外高外祖父','祖太姥爷'], + 'm,f,m,m':['外高外祖母','祖太姥姥'], 'm,f,m,xb':['舅外曾祖父','外太舅公','舅太姥爷','舅太奶爷'], 'm,f,m,xb,w':['舅外曾祖母','外太舅母','舅太姥姥','舅太奶奶','外太舅婆'], 'm,f,m,xb,d':['表姑外祖母'], 'm,f,m,xb,d,h':['表姑外祖父'], 'm,f,m,xs':['姨外曾祖母','外太姨婆','姨太姥姥','姨太奶奶'], - 'm,f,m,xs,h':['姨外曾祖父','外太姑姨公','姨太姥爷','姨太奶爷'], + 'm,f,m,xs,h':['姨外曾祖父','外太姑姨公','姨太姥爷','姨太奶爷','姨太爷爷'], 'm,f,m,xs,d':['表姑外祖母'], 'm,f,m,xs,d,h':['表姑外祖父'], 'm,f,xb':['小姥爷','x姥爷'], @@ -416,7 +420,9 @@ 'm,f,xs,d,s':['从表兄弟'], 'm,f,xs,d,d':['从表姐妹'], 'm,m':['外婆','外祖母','姥姥','阿婆'], - 'm,m,f':['外曾外祖父','外太外公','太姥爷'], + 'm,m,f':['外曾外祖父','外太外公','外太姥爷'], + 'm,m,f,f':['祖太爷爷'], + 'm,m,f,m':['祖太奶奶'], 'm,m,f,xb,s':['堂舅外祖父'], 'm,m,f,xb,s,w':['堂舅外祖母'], 'm,m,f,xb,d':['堂姨外祖母'], @@ -431,7 +437,9 @@ 'm,m,f,xs,s,w':['表舅外祖母'], 'm,m,f,xs,d':['表姨外祖母'], 'm,m,f,xs,d,h':['表姨外祖父'], - 'm,m,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':['表舅外祖父'], @@ -556,42 +564,10 @@ 'h,m,xb,w':['舅婆'], 'h,m,xs':['姨婆'], 'h,m,xs,h':['姨公'], - 'h,xb,s':['侄子','侄儿'], - 'h,xb,s,w':['侄媳','侄媳妇'], - 'h,xb,s,s':['侄孙','侄孙子'], - 'h,xb,s,s,w':['侄孙媳'], - 'h,xb,s,d':['侄孙女'], - 'h,xb,s,d,h':['侄孙女婿'], - 'h,xb,d':['侄女'], - 'h,xb,d,h':['侄女婿','侄婿'], - 'h,xb,d,s':['外侄孙'], - 'h,xb,d,s,w':['外侄媳妇'], - 'h,xb,d,d':['外侄孙女'], - 'h,xb,d,d,h':['外侄孙女婿'], 'h,ob':['大伯子','大伯哥','大伯兄','夫兄'], 'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'], 'h,lb':['小叔子','小叔弟'], 'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'], - 'h,xs,s':['外甥','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], - 'h,xs,s,w':['外甥媳妇'], - 'h,xs,s,s':['外甥孙'], - 'h,xs,s,s,w':['外甥孙媳妇'], - 'h,xs,s,s,s':['外曾甥孙'], - 'h,xs,s,s,d':['外曾甥孙女'], - 'h,xs,s,d':['外甥孙女'], - 'h,xs,s,d,h':['外甥孙女婿'], - 'h,xs,s,d,s':['外曾甥孙'], - 'h,xs,s,d,d':['外曾甥孙女'], - 'h,xs,d':['外甥女','甥女'], - 'h,xs,d,h':['外甥女婿'], - 'h,xs,d,s':['外甥孙'], - 'h,xs,d,s,w':['外甥孙媳妇'], - 'h,xs,d,s,s':['外曾甥孙'], - 'h,xs,d,s,d':['外曾甥孙女'], - 'h,xs,d,d':['外甥孙女'], - 'h,xs,d,d,h':['外甥孙女婿'], - 'h,xs,d,d,s':['外曾甥孙'], - 'h,xs,d,d,d':['外曾甥孙女'], 'h,os':['大姑子','大姑','大娘姑','大姑姊'], 'h,os,h':['大姑夫','姊丈','大姑姐夫','大姑姊夫'], 'h,ls':['小姑子','小姑','小姑妹','姑仔'], @@ -688,7 +664,7 @@ 'xb,s,d':['侄孙女'], 'xb,s,d,h':['侄孙女婿'], 'xb,d':['侄女'], - 'xb,d,h':['侄女婿'], + 'xb,d,h':['侄女婿','侄婿'], 'xb,d,s':['外侄孙','外侄孙子'], 'xb,d,s,w':['外侄孙媳妇'], 'xb,d,d':['外侄孙女'], @@ -704,23 +680,23 @@ 'xs':['姐妹','姊妹'], 'xs,h,f':['姻世伯','亲家爷','亲爹','亲伯'], 'xs,h,m':['姻伯母','亲家娘','亲娘'], - 'xs,s':['外甥'], + 'xs,s':['外甥','甥男','甥儿','甥子','外甥儿','外甥子','外甥儿子'], 'xs,s,w':['外甥媳妇'], - 'xs,s,s':['外甥孙'], + 'xs,s,s':['外甥孙','甥孙男','甥孙'], 'xs,s,s,w':['外甥孙媳妇'], 'xs,s,s,s':['外曾甥孙'], 'xs,s,s,d':['外曾甥孙女'], - 'xs,s,d':['外甥孙女'], + 'xs,s,d':['外甥孙女','甥孙女','甥孙'], 'xs,s,d,h':['外甥孙女婿'], 'xs,s,d,s':['外曾甥孙'], 'xs,s,d,d':['外曾甥孙女'], 'xs,d':['外甥女'], 'xs,d,h':['外甥女婿'], - 'xs,d,s':['外甥孙'], + 'xs,d,s':['外甥孙','甥孙男','甥孙'], 'xs,d,s,w':['外甥孙媳妇'], 'xs,d,s,s':['外曾甥孙'], 'xs,d,s,d':['外曾甥孙女'], - 'xs,d,d':['外甥孙女'], + 'xs,d,d':['外甥孙女','甥孙女','甥孙'], 'xs,d,d,h':['外甥孙女婿'], 'xs,d,d,s':['外曾甥孙'], 'xs,d,d,d':['外曾甥孙女'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index bc17894..501ac80 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&&(!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