diff --git a/dist/relationship.js b/dist/relationship.js index f7f8cb6..17346bb 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -331,7 +331,7 @@ 'f,xb,s&o':['堂哥','堂兄'], 'f,xb,s&o,w':['堂嫂'], 'f,xb,s&l':['堂弟'], - 'f,xb,s&l,w':['堂弟媳'], + 'f,xb,s&l,w':['堂弟媳','堂弟妹'], 'f,xb,s,s':['堂侄','堂侄子'], 'f,xb,s,s,w':['堂侄媳妇'], 'f,xb,s,s,s':['堂侄孙'], @@ -356,7 +356,7 @@ 'f,xs,s&o':['姑表哥','表哥'], 'f,xs,s&o,w':['姑表嫂','表嫂'], 'f,xs,s&l':['姑表弟','表弟'], - 'f,xs,s&l,w':['姑表弟媳','表弟媳'], + 'f,xs,s&l,w':['姑表弟媳','表弟媳','表弟妹'], 'f,xs,s,s':['表侄','表侄子'], 'f,xs,s,s,s':['表侄孙'], 'f,xs,s,s,s,w':['表侄孙媳妇'], @@ -488,7 +488,7 @@ 'm,xb,s&o':['舅表哥','表哥'], 'm,xb,s&o,w':['舅表嫂','表嫂'], 'm,xb,s&l':['舅表弟',,'表弟'], - 'm,xb,s&l,w':['舅表弟媳','表弟媳'], + 'm,xb,s&l,w':['舅表弟媳','表弟媳','表弟妹'], 'm,xb,s,s':['表侄','表侄子'], 'm,xb,s,s,s':['表侄孙'], 'm,xb,s,s,s,w':['表侄孙媳妇'], @@ -515,7 +515,7 @@ 'm,xs,s&o':['姨表哥','表哥'], 'm,xs,s&o,w':['姨表嫂','表嫂'], 'm,xs,s&l':['姨表弟','表弟'], - 'm,xs,s&l,w':['姨表弟媳','表弟媳'], + 'm,xs,s&l,w':['姨表弟媳','表弟媳','表弟妹'], 'm,xs,s,s':['表侄','表侄子'], 'm,xs,s,s,s':['表侄孙'], 'm,xs,s,s,s,w':['表侄孙媳妇'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 480058c..67c0e5d 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