From 0513d8e4c1e224152594e649e6474bfaec5f39b8 Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 23 Jan 2017 00:48:40 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E5=A7=BB=E4=BA=B2?= =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E4=BA=B2=E5=8F=8A=E7=A5=96=E8=BE=88=E5=A4=9A?= =?UTF-8?q?=E4=BB=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 107 ++++++++++++++++++++++++++++++++------- dist/relationship.min.js | 2 +- script/relationship.js | 107 ++++++++++++++++++++++++++++++++------- 3 files changed, 179 insertions(+), 37 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 26e55d3..0f37a25 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -185,6 +185,16 @@ 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], 'f,f,f,f':['高祖父','老太爷','祖太爷','祖太爷爷','祖太公'], + 'f,f,f,f,f':['天祖父'], + 'f,f,f,f,f,f':['烈祖父'], + 'f,f,f,f,f,m':['烈祖母'], + 'f,f,f,f,f,f,f':['太祖父'], + 'f,f,f,f,f,f,m':['太祖母'], + 'f,f,f,f,f,f,f,f':['远祖父'], + 'f,f,f,f,f,f,f,m':['远祖母'], + 'f,f,f,f,f,f,f,f,f':['鼻祖父'], + 'f,f,f,f,f,f,f,f,m':['鼻祖母'], + 'f,f,f,f,m':['天祖母'], 'f,f,f,f,ob':['伯高祖父'], 'f,f,f,f,ob,w':['伯高祖母'], 'f,f,f,f,lb':['叔高祖父'], @@ -332,6 +342,12 @@ 'f,m,xs,d,h':['姨表姑父','表姑爸','表姑父','表姑丈','从母姑父'], 'f,m,xs,d,s':['从表兄弟'], 'f,m,xs,d,d':['从表姐妹'], + 'f,xb,w,f':['姻伯公'], + 'f,xb,w,m':['姻伯婆'], + 'f,xb,w,xb':['姻世伯'], + 'f,xb,w,xb,w':['姻伯母'], + 'f,xb,w,xs':['姻伯母'], + 'f,xb,w,xs,h':['姻世伯'], 'f,xb,s&o':['堂哥','堂兄','堂阿哥'], 'f,xb,s&o,w':['堂嫂'], 'f,xb,s&l':['堂弟','堂阿弟'], @@ -357,6 +373,12 @@ //姑家 'f,xs':['姑妈','姑姑','姑娘','大姑妈','x姑妈','姑'], 'f,xs,h':['姑丈','姑父','姑爸','姑夫'], + 'f,xs,h,f':['姻伯公'], + 'f,xs,h,m':['姻伯婆'], + 'f,xs,h,xb':['姻世伯'], + 'f,xs,h,xb,w':['姻伯母'], + 'f,xs,h,xs':['姻伯母'], + 'f,xs,h,xs,h':['姻世伯'], 'f,xs,s&o':['姑表哥','表哥'], 'f,xs,s&o,w':['姑表嫂','表嫂'], 'f,xs,s&l':['姑表弟','表弟'], @@ -497,6 +519,12 @@ //舅家 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'], 'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'], + 'm,xb,w,f':['姻伯公'], + 'm,xb,w,m':['姻伯婆'], + 'm,xb,w,xb':['姻世伯'], + 'm,xb,w,xb,w':['姻伯母'], + 'm,xb,w,xs':['姻伯母'], + 'm,xb,w,xs,h':['姻世伯'], 'm,xb,s&o':['舅表哥','表哥'], 'm,xb,s&o,w':['舅表嫂','表嫂'], 'm,xb,s&l':['舅表弟',,'表弟'], @@ -524,6 +552,12 @@ //姨家 'm,xs':['姨妈','姨母','姨姨','姨娘','阿姨','姨','x姨','x姨妈'], 'm,xs,h':['姨丈','姨父','姨爸','姨爹','x姨父'], + 'm,xs,h,f':['姻伯公'], + 'm,xs,h,m':['姻伯婆'], + 'm,xs,h,xb':['姻世伯'], + 'm,xs,h,xb,w':['姻伯母'], + 'm,xs,h,xs':['姻伯母'], + 'm,xs,h,xs,h':['姻世伯'], 'm,xs,s&o':['姨表哥','表哥'], 'm,xs,s&o,w':['姨表嫂','表嫂'], 'm,xs,s&l':['姨表弟','表弟'], @@ -581,28 +615,44 @@ 'h,f,xb,d,d':['堂夫甥女'], 'h,f,xs':['姑婆'], 'h,f,xs,h':['姑公'], - 'h,f,xs,s&o':['姑表大伯子'], - 'h,f,xs,s&o,w':['姑表大伯嫂'], - 'h,f,xs,s&l':['姑表小叔弟'], + 'h,f,xs,s&o':['姑表大伯子','表大伯'], + 'h,f,xs,s&o,w':['姑表大伯嫂','表大姆'], + 'h,f,xs,s&l':['姑表小叔弟','表叔仔'], 'h,f,xs,s&l,w':['姑表小叔弟妇'], - 'h,f,xs,d&o':['姑表大姑姐'], + 'h,f,xs,s,s':['姑表夫侄男'], + 'h,f,xs,s,d':['姑表夫侄女'], + 'h,f,xs,d&o':['姑表大姑姐','表大姑'], 'h,f,xs,d&o,h':['姑表大姑姐夫'], - 'h,f,xs,d&l':['姑表小姑妹'], + 'h,f,xs,d&l':['姑表小姑妹','表姑仔'], 'h,f,xs,d&l,h':['姑表小姑妹夫'], + 'h,f,xs,d,s':['姑表夫甥男'], + 'h,f,xs,d,d':['姑表夫甥女'], 'h,m':['婆婆','姑亲','老婆婆'], 'h,m,xb':['舅公'], 'h,m,xb,w':['舅婆'], + 'h,m,xb,s&o':['舅表大伯子','表大伯'], + 'h,m,xb,s&o,w':['舅表大伯嫂','表大姆'], + 'h,m,xb,s&l':['舅表小叔弟','表叔仔'], + 'h,m,xb,s&l,w':['舅表小叔弟妇'], + 'h,m,xb,s,s':['舅表夫侄男'], + 'h,m,xb,s,d':['舅表夫侄女'], + 'h,m,xb,d&o':['舅表大姑姐','表大姑'], + 'h,m,xb,d&o,h':['舅表大姑姐夫'], + 'h,m,xb,d&l':['舅表小姑妹','表姑仔'], + 'h,m,xb,d&l,h':['舅表小姑妹夫'], + 'h,m,xb,d,s':['舅表夫甥男'], + 'h,m,xb,d,d':['舅表夫甥女'], 'h,m,xs':['姨婆'], 'h,m,xs,h':['姨公'], - 'h,m,xs,s&o':['姨表大伯子'], - 'h,m,xs,s&o,w':['姨表大伯嫂'], - 'h,m,xs,s&l':['姨表小叔弟'], + 'h,m,xs,s&o':['姨表大伯子','表大伯'], + 'h,m,xs,s&o,w':['姨表大伯嫂','表大姆'], + 'h,m,xs,s&l':['姨表小叔弟','表叔仔'], 'h,m,xs,s&l,w':['姨表小叔弟妇'], 'h,m,xs,s,s':['姨表夫侄男'], 'h,m,xs,s,d':['姨表夫侄女'], - 'h,m,xs,d&o':['姨表大姑姐'], + 'h,m,xs,d&o':['姨表大姑姐','表大姑'], 'h,m,xs,d&o,h':['姨表大姑姐夫'], - 'h,m,xs,d&l':['姨表小姑妹'], + 'h,m,xs,d&l':['姨表小姑妹','表姑仔'], 'h,m,xs,d&l,h':['姨表小姑妹夫'], 'h,m,xs,d,s':['姨表夫甥男'], 'h,m,xs,d,d':['姨表夫甥女'], @@ -644,10 +694,14 @@ 'w,f,lb':['叔岳','叔岳父'], 'w,f,lb,w':['叔岳母'], 'w,f,xs':['姑岳母'], - 'w,f,xs,s&o':['表大舅'], - 'w,f,xs,s&l':['表舅仔'], - 'w,f,xs,d&o':['表大姨'], - 'w,f,xs,d&l':['表姨仔'], + 'w,f,xs,s&o':['表大舅','表内兄'], + 'w,f,xs,s&o,w':['表内嫂'], + 'w,f,xs,s&l':['表舅仔','表内弟'], + 'w,f,xs,s&l,w':['表内弟妇'], + 'w,f,xs,d&o':['表大姨','表内姐'], + 'w,f,xs,d&o,h':['表襟兄'], + 'w,f,xs,d&l':['表姨仔','表内妹'], + 'w,f,xs,d&l,w':['表襟弟'], 'w,m':['岳母','丈母娘','丈母','泰水'], 'w,m,f':['外太岳父'], 'w,m,m':['外太岳母'], @@ -754,7 +808,11 @@ 's':['儿子','仔','阿仔','仔仔'], 's,w':['儿媳妇','儿媳','新妇'], 's,w,xb':['姻侄'], + 's,w,xb,s':['姻侄孙'], + 's,w,xb,d':['姻侄孙女'], 's,w,xs':['姻侄女'], + 's,w,xs,s':['姻侄孙'], + 's,w,xs,d':['姻侄孙女'], 's,s':['孙子','孙儿','孙'], 's,s,w':['孙媳妇','孙媳'], 's,s,s':['曾孙'], @@ -762,6 +820,15 @@ 's,s,s,s':['玄孙','元孙','膀孙'], 's,s,s,d':['玄孙女'], 's,s,s,s,s':['来孙'], + 's,s,s,s,d':['来孙女'], + 's,s,s,s,s,s':['晜孙'], + 's,s,s,s,s,d':['晜孙女'], + 's,s,s,s,s,s,s':['仍孙'], + 's,s,s,s,s,s,d':['仍孙女'], + 's,s,s,s,s,s,s,s':['云孙'], + 's,s,s,s,s,s,s,d':['云孙女'], + 's,s,s,s,s,s,s,s,s':['耳孙'], + 's,s,s,s,s,s,s,s,d':['耳孙女'], 's,s,d':['曾孙女'], 's,s,d,h':['曾孙女婿'], 's,s,d,s':['外玄孙'], @@ -773,7 +840,11 @@ 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡'], 'd,h':['女婿','姑爷','女婿子','女婿儿'], 'd,h,xb':['姻侄'], + 'd,h,xb,s':['姻侄孙'], + 'd,h,xb,d':['姻侄孙女'], 'd,h,xs':['姻侄女'], + 'd,h,xs,s':['姻侄孙'], + 'd,h,xs,d':['姻侄孙女'], 'd,s':['外孙'], 'd,s,w':['外孙媳'], 'd,s,s':['外曾孙','重外孙'], @@ -787,14 +858,14 @@ 's,w,f':['亲家公','亲家翁','亲家'], 's,w,f,f':['太姻翁'], 's,w,f,m':['太姻姆'], - 's,w,f,ob':['姻兄'], - 's,w,f,lb':['姻弟'], + 's,w,f,ob':['姻兄','姻亲'], + 's,w,f,lb':['姻弟','姻亲'], 'd,h,m':['亲家母','亲家'], 'd,h,f':['亲家公','亲家翁','亲家'], 'd,h,f,f':['太姻翁'], 'd,h,f,m':['太姻姆'], - 'd,h,f,ob':['姻兄'], - 'd,h,f,lb':['姻弟'] + 'd,h,f,ob':['姻兄','姻亲'], + 'd,h,f,lb':['姻弟','姻亲'] }; //数组去重 diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 693d8c8..48d73ff 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