From 345f84897887ac1a37670a175910067bb622bc46 Mon Sep 17 00:00:00 2001 From: mumuy Date: Mon, 23 Jan 2017 16:27:18 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E9=83=A8=E5=88=86=E8=A1=A8=E4=BA=B2?= =?UTF-8?q?=E5=88=AB=E7=A7=B0=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 51 ++++++++++++++++++++-------------------- dist/relationship.min.js | 2 +- script/relationship.js | 51 ++++++++++++++++++++-------------------- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index b30eedf..be5093c 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -348,11 +348,11 @@ 'f,xb,w,xb,w':['姻伯母'], 'f,xb,w,xs':['姻伯母'], 'f,xb,w,xs,h':['姻世伯'], - 'f,xb,s&o':['堂哥','堂兄','堂阿哥'], + 'f,xb,s&o':['堂哥','堂兄','堂阿哥','叔伯兄弟'], 'f,xb,s&o,w':['堂嫂'], - 'f,xb,s&l':['堂弟','堂阿弟'], + 'f,xb,s&l':['堂弟','堂阿弟','叔伯兄弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'], - 'f,xb,s,s':['堂侄','堂侄子'], + 'f,xb,s,s':['堂侄','堂侄子','叔伯侄子'], 'f,xb,s,s,w':['堂侄媳妇'], 'f,xb,s,s,s':['堂侄孙'], 'f,xb,s,s,s,w':['堂侄孙媳妇'], @@ -360,9 +360,9 @@ 'f,xb,s,s,d,h':['堂侄孙女婿'], 'f,xb,s,d':['堂侄女'], 'f,xb,s,d,h':['堂侄女婿'], - 'f,xb,d&o':['堂姐','堂阿姐'], + 'f,xb,d&o':['堂姐','堂阿姐','叔伯姐妹'], 'f,xb,d&o,h':['堂姐夫'], - 'f,xb,d&l':['堂妹','堂阿妹'], + 'f,xb,d&l':['堂妹','堂阿妹','叔伯姐妹'], 'f,xb,d&l,h':['堂妹夫'], 'f,xb,d,s':['堂外甥'], 'f,xb,d,d':['堂外甥女'], @@ -383,12 +383,12 @@ 'f,xs,s&o,w':['姑表嫂','表嫂'], 'f,xs,s&l':['姑表弟','表弟'], 'f,xs,s&l,w':['姑表弟媳','表弟媳','表弟妹'], - 'f,xs,s,s':['表侄','表侄子'], + 'f,xs,s,s':['表侄','表侄子','姑表侄男','表侄男'], 'f,xs,s,s,s':['表侄孙'], 'f,xs,s,s,s,w':['表侄孙媳妇'], 'f,xs,s,s,d':['表侄孙女'], 'f,xs,s,s,d,h':['表侄孙女婿'], - 'f,xs,s,d':['表侄女'], + 'f,xs,s,d':['表侄女','姑表侄女'], 'f,xs,s,d,s':['外表侄孙'], 'f,xs,s,d,s,w':['外表侄孙媳妇'], 'f,xs,s,d,d':['外表侄孙女'], @@ -397,8 +397,8 @@ 'f,xs,d&o,h':['姑表姐夫','表姐夫','表姐丈'], 'f,xs,d&l':['姑表妹','表妹'], 'f,xs,d&l,h':['姑表妹夫','表妹夫'], - 'f,xs,d,s':['表外甥'], - 'f,xs,d,d':['表外甥女'], + 'f,xs,d,s':['表外甥','姑表甥男','表甥男'], + 'f,xs,d,d':['表外甥女','姑表甥女','表甥女'], 'f,os':['姑母'], 'f,ls':['姑姐'], //外家 @@ -529,12 +529,12 @@ 'm,xb,s&o,w':['舅表嫂','表嫂'], 'm,xb,s&l':['舅表弟',,'表弟'], 'm,xb,s&l,w':['舅表弟媳','表弟媳','表弟妹'], - 'm,xb,s,s':['表侄','表侄子'], + 'm,xb,s,s':['表侄','表侄子','舅表侄男','表侄男'], 'm,xb,s,s,s':['表侄孙'], 'm,xb,s,s,s,w':['表侄孙媳妇'], 'm,xb,s,s,d':['表侄孙女'], 'm,xb,s,s,d,h':['表侄孙女婿'], - 'm,xb,s,d':['表侄女'], + 'm,xb,s,d':['表侄女','舅表侄女'], 'm,xb,s,d,s':['外表侄孙'], 'm,xb,s,d,s,w':['外表侄孙媳妇'], 'm,xb,s,d,d':['外表侄孙女'], @@ -543,8 +543,8 @@ 'm,xb,d&o,h':['舅表姐夫','表姐夫','表姐丈'], 'm,xb,d&l':['舅表妹','表妹'], 'm,xb,d&l,h':['舅表妹夫','表妹夫'], - 'm,xb,d,s':['表外甥'], - 'm,xb,d,d':['表外甥女'], + 'm,xb,d,s':['表外甥','舅表甥男','表甥男'], + 'm,xb,d,d':['表外甥女','舅表甥女','表甥女'], 'm,ob':['大舅'], 'm,ob,w':['大舅妈'], 'm,lb':['小舅','舅父仔'], @@ -562,12 +562,12 @@ 'm,xs,s&o,w':['姨表嫂','表嫂'], 'm,xs,s&l':['姨表弟','表弟'], 'm,xs,s&l,w':['姨表弟媳','表弟媳','表弟妹'], - 'm,xs,s,s':['表侄','表侄子'], + 'm,xs,s,s':['表侄','表侄子','姨表侄男','表侄男'], 'm,xs,s,s,s':['表侄孙'], 'm,xs,s,s,s,w':['表侄孙媳妇'], 'm,xs,s,s,d':['表侄孙女'], 'm,xs,s,s,d,h':['表侄孙女婿'], - 'm,xs,s,d':['表侄女'], + 'm,xs,s,d':['表侄女','姨表侄女'], 'm,xs,s,d,s':['外表侄孙'], 'm,xs,s,d,s,w':['外表侄孙媳妇'], 'm,xs,s,d,d':['外表侄孙女'], @@ -576,8 +576,8 @@ 'm,xs,d&o,h':['姨表姐夫','表姐夫','表姐丈'], 'm,xs,d&l':['姨表妹','表妹'], 'm,xs,d&l,h':['姨表妹夫','表妹夫'], - 'm,xs,d,s':['表外甥'], - 'm,xs,d,d':['表外甥女'], + 'm,xs,d,s':['表外甥','姨表甥男','姨表甥男'], + 'm,xs,d,d':['表外甥女','姨表甥女','表甥女'], 'm,os':['大姨','大姨妈'], 'm,os,h':['大姨父','大姨丈'], 'm,ls':['小姨','小姨妈','姨仔'], @@ -669,7 +669,7 @@ //岳家 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], - 'w,f,f':['太岳父'], + 'w,f,f':['太岳父','祖岳父'], 'w,f,f,ob':['太伯岳'], 'w,f,f,ob,w':['太伯岳母'], 'w,f,f,lb,':['太叔岳'], @@ -680,7 +680,7 @@ 'w,f,f,xb,s&l,w':['姻婶'], 'w,f,f,xs':['太姑岳母'], 'w,f,f,xs,h':['太姑岳父'], - 'w,f,m':['太岳母'], + 'w,f,m':['太岳母','祖岳母'], 'w,f,m,xb':['太舅岳父'], 'w,f,m,xb,w':['太舅岳母'], 'w,f,m,xs':['太姨岳母'], @@ -694,6 +694,7 @@ 'w,f,lb':['叔岳','叔岳父'], 'w,f,lb,w':['叔岳母'], 'w,f,xs':['姑岳母'], + 'w,f,xs,h':['姑岳父'], 'w,f,xs,s&o':['表大舅','表内兄'], 'w,f,xs,s&o,w':['表内嫂'], 'w,f,xs,s&l':['表舅仔','表内弟'], @@ -729,9 +730,9 @@ 'w,xb,d,s,w':['外侄孙媳妇'], 'w,xb,d,d':['外侄孙女'], 'w,xb,d,d,h':['外侄孙女婿'], - 'w,ob':['大舅子','大舅哥','大舅兄','内兄','妻兄','妻舅'], + 'w,ob':['大舅子','大舅哥','大舅兄','内兄','妻兄','妻舅','舅兄'], 'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'], - 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅'], + 'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅','舅弟'], 'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'], 'w,xs,s':['内甥','姨甥','妻外甥'], 'w,xs,s,w':['姨甥媳妇'], @@ -764,9 +765,9 @@ 'xb,s,d,h':['侄孙女婿'], 'xb,d':['侄女','侄囡'], 'xb,d,h':['侄女婿','侄婿'], - 'xb,d,s':['外侄孙','外侄孙子'], + 'xb,d,s':['外侄孙','外侄孙子','侄外孙男'], 'xb,d,s,w':['外侄孙媳妇'], - 'xb,d,d':['外侄孙女'], + 'xb,d,d':['外侄孙女','侄外孙女'], 'xb,d,d,h':['外侄孙女婿'], 'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥','兄长'], 'ob,w':['嫂子','大嫂','x嫂','嫂','嫂嫂','阿嫂'], @@ -792,11 +793,11 @@ '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 0d386a1..0193b67 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