From 60190286ac9ff416f79b1dad83c66cd3c3a446a8 Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 22 Nov 2016 16:05:24 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E6=B7=BB=E5=8A=A0=E5=A6=BB=E8=88=85?= =?UTF-8?q?=E7=AD=89=E7=A7=B0=E5=91=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 8 ++++---- dist/relationship.min.js | 2 +- script/relationship.js | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 2330840..10bd48e 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -647,10 +647,10 @@ 'w,xb,d,s,w':['外侄孙媳妇'], 'w,xb,d,d':['外侄孙女'], 'w,xb,d,d,h':['外侄孙女婿'], - 'w,ob':['大舅哥','大舅子','内兄'], - 'w,ob,w':['舅嫂','大舅妇','大舅媳妇','大妗子','内嫂'], - 'w,lb':['小舅子','内弟'], - 'w,lb,w':['舅弟媳','小舅妇','小舅媳妇','小妗子'], + 'w,ob':['大舅子','大舅哥','内兄','妻兄','妻舅'], + 'w,ob,w':['舅嫂','大舅妇','大舅媳妇','大妗子','内嫂','妻兄嫂'], + 'w,lb':['小舅子','内弟','妻弟','妻舅'], + 'w,lb,w':['舅弟媳','小舅妇','小舅媳妇','小妗子','妻妹夫'], 'w,xs,s':['姨甥','妻外甥'], 'w,xs,s,w':['姨甥媳妇'], 'w,xs,s,s':['姨甥孙'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 0f4befe..7c0ce3f 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