From 968295f8e3426fed277b8aaf09c39f6195d5b709 Mon Sep 17 00:00:00 2001 From: mumuy Date: Thu, 20 Apr 2017 15:10:14 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E9=83=A8=E5=88=86=E4=B9=9D=E6=97=8F?= =?UTF-8?q?=E5=88=AB=E7=A7=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 50 ++++++++++++++++++++-------------------- dist/relationship.min.js | 2 +- script/relationship.js | 50 ++++++++++++++++++++-------------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 9a3cca5..79ecfdb 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -183,7 +183,7 @@ '[xb|xs]':['兄弟姐妹'], '[s|d]':['子女','儿女','小孩','孩子'], //本家 - 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'], + 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子','老头子'], 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], 'f,f,f':['曾祖父','太爷','太爷爷','太公','祖公','祖奶爷'], 'f,f,f,f':['高祖父','老太爷','祖太爷','祖太爷爷','祖太公'], @@ -212,25 +212,25 @@ 'f,f,f,ob,w':['曾伯祖母','曾伯母','伯曾祖母','伯婆太','伯太太'], 'f,f,f,lb':['曾叔祖父','曾叔父','叔曾祖父','叔公太','叔太爷'], 'f,f,f,lb,w':['曾叔祖母','曾叔母','叔曾祖母','叔婆太','叔太太'], - 'f,f,f,xb,s&o':['堂伯祖父'], - 'f,f,f,xb,s&o,w':['堂伯祖母'], - 'f,f,f,xb,s&l':['堂叔祖父'], - 'f,f,f,xb,s&l,w':['堂叔祖母'], - 'f,f,f,xb,s,s&o':['从伯父'], - 'f,f,f,xb,s,s&o,w':['从伯母'], - 'f,f,f,xb,s,s&l':['从叔父'], - 'f,f,f,xb,s,s&l,w':['从叔母'], + 'f,f,f,xb,s&o':['堂伯祖父','族伯祖父'], + 'f,f,f,xb,s&o,w':['堂伯祖母','族伯祖母'], + 'f,f,f,xb,s&l':['堂叔祖父','族叔祖父'], + 'f,f,f,xb,s&l,w':['堂叔祖母','族叔祖母'], + 'f,f,f,xb,s,s&o':['从伯父','族伯父'], + 'f,f,f,xb,s,s&o,w':['从伯母','族伯母'], + 'f,f,f,xb,s,s&l':['从叔父','族叔父'], + 'f,f,f,xb,s,s&l,w':['从叔母','族叔母'], 'f,f,f,xb,s,s,s&o':['族兄'], 'f,f,f,xb,s,s,s&l':['族弟'], 'f,f,f,xb,d':['堂姑祖母'], 'f,f,f,xb,d,h':['堂姑祖父'], - 'f,f,f,xs':['曾祖姑母','姑曾祖母','太姑婆','姑婆太','姑太太'], + 'f,f,f,xs':['曾祖姑母','姑曾祖母','太姑婆','姑婆太','姑太太','曾祖姑'], 'f,f,f,xs,h':['曾祖姑丈','姑曾祖父','太姑丈公','姑丈公太','姑太爷'], 'f,f,f,xs,s&o':['表伯祖父'], 'f,f,f,xs,s&o,w':['表伯祖母'], 'f,f,f,xs,s&l':['表叔祖父'], 'f,f,f,xs,s&l,w':['表叔祖母'], - 'f,f,f,xs,d':['表姑祖母'], + 'f,f,f,xs,d':['表姑祖母','族祖姑'], 'f,f,f,xs,d,h':['表姑祖父'], 'f,f,m':['曾祖母','太奶奶','太婆','祖婆','祖奶奶'], 'f,f,m,f':['高外祖父','祖太姥爷','祖太公'], @@ -257,20 +257,20 @@ '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':['从弟','从兄弟'], - 'f,f,xb,s,s&l,w':['从弟妹'], - 'f,f,xb,s,s,s':['从侄','从侄子'], - 'f,f,xb,s,s,s,w':['从侄媳妇'], + 'f,f,xb,s,s&o':['从兄','再从兄','从兄弟'], + 'f,f,xb,s,s&o,w':['从嫂','再从嫂'], + 'f,f,xb,s,s&l':['从弟','再从弟','从兄弟'], + 'f,f,xb,s,s&l,w':['从弟妹','再从弟妹','再从兄'], + 'f,f,xb,s,s,s':['从侄','再从侄','从侄子'], + 'f,f,xb,s,s,s,w':['从侄媳妇','再从侄妇'], 'f,f,xb,s,s,s,s':['从侄孙'], 'f,f,xb,s,s,s,d':['从侄孙女'], - 'f,f,xb,s,s,d':['从侄女'], - 'f,f,xb,s,s,d,h':['从侄女婿','姻家侄婿'], - 'f,f,xb,s,d&o':['从姐','从姐妹'], - 'f,f,xb,s,d&o,h':['从姐夫'], - 'f,f,xb,s,d&l':['从妹','从姐妹'], - 'f,f,xb,s,d&l,h':['从妹夫'], + 'f,f,xb,s,s,d':['从侄女','再从侄女'], + 'f,f,xb,s,s,d,h':['从侄女婿','再从侄女婿','姻家侄婿'], + 'f,f,xb,s,d&o':['从姐','再从姐','从姐妹'], + '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,s&o':['堂姑表兄'], @@ -281,7 +281,7 @@ 'f,f,ob,w':['伯祖母','伯奶奶','伯婆','大奶奶','堂祖母','姆婆'], 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔祖母','叔奶奶','叔婆','小奶奶','堂祖母','婶婆'], - 'f,f,xs':['姑奶奶','姑内祖母','祖姑母','姑祖母','姑婆'], + 'f,f,xs':['姑奶奶','姑内祖母','祖姑母','姑祖母','姑婆','祖姑'], 'f,f,xs,h':['姑爷爷','姑内祖父','祖姑父','姑祖父','姑老爷','姑公','姑奶爷','姑丈公'], 'f,f,xs,s&o':['姑表伯父','表伯父','表伯'], 'f,f,xs,s&o,w':['姑表伯母','表伯母'], @@ -374,7 +374,7 @@ 'f,xb,d&l,h':['堂妹夫'], 'f,xb,d,s':['堂外甥'], 'f,xb,d,d':['堂外甥女'], - 'f,ob':['伯父','伯伯','大伯','x伯'], + 'f,ob':['伯父','伯伯','阿伯','大伯','x伯'], 'f,ob,w':['伯母','大娘','大妈','x妈'], 'f,lb':['叔叔','叔父','阿叔','叔爸','叔爹','仲父','x叔','叔'], 'f,lb,w':['婶婶','婶母','阿婶','家婶','叔母','叔妈','叔娘','季母','x婶','婶'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 5bf89ed..dc36041 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("#"),e=0;e-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("#"),e=0;e-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