diff --git a/dist/relationship.js b/dist/relationship.js index 6df50b0..7b9b082 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -287,15 +287,15 @@ 'f,m,m,xb,d':['表姨祖母'], 'f,m,m,xb,d,h':['表姨祖父'], 'f,m,m,xs':['姨曾外祖母','姨太姥姥','姨太奶奶'], - 'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'], + 'f,m,m,xs,h':['姨曾外祖父','姨太姥爷','姨太奶爷'], 'f,m,m,xs,d':['表姨祖母'], 'f,m,m,xs,d,h':['表姨祖父'], 'f,m,m,xs,s':['表舅祖父'], 'f,m,m,xs,s,w':['表舅祖母'], 'f,m,m,xs,d':['表姨祖母'], 'f,m,m,xs,d,h':['表姨祖父'], - 'f,m,xb':['舅祖父','舅公','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父'], - 'f,m,xb,w':['舅祖母','舅婆','舅奶奶','妗婆','太舅母'], + 'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','太舅父'], + 'f,m,xb,w':['舅婆','舅祖母','舅奶奶','妗婆','太舅母'], 'f,m,xb,s&o':['舅表伯父','表伯父','表伯'], 'f,m,xb,s&o,w':['舅表伯母','表伯母'], 'f,m,xb,s&l':['舅表叔父','表叔父','表叔爸','表叔'], @@ -452,8 +452,8 @@ 'm,m,m,xs,s,w':['表舅外祖母'], 'm,m,m,xs,d':['表姨外祖母'], 'm,m,m,xs,d,h':['表姨外祖父'], - 'm,m,xb':['舅外祖父','外舅公','外舅祖父','舅姥爷','舅外公','舅公','x舅姥爷'], - 'm,m,xb,w':['舅外祖母','外舅婆','外舅祖母','舅姥姥','舅婆'], + 'm,m,xb':['外舅公','舅外祖父','外舅祖父','舅姥爷','舅外公','舅公','x舅姥爷'], + 'm,m,xb,w':['外舅婆','舅外祖母','外舅祖母','舅姥姥','舅婆'], 'm,m,xb,s':['舅表舅父','舅表舅爸','表舅父','表舅爸','表舅','表舅舅','舅表舅舅'], 'm,m,xb,s,w':['舅表舅母','舅表舅妈','表舅母','表舅妈'], 'm,m,xb,s,s':['从表兄弟'], @@ -527,7 +527,7 @@ 'm,ls':['小姨','小姨妈','姨仔'], 'm,ls,h':['小姨父','小姨丈'], //婆家 - 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','夫婿','爱人','老伴'], + 'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','爱人','老伴'], 'h,f':['公公','翁亲'], 'h,f,f':['祖翁'], 'h,f,f,ob':['伯祖翁'], @@ -709,7 +709,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 f1b016f..dc02b52 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