updated 部分关系补充

dist/relationship.js

@@ -317,7 +317,7 @@
 		'f,m,xb,d,s':['从表兄弟'],
 		'f,m,xb,d,d':['从表姐妹'],
 		'f,m,xs':['祖姨母','姨祖母','姨婆','姨奶奶'],
-		'f,m,xs,h':['祖姨父','姨祖父','姨丈公','姨爷爷','姨爷','姨老爷','姨奶爷'],
+		'f,m,xs,h':['祖姨父','姨祖父','姨公','姨爷爷','姨丈公','姨爷','姨老爷','姨奶爷'],
 		'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'],
 		'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'],
 		'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'],
@@ -484,7 +484,7 @@
 		'm,m,xs,d,d':['从表姐妹'],
 		//舅家
 		'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
-		'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'],
+		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'],
 		'm,xb,s&o':['舅表哥','表哥'],
 		'm,xb,s&o,w':['舅表嫂','表嫂'],
 		'm,xb,s&l':['舅表弟',,'表弟'],
@@ -538,7 +538,7 @@
 		'm,ls,h':['小姨父','小姨丈'],
 		//婆家
 		'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','爱人','老伴'],
-		'h,f':['公公','翁亲'],
+		'h,f':['公公','翁亲','老公公'],
 		'h,f,f':['祖翁'],
 		'h,f,f,ob':['伯祖翁'],
 		'h,f,f,ob,w':['伯祖婆'],
@@ -560,6 +560,7 @@
 		'h,f,xb,s&l':['堂叔仔','堂弟'],
 		'h,f,xb,s&l,w':['堂小弟'],
 		'h,f,xs':['姑婆'],
+		'h,f,xs,h':['姑公'],
 		'h,f,xs,s&o':['姑表大伯子'],
 		'h,f,xs,s&o,w':['姑表大伯嫂'],
 		'h,f,xs,s&l':['姑表小叔弟'],
@@ -568,20 +569,33 @@
 		'h,f,xs,d&o,h':['姑表大姑姐夫'],
 		'h,f,xs,d&l':['姑表小姑妹'],
 		'h,f,xs,d&l,h':['姑表小姑妹夫'],
-		'h,f,xs,h':['姑公'],
+		'h,m':['婆婆','姑亲','老婆婆'],
-		'h,m':['婆婆','姑亲'],
 		'h,m,xb':['舅公'],
 		'h,m,xb,w':['舅婆'],
 		'h,m,xs':['姨婆'],
 		'h,m,xs,h':['姨公'],
+		'h,m,xs,s&o':['姨表大伯子'],
+		'h,m,xs,s&o,w':['姨表大伯嫂'],
+		'h,m,xs,s&l':['姨表小叔弟'],
+		'h,m,xs,s&l,w':['姨表小叔弟妇'],
+		'h,m,xs,s,s':['姨表夫侄男'],
+		'h,m,xs,s,d':['姨表夫侄女'],
+		'h,m,xs,d&o':['姨表大姑姐'],
+		'h,m,xs,d&o,h':['姨表大姑姐夫'],
+		'h,m,xs,d&l':['姨表小姑妹'],
+		'h,m,xs,d&l,h':['姨表小姑妹夫'],
+		'h,m,xs,d,s':['姨表夫甥男'],
+		'h,m,xs,d,d':['姨表夫甥女'],
 		'h,ob':['大伯子','大伯哥','大伯兄','夫兄'],
 		'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'],
 		'h,lb':['小叔子','小叔弟'],
 		'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'],
+		'h,xb,s':['婆家侄'],
 		'h,os':['大姑子','大姑','大娘姑','大姑姊'],
 		'h,os,h':['大姑夫','姊丈','大姑姐夫','大姑姊夫'],
 		'h,ls':['小姑子','小姑','小姑妹','姑仔'],
 		'h,ls,h':['小姑夫','小亘子','小姑妹夫'],
+		'h,xs,s':['婆家甥'],
 		//岳家
 		'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'],
 		'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'],
