From da919d9cfe1568d44298fb078d600af829e7b8cc Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 27 Sep 2016 11:09:46 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E5=A7=A8=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E8=88=85=E8=A1=A8=E3=80=81=E4=BB=8E=E8=A1=A8=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 66 ++++++++++++++++++++++++++-------------- dist/relationship.min.js | 2 +- script/relationship.js | 66 ++++++++++++++++++++++++++-------------- 3 files changed, 87 insertions(+), 47 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index b0d6257..cda7bd1 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -242,27 +242,35 @@ 'f,f,xs,s&o,w':['姑表伯母','表伯母'], 'f,f,xs,s&l':['姑表叔父','表叔','表叔父'], 'f,f,xs,s&l,w':['姑表叔母','表婶','表叔母'], - 'f,f,xs,d':['姑表姑母','表姑'], + 'f,f,xs,d':['姑表姑母','表姑','表姑姑'], 'f,f,xs,d,h':['姑表姑父','表姑丈'], 'f,m':['奶奶','祖母','阿嫲','嫲嫲'], 'f,m,f':['曾外祖父','外太公'], 'f,m,m':['曾外祖母','外太婆'], 'f,m,xb':['舅公','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅祖父','太舅父'], 'f,m,xb,w':['舅婆','舅奶奶','舅祖母','妗婆','太舅母'], - 'f,m,xb,s&o':['表伯','表伯父'], - 'f,m,xb,s&o,w':['表伯母'], - 'f,m,xb,s&l':['表叔','表叔父'], - 'f,m,xb,s&l,w':['表婶','表叔母'], - 'f,m,xb,d':['表姑'], - 'f,m,xb,d,h':['表姑丈'], + 'f,m,xb,s&o':['舅表伯父','表伯父','表伯'], + 'f,m,xb,s&o,w':['舅表伯母','表伯母'], + 'f,m,xb,s&l':['舅表叔父','表叔父','表叔'], + 'f,m,xb,s&l,w':['舅表叔母','表叔母','表婶'], + 'f,m,xb,s,s':['从表兄弟'], + 'f,m,xb,s,d':['从表姐妹'], + 'f,m,xb,d':['舅表姑母','表姑','表姑姑'], + 'f,m,xb,d,h':['舅表姑父','表姑丈'], + 'f,m,xb,d,s':['从表兄弟'], + '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,d':['表姑'], - 'f,m,xs,d,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,s':['从表兄弟'], + 'f,m,xs,s,d':['从表姐妹'], + 'f,m,xs,d':['姨表姑母','表姑','表姑姑'], + 'f,m,xs,d,h':['姨表姑父','表姑丈'], + 'f,m,xs,d,s':['从表兄弟'], + 'f,m,xs,d,d':['从表姐妹'], 'f,xb,s&o':['堂哥','堂兄'], 'f,xb,s&o,w':['堂嫂'], 'f,xb,s&l':['堂弟'], @@ -328,7 +336,7 @@ 'm,f,m,xs':['外太姨婆'], 'm,f,m,xs,h':['外太姑姨公'], 'm,f,xb':['小姥爷','x姥爷'], - 'm,f,xb,s':['堂舅','堂舅父'], + 'm,f,xb,s':['堂舅','堂舅父','堂舅舅'], 'm,f,xb,s,w':['堂舅妈','堂舅母'], 'm,f,xb,d':['堂姨'], 'm,f,xb,d,h':['堂姨丈'], @@ -338,25 +346,37 @@ 'm,f,lb,w':['外叔祖母','叔姥姥','小姥姥','外姆婆'], 'm,f,xs':['外姑祖母','姑姥姥','外太姑母','姑婆'], 'm,f,xs,h':['外姑祖父','姑姥爷','外太姑父','姑公'], - 'm,f,xs,s':['姑表舅父','表舅','表舅父'], + 'm,f,xs,s':['姑表舅父','姑表舅','表舅','表舅父','表舅舅','姑表舅舅'], 'm,f,xs,s,w':['姑表舅母','表舅妈','表舅母'], + 'm,f,xs,s,s':['从表兄弟'], + 'm,f,xs,s,d':['从表姐妹'], 'm,f,xs,d':['姑表姨母','表姨','表姨母','表姨妈','表阿姨'], 'm,f,xs,d,h':['姑表姨父','表姨丈','表姨父'], + 'm,f,xs,d,s':['从表兄弟'], + 'm,f,xs,d,d':['从表姐妹'], 'm,m':['外婆','姥姥','阿婆'], 'm,m,f':['外曾外祖父','外太外公','太姥爷'], 'm,m,m':['外曾外祖母','外太外婆','太姥姥'], 'm,m,xb':['外舅公','外舅祖父','舅姥爷','舅外祖父','舅外公','舅公'], 'm,m,xb,w':['外舅婆','外舅祖母','舅姥姥'], - 'm,m,xb,s':['表舅','表舅父'], - 'm,m,xb,s,w':['表舅妈','表舅母'], - 'm,m,xb,d':['表姨','表姨母','表姨妈','表阿姨'], - 'm,m,xb,d,h':['表姨丈','表姨父'], + 'm,m,xb,s':['舅表舅父','表舅','表舅父','表舅舅','舅表舅舅'], + 'm,m,xb,s,w':['舅表舅母','表舅妈','表舅母'], + 'm,m,xb,s,s':['从表兄弟'], + 'm,m,xb,s,d':['从表姐妹'], + 'm,m,xb,d':['舅表姨母','表姨母','表姨','表姨妈','表阿姨','舅表姨姨'], + 'm,m,xb,d,h':['舅表姨父','表姨父','表姨丈'], + 'm,m,xb,d,s':['从表兄弟'], + 'm,m,xb,d,d':['从表姐妹'], 'm,m,xs':['外姨婆','外姨祖母','姨姥姥','姨婆'], 'm,m,xs,h':['外姨丈公','外姨祖父','姨姥爷'], - 'm,m,xs,s':['表舅','表舅父'], - 'm,m,xs,s,w':['表舅妈','表舅母'], - 'm,m,xs,d':['表姨','表姨母','表姨妈','表阿姨'], - 'm,m,xs,d,h':['表姨丈','表姨父'], + '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,s':['从表兄弟'], + 'm,m,xs,d,d':['从表姐妹'], //舅家 'm,xb':['舅舅','舅父','舅','娘舅','舅仔','x舅'], 'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 966a37e..a15581a 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1 +1 @@ -!function(s,x){"object"==typeof module&&module.exports?module.exports=x():s.relationship=x()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var x=s.split("的"),f=[],b=!0;x.length;){var d=x.shift(),m=[],w=!1;for(var l in h){var o=h[l];o.indexOf(d)>-1&&(!l&&x.length||m.push(l),w=!0)}if(w||(b=!1),f.length){for(var e=[],l=0;l-1&&(s=","+x+s);var d=function(s){var x="";if(!b[s]){b[s]=!0;var m=!0;do{x=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?b="&l":s.indexOf("&l")>-1&&(b="&o"),s){s=s.replace(/&[ol]/g,""),x=x?1:0;var d=(","+x+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var m=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l-1&&(!l&&x.length||m.push(l),w=!0)}if(w||(d=!1),f.length){for(var e=[],l=0;l-1&&(s=","+x+s);var b=function(s){var x="";if(!d[s]){d[s]=!0;var m=!0;do{x=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?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),x=x?1:0;var b=(","+x+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");b=b.substring(0,b.lastIndexOf(","));for(var m=s.split(",").reverse(),w=b.split(",").reverse(),h=[],l=0;l