From 7b1e2111b22d5ff81b2ab08ab9a83294d876c05e Mon Sep 17 00:00:00 2001 From: mumuy Date: Wed, 28 Sep 2016 08:02:38 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E7=88=B6=E8=BE=88?= =?UTF-8?q?=E4=BB=8E=E7=B3=BB=E7=A7=B0=E5=91=BC,=E4=BF=AE=E5=A4=8D'?= =?UTF-8?q?=E5=A7=A8=E5=A4=AB','=E5=A7=A8=E7=88=B6'=E6=B7=B7=E6=B7=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 56 ++++++++++++++++++++-------------------- dist/relationship.min.js | 2 +- script/relationship.js | 56 ++++++++++++++++++++-------------------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 0f14af2..2635720 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -228,10 +228,10 @@ 'f,f,m,xs,d,h':['表姑祖父'], 'f,f,xb':['堂祖父','x爷爷'], 'f,f,xb,w':['堂祖母'], - 'f,f,xb,s&o':['堂伯','堂伯父'], - 'f,f,xb,s&o,w':['堂伯母'], - 'f,f,xb,s&l':['堂叔'], - 'f,f,xb,s,w':['堂婶','堂叔母','堂婶母'], + 'f,f,xb,s&o':['堂伯','堂伯父','从父伯父'], + 'f,f,xb,s&o,w':['堂伯母','从父伯母'], + 'f,f,xb,s&l':['堂叔','从父叔父'], + 'f,f,xb,s,w':['堂婶','堂叔母','堂婶母','从父叔母'], 'f,f,xb,s,s&o':['从兄','从兄弟'], 'f,f,xb,s,s&o,w':['从嫂'], 'f,f,xb,s,s&l':['从弟','从兄弟'], @@ -246,15 +246,15 @@ 'f,f,xb,s,d&o,h':['从姐夫'], 'f,f,xb,s,d&l':['从妹','从姐妹'], 'f,f,xb,s,d&l,h':['从妹夫'], - 'f,f,xb,d':['堂姑','堂姑妈','堂姑母'], - 'f,f,xb,d,h':['堂姑丈','堂姑爸'], + 'f,f,xb,d':['堂姑','堂姑妈','堂姑母','从父姑母'], + 'f,f,xb,d,h':['堂姑丈','堂姑爸','堂姑父','从父姑父'], 'f,f,ob':['伯祖父','伯老爷','伯公','大爷爷','大爷','堂祖父','伯爷爷'], 'f,f,ob,w':['伯祖母','伯奶奶','伯婆','大奶奶','堂祖母'], 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷'], 'f,f,lb,w':['叔祖母','叔奶奶','叔婆','小奶奶','堂祖母'], 'f,f,xs':['姑祖母','祖姑母','姑奶奶','姑婆'], 'f,f,xs,h':['姑祖父','祖姑丈','姑爷爷','姑老爷','姑公','姑奶爷','姑丈公'], - 'f,f,xs,s&o':['姑表伯父','表伯','表伯父'], + 'f,f,xs,s&o':['姑表伯父','表伯父','表伯'], 'f,f,xs,s&o,w':['姑表伯母','表伯母'], 'f,f,xs,s&l':['姑表叔父','表叔父','表叔爸','表叔'], 'f,f,xs,s&l,w':['姑表叔母','表叔母','表叔妈','表婶'], @@ -303,14 +303,14 @@ 'f,m,xb,d,d':['从表姐妹'], 'f,m,xs':['姨祖母','姨婆','姨奶奶'], 'f,m,xs,h':['姨祖父','姨丈公','姨爷爷','姨爷','姨老爷','姨奶爷'], - 'f,m,xs,s&o':['姨表伯父','表伯','表伯父'], - 'f,m,xs,s&o,w':['姨表伯母','表伯母'], - 'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔'], - 'f,m,xs,s&l,w':['姨表叔母','表叔母','表叔妈','表婶'], + 'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'], + 'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'], + 'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'], + 'f,m,xs,s&l,w':['姨表叔母','表叔母','表叔妈','表婶','从母叔母'], 'f,m,xs,s,s':['从表兄弟'], 'f,m,xs,s,d':['从表姐妹'], - 'f,m,xs,d':['姨表姑母','表姑妈','表姑母','表姑姑','表姑'], - 'f,m,xs,d,h':['姨表姑父','表姑爸','表姑父','表姑丈'], + 'f,m,xs,d':['姨表姑母','表姑妈','表姑母','表姑姑','表姑','从母姑母'], + 'f,m,xs,d,h':['姨表姑父','表姑爸','表姑父','表姑丈','从母姑父'], 'f,m,xs,d,s':['从表兄弟'], 'f,m,xs,d,d':['从表姐妹'], 'f,xb,s&o':['堂哥','堂兄'], @@ -333,8 +333,8 @@ 'f,xb,d,d':['堂外甥女'], 'f,ob':['伯父','伯伯','大伯','x伯'], 'f,ob,w':['伯母','大娘'], - 'f,lb':['叔叔','叔父','阿叔','叔','叔爸','叔爹','仲父','x叔'], - 'f,lb,w':['婶婶','婶母','阿婶','家婶','婶','季母'], + 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'], + 'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','婶'], //姑家 'f,xs':['姑妈','姑母','姑姑','姑娘','姑'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫'], @@ -396,10 +396,10 @@ 'm,f,m,xs,d':['表姑外祖母'], 'm,f,m,xs,d,h':['表姑外祖父'], 'm,f,xb':['小姥爷','x姥爷'], - 'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅'], - 'm,f,xb,s,w':['堂舅妈','堂舅母'], - 'm,f,xb,d':['堂姨','堂姨妈','堂姨母'], - 'm,f,xb,d,h':['堂姨丈','堂姨爸','堂姨父'], + 'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父'], + 'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母'], + 'm,f,xb,d':['堂姨','堂姨妈','堂姨母','从父姨母'], + 'm,f,xb,d,h':['堂姨丈','堂姨爸','堂姨父','从父姨父'], 'm,f,ob':['伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖','伯公'], 'm,f,ob,w':['伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','伯婆'], 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','叔公','小姥爷','外叔祖'], @@ -455,12 +455,12 @@ 'm,m,xb,d,d':['从表姐妹'], 'm,m,xs':['姨外祖母','外姨婆','外姨祖母','姨姥姥','姨婆'], 'm,m,xs,h':['姨外祖父','外姨丈公','外姨祖父','姨姥爷','姨公'], - 'm,m,xs,s':['姨表舅父','姨表舅爸','表舅父','表舅爸','表舅','表舅舅','姨表舅舅'], - 'm,m,xs,s,w':['姨表舅母','姨表舅妈','表舅母','表舅妈'], + 'm,m,xs,s':['姨表舅父','姨表舅爸','表舅父','表舅爸','表舅','表舅舅','姨表舅舅','从母舅父'], + 'm,m,xs,s,w':['姨表舅母','姨表舅妈','表舅母','表舅妈','从母舅母'], 'm,m,xs,s,s':['从表兄弟'], 'm,m,xs,s,d':['从表姐妹'], - 'm,m,xs,d':['姨表姨母','姨表姨妈','表姨母','表姨妈','表姨','表阿姨','姨表姨姨'], - 'm,m,xs,d,h':['姨表姨父','姨表姨丈','表姨父','表姨丈'], + 'm,m,xs,d':['姨表姨母','姨表姨妈','表姨母','表姨妈','表姨','表阿姨','姨表姨姨','从母姨母'], + 'm,m,xs,d,h':['姨表姨父','姨表姨丈','表姨父','表姨丈','从母姨父'], 'm,m,xs,d,s':['从表兄弟'], 'm,m,xs,d,d':['从表姐妹'], //舅家 @@ -492,7 +492,7 @@ 'm,lb,w':['小舅妈'], //姨家 'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'], - 'm,xs,h':['姨丈','姨夫','姨父','x姨父'], + 'm,xs,h':['姨丈','姨父','姨爸','姨爹','x姨父'], 'm,xs,s&o':['姨表哥','表哥'], 'm,xs,s&o,w':['姨表嫂','表嫂'], 'm,xs,s&l':['姨表弟','表弟'], @@ -514,9 +514,9 @@ 'm,xs,d,s':['表外甥'], 'm,xs,d,d':['表外甥女'], 'm,os':['大姨','大姨妈'], - 'm,os,h':['大姨父','大姨丈','大姨夫'], + 'm,os,h':['大姨父','大姨丈'], 'm,ls':['小姨','小姨妈','姨仔'], - 'm,ls,h':['小姨父','小姨丈','小姨夫'], + 'm,ls,h':['小姨父','小姨丈'], //婆家 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','爱人'], 'h,f':['公公'], @@ -663,9 +663,9 @@ 'w,xs,d,d':['姨甥孙女'], 'w,xs,d,d,h':['姨甥孙女婿'], 'w,os':['大姨子','大姨姐','妻姐'], - 'w,os,h':['大姨夫','大姨姐夫','襟兄','连襟'], + 'w,os,h':['大姨夫','大姨姐夫','襟兄','连襟','姨夫'], 'w,ls':['小姨子','小姨姐','妻妹','小妹儿'], - 'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟'], + 'w,ls,h':['小姨夫','小姨妹夫','襟弟','连襟','姨夫'], //旁支 'xb':['兄弟'], 'xb,w,f':['姻世伯','亲家爷','亲爹','亲伯'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index a9ee989..f405fcd 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=[],w=!1;for(var l in h){var o=h[l];o.indexOf(b)>-1&&(!l&&f.length||d.push(l),w=!0)}if(w||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s);var b=function(s){var f="";if(!m[s]){m[s]=!0;var d=!0;do{f=s;for(var h in w){var l=w[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),w=!0)}if(w||(m=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s);var b=function(s){var f="";if(!m[s]){m[s]=!0;var d=!0;do{f=s;for(var h in w){var l=w[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