diff --git a/dist/relationship.js b/dist/relationship.js index fe5d6ec..26e55d3 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -259,9 +259,13 @@ 'f,f,xb,s,d&l,h':['从妹夫'], 'f,f,xb,d':['堂姑','堂姑妈','堂姑母','从父姑母'], 'f,f,xb,d,h':['堂姑丈','堂姑爸','堂姑父','从父姑父'], + 'f,f,xb,d,s&o':['堂姑表兄'], + 'f,f,xb,d,s&l':['堂姑表弟'], + 'f,f,xb,d,d&o':['堂姑表姐'], + 'f,f,xb,d,d&l':['堂姑表妹'], 'f,f,ob':['伯祖父','伯老爷','伯公','大爷爷','大爷','堂祖父','伯爷爷'], 'f,f,ob,w':['伯祖母','伯奶奶','伯婆','大奶奶','堂祖母'], - 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷'], + 'f,f,lb':['叔祖父','叔老爷','叔公','小爷爷','堂祖父','叔爷爷','叔奶爷'], 'f,f,lb,w':['叔祖母','叔奶奶','叔婆','小奶奶','堂祖母'], 'f,f,xs':['祖姑母','姑祖母','姑奶奶','姑婆'], 'f,f,xs,h':['祖姑父','姑祖父','姑爷爷','姑老爷','姑公','姑奶爷','姑丈公'], @@ -413,11 +417,19 @@ 'm,f,xb':['大姥爷/小姥爷','x姥爷'], 'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父'], 'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母'], + 'm,f,xb,s,s&o':['堂舅表兄'], + 'm,f,xb,s,s&l':['堂舅表弟'], + 'm,f,xb,s,d&o':['堂舅表姐'], + 'm,f,xb,s,d&l':['堂舅表妹'], 'm,f,xb,d':['堂姨','堂姨妈','堂姨母','从父姨母'], 'm,f,xb,d,h':['堂姨丈','堂姨爸','堂姨父','从父姨父'], + 'm,f,xb,d,s&o':['堂姨表兄'], + 'm,f,xb,d,s&l':['堂姨表弟'], + 'm,f,xb,d,d&o':['堂姨表姐'], + 'm,f,xb,d,d&l':['堂姨表妹'], 'm,f,ob':['伯外祖父','外伯祖父','伯姥爷','大姥爷','外伯祖','伯公'], 'm,f,ob,w':['伯外祖母','外伯祖母','伯姥姥','大姥姥','外姆婆','伯婆'], - 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','叔公','小姥爷','外叔祖'], + 'm,f,lb':['叔外祖父','外叔祖父','叔姥爷','叔公','小姥爷','外叔祖','叔外祖','叔爷爷'], 'm,f,lb,w':['叔外祖母','外叔祖母','叔姥姥','叔婆','小姥姥','外姆婆'], 'm,f,xs':['姑外祖母','外姑祖母','姑姥姥','外太姑母','姑婆'], 'm,f,xs,h':['姑外祖父','外姑祖父','姑姥爷','外太姑父','姑公'], @@ -553,12 +565,20 @@ 'h,f,m':['祖婆'], 'h,f,ob':['伯翁'], 'h,f,ob,w':['伯婆'], - 'h,f,lb':['叔翁'], + 'h,f,lb':['叔公','叔翁','叔祖'], 'h,f,lb,w':['叔婆','婶婆'], - 'h,f,xb,s&o':['堂大伯','堂兄'], - 'h,f,xb,s&o,w':['堂嫂'], - 'h,f,xb,s&l':['堂叔仔','堂弟'], - 'h,f,xb,s&l,w':['堂小弟'], + 'h,f,xb,s&o':['堂大伯','堂兄','堂大伯哥'], + 'h,f,xb,s&o,w':['堂嫂','堂大伯嫂'], + 'h,f,xb,s&l':['堂叔仔','堂弟','堂小叔弟'], + 'h,f,xb,s&l,w':['堂小弟','堂弟妇','堂小叔弟妇'], + 'h,f,xb,s,s':['堂夫侄男'], + 'h,f,xb,s,d':['堂夫侄女'], + 'h,f,xb,d&o':['堂大姑姐'], + 'h,f,xb,d&o,h':['堂大姑姐夫'], + 'h,f,xb,d&l':['堂小姑妹'], + 'h,f,xb,d&l,h':['堂小姑妹夫'], + 'h,f,xb,d,s':['堂夫甥男'], + 'h,f,xb,d,d':['堂夫甥女'], 'h,f,xs':['姑婆'], 'h,f,xs,h':['姑公'], 'h,f,xs,s&o':['姑表大伯子'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 7a55d27..693d8c8 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=[],l=!1;for(var h in w){var o=w[h];o.indexOf(b)>-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h-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 l in d){var h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l-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(),l=[],h=0;h-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