@@ -645,7 +659,7 @@
 		'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'],
 		'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅'],
 		'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'],
-		'w,xs,s':['姨甥','妻外甥'],
+		'w,xs,s':['内甥','姨甥','妻外甥'],
 		'w,xs,s,w':['姨甥媳妇'],
 		'w,xs,s,s':['姨甥孙'],
 		'w,xs,s,s,w':['姨甥孙媳妇'],

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<x.length;o++)for(var r=0;r<d.length;r++)e.push(x[o]+","+d[r]);x=e}else for(var o=0;o<d.length;o++)x.push(","+d[o])}return m?x:[]}function f(s,f){var x=[],m={};if(f<0&&(0==s.indexOf(",w")?f=1:0==s.indexOf(",h")&&(f=0)),f>-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<h.length;l++)b(h[l]);w=!1;break}}}while(f!=s);if(w){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return b(s),x}function x(s){var f=[],x=/&[olx]/g,m=function(s){var f=[];for(var m in w)m.replace(x,"")==s&&f.push(w[m][0]);return f};if(w[s])f.push(w[s][0]);else if(f=m(s),f.length||(s=s.replace(/&[ol]/g,""),f=m(s)),f.length||(s=s.replace(/[ol]/g,"x"),f=m(s)),!f.length){var b=s.replace(/x/g,"l");f=m(b);var d=s.replace(/x/g,"o");f=f.concat(m(d))}return f}function m(s,f){var x={f:["d","s"],m:["d","s"],h:["w",""],w:["","h"],s:["m","f"],d:["m","f"],lb:["os","ob"],ob:["ls","lb"],xb:["xs","xb"],ls:["os","ob"],os:["ls","lb"],xs:["xs","xb"]},m="";if(s.indexOf("&o")>-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<d.length;o++)l.push(x[d[o]][w[o]]);return l.join(",")+m}return""}function b(s){for(var f=s.split(","),x=[],m=0;m<f.length;m++){var b=f[m].replace(/&[ol]/,"");x.push(w[b][0])}return x.join("的")}var d=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$1"},{exp:/m,h/g,str:"f"},{exp:/f,w/g,str:"m"},{exp:/,[xol][sb](,[mf])/g,str:"$1"},{exp:/,[mf],d&([ol])/,str:",$1s"},{exp:/,[mf],s&([ol])/,str:",$1b"},{exp:/^(.*)(,[fh1]|[xol]b),[mf],s(.*)$/,str:"$1$2,xb$3#$1$2$3"},{exp:/^(.*)(,[mw0]|[xol]s),[mf],d(.*)$/,str:"$1$2,xs$3#$1$2$3"},{exp:/(,[mw0]|[xol]s),[mf],s/,str:"$1,xb"},{exp:/(,[fh1]|[xol]b),[mf],d/,str:"$1,xs"},{exp:/^,[mf],s(.+)?$/,str:",1$1#,xb$1"},{exp:/^,[mf],d(.+)?$/,str:",0$1#,xs$1"},{exp:/(,o[sb])+(,o[sb])/,str:"$2"},{exp:/(,l[sb])+(,l[sb])/,str:"$2"},{exp:/^(.*)(,[fh1])(,[olx][sb])+,[olx]b(.*)$/,str:"$1$2,xb$4#$1$2$4"},{exp:/^(.*)(,[mw0])(,[olx][sb])+,[olx]s(.*)$/,str:"$1$2,xs$4#$1$2$4"},{exp:/(,[fh1])(,[olx][sb])+,[olx]s/g,str:"$1,xs"},{exp:/(,[mw0])(,[olx][sb])+,[olx]b/g,str:"$1,xb"},{exp:/^,[olx][sb],[olx]b(.+)?$/,str:"$1#,xb$1"},{exp:/^,[olx][sb],[olx]s(.+)?$/,str:"$1#,xs$1"},{exp:/^,x([sb])$/,str:",o$1#,l$1"},{exp:/,[ds]&o,ob/g,str:",s&o"},{exp:/,[ds]&o,os/g,str:",d&o"},{exp:/,[ds]&l,lb/g,str:",s&l"},{exp:/,[ds]&l,ls/g,str:",d&l"},{exp:/,[ds](&[ol])?,[olx]s/g,str:",d"},{exp:/,[ds](&[ol])?,[olx]b/g,str:",s"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,m/g,str:"$1"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,f/g,str:"$1,h"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,f/g,str:"$1"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,m/g,str:"$1,w"},{exp:/^,[ds],m(.+)?$/,str:"$1#,w$1"},{exp:/^,[ds],f(.+)?$/,str:"$1#,h$1"},{exp:/,[wh](,[ds])/g,str:"$1"},{exp:/,w,h|,h,w/g,str:""},{exp:/(.+)?\[(.+)\|(.+)\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我"],"[s|d]":["子女","儿女","小孩","孩子"],"[f|m]":["父母","爹娘","爹妈","爸妈","高堂"],f:["爸爸","父亲","阿爸","老爸","老窦","爹","爹爹","爹地","爹啲","老爹","大大","老爷子"],"f,f":["爷爷","祖父","阿爷","奶爷","阿公"],"f,f,f":["曾祖父","太爷","太爷爷","太公","祖公","祖奶爷"],"f,f,f,f":["高祖父","老太爷","祖太爷","祖太爷爷","祖太公"],"f,f,f,f,ob":["伯高祖父"],"f,f,f,f,ob,w":["伯高祖母"],"f,f,f,f,lb":["叔高祖父"],"f,f,f,f,lb,w":["叔高祖母"],"f,f,f,f,xs":["姑高祖母"],"f,f,f,f,xs,h":["姑高祖父"],"f,f,f,m":["高祖母","老太太","祖太太","祖太奶","祖太奶奶","祖太婆"],"f,f,f,m,xs":["姨高祖母"],"f,f,f,m,xs,h":["姨高祖父"],"f,f,f,ob":["曾伯祖父","曾伯父","伯曾祖父","伯公太","伯太爷"],"f,f,f,ob,w":["曾伯祖母","曾伯母","伯曾祖母","伯婆太","伯太太"],"f,f,f,lb":["曾叔祖父","曾叔父","叔曾祖父","叔公太","叔太爷"],"f,f,f,lb,w":["曾叔祖母","曾叔母","叔曾祖母","叔婆太","叔太太"],"f,f,f,xb,s&o":["堂伯祖父"],"f,f,f,xb,s&o,w":["堂伯祖母"],"f,f,f,xb,s&l":["堂叔祖父"],"f,f,f,xb,s&l,w":["堂叔祖母"],"f,f,f,xb,s,s&o":["从伯父"],"f,f,f,xb,s,s&o,w":["从伯母"],"f,f,f,xb,s,s&l":["从叔父"],"f,f,f,xb,s,s&l,w":["从叔母"],"f,f,f,xb,s,sLine truncated
+!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 h in w){var o=w[h];o.indexOf(b)>-1&&(!h&&f.length||d.push(h),l=!0)}if(l||(m=!1),x.length){for(var e=[],h=0;h<x.length;h++)for(var r=0;r<d.length;r++)e.push(x[h]+","+d[r]);x=e}else for(var h=0;h<d.length;h++)x.push(","+d[h])}return m?x:[]}function f(s,f){var x=[],m={};if(f<0&&(0==s.indexOf(",w")?f=1:0==s.indexOf(",h")&&(f=0)),f>-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 h=d[l];if(s=s.replace(h.exp,h.str),s.indexOf("#")>-1){for(var o=s.split("#"),l=0;l<o.length;l++)b(o[l]);w=!1;break}}}while(f!=s);if(w){if(s.match(/,[w0],w|,[h1],h/))return!1;s=s.replace(/,[01]/,"").substr(1),x.push(s)}}};return b(s),x}function x(s){var f=[],x=/&[olx]/g,m=function(s){var f=[];for(var m in w)m.replace(x,"")==s&&f.push(w[m][0]);return f};if(w[s])f.push(w[s][0]);else if(f=m(s),f.length||(s=s.replace(/&[ol]/g,""),f=m(s)),f.length||(s=s.replace(/[ol]/g,"x"),f=m(s)),!f.length){var b=s.replace(/x/g,"l");f=m(b);var d=s.replace(/x/g,"o");f=f.concat(m(d))}return f}function m(s,f){var x={f:["d","s"],m:["d","s"],h:["w",""],w:["","h"],s:["m","f"],d:["m","f"],lb:["os","ob"],ob:["ls","lb"],xb:["xs","xb"],ls:["os","ob"],os:["ls","lb"],xs:["xs","xb"]},m="";if(s.indexOf("&o")>-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=[],h=0;h<d.length;h++)l.push(x[d[h]][w[h]]);return l.join(",")+m}return""}function b(s){for(var f=s.split(","),x=[],m=0;m<f.length;m++){var b=f[m].replace(/&[ol]/,"");x.push(w[b][0])}return x.join("的")}var d=[{exp:/^(.+)&o([^#]+)&l/g,str:"$1$2"},{exp:/^(.+)&l([^#]+)&o/g,str:"$1$2"},{exp:/(,[ds],(.+),[ds])&[ol]/g,str:"$1"},{exp:/m,h/g,str:"f"},{exp:/f,w/g,str:"m"},{exp:/,[xol][sb](,[mf])/g,str:"$1"},{exp:/,[mf],d&([ol])/,str:",$1s"},{exp:/,[mf],s&([ol])/,str:",$1b"},{exp:/^(.*)(,[fh1]|[xol]b),[mf],s(.*)$/,str:"$1$2,xb$3#$1$2$3"},{exp:/^(.*)(,[mw0]|[xol]s),[mf],d(.*)$/,str:"$1$2,xs$3#$1$2$3"},{exp:/(,[mw0]|[xol]s),[mf],s/,str:"$1,xb"},{exp:/(,[fh1]|[xol]b),[mf],d/,str:"$1,xs"},{exp:/^,[mf],s(.+)?$/,str:",1$1#,xb$1"},{exp:/^,[mf],d(.+)?$/,str:",0$1#,xs$1"},{exp:/(,o[sb])+(,o[sb])/,str:"$2"},{exp:/(,l[sb])+(,l[sb])/,str:"$2"},{exp:/^(.*)(,[fh1])(,[olx][sb])+,[olx]b(.*)$/,str:"$1$2,xb$4#$1$2$4"},{exp:/^(.*)(,[mw0])(,[olx][sb])+,[olx]s(.*)$/,str:"$1$2,xs$4#$1$2$4"},{exp:/(,[fh1])(,[olx][sb])+,[olx]s/g,str:"$1,xs"},{exp:/(,[mw0])(,[olx][sb])+,[olx]b/g,str:"$1,xb"},{exp:/^,[olx][sb],[olx]b(.+)?$/,str:"$1#,xb$1"},{exp:/^,[olx][sb],[olx]s(.+)?$/,str:"$1#,xs$1"},{exp:/^,x([sb])$/,str:",o$1#,l$1"},{exp:/,[ds]&o,ob/g,str:",s&o"},{exp:/,[ds]&o,os/g,str:",d&o"},{exp:/,[ds]&l,lb/g,str:",s&l"},{exp:/,[ds]&l,ls/g,str:",d&l"},{exp:/,[ds](&[ol])?,[olx]s/g,str:",d"},{exp:/,[ds](&[ol])?,[olx]b/g,str:",s"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,m/g,str:"$1"},{exp:/(,[mwd0](&[ol])?|[olx]s),[ds](&[ol])?,f/g,str:"$1,h"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,f/g,str:"$1"},{exp:/(,[fhs1](&[ol])?|[olx]b),[ds](&[ol])?,m/g,str:"$1,w"},{exp:/^,[ds],m(.+)?$/,str:"$1#,w$1"},{exp:/^,[ds],f(.+)?$/,str:"$1#,h$1"},{exp:/,[wh](,[ds])/g,str:"$1"},{exp:/,w,h|,h,w/g,str:""},{exp:/(.+)?\[(.+)\|(.+)\](.+)?/g,str:"$1$2$4#$1$3$4"}],w={"":["自己","我"],"[s|d]":["子女","儿女","小孩","孩子"],"[f|m]":["父母","爹娘","爹妈","爸妈","高堂"],f:["爸爸","父亲","阿爸","老爸","老窦","爹","爹爹","爹地","爹啲","老爹","大大","老爷子"],"f,f":["爷爷","祖父","阿爷","奶爷","阿公"],"f,f,f":["曾祖父","太爷","太爷爷","太公","祖公","祖奶爷"],"f,f,f,f":["高祖父","老太爷","祖太爷","祖太爷爷","祖太公"],"f,f,f,f,ob":["伯高祖父"],"f,f,f,f,ob,w":["伯高祖母"],"f,f,f,f,lb":["叔高祖父"],"f,f,f,f,lb,w":["叔高祖母"],"f,f,f,f,xs":["姑高祖母"],"f,f,f,f,xs,h":["姑高祖父"],"f,f,f,m":["高祖母","老太太","祖太太","祖太奶","祖太奶奶","祖太婆"],"f,f,f,m,xs":["姨高祖母"],"f,f,f,m,xs,h":["姨高祖父"],"f,f,f,ob":["曾伯祖父","曾伯父","伯曾祖父","伯公太","伯太爷"],"f,f,f,ob,w":["曾伯祖母","曾伯母","伯曾祖母","伯婆太","伯太太"],"f,f,f,lb":["曾叔祖父","曾叔父","叔曾祖父","叔公太","叔太爷"],"f,f,f,lb,w":["曾叔祖母","曾叔母","叔曾祖母","叔婆太","叔太太"],"f,f,f,xb,s&o":["堂伯祖父"],"f,f,f,xb,s&o,w":["堂伯祖母"],"f,f,f,xb,s&l":["堂叔祖父"],"f,f,f,xb,s&l,w":["堂叔祖母"],"f,f,f,xb,s,s&o":["从伯父"],"f,f,f,xb,s,s&o,w":["从伯母"],"f,f,f,xb,s,s&l":["从叔父"],"f,f,f,xb,s,s&l,w":["从叔母"],"f,f,f,xb,s,sLine truncated

script/relationship.js

@@ -317,7 +317,7 @@
 		'f,m,xb,d,s':['从表兄弟'],
 		'f,m,xb,d,d':['从表姐妹'],
 		'f,m,xs':['祖姨母','姨祖母','姨婆','姨奶奶'],
-		'f,m,xs,h':['祖姨父','姨祖父','姨丈公','姨爷爷','姨爷','姨老爷','姨奶爷'],
+		'f,m,xs,h':['祖姨父','姨祖父','姨公','姨爷爷','姨丈公','姨爷','姨老爷','姨奶爷'],
 		'f,m,xs,s&o':['姨表伯父','表伯','表伯父','从母伯父'],
 		'f,m,xs,s&o,w':['姨表伯母','表伯母','从母伯母'],
 		'f,m,xs,s&l':['姨表叔父','表叔父','表叔爸','表叔','从母叔父'],
@@ -484,7 +484,7 @@
 		'm,m,xs,d,d':['从表姐妹'],
 		//舅家
 		'm,xb':['舅舅','舅父','舅','娘舅','舅仔','母舅','舅爸','舅爹','阿舅','x舅'],
-		'm,xb,w':['舅妈','舅母','妗妗','妗母','阿妗','x舅妈'],
+		'm,xb,w':['舅妈','舅母','妗子','妗妗','妗母','阿妗','x舅妈'],
 		'm,xb,s&o':['舅表哥','表哥'],
 		'm,xb,s&o,w':['舅表嫂','表嫂'],
 		'm,xb,s&l':['舅表弟',,'表弟'],
@@ -538,7 +538,7 @@
 		'm,ls,h':['小姨父','小姨丈'],
 		//婆家
 		'h':['老公','丈夫','先生','官人','男人','汉子','夫','夫君','相公','夫婿','爱人','老伴'],
-		'h,f':['公公','翁亲'],
+		'h,f':['公公','翁亲','老公公'],
 		'h,f,f':['祖翁'],
 		'h,f,f,ob':['伯祖翁'],
 		'h,f,f,ob,w':['伯祖婆'],
@@ -560,6 +560,7 @@
 		'h,f,xb,s&l':['堂叔仔','堂弟'],
 		'h,f,xb,s&l,w':['堂小弟'],
 		'h,f,xs':['姑婆'],
+		'h,f,xs,h':['姑公'],
 		'h,f,xs,s&o':['姑表大伯子'],
 		'h,f,xs,s&o,w':['姑表大伯嫂'],
 		'h,f,xs,s&l':['姑表小叔弟'],
@@ -568,20 +569,33 @@
 		'h,f,xs,d&o,h':['姑表大姑姐夫'],
 		'h,f,xs,d&l':['姑表小姑妹'],
 		'h,f,xs,d&l,h':['姑表小姑妹夫'],
-		'h,f,xs,h':['姑公'],
+		'h,m':['婆婆','姑亲','老婆婆'],
-		'h,m':['婆婆','姑亲'],
 		'h,m,xb':['舅公'],
 		'h,m,xb,w':['舅婆'],
 		'h,m,xs':['姨婆'],
 		'h,m,xs,h':['姨公'],
+		'h,m,xs,s&o':['姨表大伯子'],
+		'h,m,xs,s&o,w':['姨表大伯嫂'],
+		'h,m,xs,s&l':['姨表小叔弟'],
+		'h,m,xs,s&l,w':['姨表小叔弟妇'],
+		'h,m,xs,s,s':['姨表夫侄男'],
+		'h,m,xs,s,d':['姨表夫侄女'],
+		'h,m,xs,d&o':['姨表大姑姐'],
+		'h,m,xs,d&o,h':['姨表大姑姐夫'],
+		'h,m,xs,d&l':['姨表小姑妹'],
+		'h,m,xs,d&l,h':['姨表小姑妹夫'],
+		'h,m,xs,d,s':['姨表夫甥男'],
+		'h,m,xs,d,d':['姨表夫甥女'],
 		'h,ob':['大伯子','大伯哥','大伯兄','夫兄'],
 		'h,ob,w':['大婶子','大伯嫂','大伯妇','伯娘','大伯娘','大嫂','夫兄嫂','妯娌'],
 		'h,lb':['小叔子','小叔弟'],
 		'h,lb,w':['小婶子','小叔妇','小叔媳妇','小叔弟妇','妯娌'],
+		'h,xb,s':['婆家侄'],
 		'h,os':['大姑子','大姑','大娘姑','大姑姊'],
 		'h,os,h':['大姑夫','姊丈','大姑姐夫','大姑姊夫'],
 		'h,ls':['小姑子','小姑','小姑妹','姑仔'],
 		'h,ls,h':['小姑夫','小亘子','小姑妹夫'],
+		'h,xs,s':['婆家甥'],
 		//岳家
 		'w':['老婆','妻子','太太','媳妇儿','媳妇','夫人','女人','婆娘','妻','内人','娘子','爱人','老伴'],
 		'w,f':['岳父','岳丈','老丈人','丈人','泰山','妻父'],
@@ -645,7 +659,7 @@
 		'w,ob,w':['舅嫂','大舅妇','大舅嫂','大舅媳妇','大妗子','内嫂','妻兄嫂'],
 		'w,lb':['小舅子','小舅弟','内弟','妻弟','妻舅'],
 		'w,lb,w':['舅弟媳','小舅妇','小舅弟妇','小舅媳妇','小妗子','妻妹夫'],
-		'w,xs,s':['姨甥','妻外甥'],
+		'w,xs,s':['内甥','姨甥','妻外甥'],
 		'w,xs,s,w':['姨甥媳妇'],
 		'w,xs,s,s':['姨甥孙'],
 		'w,xs,s,s,w':['姨甥孙媳妇'],