diff --git a/dist/relationship.js b/dist/relationship.js index 3c0a461..e3753a3 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -832,7 +832,7 @@ 'ls':['妹妹','妹','胞妹','老妹','x妹'], 'ls,h':['妹夫','妹丈','妹婿','x妹夫'], //自家 - 's':['儿子','仔','阿仔','仔仔'], + 's':['儿子','仔','阿仔','仔仔','x儿子','孩子','孩儿'], 's,w':['儿媳妇','儿媳','新妇'], 's,w,xb':['姻侄'], 's,w,xb,s':['姻侄孙'], @@ -840,7 +840,7 @@ 's,w,xs':['姻侄女'], 's,w,xs,s':['姻侄孙'], 's,w,xs,d':['姻侄孙女'], - 's,s':['孙子','孙儿','孙'], + 's,s':['孙子','孙儿','x孙子','孙'], 's,s,w':['孙媳妇','孙媳'], 's,s,w,xb':['姻家再侄'], 's,s,w,xs':['姻家再侄'], @@ -868,7 +868,7 @@ 's,d,h,xs':['姻家再侄'], 's,d,s':['曾外孙'], 's,d,d':['曾外孙女'], - 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡'], + 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡','姑娘','x女儿','孩子','孩儿'], 'd,h':['女婿','姑爷','女婿子','女婿儿'], 'd,h,xb':['姻侄'], 'd,h,xb,w':['姻侄妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index eaf3e28..9390403 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