From a13294ee4b4ef2e591c3f9ff43ae09e3a500871d Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 29 Nov 2016 14:57:23 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=88=AB=E7=A7=B0=E5=8F=8A=E6=B7=BB=E5=8A=A0=E6=AD=A7=E4=B9=89?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 10 +++++----- dist/relationship.min.js | 2 +- readme.md | 9 ++++++++- script/relationship.js | 10 +++++----- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 70376e4..eb08ab5 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -343,7 +343,7 @@ 'f,xs,s&o,w':['姑表嫂','表嫂'], 'f,xs,s&l':['姑表弟','表弟'], 'f,xs,s&l,w':['姑表弟媳','表弟媳'], - 'f,xs,s,s':['表侄子'], + 'f,xs,s,s':['表侄','表侄子'], 'f,xs,s,s,s':['表侄孙'], 'f,xs,s,s,s,w':['表侄孙媳妇'], 'f,xs,s,s,d':['表侄孙女'], @@ -471,7 +471,7 @@ 'm,xb,s&o,w':['舅表嫂','表嫂'], 'm,xb,s&l':['舅表弟',,'表弟'], 'm,xb,s&l,w':['舅表弟媳','表弟媳'], - 'm,xb,s,s':['表侄子'], + 'm,xb,s,s':['表侄','表侄子'], 'm,xb,s,s,s':['表侄孙'], 'm,xb,s,s,s,w':['表侄孙媳妇'], 'm,xb,s,s,d':['表侄孙女'], @@ -498,7 +498,7 @@ 'm,xs,s&o,w':['姨表嫂','表嫂'], 'm,xs,s&l':['姨表弟','表弟'], 'm,xs,s&l,w':['姨表弟媳','表弟媳'], - 'm,xs,s,s':['表侄子'], + 'm,xs,s,s':['表侄','表侄子'], 'm,xs,s,s,s':['表侄孙'], 'm,xs,s,s,s,w':['表侄孙媳妇'], 'm,xs,s,s,d':['表侄孙女'], @@ -597,7 +597,7 @@ 'h,ls':['小姑子','小姑','姑仔'], 'h,ls,h':['小姑夫','小姑妹夫'], //岳家 - 'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], + 'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'], 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], 'w,f,f':['太岳父'], 'w,f,f,ob':['太伯岳'], @@ -733,7 +733,7 @@ 's,w':['儿媳妇','儿媳'], 's,w,xb':['姻侄'], 's,w,xs':['姻侄女'], - 's,s':['孙子'], + 's,s':['孙子','孙儿'], 's,s,w':['孙媳妇','孙媳'], 's,s,s':['曾孙'], 's,s,s,w':['曾孙媳妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index fb3d3f6..3ffe776 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("#"),h=0;h-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("#"),h=0;h-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