diff --git a/dist/relationship.js b/dist/relationship.js index 2f8d1f6..29cb82b 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -773,12 +773,12 @@ 'xb,d,s,w':['外侄孙媳妇'], 'xb,d,d':['外侄孙女','侄外孙女'], 'xb,d,d,h':['外侄孙女婿'], - 'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥','兄长'], - 'ob,w':['嫂子','大嫂','x嫂','嫂','嫂嫂','阿嫂'], + 'ob':['哥哥','哥','兄','阿哥','大佬','老哥','兄长','大哥','x哥'], + 'ob,w':['嫂子','嫂','嫂嫂','阿嫂','大嫂','x嫂'], 'ob,w,f':['姻伯父'], 'ob,w,m':['姻伯母'], - 'lb':['弟弟','弟','细佬','老弟'], - 'lb,w':['弟妹','弟媳','弟媳妇'], + 'lb':['弟弟','弟','细佬','老弟','x弟'], + 'lb,w':['弟妹','弟媳','弟媳妇','x弟妹'], 'lb,w,f':['姻叔父'], 'lb,w,m':['姻叔母'], 'xs':['姐妹','姊妹'], @@ -805,10 +805,10 @@ 'xs,d,d,h':['外甥孙女婿'], 'xs,d,d,s':['外曾甥孙'], 'xs,d,d,d':['外曾甥孙女'], - 'os':['姐姐','姐','家姐','阿姐','阿姊'], - 'os,h':['姐夫','姊夫','姊婿'], - 'ls':['妹妹','妹','老妹'], - 'ls,h':['妹夫','妹婿'], + 'os':['姐姐','姐','家姐','阿姐','阿姊','大姐','x姐'], + 'os,h':['姐夫','姊夫','姊婿','大姐夫','x姐夫'], + 'ls':['妹妹','妹','老妹','x妹'], + 'ls,h':['妹夫','妹婿','x妹夫'], //自家 's':['儿子','仔','阿仔','仔仔'], 's,w':['儿媳妇','儿媳','新妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 9135f2d..adc5784 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