diff --git a/dist/relationship.js b/dist/relationship.js index da8c758..f2d65f1 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -407,8 +407,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':['姑妈','姑姐'], //外家 @@ -561,8 +561,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':['小舅','舅父仔'], @@ -594,8 +594,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':['小姨','小姨妈','姨仔'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 14de069..a2e745a 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.replace("我","").replace("家的","的").replace("家","的").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