diff --git a/dist/relationship.js b/dist/relationship.js index 10bd48e..b07e633 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -590,7 +590,7 @@ 'h,ls,h':['小姑夫','小姑妹夫'], //岳家 'w':['老婆','妻子','太太','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人'], - 'w,f':['岳父','老丈人','丈人','泰山','妻父'], + 'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'], 'w,f,f':['太岳父'], 'w,f,f,ob':['太伯岳'], 'w,f,f,ob,w':['太伯岳母'], @@ -620,7 +620,7 @@ 'w,f,xs,s&l':['表舅仔'], 'w,f,xs,d&o':['表大姨'], 'w,f,xs,d&l':['表姨仔'], - 'w,m':['岳母','丈母娘'], + 'w,m':['岳母','丈母娘','丈母','泰水'], 'w,m,f':['外太岳父'], 'w,m,m':['外太岳母'], 'w,m,xb':['舅岳父'], diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 7c0ce3f..be7501e 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