From 4aeac2b78687043d80240a6e7a17de7c75531e8a Mon Sep 17 00:00:00 2001 From: mumuy Date: Wed, 28 Dec 2016 16:21:26 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E5=A4=8D=E5=90=88=E7=A7=B0=E8=B0=93?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 6 +++--- dist/relationship.min.js | 2 +- script/relationship.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 976b1ea..f7f8cb6 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -178,8 +178,8 @@ var _data = { '':['自己','我'], //并称 - '[s|d]':['子女','孩子'], - '[f|m]':['父母','爹娘','爸妈','高堂'], + '[s|d]':['子女','儿女','小孩','孩子'], + '[f|m]':['父母','爹娘','爹妈','爸妈','高堂'], //本家 'f':['爸爸','父亲','阿爸','老爸','老窦','爹','爹爹','爹地','爹啲','老爹','大大','老爷子'], 'f,f':['爷爷','祖父','阿爷','奶爷','阿公'], @@ -679,7 +679,7 @@ 'xb,d,s,w':['外侄孙媳妇'], 'xb,d,d':['外侄孙女'], 'xb,d,d,h':['外侄孙女婿'], - 'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥'], + 'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥','兄长'], 'ob,w':['嫂子','大嫂','x嫂','嫂','阿嫂'], 'ob,w,f':['姻伯父'], 'ob,w,m':['姻伯母'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 7d35885..480058c 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 o in w){var h=w[o];h.indexOf(b)>-1&&(!o&&f.length||d.push(o),l=!0)}if(l||(m=!1),x.length){for(var e=[],o=0;o-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 o=d[l];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var h=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=[],o=0;o-1&&(!o&&f.length||d.push(o),l=!0)}if(l||(m=!1),x.length){for(var e=[],o=0;o-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 o=d[l];if(s=s.replace(o.exp,o.str),s.indexOf("#")>-1){for(var h=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=[],o=0;o