From 45c50403d532cd8117061f5ceeaea3c7be5ea6e0 Mon Sep 17 00:00:00 2001 From: mumuy Date: Wed, 8 Feb 2017 10:10:33 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E4=BB=8E=E8=A1=A8=E5=85=84=E5=BC=9F?= =?UTF-8?q?=E5=A7=90=E5=A6=B9=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 4 ++++ dist/relationship.min.js | 2 +- script/relationship.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dist/relationship.js b/dist/relationship.js index 9b168ce..2f8d1f6 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -283,8 +283,12 @@ 'f,f,xs,s&o,w':['姑表伯母','表伯母'], 'f,f,xs,s&l':['姑表叔父','表叔父','表叔爸','表叔'], 'f,f,xs,s&l,w':['姑表叔母','表叔母','表叔妈','表婶'], + 'f,f,xs,s,s':['从表兄弟'], + 'f,f,xs,s,d':['从表姐妹'], 'f,f,xs,d':['姑表姑母','表姑妈','表姑母','表姑姑','表姑'], 'f,f,xs,d,h':['姑表姑父','表姑爸','表姑父','表姑丈'], + 'f,f,xs,d,s':['从表兄弟'], + 'f,f,xs,d,d':['从表姐妹'], 'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'], 'f,m,f':['曾外祖父','外太公','太姥爷'], 'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 5b98800..9135f2d 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