From eb597eb33cdc4b4c8b912c60254038a71db08f47 Mon Sep 17 00:00:00 2001 From: mumuy Date: Thu, 29 Dec 2016 12:04:22 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E4=B8=8A=E6=B5=B7?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E7=A7=B0=E5=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 24 ++++++++++++------------ dist/relationship.min.js | 2 +- script/relationship.js | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 17346bb..cb72cd5 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -328,9 +328,9 @@ 'f,m,xs,d,h':['姨表姑父','表姑爸','表姑父','表姑丈','从母姑父'], 'f,m,xs,d,s':['从表兄弟'], 'f,m,xs,d,d':['从表姐妹'], - 'f,xb,s&o':['堂哥','堂兄'], + 'f,xb,s&o':['堂哥','堂兄','堂阿哥'], 'f,xb,s&o,w':['堂嫂'], - 'f,xb,s&l':['堂弟'], + 'f,xb,s&l':['堂弟','堂阿弟'], 'f,xb,s&l,w':['堂弟媳','堂弟妹'], 'f,xb,s,s':['堂侄','堂侄子'], 'f,xb,s,s,w':['堂侄媳妇'], @@ -340,9 +340,9 @@ 'f,xb,s,s,d,h':['堂侄孙女婿'], 'f,xb,s,d':['堂侄女'], 'f,xb,s,d,h':['堂侄女婿'], - 'f,xb,d&o':['堂姐'], + 'f,xb,d&o':['堂姐','堂阿姐'], 'f,xb,d&o,h':['堂姐夫'], - 'f,xb,d&l':['堂妹'], + 'f,xb,d&l':['堂妹','堂阿妹'], 'f,xb,d&l,h':['堂妹夫'], 'f,xb,d,s':['堂外甥'], 'f,xb,d,d':['堂外甥女'], @@ -665,7 +665,7 @@ 'xb':['兄弟'], 'xb,w,f':['姻世伯','亲家爷','亲爹','亲伯'], 'xb,w,m':['姻伯母','亲家娘','亲娘'], - 'xb,s':['侄子','侄儿'], + 'xb,s':['侄子','侄儿','阿侄'], 'xb,s,w':['侄媳','侄媳妇'], 'xb,s,s':['侄孙','侄孙子'], 'xb,s,s,w':['侄孙媳'], @@ -673,14 +673,14 @@ 'xb,s,s,d':['侄曾孙女'], 'xb,s,d':['侄孙女'], 'xb,s,d,h':['侄孙女婿'], - 'xb,d':['侄女'], + 'xb,d':['侄女','侄囡'], 'xb,d,h':['侄女婿','侄婿'], 'xb,d,s':['外侄孙','外侄孙子'], 'xb,d,s,w':['外侄孙媳妇'], 'xb,d,d':['外侄孙女'], 'xb,d,d,h':['外侄孙女婿'], 'ob':['哥哥','哥','兄','阿哥','大哥','大佬','老哥','兄长'], - 'ob,w':['嫂子','大嫂','x嫂','嫂','阿嫂'], + 'ob,w':['嫂子','大嫂','x嫂','嫂','嫂嫂','阿嫂'], 'ob,w,f':['姻伯父'], 'ob,w,m':['姻伯母'], 'lb':['弟弟','弟','细佬','老弟'], @@ -700,7 +700,7 @@ 'xs,s,d,h':['外甥孙女婿'], 'xs,s,d,s':['外曾甥孙'], 'xs,s,d,d':['外曾甥孙女'], - 'xs,d':['外甥女'], + 'xs,d':['外甥女','外甥囡'], 'xs,d,h':['外甥女婿'], 'xs,d,s':['外甥孙','甥孙男','甥孙'], 'xs,d,s,w':['外甥孙媳妇'], @@ -716,7 +716,7 @@ 'ls,h':['妹夫','妹婿'], //自家 's':['儿子','仔','阿仔','仔仔'], - 's,w':['儿媳妇','儿媳'], + 's,w':['儿媳妇','儿媳','新妇'], 's,w,xb':['姻侄'], 's,w,xs':['姻侄女'], 's,s':['孙子','孙儿','孙'], @@ -730,11 +730,11 @@ 's,s,d,h':['曾孙女婿'], 's,s,d,s':['外玄孙'], 's,s,d,d':['外玄孙女'], - 's,d':['孙女'], + 's,d':['孙女','孙囡'], 's,d,h':['孙女婿'], 's,d,s':['曾外孙'], 's,d,d':['曾外孙女'], - 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠'], + 'd':['女儿','千金','闺女','女','阿女','女女','掌上明珠','乖囡','囡囡'], 'd,h':['女婿','姑爷','女婿子','女婿儿'], 'd,h,xb':['姻侄'], 'd,h,xs':['姻侄女'], @@ -742,7 +742,7 @@ 'd,s,w':['外孙媳'], 'd,s,s':['外曾孙','重外孙'], 'd,s,d':['外曾孙女','重外孙女'], - 'd,d':['外孙女'], + 'd,d':['外孙女','外孙囡'], 'd,d,h':['外孙女婿'], 'd,d,s':['外曾外孙'], 'd,d,d':['外曾外孙女'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 67c0e5d..36cbcc7 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