diff --git a/dist/relationship.js b/dist/relationship.js index 327b8e9..087091b 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -642,14 +642,26 @@ 'f,xb,s,s,d,h':['堂侄孙婿'], 'f,xb,s,d':['堂侄女','从父侄女','叔伯侄女','堂侄'], 'f,xb,s,d,h':['堂侄女婿','堂侄婿','从父侄婿','叔伯侄婿'], + 'f,xb,s,d,s':['堂侄外孙男'], + 'f,xb,s,d,s,w':['堂侄外孙妇'], + 'f,xb,s,d,d':['堂侄外孙女'], + 'f,xb,s,d,d,h':['堂侄外孙婿'], 'f,xb,d&o':['堂姐','堂姊','堂阿姐','从父姊','叔伯姊','从姊'], 'f,xb,d&o,h':['堂姐夫','从父姊夫','从父姊婿','叔伯姊夫'], 'f,xb,d&l':['堂妹','堂阿妹','从父妹','叔伯妹','从妹'], 'f,xb,d&l,h':['堂妹夫','从父妹夫','从父妹婿','叔伯妹夫'], 'f,xb,d,s':['堂甥男','堂甥'], 'f,xb,d,s,w':['堂甥妇'], + 'f,xb,d,s,s':['堂甥孙男'], + 'f,xb,d,s,s,w':['堂甥孙妇'], + 'f,xb,d,s,d':['堂甥孙女'], + 'f,xb,d,s,d,h':['堂甥孙婿'], 'f,xb,d,d':['堂甥女','堂甥'], 'f,xb,d,d,h':['堂甥婿'], + 'f,xb,d,d,s':['堂甥外孙男'], + 'f,xb,d,d,s,w':['堂甥外孙妇'], + 'f,xb,d,d,d':['堂甥外孙女'], + 'f,xb,d,d,d,h':['堂甥外孙婿'], // 姑表 'f,os':['姑妈','姑母'], 'f,ls':['姑妈','姑姐'], @@ -675,20 +687,26 @@ 'f,xs,s,s,d,h':['姑表侄孙婿','表侄孙婿'], 'f,xs,s,d':['姑表侄女','表侄女','表侄'], 'f,xs,s,d,h':['姑表侄婿','表侄婿'], - 'f,xs,s,d,s':['姑表侄孙'], - 'f,xs,s,d,s,w':['姑表侄孙妇'], - 'f,xs,s,d,d':['姑表侄孙女'], - 'f,xs,s,d,d,h':['姑表侄孙婿'], + 'f,xs,s,d,s':['姑表侄外孙男'], + 'f,xs,s,d,s,w':['姑表侄外孙妇'], + 'f,xs,s,d,d':['姑表侄外孙女'], + 'f,xs,s,d,d,h':['姑表侄外孙婿'], 'f,xs,d&o':['姑表姐','姑表姊','表姐','表姊'], 'f,xs,d&o,h':['姑表姐夫','姑表姊夫','姑表姊婿','表姐夫','表姊夫','表姐丈','表姊丈'], 'f,xs,d&l':['姑表妹','表妹'], 'f,xs,d&l,h':['姑表妹夫','姑表妹婿','表妹夫'], 'f,xs,d,s':['姑表甥男','表甥男','表外甥'], + 'f,xs,d,s,w':['姑表甥妇'], 'f,xs,d,s,s':['姑表甥孙男','表甥孙男'], + 'f,xs,d,s,s,w':['姑表甥孙妇','表甥孙妇'], 'f,xs,d,s,d':['姑表甥孙女','表甥孙女'], + 'f,xs,d,s,d,h':['姑表甥孙婿','表甥孙婿'], 'f,xs,d,d':['姑表甥女','表甥女','表外甥'], + 'f,xs,d,d,h':['姑表甥婿'], 'f,xs,d,d,s':['姑表甥外孙男','表甥外孙男'], + 'f,xs,d,d,s,w':['姑表甥外孙妇','表甥外孙妇'], 'f,xs,d,d,d':['姑表甥外孙女','表甥外孙女'], + 'f,xs,d,d,d,h':['姑表甥外孙婿','表甥外孙婿'], // 外家 'm':['妈妈','母亲','老妈','阿妈','老母','老妈子','妈','母','娘','娘亲','妈咪'], // 外公 @@ -1016,18 +1034,20 @@ 'm,xb,s,s,d,h':['舅表侄孙婿','表侄孙婿'], 'm,xb,s,d':['舅表侄女','表侄女','表侄'], 'm,xb,s,d,h':['舅表侄婿','表侄婿'], - 'm,xb,s,d,s':['舅表侄孙'], - 'm,xb,s,d,s,w':['舅表侄孙妇'], - 'm,xb,s,d,d':['舅表侄孙女'], - 'm,xb,s,d,d,h':['舅表侄孙婿'], + 'm,xb,s,d,s':['舅表侄外孙男'], + 'm,xb,s,d,s,w':['舅表侄外孙妇'], + 'm,xb,s,d,d':['舅表侄外孙女'], + 'm,xb,s,d,d,h':['舅表侄外孙婿'], 'm,xb,d&o':['舅表姐','舅表姊','表姐','表姊'], 'm,xb,d&o,h':['舅表姐夫','舅表姊夫','舅表姊婿','表姐夫','表姐姊','表姐丈','表姊丈'], 'm,xb,d&l':['舅表妹','表妹'], 'm,xb,d&l,h':['舅表妹夫','舅表妹婿','表妹夫'], 'm,xb,d,s':['舅表甥男','表外甥','表甥男'], + 'm,xb,d,s,w':['舅表甥妇'], 'm,xb,d,s,s':['舅表甥孙男','表甥孙男'], 'm,xb,d,s,d':['舅表甥孙女','表甥孙女'], 'm,xb,d,d':['舅表甥女','表外甥','表甥女'], + 'm,xb,d,d,h':['舅表甥婿'], 'm,xb,d,d,s':['舅表甥外孙男','表甥外孙男'], 'm,xb,d,d,d':['舅表甥外孙女','表甥外孙女'], 'm,ob':['大舅'], @@ -1055,8 +1075,16 @@ 'm,xs,s&l,w':['姨弟妇','从母弟妇'], 'm,xs,s,s':['姨侄男','从母侄男','姨侄'], 'm,xs,s,s,w':['姨侄妇','从母侄妇'], + '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,h':['姨侄婿','从母侄婿'], + 'm,xs,s,d,s':['姨侄外孙男','姨侄外孙'], + 'm,xs,s,d,s,w':['姨侄外孙妇'], + 'm,xs,s,d,d':['姨侄外孙女'], + 'm,xs,s,d,d,h':['姨侄外孙婿'], 'm,xs,d&o':['姨姐','姨姊','从母姐','从母姊'], 'm,xs,d&o,h':['姨姐夫','姨姊夫','从母姐夫','从母姊夫','从母姊丈','从母姊婿','从母姊郎'], 'm,xs,d&l':['姨妹','从母妹'], @@ -1064,9 +1092,15 @@ 'm,xs,d,s':['姨甥男','从母甥男','姨外甥','姨甥'], 'm,xs,d,s,w':['姨甥妇','从母甥妇'], 'm,xs,d,s,s':['姨甥孙男','姨甥孙'], + 'm,xs,d,s,s,w':['姨甥孙妇'], 'm,xs,d,s,d':['姨甥孙女'], + 'm,xs,d,s,d,h':['姨甥孙婿'], 'm,xs,d,d':['姨甥女','从母甥女','姨外甥女','姨甥'], 'm,xs,d,d,h':['姨甥婿','从母甥婿'], + 'm,xs,d,d,s':['姨甥外孙男','姨甥外孙'], + 'm,xs,d,d,s,w':['姨甥外孙妇'], + 'm,xs,d,d,d':['姨甥外孙女'], + 'm,xs,d,d,d,h':['姨甥外孙婿'], // 婆家 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','良人','爱人','老伴','老头子'], 'h,f':['公公','翁亲','老公公'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 1f43a82..ff8a434 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1,2 +1,2 @@ -!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.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],m=!0;f.length;){var d=f.shift(),b=[],h=!1;for(var l in w){var o=w[l];o.indexOf(d)>-1&&(!l&&f.length||b.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 d=function(s){var f="";if(!m[s]){m[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[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 d=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");d=d.substring(0,d.lastIndexOf(","));for(var b=s.split(",").reverse(),w=d.split(",").reverse(),h=[],l=0;l-1&&(!l&&f.length||b.push(l),h=!0)}if(h||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var w=!0;do{f=s;for(var h in b){var l=b[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],l=0;l